diff --git a/.eslintrc.js b/.eslintrc.js
index 64950ee0d..0bb050ad1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,7 @@
 module.exports = {
   "env": {
     "browser": true,
+    "es6": true,
   },
   "extends": ["google"],
   "overrides": [{
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..8804e639c
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [connortechnology,pliablepixels] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: zoneminder # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index dbb351b80..7751de627 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!--
+
 **THIS FORUM IS FOR BUG REPORTS ONLY**
 
 Do not post feature or enhancement requests, general discussions, or support questions here.
@@ -12,35 +14,46 @@ Docker related issues should be posted here: https://github.com/ZoneMinder/zmdoc
 In order to submit a bug report, please populate the fields below this line. This is required.
 
 ----------------------------------------------------------------------------------------------------
-
+-->
 **Describe Your Environment**
+<!--
 - Version of ZoneMinder [release version, development version, or commit]
 - How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
 - Full name and version of OS
 - Browser name and version (if this is an issue with the web interface)
+-->
 
 **If the issue concerns a camera**
+<!--
 - Make and Model
-- frame rate
-- resolution
+- Frame rate
+- Resolution
 - ZoneMinder Source Type:
+-->
 
 **Describe the bug**
+<!--
 A clear and concise description of what the bug is.
-
+-->
 **To Reproduce**
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->
 
 **Expected behavior**
+<!--
 A clear and concise description of what you expected to happen.
+-->
 
 **Debug Logs**
 ```
 
+<!--
 <insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
+-->
 
 ```
diff --git a/.github/stale.yml b/.github/stale.yml
index 94048df3d..4dde9b5a7 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,16 +1,17 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180
 
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 30
 
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "Under Review"
   - "Bounty"
   - "bug"
+  - "Feature"
 
 # Set to true to ignore issues in a milestone (defaults to false)
 exemptMilestones: true
diff --git a/.gitignore b/.gitignore
index 0dae662d7..152802d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,7 +120,7 @@ src/CMakeFiles/
 src/cmake_install.cmake
 src/libzm.a
 src/nph-zms
-src/zm_config.h
+src/zm_config_data.h
 src/zm_config_defines.h
 src/zma
 src/zmc
@@ -157,3 +157,4 @@ web/undef.log
 zm.conf
 zmconfgen.pl
 zmlinkcontent.sh
+**/.DS_Store
diff --git a/.travis.yml b/.travis.yml
index 80541eaab..da05d8970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: trusty
+dist: bionic
 git:
   depth: 9999999
 notifications:
@@ -13,7 +13,7 @@ addons:
   ssh_known_hosts: zmrepo.zoneminder.com
   apt:
     sources:
-    - sourceline: ppa:iconnor/zoneminder
+    - sourceline: ppa:iconnor/zoneminder-master
     - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
     packages:
     - gdebi
@@ -32,14 +32,17 @@ install:
   - update-binfmts --enable qemu-arm
 
 env:
-  - SMPFLAGS=-j4 OS=el DIST=7
-  - SMPFLAGS=-j4 OS=fedora DIST=28 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=fedora DIST=29 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=ubuntu DIST=trusty
-  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial
-  - SMPFLAGS=-j4 OS=ubuntu DIST=trusty ARCH=i386
-  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial ARCH=i386
-  - SMPFLAGS=-j4 OS=raspbian DIST=stretch ARCH=armhf DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=eslint DIST=eslint
+  - SMPFLAGS=-j4 OS=el DIST=7 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=el DIST=8 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=31 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=32 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=33 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=focal DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=stretch DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=buster DOCKER_REPO=iconzm/packpack
 
 compiler:
 - gcc
@@ -47,12 +50,6 @@ services:
 - mysql
 - docker
 
-jobs:
-  include:
-    - name: eslint
-      install: npm install -g eslint@5.12.0 eslint-config-google@0.11.0 eslint-plugin-html@5.0.0 eslint-plugin-php-markup@0.2.5
-      script: eslint --ext .php,.js .
-
 script:
 - utils/packpack/startpackpack.sh
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d882942d..2079296f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,8 @@ set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
 set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
 set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_C_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
+set(CMAKE_CXX_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 set (CMAKE_CXX_STANDARD 11)
@@ -140,9 +142,9 @@ set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH
     "Location of temporary files, default: /tmp/zm")
 set(ZM_LOGDIR "/var/log/zm" CACHE PATH 
     "Location of generated log files, default: /var/log/zm")
-set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH 
+set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH 
     "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
-set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
+set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
     "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
 set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
     "Location of the web server cache busting files, default: /var/cache/zoneminder")
@@ -189,6 +191,8 @@ set(ZM_NO_MMAP "OFF" CACHE BOOL
     experience problems with the shared memory. default: OFF")
 set(ZM_NO_LIBVLC "OFF" CACHE BOOL 
 "Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
+set(ZM_NO_LIBVNC "OFF" CACHE BOOL 
+"Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
 set(ZM_NO_CURL "OFF" CACHE BOOL 
     "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
 set(ZM_NO_X10 "OFF" CACHE BOOL 
@@ -321,7 +325,7 @@ if(NOT ZM_NO_CURL)
 	find_package(CURL)
 	if(CURL_FOUND)
 		set(HAVE_LIBCURL 1)
-		list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
+		#list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
 		include_directories(${CURL_INCLUDE_DIRS})
 		set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
 		check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
@@ -349,19 +353,50 @@ else(JPEG_FOUND)
             "ZoneMinder requires jpeg but it was not found on your system")
 endif(JPEG_FOUND)
 
+# LIBJWT
+find_package(LibJWT)
+if(LIBJWT_FOUND)
+	set(HAVE_LIBJWT 1)
+	set(optlibsfound "${optlibsfound} LIBJWT")
+	list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
+else(LIBJWT_FOUND)
+	set(optlibsnotfound "${optlibsnotfound} LIBJWT")
+endif(LIBJWT_FOUND)
+
+# gnutls (using find_library and find_path)
+if(HAVE_LIBJWT)
+	find_library(GNUTLS_LIBRARIES gnutls)
+	if(GNUTLS_LIBRARIES)
+		set(HAVE_LIBGNUTLS 1)
+		list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
+		find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
+		if(GNUTLS_INCLUDE_DIR)
+			include_directories("${GNUTLS_INCLUDE_DIR}")
+			set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+		endif(GNUTLS_INCLUDE_DIR)
+		mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
+		check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+		set(optlibsfound "${optlibsfound} GnuTLS")
+	else(GNUTLS_LIBRARIES)
+		set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+	endif(GNUTLS_LIBRARIES)
+endif(HAVE_LIBJWT)
+
 # OpenSSL
-find_package(OpenSSL)
-if(OPENSSL_FOUND)
-	set(HAVE_LIBOPENSSL 1)
-	set(HAVE_LIBCRYPTO 1)
-	list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
-	include_directories("${OPENSSL_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
-	set(optlibsfound "${optlibsfound} OpenSSL")
-else(OPENSSL_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} OpenSSL")
-endif(OPENSSL_FOUND)
+if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
+    find_package(OpenSSL)
+    if(OPENSSL_FOUND)
+        set(HAVE_LIBOPENSSL 1)
+        set(HAVE_LIBCRYPTO 1)
+        list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
+        include_directories("${OPENSSL_INCLUDE_DIR}")
+        set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+        check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+        set(optlibsfound "${optlibsfound} OpenSSL")
+    else(OPENSSL_FOUND)
+        set(optlibsnotfound "${optlibsnotfound} OpenSSL")
+    endif(OPENSSL_FOUND)
+endif(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
 
 # pthread (using find_library and find_path)
 find_library(PTHREAD_LIBRARIES pthread)
@@ -418,28 +453,6 @@ else(GCRYPT_LIBRARIES)
 	set(optlibsnotfound "${optlibsnotfound} GCrypt")
 endif(GCRYPT_LIBRARIES)
 
-# gnutls (using find_library and find_path)
-find_library(GNUTLS_LIBRARIES gnutls-openssl)
-if(NOT GNUTLS_LIBRARIES)
-    find_library(GNUTLS_LIBRARIES gnutls)
-endif(NOT GNUTLS_LIBRARIES)
-
-if(GNUTLS_LIBRARIES)
-	set(HAVE_LIBGNUTLS 1)
-	list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
-	find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
-	if(GNUTLS_INCLUDE_DIR)
-		include_directories("${GNUTLS_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	endif(GNUTLS_INCLUDE_DIR)
-	mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-	check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H)
-	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-	set(optlibsfound "${optlibsfound} GnuTLS")
-else(GNUTLS_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-endif(GNUTLS_LIBRARIES)
-
 # mysqlclient (using find_library and find_path)
 find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
@@ -547,6 +560,7 @@ if(AVCODEC_LIBRARIES)
 	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
 	set(optlibsfound "${optlibsfound} AVCodec")
 else(AVCODEC_LIBRARIES)
+  message(WARNING "\nWhile it should be possible to build ZM without AVCODEC the result will pretty useless.")
 	set(optlibsnotfound "${optlibsnotfound} AVCodec")
 endif(AVCODEC_LIBRARIES)
 
@@ -654,7 +668,7 @@ if(NOT ZM_NO_LIBVLC)
 	find_library(LIBVLC_LIBRARIES vlc)
 	if(LIBVLC_LIBRARIES)
 		set(HAVE_LIBVLC 1)
-		list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
+		#list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
 		find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
 		if(LIBVLC_INCLUDE_DIR)
 			include_directories("${LIBVLC_INCLUDE_DIR}")
@@ -668,6 +682,25 @@ if(NOT ZM_NO_LIBVLC)
 	endif(LIBVLC_LIBRARIES)
 endif(NOT ZM_NO_LIBVLC)
 
+if(NOT ZM_NO_LIBVNC)
+	# libvncclient (using find_library and find_path)
+	find_library(LIBVNC_LIBRARIES vncclient)
+	if(LIBVNC_LIBRARIES)
+		set(HAVE_LIBVNC 1)
+		#list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
+		find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
+		if(LIBVNC_INCLUDE_DIR)
+			include_directories("${LIBVNC_INCLUDE_DIR}")
+			set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
+		endif(LIBVNC_INCLUDE_DIR)
+		mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
+		check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
+		set(optlibsfound "${optlibsfound} libVNC")
+	else(LIBVNC_LIBRARIES)
+		set(optlibsnotfound "${optlibsnotfound} libVNC")
+	endif(LIBVNC_LIBRARIES)
+endif(NOT ZM_NO_LIBVNC)
+
 #find_package(Boost 1.36.0)
 #if(Boost_FOUND)
   #include_directories(${Boost_INCLUDE_DIRS})
@@ -733,14 +766,7 @@ if(HAVE_OPENSSL_MD5_H)
             "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" 
             HAVE_MD5_OPENSSL)
 endif(HAVE_OPENSSL_MD5_H)
-if(HAVE_GNUTLS_OPENSSL_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	check_prototype_definition(
-            MD5 
-            "unsigned char *MD5 (const unsigned char *buf, unsigned long len, unsigned char *md)" "NULL" "gnutls/openssl.h" 
-            HAVE_MD5_GNUTLS)
-endif(HAVE_GNUTLS_OPENSSL_H)
+
 if(HAVE_GNUTLS_GNUTLS_H)
 	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
 	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
@@ -749,13 +775,17 @@ if(HAVE_GNUTLS_GNUTLS_H)
             "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h" 
             HAVE_DECL_GNUTLS_FINGERPRINT)
 endif(HAVE_GNUTLS_GNUTLS_H)
-if(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+
+if(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
 	set(HAVE_DECL_MD5 1)
-else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+endif(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
+
+if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
 	message(AUTHOR_WARNING 
-        "ZoneMinder requires a working MD5 function for hashed authenication but 
-        none were found - hashed authenication will not be available")
-endif(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+        "ZoneMinder requires a working MD5 function for hashed authentication but 
+        none were found - hashed authentication will not be available")
+endif((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+
 # Dirty fix for zm_user only using openssl's md5 if gnutls and gcrypt are not available.
 # This needs to be fixed in zm_user.[h,cpp] but such fix will also require changes to configure.ac
 if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
@@ -871,7 +901,6 @@ configure_file(zmlinkcontent.sh.in "${CMAKE_CURRENT_BINARY_DIR}/zmlinkcontent.sh
 
 # Create a target for man pages
 include(Pod2Man)
-ADD_MANPAGE_TARGET()
 
 # Process subdirectories
 
@@ -886,11 +915,7 @@ add_subdirectory(scripts)
 add_subdirectory(db)
 add_subdirectory(web)
 add_subdirectory(misc)
-
-# Enable ONVIF support
-if(ZM_ONVIF)
-	add_subdirectory(onvif)
-endif(ZM_ONVIF)
+add_subdirectory(onvif)
 
 # Process distro subdirectories
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
@@ -905,7 +930,7 @@ message(STATUS "Optional libraries not found:${optlibsnotfound}")
 
 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
-execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
+execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
 if(zmconfgen_result EQUAL 0)
 	message(STATUS 
             "ZoneMinder configuration generator completed successfully")
diff --git a/README.md b/README.md
index b0f4be37b..c7bd801b7 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
 ZoneMinder
 ==========
 
-[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
-
-[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTlhZDU2MGU4MmZmN2MxOTg1MmNmNmZjZGRmY2EzMThhNGQ0MWNmZTg1ZmYzNDQ4YjliMzVmYTQ3MDc5MTkzODE)
+[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
+[![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
+[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
+[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder)
 
 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 
@@ -21,17 +22,11 @@ https://github.com/ZoneMinder/zmdockerfiles
 
 ## Installation Methods
 
-### Building from Source is Discouraged
-
-Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
-
-Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
-
 ### Install from a Package Repository
 
 This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
 
-- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor/+archive/ubuntu/zoneminder)
+- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor)
 - Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
 - RHEL/CentOS and clones via [RPM Fusion](http://rpmfusion.org)
 - Fedora via [RPM Fusion](http://rpmfusion.org)
@@ -42,6 +37,13 @@ This is the recommended method to install ZoneMinder onto your system. ZoneMinde
 
 If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
 
+### Building from Source is Discouraged
+
+Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
+
+Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
+
+
 ### Building a ZoneMinder Package ###
 
 Building ZoneMinder into a package is not any harder than building from source.  As a matter of fact, if you have successfully built ZoneMinder from source in the past, then you may find these steps to be easier. 
@@ -68,18 +70,19 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 
 
-## Contribution Model and  Development
+## Contribution Model and Development
 
 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Report issues at [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Questions/feature requests in [Slack](https://zoneminder-chat.slack.com/) or [forums](https://forums.zoneminder.com)
 
 Pull requests are very welcome!  If you would like to contribute, please follow
-the following steps.
+the following steps.  While step 3 is optional, it is preferred.
 
 1. Fork the repo
 2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Describe the bug that you've found, or the feature which you're asking for.
-   Jot down the issue number (e.g. 456)
+   Follow the issue template to describe the bug or security issue you found. Please note feature
+   requests or questions should be posted in our user forum or Slack channel.
 3. Create your feature branch (`git checkout -b 456-my-new-feature`)
 4. Commit your changes (`git commit -am 'Added some feature'`)
    It is preferred that you 'commit early and often' instead of bunching all
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..c3b4c7211
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+Time and computers move on. We do not have the resources to support every ancient version of everything
+(unless you'd like to pay us to do so.)  We ONLY support the latest stable release and development releases.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.34.x   | :white_check_mark: |
+| 1.35.x   | :white_check_mark: |
+| < 1.34.x   | :x:                |
+
+## Reporting a Vulnerability
+
+Since sometimes security vulnerabilities can be sensitive, you can just email me at isaac@zoneminder.com.
+If it's not such a big deal, by all means, create an issue here on github
+
diff --git a/cmake/Modules/FindLibJWT.cmake b/cmake/Modules/FindLibJWT.cmake
new file mode 100644
index 000000000..e0c834609
--- /dev/null
+++ b/cmake/Modules/FindLibJWT.cmake
@@ -0,0 +1,28 @@
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_LIBJWT QUIET libjwt)
+
+find_path(LIBJWT_INCLUDE_DIR
+  NAMES jwt.h
+  HINTS ${PC_LIBJWT_INCLUDEDIR} ${PC_LIBJWT_INCLUDE_DIRS}
+  )
+
+find_library(LIBJWT_LIBRARY
+  NAMES jwt-gnutls libjwt-gnutls liblibjwt-gnutls
+  HINTS ${PC_LIBJWT_LIBDIR} ${PC_LIBJWT_LIBRARY_DIR}
+  )
+
+find_package_handle_standard_args(LibJWT
+  REQUIRED_VARS LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY
+  )
+
+if(LIBJWT_FOUND)
+  add_library(libjwt STATIC IMPORTED GLOBAL)
+  set_target_properties(libjwt PROPERTIES
+    IMPORTED_LOCATION "${LIBJWT_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBJWT_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY)
\ No newline at end of file
diff --git a/cmake/Modules/Pod2Man.cmake b/cmake/Modules/Pod2Man.cmake
index 734be239b..f1c0e400a 100644
--- a/cmake/Modules/Pod2Man.cmake
+++ b/cmake/Modules/Pod2Man.cmake
@@ -53,8 +53,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
 
 	SET(MANPAGE_TARGET "man-${MANFILE}")
 
-	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
-	ADD_DEPENDENCIES(man ${MANPAGE_TARGET})
+	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
 
 	INSTALL(
 		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
diff --git a/conf.d/01-system-paths.conf.in b/conf.d/01-system-paths.conf.in
index e1aaf0bef..277f63b70 100644
--- a/conf.d/01-system-paths.conf.in
+++ b/conf.d/01-system-paths.conf.in
@@ -46,3 +46,6 @@ ZM_PATH_SWAP=@ZM_TMPDIR@
 # Full path to optional arp binary
 # ZoneMinder will find the arp binary automatically on most systems
 ZM_PATH_ARP="@ZM_PATH_ARP@"
+
+#Full path to shutdown binary
+ZM_PATH_SHUTDOWN="@ZM_PATH_SHUTDOWN@"
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index e5e4d8c3d..092fce14f 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -63,7 +63,7 @@ DROP TABLE IF EXISTS `Controls`;
 CREATE TABLE `Controls` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Protocol` varchar(64) default NULL,
   `CanWake` tinyint(3) unsigned NOT NULL default '0',
   `CanSleep` tinyint(3) unsigned NOT NULL default '0',
@@ -209,7 +209,7 @@ CREATE TABLE `Events` (
   `Executed` tinyint(3) unsigned NOT NULL default '0',
   `Notes` text,
   `StateId` int(10) unsigned NOT NULL,
-  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
+  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
   `DiskSpace`   bigint unsigned default NULL,
   `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
   `Locked`    BOOLEAN NOT NULL DEFAULT False,
@@ -282,17 +282,23 @@ DROP TABLE IF EXISTS `Filters`;
 CREATE TABLE `Filters` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Query` text NOT NULL,
+  `UserId`  int(10) unsigned,
+  `Query_json` text NOT NULL,
   `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
   `AutoVideo` tinyint(3) unsigned NOT NULL default '0',
   `AutoUpload` tinyint(3) unsigned NOT NULL default '0',
   `AutoEmail` tinyint(3) unsigned NOT NULL default '0',
+	`EmailTo`				TEXT,
+	`EmailSubject`	TEXT,
+	`EmailBody`			TEXT,
   `AutoMessage` tinyint(3) unsigned NOT NULL default '0',
   `AutoExecute` tinyint(3) unsigned NOT NULL default '0',
   `AutoExecuteCmd` tinytext,
   `AutoDelete` tinyint(3) unsigned NOT NULL default '0',
   `AutoMove` tinyint(3) unsigned NOT NULL default '0',
   `AutoMoveTo`	smallint(5) unsigned NOT NULL default 0,
+  `AutoCopy` tinyint(3) unsigned NOT NULL default '0',
+  `AutoCopyTo`	smallint(5) unsigned NOT NULL default 0,
   `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0',
   `Background` tinyint(1) unsigned NOT NULL default '0',
   `Concurrent` tinyint(1) unsigned NOT NULL default '0',
@@ -401,7 +407,7 @@ DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Device` tinytext,
   `Channel` tinyint(3) unsigned default NULL,
   `Format` int(10) unsigned default NULL,
@@ -432,13 +438,18 @@ DROP TABLE IF EXISTS `Monitors`;
 CREATE TABLE `Monitors` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
+  `Notes` TEXT,
   `ServerId` int(10) unsigned,
   `StorageId`	smallint(5) unsigned default 0,
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
+  `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '',
+  `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '',
+  `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
+  `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '',
   `Device` tinytext NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
   `Format` int(10) unsigned NOT NULL default '0',
@@ -457,7 +468,7 @@ CREATE TABLE `Monitors` (
   `Height` smallint(5) unsigned NOT NULL default '0',
   `Colours` tinyint(3) unsigned NOT NULL default '1',
   `Palette` int(10) unsigned NOT NULL default '0',
-  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
+  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
   `Deinterlacing` int(10) unsigned NOT NULL default '0',
   `DecoderHWAccelName`  varchar(64),
   `DecoderHWAccelDevice`  varchar(255),
@@ -474,7 +485,7 @@ CREATE TABLE `Monitors` (
   `Hue` mediumint(7) NOT NULL default '-1',
   `Colour` mediumint(7) NOT NULL default '-1',
   `EventPrefix` varchar(32) NOT NULL default 'Event-',
-  `LabelFormat` varchar(64) default '%N - %y/%m/%d %H:%M:%S',
+  `LabelFormat` varchar(64),
   `LabelX` smallint(5) unsigned NOT NULL default '0',
   `LabelY` smallint(5) unsigned NOT NULL default '0',
   `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
@@ -728,13 +739,14 @@ CREATE TABLE `Storage` (
   `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
   `ServerId` int(10) unsigned,
   `DoDelete`  BOOLEAN NOT NULL DEFAULT true,
+  `Enabled`  BOOLEAN NOT NULL DEFAULT true,
 	PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
 -- Create a default storage location
 --
-insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true );
+insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true, true );
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -757,8 +769,95 @@ insert into Users VALUES (NULL,'admin','$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
 --
 
-insert into Filters values (NULL,'PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',0/*AutoArchive*/,0/*AutoVideo*/,0/*AutoUpload*/,0/*AutoEmail*/,0/*AutoMessage*/,0/*AutoExecute*/,'',1/*AutoDelete*/,0/*AutoMove*/,0/*MoveTo*/,0/*UpdateDiskSpace*/,1/*Background*/,0/*Concurrent*/);
-insert into Filters values (NULL,'Update DiskSpace','{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',0,0,0,0,0,0,'',0,0,0,1,1,0);
+INSERT INTO `Filters`
+  (
+    `Name`,
+    `Query_json`,
+    `AutoArchive`,
+    `AutoVideo`,
+    `AutoUpload`,
+    `AutoEmail`,
+    `EmailTo`,
+    `EmailSubject`,
+    `EmailBody`,
+    `AutoMessage`,
+    `AutoExecute`,
+    `AutoExecuteCmd`,
+    `AutoDelete`,
+    `AutoMove`,
+    `AutoMoveTo`,
+    `AutoCopy`,
+    `AutoCopyTo`,
+    `UpdateDiskSpace`,
+    `UserId`,
+    `Background`,
+    `Concurrent`
+  )
+  VALUES
+  (
+    'PurgeWhenFull',
+    '{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',
+    0/*AutoArchive*/,
+    0/*AutoVideo*/,
+    0/*AutoUpload*/,
+    0/*AutoEmail*/,
+    ''/*EmailTo*/,
+    ''/*EmailSubject*/,
+    ''/*EmailBody*/,
+    0/*AutoMessage*/,
+    0/*AutoExecute*/,'',
+    1/*AutoDelete*/,
+    0/*AutoMove*/,0/*MoveTo*/,
+    0/*AutoCopy*/,0/*CopyTo*/,
+    0/*UpdateDiskSpace*/,
+    1/*UserId = admin*/,
+    1/*Background*/,
+    0/*Concurrent*/
+  );
+INSERT INTO `Filters`
+  (
+    `Name`,
+    `Query_json`,
+    `AutoArchive`,
+    `AutoVideo`,
+    `AutoUpload`,
+    `AutoEmail`,
+    `EmailTo`,
+    `EmailSubject`,
+    `EmailBody`,
+    `AutoMessage`,
+    `AutoExecute`,
+    `AutoExecuteCmd`,
+    `AutoDelete`,
+    `AutoMove`,
+    `AutoMoveTo`,
+    `AutoCopy`,
+    `AutoCopyTo`,
+    `UpdateDiskSpace`,
+    `UserId`,
+    `Background`,
+    `Concurrent`
+  )
+VALUES (
+  'Update DiskSpace',
+  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',
+  0/*AutoArchive*/,
+  0/*AutoVideo*/,
+  0/*AutoUpload*/,
+  0/*AutoEmail*/,
+  ''/*EmailTo*/,
+  ''/*EmailSubject*/,
+  ''/*EmailBody*/,
+  0/*AutoMessage*/,
+  0/*AutoExecute*/,'',
+  0/*AutoDelete*/,
+  0/*AutoMove*/,0/*MoveTo*/,
+  0/*AutoCopy*/,0/*CopyTo*/,
+  1/*UpdateDiskSpace*/,
+  1/*UserId=admin*/,
+  1/*Background*/,
+  0/*Concurrent*/
+);
 
 --
 -- Add in some sample control protocol definitions
@@ -796,6 +895,7 @@ INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,0
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,0,1,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,0,1,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,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);
+INSERT INTO `Controls` VALUES (NULL,'D-Link DCS-5020L','Remote','DCS5020L',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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,24,1,0,1,1,1,0,1,0,1,0,0,1,30,0,0,0,0,0,1,0,0,1,30,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,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,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',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,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',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,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,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
@@ -807,6 +907,9 @@ INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0
 --
 -- Add some monitor preset values
 --
+
+INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 640x480, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=1',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 3840x2160, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=0',NULL,3840,2160,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
@@ -830,6 +933,7 @@ INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rt
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
diff --git a/db/zm_update-1.27.99.0.sql b/db/zm_update-1.27.99.0.sql
deleted file mode 100644
index 5b5e495b6..000000000
--- a/db/zm_update-1.27.99.0.sql
+++ /dev/null
@@ -1,206 +0,0 @@
---
--- This updates a 1.27.0 database to 1.27.1
---
-
---
--- Add Controls definition for Wanscam
---
-INSERT INTO Controls 
-SELECT * FROM (SELECT NULL as Id,
-                     'WanscamPT' as Name,
-                     'Remote' as Type,
-                     'Wanscam' as Protocol,
-                     1 as CanWake,
-                     1 as CanSleep,
-                     1 as CanReset,
-                     0 as CanZoom,
-                     0 as CanAutoZoom,
-                     0 as CanZoomAbs,
-                     0 as CanZoomRel,
-                     0 as CanZoomCon,
-                     0 as MinZoomRange,
-                     0 as MaxZoomRange,
-                     0 as MinZoomStep,
-                     0 as MaxZoomStep,
-                     0 as HasZoomSpeed,
-                     0 as MinZoomSpeed,
-                     0 as MaxZoomSpeed,
-                     0 as CanFocus,
-                     0 as CanAutoFocus,
-                     0 as CanFocusAbs,
-                     0 as CanFocusRel,
-                     0 as CanFocusCon,
-                     0 as MinFocusRange,
-                     0 as MaxFocusRange,
-                     0 as MinFocusStep,
-                     0 as MaxFocusStep,
-                     0 as HasFocusSpeed,
-                     0 as MinFocusSpeed,
-                     0 as MaxFocusSpeed,
-                     1 as CanIris,
-                     0 as CanAutoIris,
-                     1 as CanIrisAbs,
-                     0 as CanIrisRel,
-                     0 as CanIrisCon,
-                     0 as MinIrisRange,
-                     16 as MaxIrisRange,
-                     0 as MinIrisStep,
-                     0 as MaxIrisStep,
-                     0 as HasIrisSpeed,
-                     0 as MinIrisSpeed,
-                     0 as MaxIrisSpeed,
-                     0 as CanGain,
-                     0 as CanAutoGain,
-                     0 as CanGainAbs,
-                     0 as CanGainRel,
-                     0 as CanGainCon,
-                     0 as MinGainRange,
-                     0 as MaxGainRange,
-                     0 as MinGainStep,
-                     0 as MaxGainStep,
-                     0 as HasGainSpeed,
-                     0 as MinGainSpeed,
-                     0 as MaxGainSpeed,
-                     1 as CanWhite,
-                     0 as CanAutoWhite,
-                     1 as CanWhiteAbs,
-                     0 as CanWhiteRel,
-                     0 as CanWhiteCon,
-                     0 as MinWhiteRange,
-                     16 as MaxWhiteRange,
-                     0 as MinWhiteStep,
-                     0 as MaxWhiteStep,
-                     0 as HasWhiteSpeed,
-                     0 as MinWhiteSpeed,
-                     0 as MaxWhiteSpeed,
-                     1 as HasPresets,
-                     16 as NumPresets,
-                     1 as HasHomePreset,
-                     1 as CanSetPresets,
-                     1 as CanMove,
-                     1 as CanMoveDiag,
-                     0 as CanMoveMap,
-                     0 as CanMoveAbs,
-                     0 as CanMoveRel,
-                     1 as CanMoveCon,
-                     1 as CanPan,
-                     0 as MinPanRange,
-                     0 as MaxPanRange,
-                     0 as MinPanStep,
-                     0 as MaxPanStep,
-                     0 as HasPanSpeed,
-                     0 as MinPanSpeed,
-                     0 as MaxPanSpeed,
-                     0 as HasTurboPan,
-                     0 as TurboPanSpeed,
-                     1 as CanTilt,
-                     0 as MinTiltRange,
-                     0 as MaxTiltRange,
-                     0 as MinTiltStep,
-                     0 as MaxTiltStep,
-                     0 as HasTiltSpeed,
-                     0 as MinTiltSpeed,
-                     0 as MaxTiltSpeed,
-                     0 as HasTurboTilt,
-                     0 as TurboTiltSpeed,
-                     0 as CanAutoScan,
-                     0 as NumScanPaths) AS tmp
-WHERE NOT EXISTS (
-    SELECT Name FROM Controls WHERE name = 'WanscamPT'
-) LIMIT 1;
-
--- Add extend alarm frame count to zone definition and Presets
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Zones'
-	AND table_schema = DATABASE()
-	AND column_name = 'ExtendAlarmFrames'
-	) > 0,
-"SELECT 'Column ExtendAlarmFrames exists in Zones'",
-"ALTER TABLE `Zones` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'ZonePresets'
-	AND table_schema = DATABASE()
-	AND column_name = 'ExtendAlarmFrames'
-	) > 0,
-"SELECT 'Column ExtendAlarmFrames exists in ZonePresets'",
-"ALTER TABLE `ZonePresets` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add MotionSkipFrame field for controlling how many frames motion detection should skip.
---
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'MotionFrameSkip'
-	) > 0,
-"SELECT 1",
-"ALTER TABLE `Monitors` ADD `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0' AFTER `FrameSkip`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add Monitor Options field; used for specifying Ffmpeg AVoptions like rtsp_transport http or libVLC options
---
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'Options'
-	) > 0,
-"SELECT 'Column Options already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Options` varchar(255) not null default '' AFTER `Path`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add V4LMultiBuffer and V4LCapturesPerFrame to Monitor
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'V4LMultiBuffer'
-    ) > 0,
-"SELECT 'Column V4LMultiBuffer exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `V4LMultiBuffer` tinyint(1) unsigned AFTER `Format`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'V4LCapturesPerFrame'
-    ) > 0,
-"SELECT 'Column V4LCapturesPerFrame exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `V4LCapturesPerFrame` tinyint(3) unsigned AFTER `V4LMultiBuffer`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
diff --git a/db/zm_update-1.31.13.sql b/db/zm_update-1.31.13.sql
index dd63b347a..150264027 100644
--- a/db/zm_update-1.31.13.sql
+++ b/db/zm_update-1.31.13.sql
@@ -13,6 +13,8 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
+UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId)  WHERE `SaveJPEGs` IS NULL;
+
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Storage'
diff --git a/db/zm_update-1.33.15.sql b/db/zm_update-1.33.15.sql
new file mode 100644
index 000000000..56b26fa2d
--- /dev/null
+++ b/db/zm_update-1.33.15.sql
@@ -0,0 +1,19 @@
+ALTER TABLE Events MODIFY `Orientation` enum('0','90','180','270','hori','vert','ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
+UPDATE Events SET Orientation='ROTATE_0' WHERE Orientation='0';
+UPDATE Events SET Orientation='ROTATE_90' WHERE Orientation='90';
+UPDATE Events SET Orientation='ROTATE_180' WHERE Orientation='180';
+UPDATE Events SET Orientation='ROTATE_270' WHERE Orientation='270';
+UPDATE Events SET Orientation='FLIP_HORI' WHERE Orientation='hori';
+UPDATE Events SET Orientation='FLIP_VERT' WHERE Orientation='vert';
+
+ALTER TABLE Events MODIFY `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
+
+ALTER TABLE Monitors MODIFY `Orientation` enum('0','90','180','270','hori','vert','ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
+UPDATE Monitors SET Orientation='ROTATE_0' WHERE Orientation='0';
+UPDATE Monitors SET Orientation='ROTATE_90' WHERE Orientation='90';
+UPDATE Monitors SET Orientation='ROTATE_180' WHERE Orientation='180';
+UPDATE Monitors SET Orientation='ROTATE_270' WHERE Orientation='270';
+UPDATE Monitors SET Orientation='FLIP_HORI' WHERE Orientation='hori';
+UPDATE Monitors SET Orientation='FLIP_VERT' WHERE Orientation='vert';
+
+ALTER TABLE Monitors MODIFY `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
diff --git a/db/zm_update-1.33.16.sql b/db/zm_update-1.33.16.sql
new file mode 100644
index 000000000..87058e3f8
--- /dev/null
+++ b/db/zm_update-1.33.16.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Monitors'
+      AND column_name = 'Notes'
+    ) > 0,
+    "SELECT 'Column Notes already exists in Monitors'",
+    "ALTER TABLE `Monitors` ADD `Notes` TEXT AFTER `Name`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.34.0.sql b/db/zm_update-1.34.0.sql
new file mode 100644
index 000000000..b8bd3e4ed
--- /dev/null
+++ b/db/zm_update-1.34.0.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.33.16 database to 1.34.0
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.1.sql b/db/zm_update-1.34.1.sql
new file mode 100644
index 000000000..65ba2e5ff
--- /dev/null
+++ b/db/zm_update-1.34.1.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.0 database to 1.34.1
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.2.sql b/db/zm_update-1.34.2.sql
new file mode 100644
index 000000000..1fcc882d2
--- /dev/null
+++ b/db/zm_update-1.34.2.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.1 database to 1.34.2
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.20.sql b/db/zm_update-1.34.20.sql
new file mode 100644
index 000000000..3512534be
--- /dev/null
+++ b/db/zm_update-1.34.20.sql
@@ -0,0 +1,2 @@
+/* This was done in 1.31.0 but zm_create.sql.in wasn't updated to match. */
+ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
diff --git a/db/zm_update-1.34.3.sql b/db/zm_update-1.34.3.sql
new file mode 100644
index 000000000..b84207047
--- /dev/null
+++ b/db/zm_update-1.34.3.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.2 database to 1.34.3
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.4.sql b/db/zm_update-1.34.4.sql
new file mode 100644
index 000000000..2910943a0
--- /dev/null
+++ b/db/zm_update-1.34.4.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.3 database to 1.34.4
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.5.sql b/db/zm_update-1.34.5.sql
new file mode 100644
index 000000000..7e12b977f
--- /dev/null
+++ b/db/zm_update-1.34.5.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.4 database to 1.34.5
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.6.sql b/db/zm_update-1.34.6.sql
new file mode 100644
index 000000000..1a58bee1f
--- /dev/null
+++ b/db/zm_update-1.34.6.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.5 database to 1.34.6
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.34.7.sql b/db/zm_update-1.34.7.sql
new file mode 100644
index 000000000..ba86b1202
--- /dev/null
+++ b/db/zm_update-1.34.7.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.6 database to 1.34.7
+--
+-- No changes required
+--
diff --git a/db/zm_update-1.35.0.sql b/db/zm_update-1.35.0.sql
new file mode 100644
index 000000000..2e9132a63
--- /dev/null
+++ b/db/zm_update-1.35.0.sql
@@ -0,0 +1,41 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'EmailTo'
+    ) > 0,
+"SELECT 'Column EmailTo already exists in Filters'",
+"ALTER TABLE `Filters` ADD `EmailTo` TEXT AFTER `AutoEmail`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Filters SET EmailTo=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_ADDRESS') WHERE AutoEmail=1;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'EmailSubject'
+    ) > 0,
+"SELECT 'Column EmailSubject already exists in Filters'",
+"ALTER TABLE `Filters` ADD `EmailSubject` TEXT AFTER `EmailTo`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Filters SET EmailSubject=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_SUBJECT') WHERE AutoEmail=1;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'EmailBody'
+    ) > 0,
+"SELECT 'Column EmailBody already exists in Filters'",
+"ALTER TABLE `Filters` ADD `EmailBody` TEXT AFTER `EmailSubject`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Filters SET EmailBody=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_BODY') WHERE AutoEmail=1;
diff --git a/db/zm_update-1.35.1.sql b/db/zm_update-1.35.1.sql
new file mode 100644
index 000000000..d250cf751
--- /dev/null
+++ b/db/zm_update-1.35.1.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Storage'
+     AND column_name = 'Enabled'
+    ) > 0,
+"SELECT 'Column Enabled already exists in Storage'",
+"ALTER TABLE `Storage` ADD `Enabled` BOOLEAN NOT NULL default true AFTER `DoDelete`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.2.sql b/db/zm_update-1.35.2.sql
new file mode 100644
index 000000000..55eabd887
--- /dev/null
+++ b/db/zm_update-1.35.2.sql
@@ -0,0 +1 @@
+ALTER TABLE Monitors MODIFY `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local';
diff --git a/db/zm_update-1.35.3.sql b/db/zm_update-1.35.3.sql
new file mode 100644
index 000000000..23f24dd3d
--- /dev/null
+++ b/db/zm_update-1.35.3.sql
@@ -0,0 +1,2 @@
+SELECT 'ALTERING Frames.Id to a BIGINT.  This could take a long time.';
+ALTER TABLE Frames MODIFY Id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
diff --git a/db/zm_update-1.35.4.sql b/db/zm_update-1.35.4.sql
new file mode 100644
index 000000000..44d195224
--- /dev/null
+++ b/db/zm_update-1.35.4.sql
@@ -0,0 +1,60 @@
+--
+-- This update adds ONVIF features
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'ONVIF_URL'
+	) > 0,
+"SELECT 'Column ONVIF_URL already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'ONVIF_Username'
+	) > 0,
+"SELECT 'Column ONVIF_Username already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_URL`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'ONVIF_Password'
+  ) > 0,
+"SELECT 'Column ONVIF_Password already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Username`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'ONVIF_Options'
+  ) > 0,
+"SELECT 'Column ONVIF_Options already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Password`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
diff --git a/db/zm_update-1.35.5.sql b/db/zm_update-1.35.5.sql
new file mode 100644
index 000000000..5507fcbfa
--- /dev/null
+++ b/db/zm_update-1.35.5.sql
@@ -0,0 +1,11 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'UserId'
+    ) > 0,
+"SELECT 'Column UserId already exists in Filters'",
+"ALTER TABLE `Filters` ADD `UserId`  int(10) unsigned AFTER `Name`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.6.sql b/db/zm_update-1.35.6.sql
new file mode 100644
index 000000000..3512534be
--- /dev/null
+++ b/db/zm_update-1.35.6.sql
@@ -0,0 +1,2 @@
+/* This was done in 1.31.0 but zm_create.sql.in wasn't updated to match. */
+ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
diff --git a/distros/beowulf/NEWS b/distros/beowulf/NEWS
new file mode 100644
index 000000000..6200726cf
--- /dev/null
+++ b/distros/beowulf/NEWS
@@ -0,0 +1,10 @@
+zoneminder (1.28.1-1) unstable; urgency=low
+
+  This version is no longer automatically initialize or upgrade database.
+  See README.Debian for details.
+
+  Changed installation paths (please correct your web server configuration):
+    /usr/share/zoneminder --> /usr/share/zoneminder/www
+    /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:12:17 +1100
diff --git a/distros/ubuntu1204/README.Debian b/distros/beowulf/README.Debian
similarity index 64%
rename from distros/ubuntu1204/README.Debian
rename to distros/beowulf/README.Debian
index 2ba809fe4..4fe3464d2 100644
--- a/distros/ubuntu1204/README.Debian
+++ b/distros/beowulf/README.Debian
@@ -8,7 +8,7 @@ Initializing database
 OR
     cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
 
-    echo 'grant lock tables,alter,create,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    echo 'grant lock tables,alter,create,index,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
     | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
 
 Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
@@ -23,8 +23,7 @@ configuration file:
 Upgrading database
 ------------------
 
-Prior to 1.28.1 database upgrade was performed automatically.
-"zoneminder" service will refuse to start with outdated database.
+The database is updated automatically on installation. You should not need to take this step.
 
 Assuming that database is on "localhost" then the following command can be
 used to upgrade "zm" database:
@@ -45,17 +44,11 @@ The following command prints the current version of zoneminder database:
 Enabling service
 ----------------
 
-By default Zoneminder service is not starting automatically and need to be
-manually activated once database is configured:
-
-On systemd:
+By default Zoneminder service is not automatically started and needs to be
+manually enabled once database is configured:
 
     sudo systemctl enable zoneminder.service
 
-On SysV:
-
-    sudo update-rc.d zoneminder enable
-
 
 Web server set-up
 -----------------
@@ -82,10 +75,10 @@ Common configuration steps for Apache2:
 
 ## nginx / fcgiwrap
 
-Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
+Nginx needs "php-fpm" package to support PHP and "fcgiwrap" package
 for binary "cgi-bin" applications:
 
-    sudo apt-get install php5-fpm fcgiwrap
+    sudo apt-get install php-fpm fcgiwrap
 
 To enable a URL alias that makes Zoneminder available from
 
@@ -119,32 +112,9 @@ site configuration.
 Changing the location for images and events
 -------------------------------------------
 
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-(thanks to vagrant@freegeek.org):
-
-These lines in fstab could allow you to bind-mount an alternate location
-
-         /dev/sdX1 /otherdrive ext3 defaults 0 2
-         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
-         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
+ZoneMinder is now able to be configured to use an alternative location for storing
+events and images at compile time. This package makes use of that, so symlinks in
+/usr/share/zoneminder/www are no longer necessary.
 
 Access to /dev/video*
 ---------------------
diff --git a/distros/ubuntu1204/TODO.Debian b/distros/beowulf/TODO.Debian
similarity index 100%
rename from distros/ubuntu1204/TODO.Debian
rename to distros/beowulf/TODO.Debian
diff --git a/distros/beowulf/changelog b/distros/beowulf/changelog
new file mode 100644
index 000000000..616f75178
--- /dev/null
+++ b/distros/beowulf/changelog
@@ -0,0 +1,3 @@
+zoneminder (1.31.39~20180223.27-stretch-1) unstable; urgency=low
+  * 
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 23 Feb 2018 14:15:59 -0500
diff --git a/distros/ubuntu1204/clean b/distros/beowulf/clean
similarity index 100%
rename from distros/ubuntu1204/clean
rename to distros/beowulf/clean
diff --git a/distros/ubuntu1204/compat b/distros/beowulf/compat
similarity index 100%
rename from distros/ubuntu1204/compat
rename to distros/beowulf/compat
diff --git a/distros/ubuntu1204/conf/apache2/zoneminder.conf b/distros/beowulf/conf/apache2/zoneminder.conf
similarity index 95%
rename from distros/ubuntu1204/conf/apache2/zoneminder.conf
rename to distros/beowulf/conf/apache2/zoneminder.conf
index 8e2957cbf..e3164d36c 100644
--- a/distros/ubuntu1204/conf/apache2/zoneminder.conf
+++ b/distros/beowulf/conf/apache2/zoneminder.conf
@@ -6,7 +6,8 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
     Require all granted
 </Directory>
 
-# Order matters. This Alias must come first
+
+# Order matters. This alias must come first.
 Alias /zm/cache /var/cache/zoneminder/cache
 <Directory /var/cache/zoneminder/cache>
     Options -Indexes +FollowSymLinks
@@ -24,7 +25,6 @@ Alias /zm/cache /var/cache/zoneminder/cache
 
 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
-  php_flag register_globals off
   Options -Indexes +FollowSymLinks
   <IfModule mod_dir.c>
     DirectoryIndex index.php
diff --git a/distros/ubuntu1204/control b/distros/beowulf/control
similarity index 79%
rename from distros/ubuntu1204/control
rename to distros/beowulf/control
index cc6158334..dd410c0ba 100644
--- a/distros/ubuntu1204/control
+++ b/distros/beowulf/control
@@ -1,35 +1,41 @@
 Source: zoneminder
 Section: net
 Priority: optional
-Maintainer: Dmitry Smirnov <onlyjob@debian.org>
-Uploaders: Vagrant Cascadian <vagrant@debian.org>
-Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
+Maintainer: Isaac Connor <isaac@zoneminder.com>
+Uploaders: Isaac Connor <isaac@zoneminder.com>
+Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
               ,cmake
               ,libx264-dev, libmp4v2-dev
-              ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libavdevice-dev
+              ,libavcodec-dev
+              ,libavformat-dev
+              ,libavutil-dev
+              ,libswresample-dev
+              ,libswscale-dev
+              ,ffmpeg
+              ,net-tools
               ,libbz2-dev
-              ,libgcrypt-dev
+              ,libgcrypt20-dev
               ,libcurl4-gnutls-dev
-              ,libgnutls-openssl-dev
-              ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
-              ,libmysqlclient-dev
+              ,libturbojpeg0-dev
+              ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
               ,libpcre3-dev
               ,libpolkit-gobject-1-dev
-              ,libv4l-dev (>= 0.8.3) [!hurd-any]
+              ,libv4l-dev [!hurd-any]
               ,libvlc-dev
               ,libdate-manip-perl
               ,libdbd-mysql-perl
               ,libphp-serialization-perl
               ,libsys-mmap-perl [!hurd-any]
               ,libwww-perl
-              ,libdata-uuid-perl 
+              ,libdata-uuid-perl
               ,libssl-dev
               ,libcrypt-eksblowfish-perl
               ,libdata-entropy-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
 Homepage: http://www.zoneminder.com/
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
@@ -38,16 +44,15 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libmp4v2-2, libx264-142
-        ,libav-tools|ffmpeg
-        ,libdate-manip-perl
+        ,libmp4v2-2, libx264-155
+        ,libswscale5
+        ,libswresample3
+        ,ffmpeg
+        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
-        ,libmime-lite-perl
-        ,libmime-tools-perl
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl
         ,libnet-sftp-foreign-perl
-#       ,libzoneminder-perl (= ${source:Version})
         ,libarchive-zip-perl
         ,libdbd-mysql-perl
         ,libdevice-serialport-perl
@@ -55,26 +60,31 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libjson-maybexs-perl
         ,libsys-mmap-perl [!hurd-any]
         ,liburi-encode-perl
-        ,libwww-perl
-        ,libdata-uuid-perl 
+        ,libwww-perl, liburi-perl
+        ,libdata-dump-perl
+        ,libdatetime-perl
+        ,libclass-std-fast-perl
+        ,libsoap-wsdl-perl
+        ,libio-socket-multicast-perl
+        ,libdigest-sha-perl
+        ,libsys-cpu-perl, libsys-meminfo-perl
+        ,libdata-uuid-perl
         ,libnumber-bytes-human-perl
         ,libfile-slurp-perl
-        ,mysql-client | virtual-mysql-client
+        ,mysql-client | mariadb-client | virtual-mysql-client
         ,perl-modules
-        ,php5-mysql, php5-gd, php5-apcu, php-apc
+        ,php-mysql, php-gd, php-apcu, php-apc | php-apcu-bc, php-json
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
-        ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl
-        ,libio-socket-multicast-perl, libdigest-sha-perl
-        ,libsys-cpu-perl, libsys-meminfo-perl
-        ,libssl | libssl1.0.0
+        ,libpcre3
         ,libcrypt-eksblowfish-perl
         ,libdata-entropy-perl
 Recommends: ${misc:Recommends}
-           ,libapache2-mod-php5 | php5-fpm
-           ,mysql-server | virtual-mysql-server
+           ,libapache2-mod-php | php-fpm
+           ,mysql-server | mariadb-server | virtual-mysql-server
            ,zoneminder-doc (>= ${source:Version})
+           ,ffmpeg
 Suggests: fcgiwrap, logrotate
 Description: video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security
@@ -120,7 +130,7 @@ Package: zoneminder-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
 Suggests: www-browser
 Description: ZoneMinder documentation
  ZoneMinder is intended for use in single or multi-camera video security
diff --git a/distros/ubuntu1204/copyright b/distros/beowulf/copyright
similarity index 100%
rename from distros/ubuntu1204/copyright
rename to distros/beowulf/copyright
diff --git a/distros/ubuntu1204/examples/nginx.conf b/distros/beowulf/examples/nginx.conf
similarity index 100%
rename from distros/ubuntu1204/examples/nginx.conf
rename to distros/beowulf/examples/nginx.conf
diff --git a/distros/ubuntu1204/gbp.conf b/distros/beowulf/gbp.conf
similarity index 100%
rename from distros/ubuntu1204/gbp.conf
rename to distros/beowulf/gbp.conf
diff --git a/distros/ubuntu1204/libzoneminder-perl.install b/distros/beowulf/libzoneminder-perl.install
similarity index 100%
rename from distros/ubuntu1204/libzoneminder-perl.install
rename to distros/beowulf/libzoneminder-perl.install
diff --git a/distros/ubuntu1204/patches/series b/distros/beowulf/patches/series
similarity index 100%
rename from distros/ubuntu1204/patches/series
rename to distros/beowulf/patches/series
diff --git a/distros/ubuntu1204/rules b/distros/beowulf/rules
similarity index 71%
rename from distros/ubuntu1204/rules
rename to distros/beowulf/rules
index 657697fcf..e26f1bb91 100755
--- a/distros/ubuntu1204/rules
+++ b/distros/beowulf/rules
@@ -16,23 +16,23 @@ endif
             --with sphinxdoc,apache2,linktree
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(ARGS)                          \
-            -DCMAKE_VERBOSE_MAKEFILE=ON                       \
-            -DCMAKE_BUILD_TYPE=Release                        \
-            -DZM_CONFIG_DIR="/etc/zm"                         \
-            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"               \
-            -DZM_RUNDIR="/var/run/zm"                         \
-            -DZM_SOCKDIR="/var/run/zm"                        \
-            -DZM_TMPDIR="/tmp/zm"                             \
-            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"         \
-            -DZM_CACHEDIR="/var/cache/zoneminder/cache"       \
+	dh_auto_configure -- $(ARGS)                  \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                \
+            -DCMAKE_BUILD_TYPE=Release                 \
+            -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
+            -DZM_RUNDIR="/run/zm"                  \
+            -DZM_SOCKDIR="/run/zm"                 \
+            -DZM_TMPDIR="/tmp/zm"                      \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
             -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-            -DZM_PATH_SHUTDOWN="/sbin/shutdown"               \
-            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               
+            -DZM_PATH_SHUTDOWN="/sbin/shutdown"        \
+            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"
 
 override_dh_clean:
 	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
+	$(RM) -r docs/_build
 
 build-indep:
 	#$(MAKE) -C docs text
@@ -67,12 +67,6 @@ override_dh_fixperms:
 	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
-override_dh_installinit:
-	dh_installinit --no-start
-
-override_dh_apache2:
-	dh_apache2 --noenable
-
 override_dh_strip:
 	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
         && dh_strip --dbg-package=zoneminder-dbg \
diff --git a/distros/ubuntu1204/source/format b/distros/beowulf/source/format
similarity index 100%
rename from distros/ubuntu1204/source/format
rename to distros/beowulf/source/format
diff --git a/distros/ubuntu1204/source/lintian-overrides b/distros/beowulf/source/lintian-overrides
similarity index 100%
rename from distros/ubuntu1204/source/lintian-overrides
rename to distros/beowulf/source/lintian-overrides
diff --git a/distros/ubuntu1204/zoneminder-doc.doc-base b/distros/beowulf/zoneminder-doc.doc-base
similarity index 100%
rename from distros/ubuntu1204/zoneminder-doc.doc-base
rename to distros/beowulf/zoneminder-doc.doc-base
diff --git a/distros/ubuntu1204/zoneminder-doc.install b/distros/beowulf/zoneminder-doc.install
similarity index 100%
rename from distros/ubuntu1204/zoneminder-doc.install
rename to distros/beowulf/zoneminder-doc.install
diff --git a/distros/ubuntu1204/zoneminder-doc.links b/distros/beowulf/zoneminder-doc.links
similarity index 100%
rename from distros/ubuntu1204/zoneminder-doc.links
rename to distros/beowulf/zoneminder-doc.links
diff --git a/distros/ubuntu1204/zoneminder.apache2 b/distros/beowulf/zoneminder.apache2
similarity index 100%
rename from distros/ubuntu1204/zoneminder.apache2
rename to distros/beowulf/zoneminder.apache2
diff --git a/distros/ubuntu1204/zoneminder.bug-presubj b/distros/beowulf/zoneminder.bug-presubj
similarity index 100%
rename from distros/ubuntu1204/zoneminder.bug-presubj
rename to distros/beowulf/zoneminder.bug-presubj
diff --git a/distros/ubuntu1204/zoneminder.dirs b/distros/beowulf/zoneminder.dirs
similarity index 95%
rename from distros/ubuntu1204/zoneminder.dirs
rename to distros/beowulf/zoneminder.dirs
index 79b2c66af..6db3d5a95 100644
--- a/distros/ubuntu1204/zoneminder.dirs
+++ b/distros/beowulf/zoneminder.dirs
@@ -5,5 +5,5 @@ var/cache/zoneminder/images
 var/cache/zoneminder/temp
 var/cache/zoneminder/cache
 usr/share/zoneminder/db
-etc/zm
+etc/zm/
 etc/zm/conf.d
diff --git a/distros/ubuntu1204/zoneminder.docs b/distros/beowulf/zoneminder.docs
similarity index 100%
rename from distros/ubuntu1204/zoneminder.docs
rename to distros/beowulf/zoneminder.docs
diff --git a/distros/ubuntu1204/zoneminder.examples b/distros/beowulf/zoneminder.examples
similarity index 100%
rename from distros/ubuntu1204/zoneminder.examples
rename to distros/beowulf/zoneminder.examples
diff --git a/distros/ubuntu1204/zoneminder.init b/distros/beowulf/zoneminder.init
similarity index 86%
rename from distros/ubuntu1204/zoneminder.init
rename to distros/beowulf/zoneminder.init
index de552848b..6132481f3 100644
--- a/distros/ubuntu1204/zoneminder.init
+++ b/distros/beowulf/zoneminder.init
@@ -17,19 +17,12 @@
 
 prog=ZoneMinder
 ZM_PATH_BIN="/usr/bin"
-RUNDIR="/var/run/zm"
+RUNDIR="/run/zm"
 TMPDIR="/tmp/zm"
 command="$ZM_PATH_BIN/zmpkg.pl"
 
 start() {
 	echo -n "Starting $prog: "
-        # Wait for mysqld to start. Continue if it takes too long.
-            count=0
-            while [ ! -e /var/run/mysqld/mysqld.sock ] && [ $count -lt 60 ]
-                do
-                    sleep 1
-                    count=$((count+1))
-            done
 	export TZ=:/etc/localtime
 	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
 	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"
diff --git a/distros/ubuntu1204/zoneminder.install b/distros/beowulf/zoneminder.install
similarity index 100%
rename from distros/ubuntu1204/zoneminder.install
rename to distros/beowulf/zoneminder.install
diff --git a/distros/beowulf/zoneminder.links b/distros/beowulf/zoneminder.links
new file mode 100644
index 000000000..b7258c3c4
--- /dev/null
+++ b/distros/beowulf/zoneminder.links
@@ -0,0 +1 @@
+/var/tmp  /usr/share/zoneminder/www/api/app/tmp
diff --git a/distros/ubuntu1204/zoneminder.linktrees b/distros/beowulf/zoneminder.linktrees
similarity index 100%
rename from distros/ubuntu1204/zoneminder.linktrees
rename to distros/beowulf/zoneminder.linktrees
diff --git a/distros/ubuntu1204/zoneminder.lintian-overrides b/distros/beowulf/zoneminder.lintian-overrides
similarity index 100%
rename from distros/ubuntu1204/zoneminder.lintian-overrides
rename to distros/beowulf/zoneminder.lintian-overrides
diff --git a/distros/ubuntu1204/zoneminder.logrotate b/distros/beowulf/zoneminder.logrotate
similarity index 85%
rename from distros/ubuntu1204/zoneminder.logrotate
rename to distros/beowulf/zoneminder.logrotate
index 846abd4fb..6162e9c4d 100644
--- a/distros/ubuntu1204/zoneminder.logrotate
+++ b/distros/beowulf/zoneminder.logrotate
@@ -1,4 +1,4 @@
-/var/log/zm/*log {
+/var/log/zm/*.log {
     missingok
     notifempty
     sharedscripts
@@ -9,4 +9,5 @@
     endscript
     daily
     rotate 7
+    maxage 7
 }
diff --git a/distros/ubuntu1204/zoneminder.maintscript b/distros/beowulf/zoneminder.maintscript
similarity index 100%
rename from distros/ubuntu1204/zoneminder.maintscript
rename to distros/beowulf/zoneminder.maintscript
diff --git a/distros/ubuntu1204/zoneminder.manpages b/distros/beowulf/zoneminder.manpages
similarity index 100%
rename from distros/ubuntu1204/zoneminder.manpages
rename to distros/beowulf/zoneminder.manpages
diff --git a/distros/ubuntu1204/zoneminder.postinst b/distros/beowulf/zoneminder.postinst
similarity index 100%
rename from distros/ubuntu1204/zoneminder.postinst
rename to distros/beowulf/zoneminder.postinst
diff --git a/distros/ubuntu1204/zoneminder.postrm b/distros/beowulf/zoneminder.postrm
similarity index 100%
rename from distros/ubuntu1204/zoneminder.postrm
rename to distros/beowulf/zoneminder.postrm
diff --git a/distros/beowulf/zoneminder.preinst b/distros/beowulf/zoneminder.preinst
new file mode 100644
index 000000000..6088c3ea9
--- /dev/null
+++ b/distros/beowulf/zoneminder.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+## Remove obsolete symlink which is in the way of dh_apache2:
+ol="/etc/apache2/conf-available/zoneminder.conf"
+if [ -h "${ol}" ]; then
+    [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
+fi
+
+#DEBHELPER#
diff --git a/distros/beowulf/zoneminder.tmpfile b/distros/beowulf/zoneminder.tmpfile
new file mode 100644
index 000000000..cbfdec1de
--- /dev/null
+++ b/distros/beowulf/zoneminder.tmpfile
@@ -0,0 +1,4 @@
+d /run/zm                   0755 www-data www-data
+d /tmp/zm                       0755 www-data www-data
+d /var/tmp/zm                   0755 www-data www-data
+d /var/cache/zoneminder/cache   0755 www-data www-data
diff --git a/distros/debian/changelog b/distros/debian/changelog
index 46f1e2bd9..72841f158 100644
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@@ -40,7 +40,7 @@ zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium
 
  -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400
 
-zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high
+zoneminder (1.27.0+1-trusty-v4ltomonitor-1) trusty; urgency=high
 
   * Snapshot release - 
 
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index f1a1bc75b..45cafe57d 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -21,7 +21,7 @@ endif(ZM_TARGET_DISTRO MATCHES "^el")
 # Configure the common zoneminder files
 configure_file(common/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
 configure_file(common/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events temp)
+file(MAKE_DIRECTORY sock swap zoneminder events temp)
 
 # Configure the Apache zoneminder files
 configure_file(httpd/zm-httpd.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zm-httpd.conf @ONLY)
@@ -51,7 +51,6 @@ install(DIRECTORY sock swap DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSION
 install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/cache DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(DIRECTORY zoneminder-upload DESTINATION /var/spool DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY events temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 # Install the Apache zoneminder files
diff --git a/distros/redhat/common/zoneminder.service.in b/distros/redhat/common/zoneminder.service.in
index 8551a60e2..f4b3aad9b 100644
--- a/distros/redhat/common/zoneminder.service.in
+++ b/distros/redhat/common/zoneminder.service.in
@@ -5,6 +5,7 @@
 Description=ZoneMinder CCTV recording and security system
 After=network.target mariadb.service
 Requires=mariadb.service
+BindsTo=mariadb.service
 
 [Service]
 Type=forking
diff --git a/distros/redhat/readme/README b/distros/redhat/readme/README
index 0b3e4bb9c..f0fff828f 100644
--- a/distros/redhat/readme/README
+++ b/distros/redhat/readme/README
@@ -22,14 +22,10 @@ What's New
    switching between httpd <-> nginx requires manaully changing ownership of
    all event folders and the php session folder after the change.
 
-4. If you have installed ZoneMinder from the FedBerry repositories, this build
-   of ZoneMinder has support for Raspberry Pi hardware acceleration when using
-   ffmpeg. Unforunately, there is a problem with the same hardware acceleration
-   when using libvlc. Consequently, libvlc support in this build of ZoneMinder
-   has been disabled until the problem is resolved. See the following bug
-   report for details: https://trac.videolan.org/vlc/ticket/18594
+4. The timezone must now be set from the ZoneMinder web console. See the
+   appropriate README, mentioned in the next step, for details.
 
-5. Continue on to the next README that corresponds to the chosen webserver:
+6. Continue on to the next README that corresponds to your chosen webserver:
 
      README.httpd - Follow these steps when using Apache
      README.nginx - Follow these steps when using Nginx
diff --git a/distros/redhat/readme/README.httpd b/distros/redhat/readme/README.httpd
index 5301850df..1ba0ee688 100644
--- a/distros/redhat/readme/README.httpd
+++ b/distros/redhat/readme/README.httpd
@@ -36,20 +36,17 @@ NOTE: EL7 users should replace "dnf" with "yum" in the instructions below.
      sudo chown root:apache *.conf
      sudo chmod 640 *.conf     
 
-4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
-   timezone.  PHP will complain loudly if this is not set, or if it is set
-   incorrectly, and these complaints will show up in the zoneminder logging
-   system as errors.
+4. Manually setting the timezone in /etc/php.ini is deprecated.
 
-   If you are not sure of the proper timezone specification to use, look at
-   http://php.net/date.timezone
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this after completing step 10, below.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.
 
 5. Disable SELinux 
 
-   We currently do not have the resources to create and maintain an accurate
-   SELinux policy for ZoneMinder on Fedora. We will gladly accept pull
-   reqeusts from anyone who wishes to do the work. In the meantime, SELinux
-   will need to be disabled or put into permissive mode.
+   SELinux must be disabled or put into permissive mode. This is not optional!
    
    To immediately disbale SELinux for the current seesion, issue the following
    from the command line:
@@ -166,3 +163,11 @@ Upgrades
         sudo systemctl restart httpd
 	sudo systemctl start zoneminder
 
+6. Manually setting the timezone in /etc/php.ini is deprecated.
+
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this now.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.
+
diff --git a/distros/redhat/readme/README.nginx b/distros/redhat/readme/README.nginx
index cca4e72c2..8bc3bbdc1 100644
--- a/distros/redhat/readme/README.nginx
+++ b/distros/redhat/readme/README.nginx
@@ -34,13 +34,13 @@ New installs
      sudo chown root:nginx *.conf
      sudo chmod 640 *.conf     
 
-4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
-   timezone.  PHP will complain loudly if this is not set, or if it is set
-   incorrectly, and these complaints will show up in the zoneminder logging
-   system as errors.
+4. Manually setting the timezone in /etc/php.ini is deprecated.
 
-   If you are not sure of the proper timezone specification to use, look at
-   http://php.net/date.timezone
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this after completing step 10, below.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.
 
 5. Disable SELinux 
 
@@ -169,3 +169,11 @@ Upgrades
 	sudo systemctl restart php-fpm
 	sudo systemctl start zoneminder
 
+6. Manually setting the timezone in /etc/php.ini is deprecated.
+
+   Instead, navigate to Options -> System from the ZoneMinder web console.
+   Do this now.
+
+   Note that timezone errors will appear in the ZoneMinder log until this
+   has been completed.
+
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index e319f4c8f..8a03de245 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -14,23 +14,32 @@
 # This will tell zoneminder's cmake process we are building against a known distro
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
-# Fedora >= 25 needs apcu backwards compatibility module
-%if 0%{?fedora} >= 25
+# Fedora needs apcu backwards compatibility module
+%if 0%{?fedora}
 %global with_apcu_bc 1
 %endif
 
+# Newer php's keep json functions in a subpackage
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%global with_php_json 1
+%endif
+
 # The default for everything but el7 these days
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.33.14
+Version: 1.35.6
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
-# Mootools is inder the MIT license: http://mootools.net/
+# Mootools is under the MIT license: http://mootools.net/
+# jQuery is under the MIT license: https://jquery.org/license/
 # CakePHP is under the MIT license: https://github.com/cakephp/cakephp
 # Crud is under the MIT license: https://github.com/FriendsOfCake/crud
 # CakePHP-Enum-Behavior is under the MIT license: https://github.com/asper/CakePHP-Enum-Behavior
+# Bootstrap is under the MIT license: https://getbootstrap.com/docs/4.5/about/license/
+# Bootstrap-table is under the MIT license: https://bootstrap-table.com/docs/about/license/
+# font-awesome is under CC-BY license: https://fontawesome.com/license/free
 License: GPLv2+ and LGPLv2+ and MIT
 URL: http://www.zoneminder.com/
 
@@ -38,6 +47,7 @@ Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zon
 Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
 Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version}.tar.gz#/cakephp-enum-behavior-%{ceb_version}.tar.gz
 
+%{?rhel:BuildRequires: epel-rpm-macros}
 BuildRequires: systemd-devel
 BuildRequires: mariadb-devel
 BuildRequires: perl-podlators
@@ -105,7 +115,7 @@ Summary: Common files for ZoneMinder, not tied to a specific web server
 Requires: php-mysqli
 Requires: php-common
 Requires: php-gd
-%{?fedora:Requires: php-json}
+%{?with_php_json:Requires: php-json}
 Requires: php-pecl-apcu
 %{?with_apcu_bc:Requires: php-pecl-apcu-bc}
 Requires: cambozola
@@ -194,23 +204,24 @@ mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Beh
 
 # Change the following default values
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
-./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR %{_localstatedir}/spool/zoneminder-upload
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
-./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
-./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
+# Disable LTO due to top level asm
+# See https://fedoraproject.org/wiki/LTOByDefault
+%define _lto_cflags %{nil}
+
 %cmake3 \
         -DZM_WEB_USER="%{zmuid_final}" \
         -DZM_WEB_GROUP="%{zmgid_final}" \
         -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
         .
 
-%make_build
+%cmake3_build
 
 %install
-%make_install
+%cmake3_install
 
 desktop-file-install					\
 	--dir %{buildroot}%{_datadir}/applications	\
@@ -352,6 +363,7 @@ EOF
 %{_bindir}/zmtelemetry.pl
 %{_bindir}/zmx10.pl
 %{_bindir}/zmonvif-probe.pl
+%{_bindir}/zmonvif-trigger.pl
 %{_bindir}/zmstats.pl
 %{_bindir}/zmrecover.pl
 
@@ -384,7 +396,6 @@ EOF
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 
 %files nginx
 %config(noreplace) %attr(640,root,nginx) %{_sysconfdir}/zm/zm.conf
@@ -408,29 +419,28 @@ EOF
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp
 %dir %attr(755,nginx,nginx) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
-%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
-* Sun Aug 11 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.14-1
-- Bump to 1.33.13 Development
+* Tue Feb 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.2-1
+- 1.34.2 Release
 
-* Sun Jul 07 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.12-1
-- Bump to 1.33.12 Development
+* Fri Jan 31 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.1-1
+- 1.34.1 Release
 
-* Sun Jun 23 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.9-1
-- Bump to 1.33.9 Development
+* Sat Jan 18 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.0-1
+- 1.34.0 Release
 
-* Tue Apr 30 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.8-1
-- Bump to 1.33.8 Development
+* Tue Dec 17 2019 Leigh Scott <leigh123linux@gmail.com> - 1.32.3-5
+- Mass rebuild for x264
 
-* Sun Apr 07 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.6-1
-- Bump to 1.33.6 Development
+* Wed Aug 07 2019 Leigh Scott <leigh123linux@gmail.com> - 1.32.3-4
+- Rebuild for new ffmpeg version
 
-* Sat Mar 30 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.4-1
-- Bump to 1.33.4 Development
+* Tue Mar 12 2019 Sérgio Basto <sergio@serjux.com> - 1.32.3-3
+- Mass rebuild for x264
 
-* Tue Dec 11 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.0-1
-- Bump to 1.33.0 Development
+* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.32.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
 * Sat Dec 08 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.32.3-1
 - 1.32.3 Release
diff --git a/distros/ubuntu1204/NEWS b/distros/ubuntu1204/NEWS
deleted file mode 100644
index e69de29bb..000000000
diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog
deleted file mode 100644
index b19a3f228..000000000
--- a/distros/ubuntu1204/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-zoneminder (1.31.0-trusty) trusty; urgency=medium
-
-  * placeholder
-
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 13 May 2016 09:45:49 -0400
-=======
->>>>>>> master
diff --git a/distros/ubuntu1204/watch b/distros/ubuntu1204/watch
deleted file mode 100644
index 7ee690edb..000000000
--- a/distros/ubuntu1204/watch
+++ /dev/null
@@ -1,7 +0,0 @@
-version=3
-
-opts=\
-repacksuffix=+dfsg,\
-dversionmangle=s{\+dfsg\d*}{},\
- https://github.com/ZoneMinder/ZoneMinder/releases \
-  .*/ZoneMinder/archive/v(.*).tar.gz
diff --git a/distros/ubuntu1204/zoneminder.links b/distros/ubuntu1204/zoneminder.links
deleted file mode 100644
index 373548919..000000000
--- a/distros/ubuntu1204/zoneminder.links
+++ /dev/null
@@ -1 +0,0 @@
-/tmp/zm						/usr/share/zoneminder/www/api/app/tmp
diff --git a/distros/ubuntu1204/zoneminder.preinst b/distros/ubuntu1204/zoneminder.preinst
deleted file mode 100644
index 3f75a1b3e..000000000
--- a/distros/ubuntu1204/zoneminder.preinst
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-## Remove obsolete symlink which is in the way of dh_apache2:
-ol="/etc/apache2/conf-available/zoneminder.conf"
-if [ -h "${ol}" ]; then
-    [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
-fi
-
-abort=false
-if [ -h /usr/share/zoneminder/www/events ]; then
-    l=$(readlink /usr/share/zoneminder/www/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -h /usr/share/zoneminder/www/images ]; then
-    l=$(readlink /usr/share/zoneminder/www/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
diff --git a/distros/ubuntu1204/zoneminder.tmpfile b/distros/ubuntu1204/zoneminder.tmpfile
deleted file mode 100644
index 017955900..000000000
--- a/distros/ubuntu1204/zoneminder.tmpfile
+++ /dev/null
@@ -1,3 +0,0 @@
-d /var/run/zm 0755 www-data www-data
-d /tmp/zm     0755 www-data www-data
-d /var/tmp/zm                   0755 www-data www-data
diff --git a/distros/ubuntu1410/README.Debian b/distros/ubuntu1410/README.Debian
deleted file mode 100644
index a49b6be72..000000000
--- a/distros/ubuntu1410/README.Debian
+++ /dev/null
@@ -1,51 +0,0 @@
-zoneminder for Debian
----------------------
-
-There is one manual step to get the web interface working.
-You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
-then reload the apache config (i.e. /etc/init.d/apache2 reload)
-
-Changing the location for images and events
--------------------------------------------
-
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-
-These lines would mount /dev/sdX1 to /video_storage, and then 'link' /video_storage
-to the locations that ZoneMinder expects them to be at.
-
-         /dev/sdX1 /video_storage ext4 defaults 0 2
-         /video_storage/zoneminder/images /var/cache/zoneminder/images none bind 0 2
-         /video_storage/zoneminder/events /var/cache/zoneminder/events none bind 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext4 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext4 defaults 0 2
-
-
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
-
-Access to /dev/video*
----------------------
-
-For cameras which require access to /dev/video*, zoneminder may need the 
-www-data user added to the video group in order to see those cameras:
-
-  adduser www-data video
-
-Note that all web applications running on the zoneminder server will then have 
-access to all video devices on the system.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu1410/apache.conf b/distros/ubuntu1410/apache.conf
deleted file mode 100644
index 92a2b6414..000000000
--- a/distros/ubuntu1410/apache.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /zm /usr/share/zoneminder
-
-<Directory /usr/share/zoneminder>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
diff --git a/distros/ubuntu1410/changelog b/distros/ubuntu1410/changelog
deleted file mode 100644
index 55e3d17b0..000000000
--- a/distros/ubuntu1410/changelog
+++ /dev/null
@@ -1,323 +0,0 @@
-zoneminder (1.30.2-trusty-2016033001) trusty; urgency=medium
-
-  * merge master
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 30 Mar 2016 14:09:48 -0400
-
-zoneminder (1.30.2-trusty-2016032901) trusty; urgency=medium
-
-  * filter fixes, merge options rework by Kyle
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Mar 2016 12:27:57 -0400
-
-zoneminder (1.30.2-trusty-2016030702) trusty; urgency=medium
-
-  * 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 07 Mar 2016 22:14:03 -0500
-
-zoneminder (1.30.2-trusty-2016030701) trusty; urgency=medium
-
-  * merge master. with telemetry
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 07 Mar 2016 21:47:53 -0500
-
-zoneminder (1.30.2-trusty-2016022101) trusty; urgency=medium
-
-  * merge zmtrigger fix
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 22 Feb 2016 09:15:53 -0500
-
-zoneminder (1.30.2-trusty-2016021901) trusty; urgency=medium
-
-  * zmtrigger improvements
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 19 Feb 2016 11:09:57 -0500
-
-zoneminder (1.30.2-trusty-2016021701) trusty; urgency=medium
-
-  * printout id, and ip address when failing to connect
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 17 Feb 2016 09:40:49 -0500
-
-zoneminder (1.30.2-trusty-2016021001) trusty; urgency=medium
-
-  * 
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 10 Feb 2016 13:06:09 -0500
-
-zoneminder (1.29.111-trusty-2016020101) trusty; urgency=medium
-
-  * Fix video download and use of Storage Areas
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 01 Feb 2016 13:42:06 -0500
-
-zoneminder (1.29.111-trusty-2016011401) trusty; urgency=medium
-
-  * fix timeline view for storageareas
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 14 Jan 2016 14:03:41 -0500
-
-zoneminder (1.29.111-trusty-2016010801) trusty; urgency=medium
-
-  * Add better debug and skip when event links are not just digits. Merge multi-server stuff from master.
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 08 Jan 2016 10:37:16 -0500
-
-zoneminder (1.29.111-trusty-2016010401) trusty; urgency=medium
-
-  *  include fix to rotate image dimensions when applying a rotation
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 04 Jan 2016 13:24:42 -0500
-
-zoneminder (1.29.111-trusty-2016010101) trusty; urgency=medium
-
-  * fix logging with multi-server
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 01 Jan 2016 17:11:09 -0500
-
-zoneminder (1.29.111-trusty-2015123101) trusty; urgency=medium
-
-  * Add log filtering from multi-server
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 31 Dec 2015 10:18:03 -0500
-
-zoneminder (1.29.109-trusty-2015122401) trusty; urgency=medium
-
-  * fix delete events not in database in zmaudit.pl
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 24 Dec 2015 12:38:05 -0500
-
-zoneminder (1.29.109-trusty-2015122301) trusty; urgency=medium
-
-  * todays release
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 23 Dec 2015 09:33:46 -0500
-
-zoneminder (1.29.109-trusty-2015122202) trusty; urgency=medium
-
-  * more object work and zmaudit
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Tue, 22 Dec 2015 13:13:56 -0500
-
-zoneminder (1.29.109-trusty-2015122201) trusty; urgency=medium
-
-  * merge multi-server, and master stuff, start work on zmaudit storage areas support
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Tue, 22 Dec 2015 11:11:44 -0500
-
-zoneminder (1.29.109-trusty-2015122103) trusty; urgency=medium
-
-  * Fixes
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 21 Dec 2015 15:20:15 -0500
-
-zoneminder (1.29.109-trusty-2015122102) trusty; urgency=medium
-
-  * fix deleting events
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 21 Dec 2015 14:49:12 -0500
-
-zoneminder (1.29.109-trusty-2015122101) trusty; urgency=medium
-
-  * Make zmfilter work.
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 21 Dec 2015 12:32:27 -0500
-
-zoneminder (1.29.109-trusty-2015121803) trusty; urgency=medium
-
-  * merge zmvideo improvements
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 18 Dec 2015 14:17:56 -0500
-
-zoneminder (1.29.109-trusty-2015121802) trusty; urgency=medium
-
-  * Add some missing files to the autoconf build
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 18 Dec 2015 12:14:08 -0500
-
-zoneminder (1.29.109-trusty-2015121801) trusty; urgency=medium
-
-  * 
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 18 Dec 2015 11:05:58 -0500
-
-zoneminder (1.29.109-trusty-2015121701) trusty; urgency=medium
-
-  * Merge master + better zmvideo
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 17 Dec 2015 15:11:18 -0500
-
-zoneminder (1.29.0-trusty-2015112301) trusty; urgency=medium
-
-  * apply fix for zms crash
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 23 Nov 2015 10:47:49 -0500
-
-zoneminder (1.29.0-trusty-2015110601) trusty; urgency=medium
-
-  * add a FIONREAD test on timeout
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 22 Jul 2015 09:55:37 -0400
-
-zoneminder (1.29.0-trusty-2015072201) trusty; urgency=medium
-
-  * add AnalysisFPS
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 22 Jul 2015 09:55:37 -0400
-
-zoneminder (1.29.0-trusty-2015071601) trusty; urgency=medium
-
-  * Merge master and zmtrigger
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 16 Jul 2015 13:15:58 -0400
-
-zoneminder (1.29.0-trusty-38) trusty; urgency=medium
-
-  * Merge master
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Tue, 14 Jul 2015 10:15:00 -0400
-
-zoneminder (1.29.0-trusty-37) trusty; urgency=medium
-
-  * merge master api stuff, set sleep after failure to capture to 5000 instead of 5000000
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 19 Jun 2015 09:59:54 -0400
-
-zoneminder (1.29.0-trusty-36) trusty; urgency=medium
-
-  * Detect select interuption when no action on our fd
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 28 May 2015 09:35:59 -0400
-
-zoneminder (1.29.0-trusty-35) trusty; urgency=medium
-
-  * better logging
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Fri, 22 May 2015 15:30:42 -0400
-
-zoneminder (1.29.0-trusty-34) trusty; urgency=medium
-
-  * Faster shutdown and changes to ReadData
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 21 May 2015 15:54:47 -0400
-
-zoneminder (1.29.0-trusty-33) trusty; urgency=medium
-
-  * update zmaudit some more
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Thu, 14 May 2015 13:44:35 -0400
-
-zoneminder (1.29.0-trusty-32) trusty; urgency=medium
-
-  * merge zmaudit_updates1
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 13 May 2015 15:51:56 -0400
-
-zoneminder (1.29.0-trusty-31) trusty; urgency=medium
-
-  * Merge some fixes and zmaudit improvements
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Wed, 13 May 2015 15:16:19 -0400
-
-zoneminder (1.29.0-trusty-27) trusty; urgency=medium
-
-  * fflush logs, merge master.
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Mon, 30 Mar 2015 19:28:05 -0400
-
-zoneminder (1.29.0-vivid-26) vivid; urgency=medium
-
-  *  logging improvements, merge RedData changes
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 04 Mar 2015 16:39:19 -0500
-
-zoneminder (1.29.0-vivid-25) vivid; urgency=medium
-
-  * some change to ReadData
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 02 Mar 2015 12:57:16 -0500
-
-zoneminder (1.29.0-utopic-24) utopic; urgency=medium
-
-  * merge local_raw
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 23 Feb 2015 17:49:36 -0500
-
-zoneminder (1.29.0-trusty-23) trusty; urgency=medium
-
-  * more onvif merges, fix to zmfilter
-
- -- Isaac Connor <iconnor@testing.internal.point-one.com>  Sat, 21 Feb 2015 16:17:01 -0500
-
-zoneminder (1.29.0-trusty-22) trusty; urgency=medium
-
-  * updates from master: merge onvif, default to classic if skin not defined.
-
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 19 Feb 2015 18:14:58 -0500
-
-zoneminder (1.29.0-utopic-21) utopic; urgency=medium
-
-  * updates from master, improve monitor probing and support TRENDnet cameras
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 17 Feb 2015 14:18:52 -0500
-
-zoneminder (1.29.0-wheezy-20) wheezy; urgency=medium
-
-  * zmaudit.pl improvements - double check db before deleting fs event
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 04 Feb 2015 11:09:22 -0500
-
-zoneminder (1.29.0-utopic-18) utopic; urgency=medium
-
-  * RTSP Timeout fixes
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 28 Jan 2015 13:49:16 -0500
-
-zoneminder (1.29.0-utopic-17) utopic; urgency=medium
-
-  * Merge master, use new split-up debian build
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 26 Jan 2015 11:21:07 -0500
-
-zoneminder (1.28.0+nmu1) testing; urgency=medium
-
-  * Non-maintainer upload
-  * Split the debian package into several packages
-  * Switch to native source format
-
- -- Emmanuel Papin <manupap01@gmail.com>  Thu, 15 Jan 2015 20:00:08 +0100
-
-zoneminder (1.28.0-0.2) testing; urgency=medium
-
-  * Non-maintainer upload.
-  * Upstream release for debian jessie
-  * Package dependencies updated
-  * debhelper version upgraded
-  * Standards-Version upgraded
-  * Use debhelper commands instead of standard commands
-  * Install man pages in /usr/share/man (patch added)
-  * Switch to quilt
-  * Switch to systemd
-  * Some lintian fixes
-
- -- Emmanuel Papin <manupap01@gmail.com>  Wed, 26 Nov 2014 00:26:01 +0100
-
-zoneminder (1.28.0-0.1) stable; urgency=medium
-
-  * Release
-
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:27:22 -0400
-
-zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium
-
-  * improve error messages
-  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400
-
-zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high
-
-  * Snapshot release - 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
diff --git a/distros/ubuntu1410/control b/distros/ubuntu1410/control
deleted file mode 100644
index 5a873f133..000000000
--- a/distros/ubuntu1410/control
+++ /dev/null
@@ -1,122 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), autoconf, automake, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl, libx264-dev, libmp4v2-dev, libpcre3-dev
-Standards-Version: 3.9.6
-
-Package: zoneminder
-Section: metapackages
-Architecture: all
-Depends: ${misc:Depends},
- libzoneminder-perl (>= ${source:Version}),
- zoneminder-database (>= ${source:Version}),
- zoneminder-core (>= ${binary:Version}),
- zoneminder-ui-base (>= ${source:Version}),
- zoneminder-ui-classic (>= ${source:Version}),
- zoneminder-ui-mobile (>= ${source:Version}),
- zoneminder-ui-xml (>= ${source:Version})
-Description: Video camera security and surveillance solution (metapackage)
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-Package: libzoneminder-perl
-Section: perl
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libdbi-perl,
- libdevice-serialport-perl, libimage-info-perl, libjson-any-perl, libjson-maybexs-perl,
- libsys-mmap-perl, liburi-encode-perl, libwww-perl
-Description: Perl libraries for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the libraries for the perl scripts, it can be used to
- write custom interfaces as well.
-
-Package: zoneminder-database
-Section: database
-Architecture: all
-Depends: ${misc:Depends}, debconf, dbconfig-common,
- mysql-client | mariadb-client
-Recommends: mysql-server | mariadb-server
-Description: Database management package for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the sql files and maintenance scripts to perform all the
- database operations (installation, upgrade or removal) on a local or a remote
- server.
-
-Package: zoneminder-core
-Section: video
-Architecture: any
-Depends: libzoneminder-perl (= ${source:Version}),
- zoneminder-database (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
- ${perl:Depends}, libarchive-tar-perl, libarchive-zip-perl, libdate-manip-perl,
- libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
- libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
- debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, zip,
- policykit-1, apache2, libmp4v2-2, libpcre++0
-Description: Core binaries and perl scripts for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the executable compiled binaries which do the main video
- processing work and the perl scripts which perform helper and/or external
- interface tasks.
-
-Package: zoneminder-core-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: zoneminder-core (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the debugging symbols for the executable compiled
- binaries.
-
-Package: zoneminder-ui-base
-Section: web
-Architecture: any
-Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid,
- php5, php5-mysql | php5-mysqlnd, php5-gd
-Description: Essential files for ZoneMinder's web user interface
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the essential web files and maintenance scripts to set up
- a basic web environment.
-
-Package: zoneminder-ui-classic
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Classic web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the classic web user interface.
-
-Package: zoneminder-ui-mobile
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Mobile web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the web user interface for mobile devices.
-
-Package: zoneminder-ui-xml
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: XML interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides a XML interface mainly intended for use with the eyeZm
- iPhone Application, but can be used with any other custom programs as well.
diff --git a/distros/ubuntu1410/copyright b/distros/ubuntu1410/copyright
deleted file mode 100644
index a177502a0..000000000
--- a/distros/ubuntu1410/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright:
-
-Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
-
-License:
-
-This package 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 package is distributed in the hope that 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 package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
diff --git a/distros/ubuntu1410/libzoneminder-perl.install b/distros/ubuntu1410/libzoneminder-perl.install
deleted file mode 100644
index 792ffc15e..000000000
--- a/distros/ubuntu1410/libzoneminder-perl.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/perl5/ZoneMinder
-usr/share/perl5/ZoneMinder.pm
-debian/tmp/usr/share/man/man3/ZoneMinder.3pm
-debian/tmp/usr/share/man/man3/ZoneMinder::*
diff --git a/distros/ubuntu1410/po/POTFILES.in b/distros/ubuntu1410/po/POTFILES.in
deleted file mode 100644
index 5b155907e..000000000
--- a/distros/ubuntu1410/po/POTFILES.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[type: gettext/rfc822deb] zoneminder-core.templates
-[type: gettext/rfc822deb] zoneminder-database.templates
-[type: gettext/rfc822deb] zoneminder-ui-base.templates
diff --git a/distros/ubuntu1410/po/fr.po b/distros/ubuntu1410/po/fr.po
deleted file mode 100644
index 85ced7fd2..000000000
--- a/distros/ubuntu1410/po/fr.po
+++ /dev/null
@@ -1,252 +0,0 @@
-# debconf french translation file for ZoneMinder.
-# Copyright (C) 2001-2008 Philip Coombes
-# This file is distributed under the same license as the zoneminder package.
-# First author: Emmanuel Papin <manupap01@gmail.com>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zoneminder\n"
-"Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-16 12:34+0100\n"
-"PO-Revision-Date: 2014-12-07 00:40+0100\n"
-"Last-Translator: Emmanuel Papin <manupap01@gmail.com>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid "Delete this non empty directory?"
-msgstr "Supprimer ce répertoire non vide ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"A purge of the ZoneMinder package is performed but the directory '/var/cache/"
-"zoneminder' is not empty so it will not be deleted."
-msgstr ""
-"Une purge du paquet ZoneMinder est en cours mais le répertoire '/var/cache/"
-"zoneminder' n'est pas vide et sera donc conservé."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"Please consider that this directory is designed to contain data resulting "
-"from event detection. Therefore, \"proof of evidence\" could be lost!\""
-msgstr ""
-"Veuillez considérer que ce répertoire est conçu pour contenir des données "
-"résultants de la détection d'événements. Par conséquent, des preuves "
-"pourraient être perdues !"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"If you are not sure of your decision, please do not delete this directory "
-"but perform a manual checkup."
-msgstr ""
-"Si vous n'êtes pas sûr de votre décision, veuillez conserver ce répertoire "
-"et effectuer une vérification manuelle."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid "Deletion confirmed?"
-msgstr "Supression confirmée ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid ""
-"You have allowed the deletion of directory '/var/cache/zoneminder' although "
-"it may contain critical data."
-msgstr ""
-"Vous avez autorisé la suppression du répertoire '/var/cache/zoneminder' bien "
-"qu'il puisse contenir des données critiques."
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "local"
-msgstr "local"
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "remote"
-msgstr "distant"
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid "Database location:"
-msgstr "Emplacement de la base de donnée :"
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"A database server is required to run ZoneMinder. The database can be "
-"installed either locally or remotely on a machine of your network."
-msgstr ""
-"Un serveur de base de données est requis pour ZoneMinder. La base de donnée "
-"peut être installée localement ou à distance sur une machine de votre réseau."
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"If you choose a remote location, you will have to select the 'tcp/ip' "
-"connection method and enter the hostname or ip address of the remote machine "
-"in the next configuration screens."
-msgstr ""
-"Si vous choisissez un emplacement distant, vous devrez sélectionner la "
-"méthode de connexion 'tcp/ip' et entrer le nom réseau ou l'adresse ip de la "
-"machine distante dans les écrans de configuration suivants."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid "No local database server is available:"
-msgstr "Aucun serveur local de base de données n'est disponible :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"Currently ZoneMinder supports mysql or mariadb database server but none of "
-"them appears to be installed on this machine."
-msgstr ""
-"Actuellement ZoneMinder supporte les serveurs de base de données mysql et "
-"mariadb mais aucun d'entre eux n'est installé sur cette machine."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"In order to complete ZoneMinder's installation, after ending of this "
-"assistant, please install a compatible database server and then restart the "
-"assistant by invoking:"
-msgstr ""
-"Afin de compléter l'installation de ZoneMinder, après la fermeture de cet "
-"assitant, veuillez installer un serveur de base de données compatible et "
-"ensuite redémarrez l'assistant en invoquant :"
-
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001 ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr "$ sudo dpkg-reconfigure zoneminder"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "Remote database servers are not allowed:"
-msgstr "Les serveurs de base de données distants ne sont pas autorisés :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"The current configuration of dbconfig-common does not allow installation of "
-"a database on remote servers."
-msgstr ""
-"La configuration actuelle de dbconfig-common ne permet pas l'installation de "
-"bases de données sur des serveurs distants."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"In order to reconfigure dbconfig-common, please invoke the following command "
-"after ending of this assistant:"
-msgstr ""
-"Afin de reconfigurer dbconfig-common, veuillez invoquer la commande suivante "
-"après la fermeture de cet assitant :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure dbconfig-common"
-msgstr "$ sudo dpkg-reconfigure dbconfig-common"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"Then, to complete ZoneMinder's installation, please restart this assistant "
-"by invoking:"
-msgstr ""
-"Ensuite, pour compléter l'installation de ZoneMinder, veuillez redémarrer "
-"cet assistant en invoquant :"
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "New password for the ZoneMinder 'admin' user:"
-msgstr "Nouveau mot de passe pour le compte 'admin' de ZoneMinder :"
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "Please enter the password of the default administrative user."
-msgstr "Veuillez entrer le mot de passe du compte administrateur par défaut."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid ""
-"While not mandatory, it is highly recommended that you set a custom password "
-"for the administrative 'admin' user."
-msgstr ""
-"Bien que cela ne soit pas obligatoire, il est fortement recommandé de "
-"fournir un mot de passe personnalisé pour le compte administrateur 'admin'."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "If this field is left blank, the password will not be changed."
-msgstr "Si le champ est laissé vide, le mot de passe ne sera pas changé."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:5001
-msgid "Repeat password for the ZoneMinder 'admin' user:"
-msgstr "Répéter le mot de passe pour le compte 'admin' de ZoneMinder :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "Password input error"
-msgstr "Erreur de mot de passe"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"Les deux mots de passe saisis ne sont pas les mêmes. Veuillez essayer à "
-"nouveau."
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr "Serveur web à reconfigurer automatiquement :"
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured for "
-"ZoneMinder's web portal access."
-msgstr ""
-"Veuillez choisir le serveur web à reconfigurer automatiquement pour l'accès "
-"au portail web de ZoneMinder."
diff --git a/distros/ubuntu1410/po/templates.pot b/distros/ubuntu1410/po/templates.pot
deleted file mode 100644
index 941a4094e..000000000
--- a/distros/ubuntu1410/po/templates.pot
+++ /dev/null
@@ -1,222 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: zoneminder\n"
-"Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-16 12:34+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid "Delete this non empty directory?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"A purge of the ZoneMinder package is performed but the directory '/var/cache/"
-"zoneminder' is not empty so it will not be deleted."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"Please consider that this directory is designed to contain data resulting "
-"from event detection. Therefore, \"proof of evidence\" could be lost!\""
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"If you are not sure of your decision, please do not delete this directory "
-"but perform a manual checkup."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid "Deletion confirmed?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid ""
-"You have allowed the deletion of directory '/var/cache/zoneminder' although "
-"it may contain critical data."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "local"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "remote"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid "Database location:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"A database server is required to run ZoneMinder. The database can be "
-"installed either locally or remotely on a machine of your network."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"If you choose a remote location, you will have to select the 'tcp/ip' "
-"connection method and enter the hostname or ip address of the remote machine "
-"in the next configuration screens."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid "No local database server is available:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"Currently ZoneMinder supports mysql or mariadb database server but none of "
-"them appears to be installed on this machine."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"In order to complete ZoneMinder's installation, after ending of this "
-"assistant, please install a compatible database server and then restart the "
-"assistant by invoking:"
-msgstr ""
-
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001 ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "Remote database servers are not allowed:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"The current configuration of dbconfig-common does not allow installation of "
-"a database on remote servers."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"In order to reconfigure dbconfig-common, please invoke the following command "
-"after ending of this assistant:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure dbconfig-common"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"Then, to complete ZoneMinder's installation, please restart this assistant "
-"by invoking:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "New password for the ZoneMinder 'admin' user:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "Please enter the password of the default administrative user."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid ""
-"While not mandatory, it is highly recommended that you set a custom password "
-"for the administrative 'admin' user."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "If this field is left blank, the password will not be changed."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:5001
-msgid "Repeat password for the ZoneMinder 'admin' user:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "Password input error"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured for "
-"ZoneMinder's web portal access."
-msgstr ""
diff --git a/distros/ubuntu1410/rules b/distros/ubuntu1410/rules
deleted file mode 100755
index 49d3549f1..000000000
--- a/distros/ubuntu1410/rules
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-DEBOPT = --enable-debug
-CFLAGS += -g
-CXXFLAGS += -g
-else
-DEBOPT =
-endif
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-# These are used to get the most recent version of the original sources from github
-UURL = $(shell git config --get remote.origin.url)
-BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
-HEAD = $(shell git rev-parse HEAD)
-PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-|\+nmu\d+.*)};')
-DTYPE =
-TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz
-
-%:
-	dh $@ --with autoreconf
-
-override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \
-	  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man \
-	  --infodir=\$${prefix}/share/info --with-mysql=/usr \
-	  --with-mariadb=/usr --with-webdir=/usr/share/zoneminder \
-	  --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin \
-	  --with-webuser=www-data --with-webgroup=www-data \
-	  --enable-mmap=yes $(DEBOPT)
-
-override_dh_clean:
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean src/zm_config_defines.h
-	#
-	# Delete remaining auto-generated Makefile if Makefile.in exists
-	find $(CURDIR)/ -type f -name "Makefile" | while read file; do \
-	  [ -f $$file.in ] && rm -f $$file; \
-	done || true
-	#
-	# Delete remaining auto-generated Makefile.in if Makefile.am exists
-	find $(CURDIR)/ -type f -name "Makefile.in" | while read filein; do \
-	  fileam=`echo $$filein | sed 's/\(.*\)\.in/\1\.am/'`; \
-	  [ -f $$fileam ] && rm -f $$filein; \
-	done || true
-
-override_dh_install:
-	dh_install --fail-missing
-	#
-	# NOTE: This is a short-term kludge; hopefully changes in the next
-	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/images
-	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	# The link stuff for these folders has been moved to
-	# zoneminder-core.links file
-	#
-	# This is a slightly lesser kludge; moving the cgi stuff to
-	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
-	# having it just in /usr/lib/cgi-bin breaks another bit of
-	# behavior.
-	# The link stuff for /usr/share/zoneminder/cgi-bin has been moved to
-	# zoneminder-ui-base.links file
-
-override_dh_installinit:
-	dh_installinit --package=zoneminder-core --name=zoneminder
-
-override_dh_systemd_start:
-	dh_systemd_start --package=zoneminder-core --name=zoneminder \
-	  --restart-after-upgrade
-
-override_dh_systemd_enable:
-	dh_systemd_enable --package=zoneminder-core --name=zoneminder
-
-override_dh_fixperms:
-	dh_fixperms
-	#
-	# As requested by the Debian Webapps Policy Manual §3.2.1
-	chown root:www-data debian/zoneminder-core/etc/zm/zm.conf
-	chmod 640 debian/zoneminder-core/etc/zm/zm.conf
-
-override_dh_auto_test:
-	# do not run tests...
-
-.PHONY: override_dh_strip
-override_dh_strip:
-	dh_strip --dbg-package=zoneminder-core-dbg
-
-# Inspired by https://wiki.debian.org/onlyjob/get-orig-source
-.PHONY: get-orig-source
-get-orig-source: $(TARBALL) $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
-$(TARBALL):
-	$(if $(wildcard $(PKG)-$(VER)),$(error folder '$(PKG)-$(VER)' exists, aborting...))
-	@echo "# Cloning origin repository..."; \
-	if ! git clone $(UURL) $(PKG)-$(VER); then \
-	  $(RM) -r $(PKG)-$(VER); \
-	  echo "failed to clone repository, aborting..."; \
-	  false; \
-	fi
-	@if [ $(BRANCH) != "master" ]; then \
-	  cd $(PKG)-$(VER); \
-	  echo "# Not on master branch, fetching origin branch '$(BRANCH)'..."; \
-	  git fetch origin $(BRANCH):$(BRANCH) || false; \
-	  echo "# Switching to branch '$(BRANCH)'..."; \
-	  git checkout $(BRANCH) || false; \
-	fi
-	@echo "# Checking local source..."
-	@if [ $$(cd $(PKG)-$(VER) && git rev-parse HEAD) = $(HEAD) ]; then \
-	  echo "even with origin, ok"; \
-	  true; \
-	else \
-	  echo "not even with origin, aborting..."; \
-	  false; \
-	fi
-	@echo "# Setting times..."
-	@cd $(PKG)-$(VER) \
-	&& for F in $$(git ls-tree -r --name-only HEAD | sed -e "s/\s/\*/g"); do \
-	  touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; \
-	done
-	@echo "# Cleaning-up..."
-	cd $(PKG)-$(VER) && $(RM) -r .git
-	@echo "# Packing file '$(TARBALL)'..."
-	@find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	| XZ_OPT="-6v" tar -caf "$(TARBALL)" -T- --owner=root --group=root --mode=a+rX \
-	&& $(RM) -r "$(PKG)-$(VER)"
diff --git a/distros/ubuntu1410/source/format b/distros/ubuntu1410/source/format
deleted file mode 100644
index 89ae9db8f..000000000
--- a/distros/ubuntu1410/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/distros/ubuntu1410/source/local-options b/distros/ubuntu1410/source/local-options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/distros/ubuntu1410/source/options b/distros/ubuntu1410/source/options
deleted file mode 100644
index 8bd61fce6..000000000
--- a/distros/ubuntu1410/source/options
+++ /dev/null
@@ -1 +0,0 @@
-extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile|aclocal.m4|compile|config.h.in|configure|depcomp|install-sh|missing)$"
diff --git a/distros/ubuntu1410/zoneminder-core.config b/distros/ubuntu1410/zoneminder-core.config
deleted file mode 100644
index 2a15a599e..000000000
--- a/distros/ubuntu1410/zoneminder-core.config
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-core.install b/distros/ubuntu1410/zoneminder-core.install
deleted file mode 100644
index afd9ada95..000000000
--- a/distros/ubuntu1410/zoneminder-core.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/zm
-usr/bin
-usr/share/polkit-1/actions
-usr/share/polkit-1/rules.d
diff --git a/distros/ubuntu1410/zoneminder-core.links b/distros/ubuntu1410/zoneminder-core.links
deleted file mode 100644
index 5560a100a..000000000
--- a/distros/ubuntu1410/zoneminder-core.links
+++ /dev/null
@@ -1,3 +0,0 @@
-var/cache/zoneminder/events usr/share/zoneminder/events
-var/cache/zoneminder/images usr/share/zoneminder/images
-var/cache/zoneminder/temp   usr/share/zoneminder/temp
diff --git a/distros/ubuntu1410/zoneminder-core.postinst b/distros/ubuntu1410/zoneminder-core.postinst
deleted file mode 100644
index da2b444fe..000000000
--- a/distros/ubuntu1410/zoneminder-core.postinst
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Source the config file
-CONFIGFILE=/etc/zm/zm.conf
-. $CONFIGFILE
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Retrieve data from dbconfig (inputs from user)
-    . /etc/dbconfig-common/zoneminder.conf
-
-    # ZoneMinder config file handling
-    # Inspired by: http://manpages.debian.org/cgi-bin/man.cgi?query=debconf-devel&sektion=7
-
-    # Backup the config file
-    cp -a -f $CONFIGFILE ${CONFIGFILE}.postinst.bak
-
-    # Redeclare variables if missing in config file
-    test -z $dbc_dbserver || grep -Eq "^ *ZM_DB_HOST=" $CONFIGFILE \
-      || echo "ZM_DB_HOST=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbname || grep -Eq "^ *ZM_DB_NAME=" $CONFIGFILE \
-      || echo "ZM_DB_NAME=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbuser || grep -Eq "^ *ZM_DB_USER=" $CONFIGFILE \
-      || echo "ZM_DB_USER=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbpass || grep -Eq "^ *ZM_DB_PASS=" $CONFIGFILE \
-      || echo "ZM_DB_PASS=" >> ${CONFIGFILE}.postinst.bak
-
-    # Prevent ZM_DB_HOST to be empty if user selected the 'unix socket' method
-    if test -z $dbc_dbserver; then
-	dbc_dbserver_override="localhost"
-    else
-        dbc_dbserver_override=$dbc_dbserver
-    fi
-
-    # Update variables in config file
-    sed -i "s/^ *ZM_DB_HOST=.*/ZM_DB_HOST=$dbc_dbserver_override/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbname || sed -i "s/^ *ZM_DB_NAME=.*/ZM_DB_NAME=$dbc_dbname/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbuser || sed -i "s/^ *ZM_DB_USER=.*/ZM_DB_USER=$dbc_dbuser/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbpass || sed -i "s/^ *ZM_DB_PASS=.*/ZM_DB_PASS=$dbc_dbpass/" \
-      ${CONFIGFILE}.postinst.bak
-
-    # Clean-up backup file
-    mv -f ${CONFIGFILE}.postinst.bak $CONFIGFILE
-
-
-    # Set some file permissions
-    chown $ZM_WEB_USER:$ZM_WEB_GROUP /var/log/zm
-    if [ -z "$2" ]; then
-        chown $ZM_WEB_USER:$ZM_WEB_GROUP -R /var/cache/zoneminder
-    fi
-    # As requested by the Debian Webapps Policy Manual §3.2.1
-    chown root:${ZM_WEB_GROUP} $CONFIGFILE
-    chmod 640 $CONFIGFILE
-fi
-
-# Do this every time the package is installed or upgraded
-# Test for database presence to avoid failure of zmupdate.pl
-if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then
-
-    # Ensure zoneminder is stopped
-    deb-systemd-invoke stop zoneminder.service || exit $?
-
-    # Run the ZoneMinder update tool
-    zmupdate.pl --nointeractive
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-core.postrm b/distros/ubuntu1410/zoneminder-core.postrm
deleted file mode 100644
index d75e75e8b..000000000
--- a/distros/ubuntu1410/zoneminder-core.postrm
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-if [ "$1" = "purge" ]; then
-
-    # Ask the user if we have to remove the cache directory even if not empty
-    if [ -d /var/cache/zoneminder ] \
-      && [ ! $(find /var/cache/zoneminder -maxdepth 0 -type d -empty 2>/dev/null) ]; then
-        RET=""
-        db_input high zoneminder/ask_delete || true
-        db_go || true
-        db_get zoneminder/ask_delete
-        if [ "$RET" = "true" ]; then
-            RET=""
-            db_input high zoneminder/ask_delete_again || true
-            db_go || true
-            db_get zoneminder/ask_delete_again
-            if [ "$RET" = "true" ]; then
-                rm -rf /var/cache/zoneminder
-            fi
-        fi
-    fi
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-core.preinst b/distros/ubuntu1410/zoneminder-core.preinst
deleted file mode 100644
index 3ed1ef661..000000000
--- a/distros/ubuntu1410/zoneminder-core.preinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# preinst maintainer script for zoneminder-core package
-
-set -e
-
-abort=false
-if [ -L /usr/share/zoneminder/events ]; then
-    l=$(readlink /usr/share/zoneminder/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -L /usr/share/zoneminder/images ]; then
-    l=$(readlink /usr/share/zoneminder/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-core.templates b/distros/ubuntu1410/zoneminder-core.templates
deleted file mode 100644
index 35fdefd7a..000000000
--- a/distros/ubuntu1410/zoneminder-core.templates
+++ /dev/null
@@ -1,19 +0,0 @@
-Template: zoneminder/ask_delete
-Type: boolean
-Default: false
-_Description: Delete this non empty directory?
- A purge of the ZoneMinder package is performed but the directory
- '/var/cache/zoneminder' is not empty so it will not be deleted.
- .
- Please consider that this directory is designed to contain data resulting from
- event detection. Therefore, "proof of evidence" could be lost!"
- .
- If you are not sure of your decision, please do not delete this directory but
- perform a manual checkup.
-
-Template: zoneminder/ask_delete_again
-Type: boolean
-Default: false
-_Description: Deletion confirmed?
- You have allowed the deletion of directory '/var/cache/zoneminder' although
- it may contain critical data.
diff --git a/distros/ubuntu1410/zoneminder-core.zoneminder.service b/distros/ubuntu1410/zoneminder-core.zoneminder.service
deleted file mode 100644
index d82270024..000000000
--- a/distros/ubuntu1410/zoneminder-core.zoneminder.service
+++ /dev/null
@@ -1,19 +0,0 @@
-# ZoneMinder systemd unit file
-# This file is intended to work with debian distributions
-
-[Unit]
-Description=ZoneMinder CCTV recording and security system
-After=network.target mysql.service apache2.service
-Requires=apache2.service
-Wants=mysql.service
-
-[Service]
-User=www-data
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecReload=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-PIDFile=/var/run/zm/zm.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/distros/ubuntu1410/zoneminder-core.zoneminder.tmpfile b/distros/ubuntu1410/zoneminder-core.zoneminder.tmpfile
deleted file mode 100644
index 6ea70bf35..000000000
--- a/distros/ubuntu1410/zoneminder-core.zoneminder.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/zm 0755 www-data www-data
diff --git a/distros/ubuntu1410/zoneminder-database.config b/distros/ubuntu1410/zoneminder-database.config
deleted file mode 100644
index f6a84d36d..000000000
--- a/distros/ubuntu1410/zoneminder-database.config
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Set the first version in which dbconfig-common was introduced in the package
-dbc_first_version="1.28.0"
-
-CONFIGFILE=/etc/zm/zm.conf
-if [ -e $CONFIGFILE ]; then
-    # Source the config file if exists
-    . $CONFIGFILE
-elif [ -e ${CONFIGFILE}.dpkg-new ]; then
-    # If no config file, source the config file which is going to be installed
-    # by the core package
-    . ${CONFIGFILE}.dpkg-new
-else
-    # If no config file is going to be installed, set some default values
-    ZM_DB_HOST=
-    ZM_DB_NAME="zm"
-    ZM_DB_USER="zmuser"
-fi
-
-# Set some variables for the dbconfig-common stuff
-dbc_dbserver="$ZM_DB_HOST"
-dbc_dbname="$ZM_DB_NAME"
-dbc_dbuser="$ZM_DB_USER"
-
-if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
-
-    # Default use dbconfig-common
-    dbc_install="true"
-
-    # Currently we only support mysql database
-    dbc_dbtypes="mysql"
-
-    # Set authentication method to password
-    dbc_authmethod_user="password"
-
-    # Source the dbconfig-common stuff
-    . /usr/share/dbconfig-common/dpkg/config
-fi
-
-# Do this when the package is installed, upgraded or reconfigured
-# Most of answers are cached so the questions will not be asked again
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Ask the user if the database shall be installed locally or remotely
-    db_input high zoneminder/debconf_dblocation || true
-    db_go || true
-    db_get zoneminder/debconf_dblocation
-
-    if [ "$RET" = "local" ]; then
-        if [ ! -e "/usr/sbin/mysqld" ]; then
-            # Display a message and exit if the user want a local database but
-            # no database server is available
-            db_input high zoneminder/debconf_dblocalmissingerror || true
-            db_go || true
-            exit 0
-        else
-            # Set the database server to localhost
-            dbc_dbserver="localhost"
-        fi
-    else
-        # Source the dbconfig main configuration file
-        if [ -f /etc/dbconfig-common/config ]; then
-            . /etc/dbconfig-common/config
-        fi
-        if [ "$dbc_remote_questions_default" = "false" ]; then
-            # Display a message and exit if the dbconfig configuration does not
-            # allow installation of remote databases
-            # Note: To overcome this issue, we could think to override the
-            # default setting by using dbc_remote_questions_default='true' in
-            # maintainer scripts but unfortunately this does not work due to
-            # current dbconfig design
-            # More information here:
-            # https://bugs.launchpad.net/ubuntu/+source/dbconfig-common/+bug/1065331
-            db_input high zoneminder/debconf_dbconfigerror || true
-            db_go || true
-            exit 0
-        fi
-    fi
-
-    # Ask the user for all database settings
-    dbc_go zoneminder $@
-
-    # Ask the user for the password of the database administrator if the user
-    # has not yet answered to this question.
-    # This situation may occur if the user skipped the database creation step
-    # when reconfiguring the package.
-    RET=""
-    db_get zoneminder/mysql/admin-pass
-    if [ -z "$RET" ]; then
-        db_input high zoneminder/mysql/admin-pass || true
-        db_go || true
-    fi
-
-    # Do this only when not upgrading the package (no old version in argument)
-    if [ -z "$2" ]; then
-        # Ask for the password of 'admin' user
-        while :; do
-            RET=""
-            db_input high zoneminder/admin_password || true
-            db_go || true
-            db_get zoneminder/admin_password
-            # If password isn't empty we ask for password verification
-            if [ -z "$RET" ]; then
-                db_fset zoneminder/admin_password seen false
-                db_fset zoneminder/admin_password_again seen false
-                break
-            fi
-            ROOT_PW="$RET"
-            db_input high zoneminder/admin_password_again || true
-            db_go || true
-            db_get zoneminder/admin_password_again
-            if [ "$RET" = "$ROOT_PW" ]; then
-                ROOT_PW=""
-                break
-            fi
-            db_fset zoneminder/password_mismatch seen false
-            db_input critical zoneminder/password_mismatch || true
-            db_set zoneminder/admin_password ""
-            db_set zoneminder/admin_password_again ""
-            db_go || true
-        done
-    else
-        # If we are upgrading the package, set an empty password to disable
-        # password update in ZoneMinder database
-        db_set zoneminder/admin_password ""
-    fi
-    # Set the seen flag to not ask this question again if no password is
-    # provided
-    db_fset zoneminder/admin_password seen true
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-database.dirs b/distros/ubuntu1410/zoneminder-database.dirs
deleted file mode 100644
index b37463a9e..000000000
--- a/distros/ubuntu1410/zoneminder-database.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/zoneminder/db
-usr/share/dbconfig-common/data/zoneminder/install
-usr/share/dbconfig-common/data/zoneminder/upgrade/mysql
diff --git a/distros/ubuntu1410/zoneminder-database.install b/distros/ubuntu1410/zoneminder-database.install
deleted file mode 100644
index 756c5bbfa..000000000
--- a/distros/ubuntu1410/zoneminder-database.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/db
diff --git a/distros/ubuntu1410/zoneminder-database.postinst b/distros/ubuntu1410/zoneminder-database.postinst
deleted file mode 100644
index 41d4e5b5b..000000000
--- a/distros/ubuntu1410/zoneminder-database.postinst
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-db package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-mysql_update() {
-
-    # Source the dbconfig stuff
-    . /usr/share/dbconfig-common/internal/mysql
-
-    # Update the password of the hard-coded default 'admin' account
-    test -z $ADMIN_PASSWORD || dbc_mysql_exec_command "UPDATE Users SET Password = password('$ADMIN_PASSWORD') WHERE Username = 'admin';" || true
-
-    # Update the database version
-    dbc_mysql_exec_command "UPDATE Config SET Value = '$DB_VERSION' WHERE Name = 'ZM_DYN_DB_VERSION';" || true
-}
-
-if [ -f /usr/share/dbconfig-common/dpkg/postinst ]; then
-
-    # Set the first version in which dbconfig-common was introduced in the package
-    dbc_first_version="1.28.0"
-
-    # Set the database type
-    dbc_dbtypes="mysql"
-
-    # Source the dbconfig-common stuff
-    . /usr/share/dbconfig-common/dpkg/postinst
-fi
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Install sql database create file for dbconfig
-    # (needed at first package installation)
-    if [ ! -f /usr/share/dbconfig-common/data/zoneminder/install/mysql ]; then
-        install -m 644 /usr/share/zoneminder/db/zm_create.sql \
-          /usr/share/dbconfig-common/data/zoneminder/install/mysql
-        # Remove unneeded sql requests
-        # dbconfig will create the underlying database
-        sed -i "/^ *CREATE DATABASE /d" \
-          /usr/share/dbconfig-common/data/zoneminder/install/mysql
-        sed -i "/^ *USE /d" \
-          /usr/share/dbconfig-common/data/zoneminder/install/mysql
-    fi
-
-    # Symlink sql update files for dbconfig (needed when upgrading the package)
-    for sqlfile in /usr/share/zoneminder/db/zm_update-*.sql; do
-        lnk=`echo $sqlfile | sed "s/^\/usr\/share\/zoneminder\/db\/zm_update-\(.*\)\.sql/\1/"`
-        if [ ! -L /usr/share/dbconfig-common/data/zoneminder/upgrade/mysql/$lnk ]; then
-            ln -sf $sqlfile \
-              /usr/share/dbconfig-common/data/zoneminder/upgrade/mysql/$lnk
-        fi
-    done || true
-
-    # Create the underlying database and populate it
-    # dbconfig will take care of applying any updates which are newer than the
-    # previously installed version
-    dbc_go zoneminder $@
-
-    # Get the password of ZoneMinder user 'admin' from debconf
-    db_get zoneminder/admin_password
-    ADMIN_PASSWORD=$RET
-
-    # Remove the password from debconf database
-    test -z $ADMIN_PASSWORD || db_reset zoneminder/admin_password || true
-
-    # Get the lastest database version from dbconfig upgrade folder
-    DB_VERSION=$(ls -rv /usr/share/dbconfig-common/data/zoneminder/upgrade/$dbc_dbtypes | head -1)
-
-    # Update the default admin account and database version
-    mysql_update
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-database.postrm b/distros/ubuntu1410/zoneminder-database.postrm
deleted file mode 100644
index 231f01ad7..000000000
--- a/distros/ubuntu1410/zoneminder-database.postrm
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-db package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-# Source the dbconfig stuff
-if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
-    . /usr/share/dbconfig-common/dpkg/postrm
-    # Ask the user what do to with dbconfig when removing the package
-    dbc_go zoneminder $@
-fi
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    # Remove dbconfig stuff added in postinst script
-    rm -rf /usr/share/dbconfig-common/data/zoneminder
-    # No need to manually remove the zm database, dbconfig take care of this
-fi
-
-if [ "$1" = "purge" ]; then
-    # Delete a potential remaining file used in postinst script
-    rm -f /etc/zm/zm.conf.postinst.bak
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-database.prerm b/distros/ubuntu1410/zoneminder-database.prerm
deleted file mode 100644
index 31786116a..000000000
--- a/distros/ubuntu1410/zoneminder-database.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# prerm script for zoneminder-db package
-
-set -e
-
-# Source the debconf stuff if file exists
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-# If dbconfig-common is installed and has been used by zoneminder
-if [ -f /usr/share/dbconfig-common/dpkg/prerm ] \
-  &&  [ -f /etc/dbconfig-common/zoneminder.conf ]; then
-    # Source the dbconfig stuff
-    . /usr/share/dbconfig-common/dpkg/prerm
-    # Ask the user what do to with dbconfig before removing the package
-    dbc_go zoneminder $@
-fi
-
-# #DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-database.templates b/distros/ubuntu1410/zoneminder-database.templates
deleted file mode 100644
index 4de4342f6..000000000
--- a/distros/ubuntu1410/zoneminder-database.templates
+++ /dev/null
@@ -1,58 +0,0 @@
-Template: zoneminder/debconf_dblocation
-Type: select
-__Choices: local, remote
-Default: local
-_Description: Database location:
- A database server is required to run ZoneMinder. The database can be installed
- either locally or remotely on a machine of your network.
- .
- If you choose a remote location, you will have to select the 'tcp/ip'
- connection method and enter the hostname or ip address of the remote machine
- in the next configuration screens.
-
-Template: zoneminder/debconf_dblocalmissingerror
-Type: error
-_Description: No local database server is available:
- Currently ZoneMinder supports mysql or mariadb database server but none of them
- appears to be installed on this machine.
- .
- In order to complete ZoneMinder's installation, after ending of this assistant,
- please install a compatible database server and then restart the assistant by
- invoking:
- .
- $ sudo dpkg-reconfigure zoneminder
-
-Template: zoneminder/debconf_dbconfigerror
-Type: error
-_Description: Remote database servers are not allowed:
- The current configuration of dbconfig-common does not allow installation of
- a database on remote servers.
- .
- In order to reconfigure dbconfig-common, please invoke the following command
- after ending of this assistant:
- .
- $ sudo dpkg-reconfigure dbconfig-common
- .
- Then, to complete ZoneMinder's installation, please restart this assistant by
- invoking:
- .
- $ sudo dpkg-reconfigure zoneminder
-
-Template: zoneminder/admin_password
-Type: password
-_Description: New password for the ZoneMinder 'admin' user:
- Please enter the password of the default administrative user.
- .
- While not mandatory, it is highly recommended that you set a custom password
- for the administrative 'admin' user.
- .
- If this field is left blank, the password will not be changed.
-
-Template: zoneminder/admin_password_again
-Type: password
-_Description: Repeat password for the ZoneMinder 'admin' user:
-
-Template: zoneminder/password_mismatch
-Type: error
-_Description: Password input error
- The two passwords you entered were not the same. Please try again.
diff --git a/distros/ubuntu1410/zoneminder-ui-base.config b/distros/ubuntu1410/zoneminder-ui-base.config
deleted file mode 100644
index 2660208a8..000000000
--- a/distros/ubuntu1410/zoneminder-ui-base.config
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder-ui-base package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Do this when the package is installed, upgraded or reconfigured
-# Most of answers are cached so the questions will not be asked again
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Ask the user for the web server(s) to configure
-    db_input high zoneminder/webserver || true
-    db_go || true
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-ui-base.install b/distros/ubuntu1410/zoneminder-ui-base.install
deleted file mode 100644
index f72b569be..000000000
--- a/distros/ubuntu1410/zoneminder-ui-base.install
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/apache.conf etc/zm
-usr/lib/cgi-bin
-usr/share/zoneminder/ajax
-usr/share/zoneminder/css
-usr/share/zoneminder/graphics
-usr/share/zoneminder/includes
-usr/share/zoneminder/index.php
-usr/share/zoneminder/js
-usr/share/zoneminder/lang
-usr/share/zoneminder/tools
-usr/share/zoneminder/views
diff --git a/distros/ubuntu1410/zoneminder-ui-base.links b/distros/ubuntu1410/zoneminder-ui-base.links
deleted file mode 100644
index b00a147d6..000000000
--- a/distros/ubuntu1410/zoneminder-ui-base.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/cgi-bin usr/share/zoneminder/cgi-bin
diff --git a/distros/ubuntu1410/zoneminder-ui-base.postinst b/distros/ubuntu1410/zoneminder-ui-base.postinst
deleted file mode 100644
index a5bce3c98..000000000
--- a/distros/ubuntu1410/zoneminder-ui-base.postinst
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-ui-base package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-apache_install() {
-
-    mkdir -p /etc/apache2/conf-available
-    ln -sf ../../zm/apache.conf /etc/apache2/conf-available/zoneminder.conf
-
-    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-
-    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-        . /usr/share/apache2/apache2-maintscript-helper
-        apache2_invoke enconf zoneminder
-    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
-        [ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/zoneminder.conf ] && ln -s ../conf-available/zoneminder.conf /etc/apache2/conf.d/zoneminder.conf
-    fi
-
-    # Enable CGI script module in apache (not enabled by default on jessie)
-    a2enmod cgi >/dev/null 2>&1
-
-    # Reload the web server
-    deb-systemd-invoke reload apache2.service || true
-}
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Configure the web server
-    db_get zoneminder/webserver
-    webservers="$RET"
-
-    for webserver in $webservers; do
-        webserver=${webserver%,}
-        # Currently we only support apache2
-        if [ "$webserver" = "apache2" ] ; then
-            apache_install $1
-        fi
-    done
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-ui-base.postrm b/distros/ubuntu1410/zoneminder-ui-base.postrm
deleted file mode 100644
index 441bb5218..000000000
--- a/distros/ubuntu1410/zoneminder-ui-base.postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-ui-base package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-apache_remove() {
-    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-        . /usr/share/apache2/apache2-maintscript-helper
-        apache2_invoke disconf zoneminder
-    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
-        rm -f /etc/apache2/conf.d/zoneminder.conf
-    fi
-    rm -f /etc/apache2/conf-available/zoneminder.conf
-    # Reload the web server
-    deb-systemd-invoke reload apache2.service || true
-}
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    # Deconfigure the web server
-    db_get zoneminder/webserver
-    for webserver in $RET; do
-        webserver=${webserver%,}
-        # Currently we only support apache2
-        if [ "$webserver" = "apache2" ] ; then
-            apache_remove $1
-        fi
-    done
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
diff --git a/distros/ubuntu1410/zoneminder-ui-base.templates b/distros/ubuntu1410/zoneminder-ui-base.templates
deleted file mode 100644
index 31e70277f..000000000
--- a/distros/ubuntu1410/zoneminder-ui-base.templates
+++ /dev/null
@@ -1,7 +0,0 @@
-Template: zoneminder/webserver
-Type: multiselect
-Choices: apache2
-Default: apache2
-_Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configured for
- ZoneMinder's web portal access.
diff --git a/distros/ubuntu1410/zoneminder-ui-classic.install b/distros/ubuntu1410/zoneminder-ui-classic.install
deleted file mode 100644
index 9532d9dc9..000000000
--- a/distros/ubuntu1410/zoneminder-ui-classic.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/classic
diff --git a/distros/ubuntu1410/zoneminder-ui-mobile.install b/distros/ubuntu1410/zoneminder-ui-mobile.install
deleted file mode 100644
index 464bb74eb..000000000
--- a/distros/ubuntu1410/zoneminder-ui-mobile.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/mobile
diff --git a/distros/ubuntu1410/zoneminder-ui-xml.install b/distros/ubuntu1410/zoneminder-ui-xml.install
deleted file mode 100644
index 6617707f8..000000000
--- a/distros/ubuntu1410/zoneminder-ui-xml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/xml
diff --git a/distros/ubuntu1604/changelog b/distros/ubuntu1604/changelog
index 616f75178..0fc2fda2e 100644
--- a/distros/ubuntu1604/changelog
+++ b/distros/ubuntu1604/changelog
@@ -1,3 +1,3 @@
-zoneminder (1.31.39~20180223.27-stretch-1) unstable; urgency=low
-  * 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 23 Feb 2018 14:15:59 -0500
+zoneminder (1.35.6~20200825.27-xenial) xenial; urgency=low
+  *
+ -- Isaac Connor <isaac@zoneminder.com>  Tue, 25 Aug 2020 09:28:18 -0400
diff --git a/distros/ubuntu1604/conf/apache2/zoneminder.conf b/distros/ubuntu1604/conf/apache2/zoneminder.conf
index 598996bc0..e3164d36c 100644
--- a/distros/ubuntu1604/conf/apache2/zoneminder.conf
+++ b/distros/ubuntu1604/conf/apache2/zoneminder.conf
@@ -6,6 +6,7 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
     Require all granted
 </Directory>
 
+
 # Order matters. This alias must come first.
 Alias /zm/cache /var/cache/zoneminder/cache
 <Directory /var/cache/zoneminder/cache>
diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control
index 68bc1757f..34af7cef1 100644
--- a/distros/ubuntu1604/control
+++ b/distros/ubuntu1604/control
@@ -1,8 +1,8 @@
 Source: zoneminder
 Section: net
 Priority: optional
-Maintainer: Dmitry Smirnov <onlyjob@debian.org>
-Uploaders: Vagrant Cascadian <vagrant@debian.org>
+Maintainer: Isaac Connor <isaac@zoneminder.com>
+Uploaders: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree, dh-systemd, dh-apache2
               ,cmake
               ,libx264-dev, libmp4v2-dev
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libavcodec-dev (>= 6:10~)
               ,libavformat-dev  (>= 6:10~)
               ,libavutil-dev (>= 6:10~)
-              ,libswresample-dev
+              ,libswresample-dev | libavresample-dev
               ,libswscale-dev (>= 6:10~)
               ,ffmpeg | libav-tools
               ,net-tools
@@ -33,6 +33,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libssl-dev
               ,libcrypt-eksblowfish-perl
               ,libdata-entropy-perl
+              ,libvncserver-dev
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
@@ -61,8 +62,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libjson-maybexs-perl
         ,libsys-mmap-perl [!hurd-any]
         ,liburi-encode-perl
-        ,libwww-perl
+        ,libwww-perl, liburi-perl
         ,libdata-dump-perl
+        ,libdatetime-perl
         ,libclass-std-fast-perl
         ,libsoap-wsdl-perl
         ,libio-socket-multicast-perl
@@ -73,7 +75,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libfile-slurp-perl
         ,mysql-client | mariadb-client | virtual-mysql-client
         ,perl-modules
-        ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc
+        ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc, php-json | php5-json
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
@@ -81,6 +83,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libssl | libssl1.0.0 | libssl1.1
         ,libcrypt-eksblowfish-perl
         ,libdata-entropy-perl
+        ,libvncclient1|libvncclient0
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm
            ,mysql-server | mariadb-server | virtual-mysql-server
diff --git a/distros/ubuntu1604/rules b/distros/ubuntu1604/rules
index c671a1b03..9a16b1f8f 100755
--- a/distros/ubuntu1604/rules
+++ b/distros/ubuntu1604/rules
@@ -21,8 +21,8 @@ override_dh_auto_configure:
             -DCMAKE_BUILD_TYPE=Release                 \
             -DZM_CONFIG_DIR="/etc/zm"                  \
             -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
-            -DZM_RUNDIR="/var/run/zm"                  \
-            -DZM_SOCKDIR="/var/run/zm"                 \
+            -DZM_RUNDIR="/run/zm"                  \
+            -DZM_SOCKDIR="/run/zm"                 \
             -DZM_TMPDIR="/tmp/zm"                      \
             -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
             -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
diff --git a/distros/ubuntu1604/zoneminder.logrotate b/distros/ubuntu1604/zoneminder.logrotate
index 59238b7fe..6162e9c4d 100644
--- a/distros/ubuntu1604/zoneminder.logrotate
+++ b/distros/ubuntu1604/zoneminder.logrotate
@@ -9,4 +9,5 @@
     endscript
     daily
     rotate 7
+    maxage 7
 }
diff --git a/distros/ubuntu1604/zoneminder.postinst b/distros/ubuntu1604/zoneminder.postinst
index 9ee8b032c..e9bd30a17 100644
--- a/distros/ubuntu1604/zoneminder.postinst
+++ b/distros/ubuntu1604/zoneminder.postinst
@@ -19,6 +19,10 @@ if [ "$1" = "configure" ]; then
     echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
     a2enmod cgi
   fi
+  if [ ! -e "/etc/apache2/mods-enabled/rewrite.load" ] && [ "$(command -v a2enmod)" != "" ]; then
+    echo "The rewrite module is not enabled in apache2.  I am enabling it using a2enmod rewrite."
+    a2enmod rewrite
+  fi
 
   if [ "$ZM_DB_HOST" = "localhost" ]; then
 
@@ -61,11 +65,10 @@ if [ "$1" = "configure" ]; then
               exit 1;
             fi
             # This creates the user.
-            echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        else
-            echo "Updating permissions"
-            echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+            echo "CREATE USER '${ZM_DB_USER}'@localhost IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         fi
+        echo "Updating permissions"
+        echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 
         zmupdate.pl --nointeractive
         zmupdate.pl --nointeractive -f
diff --git a/distros/ubuntu2004/NEWS b/distros/ubuntu2004/NEWS
new file mode 100644
index 000000000..6200726cf
--- /dev/null
+++ b/distros/ubuntu2004/NEWS
@@ -0,0 +1,10 @@
+zoneminder (1.28.1-1) unstable; urgency=low
+
+  This version is no longer automatically initialize or upgrade database.
+  See README.Debian for details.
+
+  Changed installation paths (please correct your web server configuration):
+    /usr/share/zoneminder --> /usr/share/zoneminder/www
+    /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:12:17 +1100
diff --git a/distros/ubuntu2004/README.Debian b/distros/ubuntu2004/README.Debian
new file mode 100644
index 000000000..4fe3464d2
--- /dev/null
+++ b/distros/ubuntu2004/README.Debian
@@ -0,0 +1,130 @@
+Zoneminder for Debian
+---------------------
+
+Initializing database
+---------------------
+
+    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+OR
+    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+
+    echo 'grant lock tables,alter,create,index,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
+accordingly.
+
+The following command can help to ensure that zoneminder can read its
+configuration file:
+
+    chgrp -c www-data /etc/zm/zm.conf
+
+
+Upgrading database
+------------------
+
+The database is updated automatically on installation. You should not need to take this step.
+
+Assuming that database is on "localhost" then the following command can be
+used to upgrade "zm" database:
+
+    zmupdate.pl
+
+Additional permissions may be required to perform upgrade:
+
+    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+The following command prints the current version of zoneminder database:
+
+    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
+
+
+Enabling service
+----------------
+
+By default Zoneminder service is not automatically started and needs to be
+manually enabled once database is configured:
+
+    sudo systemctl enable zoneminder.service
+
+
+Web server set-up
+-----------------
+
+There are few manual steps to get the web interface working:
+
+## Apache2
+
+Apache can be configured as folder "/zm" using sample .conf:
+
+    sudo a2enconf zoneminder
+
+Alternatively Apache web site configuration template can be used to setup
+zoneminder as "http://zoneminder":
+
+    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
+    sudo a2ensite zoneminder.conf
+
+Common configuration steps for Apache2:
+
+    sudo a2enmod cgi
+    sudo service apache2 reload
+
+
+## nginx / fcgiwrap
+
+Nginx needs "php-fpm" package to support PHP and "fcgiwrap" package
+for binary "cgi-bin" applications:
+
+    sudo apt-get install php-fpm fcgiwrap
+
+To enable a URL alias that makes Zoneminder available from
+
+    http://yourserver/zm
+
+the following line is to be added to "server" section of a web site
+configuration:
+
+    include /usr/share/doc/zoneminder/examples/nginx.conf;
+
+For "default" web site it would be sufficient to include the above
+statement to the file
+
+    /etc/nginx/sites-enabled/default
+
+To avoid problems with feeds from multiple cameras "fcgiwrap" should be
+configured to start at least as many processes as there are cameras.
+It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
+Systemd users may be affected by the following bug:
+
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
+
+
+## Note:
+
+When Zoneminder web site is running it may be necessary to set
+Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
+site configuration.
+
+
+Changing the location for images and events
+-------------------------------------------
+
+ZoneMinder is now able to be configured to use an alternative location for storing
+events and images at compile time. This package makes use of that, so symlinks in
+/usr/share/zoneminder/www are no longer necessary.
+
+Access to /dev/video*
+---------------------
+
+For cameras which require access to /dev/video*, zoneminder may need the
+www-data user added to the video group in order to see those cameras:
+
+  adduser www-data video
+
+Note that all web applications running on the zoneminder server will then have
+access to all video devices on the system.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu2004/TODO.Debian b/distros/ubuntu2004/TODO.Debian
new file mode 100644
index 000000000..9dc59613b
--- /dev/null
+++ b/distros/ubuntu2004/TODO.Debian
@@ -0,0 +1,12 @@
+
+## Separate substantial /usr/share into its own arch-all package.
+
+## Decide how to handle database updates.
+
+  * Consider possibility that database may be on another machine (#469239).
+  * Consider dbconfig-common? Probably not (what if database is not on localhost?).
+
+### Run `zmupdate.pl` from service control scripts (init.d, service) on start?
+
+ Automatic upgrade will break "one DB, many zoneminders" setup (unimportant?).
+
diff --git a/distros/ubuntu2004/changelog b/distros/ubuntu2004/changelog
new file mode 100644
index 000000000..616f75178
--- /dev/null
+++ b/distros/ubuntu2004/changelog
@@ -0,0 +1,3 @@
+zoneminder (1.31.39~20180223.27-stretch-1) unstable; urgency=low
+  * 
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 23 Feb 2018 14:15:59 -0500
diff --git a/distros/ubuntu2004/clean b/distros/ubuntu2004/clean
new file mode 100644
index 000000000..941ef2a3a
--- /dev/null
+++ b/distros/ubuntu2004/clean
@@ -0,0 +1,3 @@
+.gitattributes
+web/api/.gitattributes
+web/api/.gitignore
diff --git a/distros/ubuntu1410/compat b/distros/ubuntu2004/compat
similarity index 100%
rename from distros/ubuntu1410/compat
rename to distros/ubuntu2004/compat
diff --git a/distros/ubuntu2004/conf/apache2/zoneminder.conf b/distros/ubuntu2004/conf/apache2/zoneminder.conf
new file mode 100644
index 000000000..e3164d36c
--- /dev/null
+++ b/distros/ubuntu2004/conf/apache2/zoneminder.conf
@@ -0,0 +1,57 @@
+# Remember to enable cgi mod (i.e. "a2enmod cgi").
+ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
+<Directory "/usr/lib/zoneminder/cgi-bin">
+    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+    AllowOverride All
+    Require all granted
+</Directory>
+
+
+# Order matters. This alias must come first.
+Alias /zm/cache /var/cache/zoneminder/cache
+<Directory /var/cache/zoneminder/cache>
+    Options -Indexes +FollowSymLinks
+    AllowOverride None
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
+
+Alias /zm /usr/share/zoneminder/www
+<Directory /usr/share/zoneminder/www>
+  Options -Indexes +FollowSymLinks
+  <IfModule mod_dir.c>
+    DirectoryIndex index.php
+  </IfModule>
+</Directory>
+
+# For better visibility, the following directives have been migrated from the
+# default .htaccess files included with the CakePHP project.
+# Parameters not set here are inherited from the parent directive above.
+<Directory "/usr/share/zoneminder/www/api">
+   RewriteEngine on
+   RewriteRule ^$ app/webroot/ [L]
+   RewriteRule (.*) app/webroot/$1 [L]
+   RewriteBase /zm/api
+</Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app">
+   RewriteEngine on
+   RewriteRule ^$ webroot/ [L]
+   RewriteRule (.*) webroot/$1 [L]
+   RewriteBase /zm/api
+</Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app/webroot">
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
+    RewriteBase /zm/api
+</Directory>
diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
new file mode 100644
index 000000000..0a1f9e0de
--- /dev/null
+++ b/distros/ubuntu2004/control
@@ -0,0 +1,166 @@
+Source: zoneminder
+Section: net
+Priority: optional
+Maintainer: Isaac Connor <isaac@zoneminder.com>
+Uploaders: Isaac Connor <isaac@zoneminder.com>
+Build-Depends: debhelper, dh-systemd, sphinx-doc, python3-sphinx, dh-linktree, dh-systemd, dh-apache2
+              ,cmake
+              ,libx264-dev, libmp4v2-dev
+              ,libavdevice-dev
+              ,libavcodec-dev
+              ,libavformat-dev
+              ,libavutil-dev
+              ,libswresample-dev
+              ,libswscale-dev
+              ,ffmpeg
+              ,net-tools
+              ,libbz2-dev
+              ,libgcrypt20-dev
+              ,libcurl4-gnutls-dev
+              ,libturbojpeg0-dev
+              ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
+              ,libpcre3-dev
+              ,libpolkit-gobject-1-dev
+              ,libv4l-dev [!hurd-any]
+              ,libvlc-dev
+              ,libdate-manip-perl
+              ,libdbd-mysql-perl
+              ,libphp-serialization-perl
+              ,libsys-mmap-perl [!hurd-any]
+              ,libwww-perl
+              ,libdata-uuid-perl
+              ,libssl-dev
+              ,libcrypt-eksblowfish-perl
+              ,libdata-entropy-perl
+# Unbundled (dh_linktree):
+        ,libjs-jquery
+        ,libjs-mootools
+Standards-Version: 3.9.8
+Homepage: http://www.zoneminder.com/
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
+
+Package: zoneminder
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+        ,javascript-common
+        ,libmp4v2-2, libx264-155
+        ,libswscale5
+        ,libswresample3
+        ,ffmpeg
+        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+        ,libdbd-mysql-perl
+        ,libphp-serialization-perl
+        ,libmodule-load-conditional-perl
+        ,libnet-sftp-foreign-perl
+        ,libarchive-zip-perl
+        ,libdbd-mysql-perl
+        ,libdevice-serialport-perl
+        ,libimage-info-perl
+        ,libjson-maybexs-perl
+        ,libsys-mmap-perl [!hurd-any]
+        ,liburi-encode-perl
+        ,libwww-perl, liburi-perl
+        ,libdata-dump-perl
+        ,libdatetime-perl
+        ,libclass-std-fast-perl
+        ,libsoap-wsdl-perl
+        ,libio-socket-multicast-perl
+        ,libdigest-sha-perl
+        ,libsys-cpu-perl, libsys-meminfo-perl
+        ,libdata-uuid-perl
+        ,libnumber-bytes-human-perl
+        ,libfile-slurp-perl
+        ,mysql-client | mariadb-client | virtual-mysql-client
+        ,perl-modules
+        ,php-mysql, php-gd, php-apcu, php-apc | php-apcu-bc, php-json
+        ,policykit-1
+        ,rsyslog | system-log-daemon
+        ,zip
+        ,libpcre3
+        ,libcrypt-eksblowfish-perl
+        ,libdata-entropy-perl
+Recommends: ${misc:Recommends}
+           ,libapache2-mod-php | php-fpm
+           ,mysql-server | mariadb-server | virtual-mysql-server
+           ,zoneminder-doc (>= ${source:Version})
+           ,ffmpeg
+Suggests: fcgiwrap, logrotate
+Description: video camera security and surveillance solution
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+
+#Package: libzoneminder-perl
+#Section: perl
+#Architecture: all
+#Multi-Arch: foreign
+#Depends: ${misc:Depends}, ${perl:Depends}
+#        ,libarchive-zip-perl
+#        ,libdbd-mysql-perl
+#        ,libdevice-serialport-perl
+#        ,libimage-info-perl
+#        ,libjson-maybexs-perl
+#        ,libsys-mmap-perl [!hurd-any]
+#        ,liburi-encode-perl
+#        ,libwww-perl
+#Description: ZoneMinder Perl libraries
+# ZoneMinder is intended for use in single or multi-camera video security
+# applications, including commercial or home CCTV, theft prevention and child
+# or family member or home monitoring and other care scenarios. It
+# supports capture, analysis, recording, and monitoring of video data coming
+# from one or more video or network cameras attached to a Linux system.
+# ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+# cameras using a variety of protocols. It is suitable for use as a home
+# video security system and for commercial or professional video security
+# and surveillance. It can also be integrated into a home automation system
+# via X.10 or other protocols.
+# .
+# This package provides ZoneMinder Perl libraries; it can be used to
+# write custom interfaces as well.
+
+Package: zoneminder-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
+Suggests: www-browser
+Description: ZoneMinder documentation
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides ZoneMinder documentation in HTML format.
+
+Package: zoneminder-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
+Description: Zoneminder -- debugging symbols
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides debugging symbols
diff --git a/distros/ubuntu2004/copyright b/distros/ubuntu2004/copyright
new file mode 100644
index 000000000..c48025a25
--- /dev/null
+++ b/distros/ubuntu2004/copyright
@@ -0,0 +1,174 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ZoneMinder
+Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
+Source: https://github.com/ZoneMinder/ZoneMinder
+Comment:
+ This package was originally debianized by matrix <matrix@cecilia>
+ on Mon,  7 Mar 2005 02:07:57 -0500.
+ It was re-done for submission to the Debian project by Peter Howard
+ <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
+Files-Excluded:
+    web/skins/*/js/jquery-*
+    web/tools/mootools/*-yc.js
+
+Files: *
+Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
+           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
+           2014      Vincent Giovannone
+           2013      Tim Craig <timcraigNO@SPAMsonic.net>
+           2003-2008 Corey DeLasaux
+           2001-2010 Chris Kistner
+License: GPL-2+
+
+Files: distros/*
+Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+           2014      Isaac Connor <iconnor@connortechnology.com>
+           2005      Serg Oskin
+License: GPL-2+
+
+Files: web/skins/*/js/jquery-*
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: GPL-2 or Expat
+Comment:
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
+ .
+ Includes Sizzle.js http://sizzlejs.com/
+ Released under the MIT, BSD, and GPL Licenses.
+
+Files: web/tools/mootools/*.js
+Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+           2006-2010 Valerio Proietti (http://mad4milk.net/)
+License: Expat
+
+Files: web/api/*
+Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
+License: Expat
+
+Files:
+    cmake/Modules/CheckPrototypeDefinition*.cmake
+    cmake/Modules/FindGLIB2.cmake
+    cmake/Modules/FindPolkit.cmake
+    cmake/Modules/GNUInstallDirs.cmake
+Copyright:
+    2005-2011 Kitware, Inc.
+    2010-2011 Andreas Schneider <asn@cryptomilk.org>
+    2009      Dario Freddi <drf@kde.org>
+    2008      Laurent Montel, <montel@kde.org>
+    2011      Nikita Krupen'ko <krnekit@gmail.com>
+License: BSD-3-clause
+ 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.
+ .
+  * The names of Kitware, Inc., the Insight Consortium, or the names of
+    any consortium members, or of any contributors, may not be used to
+    endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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 AUTHORS 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.
+
+Files: cmake/Modules/FindPerlModules.cmake
+Copyright: 2012 Iowa State University
+License: Boost-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: debian/*
+Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
+           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
+           2010-2012 Vagrant Cascadian <vagrant@debian.org>
+           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+License: GPL-2+
+
+License: Expat
+  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.
+
+License: GPL-2+
+ This package 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 package is distributed in the hope that 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2
+ This package 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; version 2 of the License.
+ .
+ This package is distributed in the hope that 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/distros/ubuntu2004/examples/nginx.conf b/distros/ubuntu2004/examples/nginx.conf
new file mode 100644
index 000000000..5636ca3e1
--- /dev/null
+++ b/distros/ubuntu2004/examples/nginx.conf
@@ -0,0 +1,32 @@
+location /zm/cgi-bin {
+    gzip off;
+    alias /usr/lib/zoneminder/cgi-bin;
+
+    include /etc/nginx/fastcgi_params;
+    fastcgi_param SCRIPT_FILENAME $request_filename;
+    fastcgi_pass  unix:/var/run/fcgiwrap.socket;
+}
+
+location /zm {
+#   if ($scheme ~ ^http:){
+#       rewrite ^(.*)$  https://$host$1 permanent;
+#   }
+
+    gzip off;
+    alias                   /usr/share/zoneminder/www;
+    index                   index.php;
+
+    location ~ \.php$ {
+        if (!-f $request_filename) { return 404; }
+        expires             epoch;
+        include             /etc/nginx/fastcgi_params;
+        fastcgi_param       SCRIPT_FILENAME         $request_filename;
+        fastcgi_index       index.php;
+        fastcgi_pass        unix:/var/run/php5-fpm.sock;
+    }
+
+    location ~ \.(jpg|jpeg|gif|png|ico)$ {
+        access_log          off;
+        expires         33d;
+    }
+}
diff --git a/distros/ubuntu2004/gbp.conf b/distros/ubuntu2004/gbp.conf
new file mode 100644
index 000000000..4608913d9
--- /dev/null
+++ b/distros/ubuntu2004/gbp.conf
@@ -0,0 +1,7 @@
+
+[dch]
+id-length    = 0
+
+[import-orig]
+pristine-tar = False
+merge        = False
diff --git a/distros/ubuntu2004/libzoneminder-perl.install b/distros/ubuntu2004/libzoneminder-perl.install
new file mode 100644
index 000000000..67191d9cf
--- /dev/null
+++ b/distros/ubuntu2004/libzoneminder-perl.install
@@ -0,0 +1,2 @@
+usr/share/man/man3
+usr/share/perl5
diff --git a/distros/ubuntu1410/patches/series b/distros/ubuntu2004/patches/series
similarity index 100%
rename from distros/ubuntu1410/patches/series
rename to distros/ubuntu2004/patches/series
diff --git a/distros/ubuntu2004/rules b/distros/ubuntu2004/rules
new file mode 100755
index 000000000..5a1cdb500
--- /dev/null
+++ b/distros/ubuntu2004/rules
@@ -0,0 +1,96 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
+
+ifeq ($(DEB_BUILD_ARCH_OS),hurd)
+ARGS:= -DZM_NO_MMAP=ON
+endif
+
+%:
+	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
+            --with systemd,sphinxdoc,apache2,linktree
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(ARGS)                  \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                \
+            -DCMAKE_BUILD_TYPE=Release                 \
+            -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
+            -DZM_RUNDIR="/run/zm"                  \
+            -DZM_SOCKDIR="/run/zm"                 \
+            -DZM_TMPDIR="/var/tmp/zm"                      \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
+            -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
+            -DZM_PATH_SHUTDOWN="/sbin/shutdown"        \
+            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"
+
+override_dh_clean:
+	dh_clean $(MANPAGES1)
+	$(RM) -r docs/_build
+
+build-indep:
+	#$(MAKE) -C docs text
+	$(MAKE) -C docs html
+
+MANPAGES1 = dbuild/scripts/zmupdate.pl.1
+$(MANPAGES1):
+	# generate man page(s):
+	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
+
+## reproducible build:
+LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
+BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
+override_dh_installman: $(MANPAGES1)
+	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
+	dh_installman --language=C $(MANPAGES1)
+
+override_dh_auto_install:
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	# remove worthless files:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
+	# remove empty directories:
+	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
+	# remove extra-license-file:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
+
+override_dh_fixperms:
+	dh_fixperms
+	#
+	# As requested by the Debian Webapps Policy Manual §3.2.1
+	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
+
+override_dh_systemd_start:
+	dh_systemd_start --no-start
+
+override_dh_systemd_enable:
+	dh_systemd_enable --no-enable
+
+override_dh_apache2:
+	dh_apache2 --noenable
+
+override_dh_strip:
+	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
+        && dh_strip --dbg-package=zoneminder-dbg \
+        || dh_strip
+
+#%:
+#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
+#
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#            --sysconfdir=/etc/zm \
+#            --with-mysql=/usr \
+#            --with-webdir=/usr/share/zoneminder \
+#            --with-ffmpeg=/usr \
+#            --with-cgidir=/usr/lib/cgi-bin \
+#            --with-webuser=www-data \
+#            --with-webgroup=www-data \
+#            --enable-mmap=yes
diff --git a/distros/ubuntu2004/source/format b/distros/ubuntu2004/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/distros/ubuntu2004/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/distros/ubuntu2004/source/lintian-overrides b/distros/ubuntu2004/source/lintian-overrides
new file mode 100644
index 000000000..3669e5de8
--- /dev/null
+++ b/distros/ubuntu2004/source/lintian-overrides
@@ -0,0 +1,9 @@
+## Actually sources are there: "*-nc.js".
+source-is-missing web/tools/mootools/mootools-*-yc.js
+
+## We're using "libjs-jquery" instead.
+source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+
+## Acknowledged, will repack eventually.
+source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
diff --git a/distros/ubuntu2004/zoneminder-doc.doc-base b/distros/ubuntu2004/zoneminder-doc.doc-base
new file mode 100644
index 000000000..c43dc4336
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder-doc.doc-base
@@ -0,0 +1,8 @@
+Document: zoneminder-doc
+Title: Zoneminder documentation
+Abstract: This document describes how to use Zoneminder.
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/zoneminder-doc/html/index.html
+Files: /usr/share/doc/zoneminder-doc/html/*
diff --git a/distros/ubuntu2004/zoneminder-doc.install b/distros/ubuntu2004/zoneminder-doc.install
new file mode 100644
index 000000000..c19bc6f3a
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder-doc.install
@@ -0,0 +1 @@
+docs/_build/html	usr/share/doc/zoneminder-doc/
diff --git a/distros/ubuntu2004/zoneminder-doc.links b/distros/ubuntu2004/zoneminder-doc.links
new file mode 100644
index 000000000..cc09f6462
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder-doc.links
@@ -0,0 +1,2 @@
+## Convenience symlink:
+/usr/share/doc/zoneminder-doc/html    /usr/share/doc/zoneminder/html
diff --git a/distros/ubuntu2004/zoneminder.apache2 b/distros/ubuntu2004/zoneminder.apache2
new file mode 100644
index 000000000..466144fa7
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.apache2
@@ -0,0 +1 @@
+conf debian/conf/apache2/zoneminder.conf  nginx
diff --git a/distros/ubuntu2004/zoneminder.bug-presubj b/distros/ubuntu2004/zoneminder.bug-presubj
new file mode 100644
index 000000000..990fc1d94
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.bug-presubj
@@ -0,0 +1,5 @@
+Unless bug is specific to Debian please consider reporting it directly to
+upstream developer(s):
+
+    https://github.com/ZoneMinder/ZoneMinder/issues
+
diff --git a/distros/ubuntu1410/zoneminder-core.dirs b/distros/ubuntu2004/zoneminder.dirs
similarity index 52%
rename from distros/ubuntu1410/zoneminder-core.dirs
rename to distros/ubuntu2004/zoneminder.dirs
index 350c32aff..6db3d5a95 100644
--- a/distros/ubuntu1410/zoneminder-core.dirs
+++ b/distros/ubuntu2004/zoneminder.dirs
@@ -1,4 +1,9 @@
 var/log/zm
+var/lib/zm
 var/cache/zoneminder/events
 var/cache/zoneminder/images
 var/cache/zoneminder/temp
+var/cache/zoneminder/cache
+usr/share/zoneminder/db
+etc/zm/
+etc/zm/conf.d
diff --git a/distros/ubuntu1410/docs b/distros/ubuntu2004/zoneminder.docs
similarity index 100%
rename from distros/ubuntu1410/docs
rename to distros/ubuntu2004/zoneminder.docs
diff --git a/distros/ubuntu2004/zoneminder.examples b/distros/ubuntu2004/zoneminder.examples
new file mode 100644
index 000000000..3b8befe7b
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.examples
@@ -0,0 +1,2 @@
+debian/examples/*
+dbuild/misc/apache.conf
diff --git a/distros/ubuntu1410/zoneminder-core.zoneminder.init b/distros/ubuntu2004/zoneminder.init
similarity index 78%
rename from distros/ubuntu1410/zoneminder-core.zoneminder.init
rename to distros/ubuntu2004/zoneminder.init
index d3354c1d8..6132481f3 100644
--- a/distros/ubuntu1410/zoneminder-core.zoneminder.init
+++ b/distros/ubuntu2004/zoneminder.init
@@ -8,23 +8,24 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description:  Control ZoneMinder as a Service
+# Description: ZoneMinder CCTV recording and surveillance system
 ### END INIT INFO
-# description: Control ZoneMinder as a Service
 # chkconfig: 2345 20 20
 
 # Source function library.
-#. /etc/rc.d/init.d/functions
+. /lib/lsb/init-functions
 
 prog=ZoneMinder
 ZM_PATH_BIN="/usr/bin"
-RUNDIR=/var/run/zm
-TMPDIR=/tmp/zm
+RUNDIR="/run/zm"
+TMPDIR="/tmp/zm"
 command="$ZM_PATH_BIN/zmpkg.pl"
 
 start() {
 	echo -n "Starting $prog: "
-	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
-	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
+	export TZ=:/etc/localtime
+	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
+	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"
 	$command start
 	RETVAL=$?
 	[ $RETVAL = 0 ] && echo success
@@ -37,11 +38,11 @@ stop() {
 	echo -n "Stopping $prog: "
 	#
 	# Why is this status check being done?
-	# as $command stop returns 1 if zoneminder 
-	# is stopped, which will result in 
-	# this returning 1, which will stuff 
+	# as $command stop returns 1 if zoneminder
+	# is stopped, which will result in
+	# this returning 1, which will stuff
 	# dpkg when it tries to stop zoneminder before
-	# uninstalling . . . 
+	# uninstalling . . .
 	#
 	result=`$command status`
 	if [ ! "$result" = "running" ]; then
diff --git a/distros/ubuntu2004/zoneminder.install b/distros/ubuntu2004/zoneminder.install
new file mode 100644
index 000000000..67b135de5
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.install
@@ -0,0 +1,11 @@
+etc/zm/zm.conf
+etc/zm/conf.d/*
+usr/bin
+usr/lib/zoneminder
+usr/share/polkit-1
+usr/share/zoneminder/db
+usr/share/zoneminder/www
+
+# libzoneminder-perl files:
+usr/share/man/man3
+usr/share/perl5
diff --git a/distros/ubuntu2004/zoneminder.links b/distros/ubuntu2004/zoneminder.links
new file mode 100644
index 000000000..b7258c3c4
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.links
@@ -0,0 +1 @@
+/var/tmp  /usr/share/zoneminder/www/api/app/tmp
diff --git a/distros/ubuntu2004/zoneminder.linktrees b/distros/ubuntu2004/zoneminder.linktrees
new file mode 100644
index 000000000..2e843bbf1
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.linktrees
@@ -0,0 +1,14 @@
+## cakephp
+#replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake
+
+## libjs-mootools
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core.js
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js
+
+## libjs-jquery
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js
diff --git a/distros/ubuntu2004/zoneminder.lintian-overrides b/distros/ubuntu2004/zoneminder.lintian-overrides
new file mode 100644
index 000000000..90be05a9f
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.lintian-overrides
@@ -0,0 +1,14 @@
+# Depends: policykit-1
+unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
+
+# Intentionally not others-readable, #637685.
+non-standard-file-perm etc/zm/zm.conf 0640 != 0644
+
+# Bundled Cake PHP framework, not intended for direct execution:
+script-not-executable usr/share/zoneminder/www/api/*
+
+# Annoying but seems to be too much troubles to fix; should be fixed upstream:
+script-with-language-extension usr/bin/*.pl
+
+# dh-linktree:
+package-contains-broken-symlink usr/share/zoneminder/www/api/lib/Cake/*
diff --git a/distros/ubuntu2004/zoneminder.logrotate b/distros/ubuntu2004/zoneminder.logrotate
new file mode 100644
index 000000000..6162e9c4d
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.logrotate
@@ -0,0 +1,13 @@
+/var/log/zm/*.log {
+    missingok
+    notifempty
+    sharedscripts
+    delaycompress
+    compress
+    postrotate
+        /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
+    endscript
+    daily
+    rotate 7
+    maxage 7
+}
diff --git a/distros/ubuntu2004/zoneminder.maintscript b/distros/ubuntu2004/zoneminder.maintscript
new file mode 100644
index 000000000..3aa20b3a0
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.maintscript
@@ -0,0 +1 @@
+rm_conffile  /etc/zm/apache.conf  1.28.1-5~
diff --git a/distros/ubuntu2004/zoneminder.manpages b/distros/ubuntu2004/zoneminder.manpages
new file mode 100644
index 000000000..d2053d688
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.manpages
@@ -0,0 +1 @@
+docs/_build/man/*.1
diff --git a/distros/ubuntu2004/zoneminder.postinst b/distros/ubuntu2004/zoneminder.postinst
new file mode 100644
index 000000000..39a2fa1b0
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.postinst
@@ -0,0 +1,131 @@
+#! /bin/sh
+
+set +e
+
+create_db () {
+  echo "Checking for db"
+  mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+  # test if database if already present...
+  if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+    echo "Creating zm db"
+    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+    if [ $? -ne 0 ]; then
+      echo "Error creating db."
+      exit 1;
+    fi
+  else
+    echo "Db exists."
+  fi
+  USER_EXISTS="$(mysql --defaults-file=/etc/mysql/debian.cnf  -sse "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = '$ZM_DB_USER')")"
+  if [ $USER_EXISTS -ne 1 ]; then
+    echo "Creating zm user $ZM_DB_USER"
+    # This creates the user.
+    echo "CREATE USER '${ZM_DB_USER}'@${ZM_DB_HOST} IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+  fi
+}
+
+update_db () {
+  echo "Updating permissions"
+  echo "GRANT LOCK tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine,trigger,execute ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@${ZM_DB_HOST};" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+  zmupdate.pl --nointeractive
+  zmupdate.pl --nointeractive -f
+
+  # Add any new PTZ control configurations to the database (will not overwrite)
+  zmcamtool.pl --import >/dev/null 2>&1
+  echo "Done Updating"
+}
+
+if [ "$1" = "configure" ]; then
+
+  . /etc/zm/zm.conf
+  for CONFFILE in /etc/zm/conf.d/*.conf; do
+    . "$CONFFILE"
+  done
+
+  # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
+  chown www-data:root /var/log/zm
+  chown www-data:www-data /var/lib/zm
+  if [ -z "$2" ]; then
+    chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
+  fi
+  if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ] && [ "$(command -v a2enmod)" != "" ]; then
+    echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
+    a2enmod cgi
+  fi
+
+  SYSTEMD=0
+  if [ -e "/run/systemd/system" ]; then
+    SYSTEMD=1
+    echo "detected systemd"
+    # Ensure zoneminder is stopped
+    deb-systemd-invoke stop zoneminder.service || exit $?
+  else
+    # Ensure zoneminder is stopped
+    invoke-rc.d zoneminder stop || true
+  fi
+
+  if [ "$ZM_DB_HOST" = "localhost" ]; then
+
+    if [ $SYSTEMD -eq 1 ] && ([ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ]); then
+      #
+      # Get mysql started if it isn't running
+      #
+
+      if [ -e "/lib/systemd/system/mariadb.service" ]; then
+        DBSERVICE="mariadb.service"
+      else
+        DBSERVICE="mysql.service"
+      fi
+      echo "Detected db service is $DBSERVICE"
+      if systemctl is-failed --quiet $DBSERVICE; then
+        echo "$DBSERVICE is in a failed state; it will not be started."
+        echo "If you have already resolved the problem preventing $DBSERVICE from running,"
+        echo "run sudo systemctl restart $DBSERVICE then run sudo dpkg-reconfigure zoneminder."
+        exit 1
+      fi
+
+      if ! systemctl is-active --quiet mysql.service mariadb.service; then
+        # Due to /etc/init.d service autogeneration, mysql.service always returns the status of mariadb.service
+        # However, mariadb.service will not return the status of mysql.service.
+        deb-systemd-invoke start $DBSERVICE
+      fi
+
+      # Make sure systemctl status exit code is 0; i.e. the DB is running
+      if systemctl is-active --quiet "$DBSERVICE"; then
+        create_db
+        update_db
+      else
+        echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+      fi
+
+    elif [ -e "/etc/init.d/mysql" ]; then
+      #
+      # Get mysql started if it isn't
+      #
+      if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        service mysql start
+      fi
+      if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        create_db
+        update_db
+      else
+        echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+      fi
+
+    else
+      echo 'MySQL/MariaDB not found; assuming remote server.'
+    fi
+  fi
+
+else
+  echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
+fi
+
+if [ $SYSTEMD -eq 1 ]; then
+  deb-systemd-invoke restart zoneminder.service
+#else
+  #service zoneminder start || true
+fi
+
+#DEBHELPER#
diff --git a/distros/ubuntu2004/zoneminder.postrm b/distros/ubuntu2004/zoneminder.postrm
new file mode 100644
index 000000000..ba2066c8d
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.postrm
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+    echo "
+Reminder: to completely remove \"zoneminder\" it may be necessary
+ * to delete database using the following sample command:
+        sudo mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+ * to delete remaining data files in "/var/cache/zoneminder".
+"
+fi
+
+#DEBHELPER#
diff --git a/distros/ubuntu2004/zoneminder.preinst b/distros/ubuntu2004/zoneminder.preinst
new file mode 100644
index 000000000..6088c3ea9
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+## Remove obsolete symlink which is in the way of dh_apache2:
+ol="/etc/apache2/conf-available/zoneminder.conf"
+if [ -h "${ol}" ]; then
+    [ "$(readlink ${ol})" = "/etc/zm/apache.conf" ] && rm -f "${ol}"
+fi
+
+#DEBHELPER#
diff --git a/distros/ubuntu1204/zoneminder.service b/distros/ubuntu2004/zoneminder.service
similarity index 95%
rename from distros/ubuntu1204/zoneminder.service
rename to distros/ubuntu2004/zoneminder.service
index ac719b733..cb2d6791e 100644
--- a/distros/ubuntu1204/zoneminder.service
+++ b/distros/ubuntu2004/zoneminder.service
@@ -13,7 +13,7 @@ Type=forking
 ExecStart=/usr/bin/zmpkg.pl start
 ExecReload=/usr/bin/zmpkg.pl restart
 ExecStop=/usr/bin/zmpkg.pl stop
-PIDFile=/var/run/zm/zm.pid
+PIDFile=/run/zm/zm.pid
 Restart=always
 RestartSec=10
 Environment=TZ=:/etc/localtime
diff --git a/distros/ubuntu2004/zoneminder.tmpfile b/distros/ubuntu2004/zoneminder.tmpfile
new file mode 100644
index 000000000..cbfdec1de
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.tmpfile
@@ -0,0 +1,4 @@
+d /run/zm                   0755 www-data www-data
+d /tmp/zm                       0755 www-data www-data
+d /var/tmp/zm                   0755 www-data www-data
+d /var/cache/zoneminder/cache   0755 www-data www-data
diff --git a/docs/_static/Icon_External_Link.png b/docs/_static/Icon_External_Link.png
new file mode 100644
index 000000000..16f9b92db
Binary files /dev/null and b/docs/_static/Icon_External_Link.png differ
diff --git a/docs/_static/README.txt b/docs/_static/README.txt
new file mode 100644
index 000000000..acc1d59d9
--- /dev/null
+++ b/docs/_static/README.txt
@@ -0,0 +1,2 @@
+The external link icon is GPL licensed. Original license link:
+https://commons.wikimedia.org/wiki/Category:External_link_icons#/media/File:Icon_External_Link.png
diff --git a/docs/_static/zmstyle.css b/docs/_static/zmstyle.css
index b8f0235f3..986614fa6 100644
--- a/docs/_static/zmstyle.css
+++ b/docs/_static/zmstyle.css
@@ -1,3 +1,18 @@
 img {
 	border: 1px solid black !important;
  }
+
+.admonition-todo {
+  border-top: 2px solid red;
+  border-bottom: 2px solid red;
+  border-left: 2px solid red;
+  border-right: 2px solid red;
+  background-color: #ff6347;
+  }
+
+  a.reference.external:link, 
+  a.reference.external:visited{
+    background: url('./Icon_External_Link.png')     center right no-repeat;
+    padding-right: 13px;
+
+  }
\ No newline at end of file
diff --git a/docs/api.rst b/docs/api.rst
index 177678977..23effc0b7 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -14,6 +14,10 @@ The API is built in CakePHP and lives under the ``/api`` directory.  It
 provides a RESTful service and supports CRUD (create, retrieve, update, delete)
 functions for Monitors, Events, Frames, Zones and Config.
 
+API Wrappers
+^^^^^^^^^^^^^
+- pyzm is a python wrapper for the ZoneMinder APIs. It supports both the legacy and new token based API, as well as ZM logs/ZM shared memory support. See `its project site <https://github.com/pliablepixels/pyzm/>`__ for more details. Documentation is `here <https://pyzm.readthedocs.io/en/latest/>`__.
+
 API evolution
 ^^^^^^^^^^^^^^^
 
@@ -21,12 +25,14 @@ The ZoneMinder API has evolved over time. Broadly speaking the iterations were a
 
 * Prior to version 1.29, there really was no API layer. Users had to use the same URLs that the web console used to 'mimic' operations, or use an XML skin
 * Starting version 1.29, a v1.0 CakePHP based API was released which continues to evolve over time. From a security perspective, it still tied into ZM auth and required client cookies for many operations. Primarily, two authentication modes were offered: 
-  * You use cookies to maintain session state (`ZM_SESS_ID`)
-  * You use an authentication hash to validate yourself, which included encoding personal information and time stamps which at times caused timing validation issues, especially for mobile consumers
-* Starting version 1.34, ZoneMinder has introduced a new "token" based system which is based JWT. We have given it a '2.0' version ID. These tokens don't encode any personal data and can be statelessly passed around per request. It introduces concepts like access tokens, refresh tokens and per user level API revocation to manage security better. The internal components of ZoneMinder all support this new scheme now and if you are using the APIs we strongly recommend you migrate to 1.34 and use this new token system (as a side note, 1.34 also moves from MYSQL PASSWORD to Bcrypt for passwords, which is also a good reason why you should migate).
-* Note that as of 1.34, both versions of API access will work (tokens and the older auth hash mechanism).
 
-.. NOTE::
+  * You use cookies to maintain session state (``ZM_SESS_ID``)
+  * You use an authentication hash to validate yourself, which included encoding personal information and time stamps which at times caused timing validation issues, especially for mobile consumers
+
+* Starting version 1.34, ZoneMinder has introduced a new "token" based system which is based JWT. We have given it a '2.0' version ID. These tokens don't encode any personal data and can be statelessly passed around per request. It introduces concepts like access tokens, refresh tokens and per user level API revocation to manage security better. The internal components of ZoneMinder all support this new scheme now and if you are using the APIs we strongly recommend you migrate to 1.34 and use this new token system (as a side note, 1.34 also moves from MYSQL PASSWORD to Bcrypt for passwords, which is also a good reason why you should migate).
+* Note that as of 1.34, both versions of API access will work (tokens and the older auth hash mechanism), however we no longer use sessions by default.  You will have to add a ``stateful=1`` query parameter during login to tell ZM to set a COOKIE and store the required info in the session. This option is only available if ``OPT_USE_LEGACY_API_AUTH`` is set to ON.
+
+.. note::
 	For the rest of the document, we will specifically highlight v2.0 only features. If you don't see a special mention, assume it applies for both API versions.
 
 
@@ -35,7 +41,9 @@ Enabling API
 ^^^^^^^^^^^^^
 
 ZoneMinder comes with APIs enabled. To check if APIs are enabled, visit ``Options->System``. If ``OPT_USE_API`` is enabled, your APIs are active. 
-For v2.0 APIs, you have an additional option right below it - ``OPT_USE_LEGACY_API_AUTH`` which is enabled by default. When enabled, the `login.json` API (discussed later) will return both the old style (``auth=``) and new style (``token=``) credentials. The reason this is enabled by default is because any existing apps that use the API would break if they were not updated to use v2.0. (Note that zmNinja 1.3.057 and beyond will support tokens)
+For v2.0 APIs, you have an additional option right below it:
+
+ * ``OPT_USE_LEGACY_API_AUTH`` which is enabled by default. When enabled, the `login.json` API (discussed later) will return both the old style (``auth=``) and new style (``token=``) credentials. The reason this is enabled by default is because any existing apps that use the API would break if they were not updated to use v2.0. (Note that zmNinja 1.3.057 and beyond will support tokens)
 
 Enabling secret key
 ^^^^^^^^^^^^^^^^^^^
@@ -51,10 +59,14 @@ To get an API key:
 
 ::
 
-    curl -XPOST [-c cookies.txt] -d "user=yourusername&pass=yourpassword" https://yourserver/zm/api/host/login.json
+    curl -XPOST -d "user=yourusername&pass=yourpassword" https://yourserver/zm/api/host/login.json
 
 
-The ``[-c cookies.txt]`` is optional, and will be explained in the next section.
+If you want to use a stateful connection, so you don't have to pass auth credentials with each query, you can use the following:
+
+::
+
+    curl -XPOST -c cookies.txt -d "user=yourusername&pass=yourpassword&stateful=1" https://yourserver/zm/api/host/login.json
 
 This returns a payload like this for API v1.0:
 
@@ -89,17 +101,14 @@ Once you have the keys (a.k.a credentials (v1.0, v2.0) or token (v2.0)) you shou
 
 ::
 
+  # v1.0 or 2.0 based API access (will only work if AUTH_HASH_LOGINS is enabled
+
   # RECOMMENDED: v2.0 token based 
-    curl -XPOST   https://yourserver/zm/api/monitors.json&token=<access_token>
+    curl -XGET  https://yourserver/zm/api/monitors.json?token=<access_token>
 
-  # or
+  # or, for legacy mode:
 
-  # v1.0 or 2.0 based API access (will only work if AUTH_HASH_LOGINS is enabled)
-  curl -XPOST -d "auth=<hex digits from 'credentials'>"   https://yourserver/zm/api/monitors.json
-
-  # or 
-
-  curl -XGET   https://yourserver/zm/api/monitors.json&auth=<hex digits from 'credentials'>
+  curl -XGET  https://yourserver/zm/api/monitors.json?auth=<hex digits from 'credentials'>
 
   # or, if you specified -c cookies.txt in the original login request
 
@@ -107,8 +116,8 @@ Once you have the keys (a.k.a credentials (v1.0, v2.0) or token (v2.0)) you shou
 
 
 .. NOTE::
-	ZoneMinder's API layer allows API keys to be encoded either as a query parameter or as a data payload. If you don't pass keys, you could use cookies (not recommended as a general approach)
 
+	If you are using an ``HTTP GET`` request, the token/auth needs to be passed as a query parameter in the URL. If you are using an ``HTTP POST`` (like when you use the API to modify a monitor, for example), you can choose to pass the token as a data payload instead. The API layer discards data payloads for ``HTTP GET``. Finally, If you don't pass keys, you could also use cookies (not recommended as a general approach).
 
 Key lifetime (v1.0)
 ^^^^^^^^^^^^^^^^^^^^^
@@ -118,7 +127,7 @@ If you are using the old credentials mechanism present in v1.0, then the credent
 Key lifetime (v2.0)
 ^^^^^^^^^^^^^^^^^^^^^^
 
-In version 2.0, it is easy to know when a key will expire before you use it. You can find that out from the ``access_token_expires`` and ``refresh_token_exipres`` values (in seconds) after you decode the JWT key (there are JWT decode libraries for every language you want). You should refresh the keys before the timeout occurs, or you will not be able to use the APIs. 
+In version 2.0, it is easy to know when a key will expire before you use it. You can find that out from the ``access_token_expires`` and ``refresh_token_expires`` values (in seconds) after you decode the JWT key (there are JWT decode libraries for every language you want). You should refresh the keys before the timeout occurs, or you will not be able to use the APIs. 
 
 Understanding access/refresh tokens (v2.0)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -473,6 +482,7 @@ Create a Zone
   &Zone[Units]=Percent\
   &Zone[NumCoords]=4\
   &Zone[Coords]=0,0 639,0 639,479 0,479\
+  &Zone[Area]=307200\
   &Zone[AlarmRGB]=16711680\
   &Zone[CheckMethod]=Blobs\
   &Zone[MinPixelThreshold]=25\
diff --git a/docs/conf.py b/docs/conf.py
index 9bda5df7b..9de7bd820 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ def setup(app):
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = ['sphinx.ext.todo']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -265,3 +265,6 @@ texinfo_documents = [
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
+
+# Display todos by setting to True
+todo_include_todos = True
diff --git a/docs/faq.rst b/docs/faq.rst
index 5b8c97f5c..56b67d082 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -1,8 +1,11 @@
 FAQ
 =====
 
+.. todo:: needs to be reviewed - some entries may be old/invalid. I've done one round, but icOn needs to review.
+
 This is the FAQ page. Feel free to contribute any FAQs that you think are missing.
 
+.. note:: It is always a good idea to refer to the `ZoneMinder forums <https://forums.zoneminder.com/viewforum.php?f=26&sid=fc93f65726d3a29fbf6f610b21f52b16>`__ for tips and tricks. While we try and make sure this FAQ is pruned/adjusted to align with the latest stable release, some of the entries may no longer be accurate (or there may be better suggestions in the forums).
 
 How can I stop ZoneMinder filling up my disk?
 ---------------------------------------------
@@ -29,23 +32,22 @@ To delete events that are older than 7 days, create a new filter with "Date" set
 Save with 'Run Filter In Background' enabled to have it run automatically.
 Optional skip archived events:  click on the plus sign next to -7 days to add another condition.  "and" "archive status" equal to "unarchived only".
 
-Optional slow delete:  limit the number of results to 3.  If you have a large backlog of events that would be deleted, this can hard spike the CPU usage for a long time.  Limiting the number of results to only the first three each time the filter is run spreads out the delete processes over time, dramatically lessening the CPU load.
+Optional slow delete:  limit the number of results to a number, say ``10`` in the filter.  If you have a large backlog of events that would be deleted, this can hard spike the CPU usage for a long time.  Limiting the number of results to only the first three each time the filter is run spreads out the delete processes over time, dramatically lessening the CPU load.
+
+
+.. warning:: We no longer recommend use enable ``OPT_FAST_DELETE`` or ``RUN_AUDIT`` anymore, unless you are using an old or low powered system to run Zoneminder. Please consider the remaining tips in this answer to be 'generally deprecated, use only if you must'.
 
 There are two methods for ZM to remove files when they are deleted that can be found in Options under the System tab ZM_OPT_FAST_DELETE and ZM_RUN_AUDIT.
 
 
 ZM_OPT_FAST_DELETE:
 
-Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if you are trying to do a lot of events at once. If you are running on an older or under-powered system, you may want to set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later. If you do so, disk space will not be freed immediately so you will need to run zmaudit more frequently.  On modern systems, we recommend that you leave this off.
-
-
+Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if you are trying to do a lot of events at once. If you are running on an older or under-powered system, you may want to set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later. If you do so, disk space will not be freed immediately so you will need to run zmaudit more frequently.  On modern systems, we recommend that you leave this **off**.
 
 ZM_RUN_AUDIT:
 
 The zmaudit daemon exists to check that the saved information in the database and on the file system match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronize the two data stores. This option controls whether zmaudit is run in the background and performs these checks and fixes continuously. This is recommended for most systems however if you have a very large number of events the process of scanning the database and file system may take a long time and impact performance. In this case you may prefer to not have zmaudit running unconditionally and schedule occasional checks at other, more convenient, times.
 
-
-
 ZM_AUDIT_CHECK_INTERVAL:
 
 The zmaudit daemon exists to check that the saved information in the database and on the files system match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronize the two data stores. The default check interval of 900 seconds (15 minutes) is fine for most systems however if you have a very large number of events the process of scanning the database and file system may take a long time and impact performance. In this case you may prefer to make this interval much larger to reduce the impact on your system. This option determines how often these checks are performed.
@@ -64,12 +66,15 @@ In *general* a good estimate of memory required would be:
 	Min Bits of Memory = 20% overhead * (image-width*image-height*image buffer size*target color space*number of cameras) 
 
 Where:
+
 * image-width and image-height are the width and height of images that your camera is configured for (in my case, 1280x960). This value is in the Source tab for each monitor
 * image buffer size is the # of images ZM will keep in memory (this is used by ZM to make sure it has pre and post images before detecting an alarm - very useful because by the time an alarm is detected, the reason for the alarm may move out of view and a buffer is really useful for this, including for analyzing stats/scores). This value is in the buffers tab for each monitor
 * target color space is the color depth - 8bit, 24bit or 32bit. It's again in the source tab of each monitor
-The 1.2 at the start is basically adding 20% on top of the calculation to account for image/stream overheads (this is an estimate)
+
+The 20% overhead on top of the calculation to account for image/stream overheads (this is an estimate)
 
 The math breakdown for 4 cameras running at 1280x960 capture, 50 frame buffer, 24 bit color space:
+
 ::
 
 	1280*960 = 1,228,800 (bytes)
@@ -96,8 +101,6 @@ So a good rule of thumb is to make sure you have twice the memory as the calcula
 As it turns out, ZM uses mapped memory and by default, 50% of your physical memory is what this will grow to. When you reach that limit , ZM breaks down with various errors.
 
 
-(**Note**: Mapped memory is applicable when you install ZoneMinder with mapped memory support, which is the default mode. If you have specifically disabled mapped memory then please see the next FAQ enty on how to increase shared memory)
-
 A good way to know how much memory is allocated to ZM for its operation is to do a ``df -h``
 
 A sample output on Ubuntu:
@@ -116,140 +119,43 @@ For example, if you want to increase this limit to 70% of your memory, add the f
 where SHMPATH is the ``Mounted on`` path.  Here, that would be ``/run/shm``.  Other systems may be ``/dev/shm``.
 
 
-What does a 'Can't shmget: Invalid argument' error in my logs mean? (and my camera does not display at higher resolutions)
---------------------------------------------------------------------------------------------------------------------------------------
-
-(*Note*: This is applicable for systems that have mapped memory disabled in ZoneMinder. By default, Mapped memory is enabled and unless you have disabled it manually, please refer to the "Math for Memory" question above and how to increase mapped memory limits)
-
-This error is discussed in the README in the following excerpt:-
-''...this is caused by an attempt to allocate an amount of shared memory greater than your system can handle. The size it requests is based on the following formula, ``ring buffer size x image width x image height x 3 (for 24 bit images) + a bit of overhead``.
-
-So, for example:
-
-::
-
-	384x288 capture resolution, that makes: 110 592 pixels
-	in 24 bit color that's x 3 = 331,776 bytes per frame 
-	by 80 frames ring buffer x80 = 26,542,080 bytes per camera 
-	by 4 cameras x4 = 106,168,320 bytes. 
-	Plus 10% overhead = 116,785,152 bytes 
-	Thats 114,048 kB, respectively 111.38 MB. 
-	If my shared memory is set to 134,217,728, which is exactly 128MB, 
-	that means I shouldn't have any problem.
-	(Note that 1kbyte = 1024bytes, 1MB = 1024 kB)
-
-If for instance you were using 24bit 640x480 then this would come to about 92Mb if you are using the default buffer size of 100. If this is too large then you can either reduce the image or buffer sizes or increase the maximum amount of shared memory available. If you are using RedHat then you can get details on how to change these settings `here <http://www.redhat.com/docs/manuals/database/RHDB-2.1-Manual/admin_user/kernel-resources.html>`__
-
-You should be able to use a similar procedure  with other distributions to modify the shared memory pool without kernel recompilations though in some cases this may be necessary. Note, this error also sometimes occurs if you have an old shared memory segment lying around from a previous run that is too small. Use the ipcs and ipcrm system commands to check and remove it if necessary.'"
-
-You can often find out how many 4KB shared memory pages are available by typing the following :-
-
-::
-
-	# cat /proc/sys/kernel/shmall
-	2097152
-
-In recent kernels the shmall is set to 2097152 memory pages multiplied by 4096 bytes per page for a total of 8 GB of shared memory available.  You only need to increase the shmall value if you have a computer with more than 8GB of memory and wish to use more of it for shared memory usage, such as large databases.
-
-The most shared memory bytes you can allocate in one go :-
-
-::
-
-	# cat /proc/sys/kernel/shmmax
-	33554432
-
-In recent kernels the shmmax is set to 33554432 bytes for only 32 MB of maximum shared memory allocatable at a time, hardly enough for ZoneMinder to go above 320 x 240 x 24-bit resolution at 40 frames in the buffer if it is using the /dev/shm shared memory device, so this value needs to be increased.  If you are using ZoneMinder with the memory mapped (mmap) compile time option then this doesn't affect you.
-
-To change the value to 128 MB temporarily during this kernel execution type (for example) :-
-``echo 536870912 >/proc/sys/kernel/shmmax``
-
-*Be sure to restart ZoneMinder after this.*
-
-However be aware that sometimes you will only need to change the shmmax value as shmall is often large enough. Also changing these values in this way is only effective until your machine is rebooted. 
-
-To change them permanently you will need to edit ``/etc/sysctl.conf`` and add the following lines (for example) :-
-``kernel.shmmax = 536870912``
-
-Or if your distribution has the ``/etc/sysctl.d/`` folder you can create a file in this folder without modifying the ``/etc/sysctl.d`` so you won't lose the changes during distro upgrades :-
-```echo kernel.shmmax = 536870912 >/etc/sysctl.d/60-kernel-shm.conf```
-
-To load these settings in the sysctl.conf file type:
-``sysctl -p``
-
-To check your shared memory settings type:
-``ipcs -l``
-
-Note that with Megapixel cameras like the Axis 207mw becoming cheaper and more attractive, the above memory settings are not adequate. To get Zoneminder working with a full 1280x1024 resolution camera in full color, increase ``134217728`` (128 MB) to, for example, ``268435456`` (256 MB) and multiple this value by each camera.
-
-These changes will now also be set the next time your machine is restarted.
-
-Versions 1.24.x of ZoneMinder also allows you to use an alternate method of shared memory allocation, `Mmap mapped memory <http://en.wikipedia.org/wiki/Mmap>`__ . This requires less configuration and can be simpler to use. Mapped memory allows you to use a special type of file as the placeholder for your memory and this file is 'mapped' into memory space for easy and fast access.
-
-To enable mapped memory in ZoneMinder you need add add the --enable--mmap=yes switch to your configure line. By default mapped memory files are created in /dev/shm which on most distributions is a dedicated pseudo-partition containing memory formatted as a filesystem. If your system uses a different path then this can be changed in ZoneMinder in Options->paths->PATH_MAP. It uses a filesystem type called `tmpfs <http://en.wikipedia.org/wiki/Tmpfs>`__. If you type ``df -h`` you should see this area and the size of memory it currently allows. To increase size for tmpfs you need to edit /etc/default/tmpfs. Search for:
-``SHM_SIZE=128M``
-and change to something like
-``SHM_SIZE=1G``
-then reboot the system. You could possibly need to change RUN_SIZE, too.
-
-It is important that you do not use a disk based filesystem for your memory mapped files as this will cause memory access to be extremely slow. ZoneMinder creates files called .zm.mmap.<monitor id> in the mapped memory filesystem.
-
-Mapped memory is subject to the same limitations in terms of total memory as using more traditional shared memory but does not require any configuration per allocation or chunk. In future versions of ZoneMinder this will be the default shared memory storage method.
-
-Another good article about shared memory settings can be found `here <http://publib.boulder.ibm.com/infocenter/db2luw/v9/index.jsp?topic=/com.ibm.db2.udb.uprun.doc/doc/t0008238.htm>`__ . 
-
-The essential difference was that the kernel.shmall setting is NOT in a direct memory setting in KB but in pages of memory. it is Max Pages of memory
-
-*For example:* If you want to allocate a maximum memory setting to 8GB you have to convert it to the number of pages (or segments).
-with a page size of 4096.
-kernel.shmall = 8000x1024x1024/4096
-``kernel.shmall = 2097152``
-NOT 8388608000 as would be suggested in the RedHat article linked above.
-
-shmmax is the max amount to allocate in one request - 
-this is is an actual memory size (as opposed to pages) set to 4GB
-``kernel.shmmax = 4294967296``
-
-The ``/etc/sysctl.conf`` would have these lines
-
-::
-
-	kernel.shmall = 2097152
-	kernel.shmmax = 4294967296</pre>
-
-As above, reload your sysctl.conf with ``sysctl -p`` and check that the settings are correct with ``ipcs -l``.
 
 I have enabled motion detection but it is not always being triggered when things happen in the camera view
 ---------------------------------------------------------------------------------------------------------------
 
-ZoneMinder uses zones to examine images for motion detection. When you create the initial zones you can choose from a number of preset values for sensitivity etc. Whilst these are usually a good starting point they are not always suitable for all situations and you will probably need to tweak the values for your specific circumstances. The meanings of the various settings are described in the documentation (`here <http://www.zoneminder.com/wiki/index.php/Documentation#Defining_Zones>`__) however if you believe you have sensible settings configured then there are two diagnostic approaches you can use.
+ZoneMinder uses zones to examine images for motion detection. When you create the initial zones you can choose from a number of preset values for sensitivity etc. Whilst these are usually a good starting point they are not always suitable for all situations and you will probably need to tweak the values for your specific circumstances. The meanings of the various settings are described in the documentation (`here <https://zoneminder.readthedocs.io/en/latest/userguide/definezone.html>`__). Another user contributed illustrated Zone definition guide can be found here: `An illustrated guide to Zones <https://wiki.zoneminder.com/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__
+
+However if you believe you have sensible settings configured then there are diagnostic approaches you can use. 
 
-Another user contributed illustrated Zone definition guide can be found here: `An illustrated guide to Zones <http://www.zoneminder.com/wiki/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__
 
 Event Statistics
 ^^^^^^^^^^^^^^^^^
-The first technique is to use event statistics. Firstly you should ensure they are switched on in Options->Logging->RECORD_EVENT_STATS. This will then cause the raw motion detection statistics for any subsequently generated events to be written to the DB. These can then be accessed by first clicking on the Frames or Alarm Frames values of the event from any event list view in the web gui. Then click on the score value to see the actual values that caused the event. Alternatively the stats can be accessed by clicking on the 'Stats' link when viewing any individual frame. The values displayed there correspond with the values that are used in the zone configuration and give you an idea of what 'real world' values are being generated. 
+The first technique is to use event statistics. Firstly you should ensure they are switched on in ``Options->Logging->RECORD_EVENT_STATS``. This will then cause the raw motion detection statistics for any subsequently generated events to be written to the DB. These can then be accessed by first clicking on the Frames or Alarm Frames values of the event from any event list view in the web gui. Then click on the score value to see the actual values that caused the event. Alternatively the stats can be accessed by clicking on the 'Stats' link when viewing any individual frame. The values displayed there correspond with the values that are used in the zone configuration and give you an idea of what 'real world' values are being generated. 
 
 Note that if you are investigating why events 'do not' happen then these will not be saved and so won't be accessible. The best thing to do in that circumstance is to make your zone more sensitive so that it captures all events (perhap even ones you don't want) so you can get an idea of what values are being generated and then start to adjust back to less sensitive settings if necessary. You should make sure you test your settings under a variety of lighting conditions (e.g. day and night, sunny or dull) to get the best feel for that works and what doesn't.
 
 Using statistics will slow your system down to a small degree and use a little extra disk space in the DB so once you are happy you can switch them off again. However it is perfectly feasible to keep them permanently on if your system is able to cope which will allow you to review your setting periodically.
 
-Diagnostic Images
-^^^^^^^^^^^^^^^^^^^^
-The second approach is to use diagnostic images which are saved copies of the intermediate images that ZM uses when determining motion detection. These are switched on and off using Options->Logging->RECORD_DIAG_IMAGES.
+Diagnostic Images along with FIFO
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The second approach is to use diagnostic images which are saved copies of the intermediate images that ZM uses when determining motion detection. These are switched on and off using ``Options->Logging->RECORD_DIAG_IMAGES``.
+
+.. note:: In addition to the detailed explanation below, a recently added ``RECORD_DIAG_IMAGES_FIFO`` option, also available in ``Options->Logging`` can be an invaluable tool to see how your current motion settings are affecting motion detection. The ``delta`` stream along with the ``raw`` (json output) stream can be invaluable to see the effect in real time. Please refer to the explanation of this feature in :doc:`/userguide/options/options_logging`
 
 There are two kinds of diagnostic images which are and are written (and continuously overwritten) to the top level monitor event directory. If an event occurs then the files are additionally copied to the event directory and renamed with the appropriate frame number as a prefix.
 
-The first set are produced by the monitor on the image as a whole. The diag-r.jpg image is the current reference image against which all individual frames are compared and the diag-d.jpg image is the delta image highlighting the difference between the reference image and the last analysed image. In this images identical pixels will be black and the more different a pixel is the whiter it will be. Viewing this image and determining the colour of the pixels is a good way of getting a feel for the pixel differences you might expect (often more than you think).
+The first set are produced by the monitor on the image as a whole. The ``diag-r.jpg`` image is the current reference image against which all individual frames are compared and the ``diag-d.jpg`` image is the delta image highlighting the difference between the reference image and the last analysed image. In this images identical pixels will be black and the more different a pixel is the whiter it will be. Viewing this image and determining the colour of the pixels is a good way of getting a feel for the pixel differences you might expect (often more than you think).
 
-The second set of diag images are labelled as diag-<zoneid>-<stage>.jpg where zoneid is the id of the zone in question (Smile) and the stage is where in the alarm check process the image is generated from. So if you have several zones you can expect to see multiple files. Also these files are only interested in what is happening in their zone only and will ignore anything else outside of the zone. The stages that each number represents are as follows,
+The second set of diag images are labelled as ``diag-<zoneid>-<stage>.jpg`` where zoneid is the id of the zone in question (Smile) and the stage is where in the alarm check process the image is generated from. So if you have several zones you can expect to see multiple files. Also these files are only interested in what is happening in their zone only and will ignore anything else outside of the zone. The stages that each number represents are as follows,
 
-# Alarmed Pixels - This image shows all pixels in the zone that are considered to be alarmed as white pixels and all other pixels as black.
-# Filtered Pixels - This is as stage one except that all pixels removed by the filters are now black. The white pixels represent the pixels that are candidates to generate an event.
-# Raw Blobs - This image contains all alarmed pixels from stage 2 but aggrageted into blobs. Each blob will have a different greyscale value (between 1 and 254) so they can be difficult to spot with the naked eye but using a colour picker or photoshop will make it easier to see what blob is what.
-# Filtered Blobs - This image is as stage 3 but under (or over) sized blobs have been removed. This is the final step before determining if an event has occurred, just prior to the number of blobs being counted. Thus this image forms the basis for determining whether an event is generated and outlining on alarmed images is done from the blobs in this image.
+* Alarmed Pixels - This image shows all pixels in the zone that are considered to be alarmed as white pixels and all other pixels as black.
+* Filtered Pixels - This is as stage one except that all pixels removed by the filters are now black. The white pixels represent the pixels that are candidates to generate an event.
+* Raw Blobs - This image contains all alarmed pixels from stage 2 but aggrageted into blobs. Each blob will have a different greyscale value (between 1 and 254) so they can be difficult to spot with the naked eye but using a colour picker or photoshop will make it easier to see what blob is what.
+* Filtered Blobs - This image is as stage 3 but under (or over) sized blobs have been removed. This is the final step before determining if an event has occurred, just prior to the number of blobs being counted. Thus this image forms the basis for determining whether an event is generated and outlining on alarmed images is done from the blobs in this image.
 
 Using the above images you should be able to tell at all stages what ZM is doing to determine if an event should happen or not. They are useful diagnostic tools but as is mentioned elsewhere they will massively slow your system down and take up a great deal more space. You should never leave ZM running for any length of time with diagnostic images on.
 
+
 Why can't ZoneMinder capture images (either at all or just particularly fast) when I can see my camera just fine in xawtv or similar?
 ----------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -259,14 +165,14 @@ On average a card that can capture at 25fps per chip PAL for one input will do m
 
 When using xawtv etc to view the stream you are not looking at an image captured using the frame grabber but the card's video memory mapped onto your screen. This requires no capture or processing unless you do an explicit capture via the J or ctrl-J keys for instance. Some cards or drivers do not support the frame grabber interface at all so may not work with ZoneMinder even though you can view the stream in xawtv. If you can grab a still using the grab functionality of xawtv then in general your card will work with ZoneMinder.
 
-Why can't I see streamed images when I can see stills in the Zone window etc?
+Why can't I see streamed images when I can see stills in the zone window etc?
 -------------------------------------------------------------------------------------
 
 This issue is normally down to one of two causes
 
-1) You are using Internet Explorer and are trying to view multi-part jpeg streams. IE does not support these streams directly, unlike most other browsers. You will need to install Cambozola or another multi-part jpeg aware plugin to view them. To do this you will need to obtain the applet from the Downloads page and install the cambozola.jar file in the same directory as the ZoneMinder php files. Then find the ZoneMinder Options->Images page and enable ZM_OPT_CAMBOZOLA and enter the web path to the .jar file in ZM_PATH_CAMBOZOLA. This will ordinarily just be cambozola.jar. Provided (Options / B/W tabs) WEB_H_CAN_STREAM is set to auto and WEB_H_STREAM_METHOD is set to jpeg then Cambozola should be loaded next time you try and view a stream.
+1) You are using Internet Explorer and are trying to view multi-part jpeg streams. IE does not support these streams directly, unlike most other browsers. You will need to install Cambozola or another multi-part jpeg aware plugin to view them. To do this you will need to obtain the applet from the Downloads page and install the cambozola.jar file in the same directory as the ZoneMinder php files. Then find the ZoneMinder Options->Images page and enable ``OPT_CAMBOZOLA`` and enter the web path to the .jar file in ``PATH_CAMBOZOLA``. This will ordinarily just be cambozola.jar. Provided (Options / B/W tabs) ``WEB_H_CAN_STREAM`` is set to auto and ``WEB_H_STREAM_METHOD`` is set to jpeg then Cambozola should be loaded next time you try and view a stream.
 
-'''NOTE''': If you find that the Cambozola applet loads in IE but the applet just displays the version # of Cambozola and the author's name (as opposed to seeing the streaming images), you may need to chmod (''-rwxrwxr-x'') your (''usr/share/zoneminder/'') cambozola.jar:
+**NOTE**: If you find that the Cambozola applet loads in IE but the applet just displays the version  of Cambozola and the author's name (as opposed to seeing the streaming images), you may need to chmod (``-rwxrwxr-x``) your (``usr/share/zoneminder/``) cambozola.jar:
 
 ::
 
@@ -274,9 +180,7 @@ This issue is normally down to one of two causes
 
 Once I did this, images started to stream for me.
 
-2) The other common cause for being unable to view streams is that you have installed the ZoneMinder cgi binaries (zms and nph-zms) in a different directory than your web server is expecting. Make sure that the --with-cgidir option you use to the ZoneMinder configure script is the same as the CGI directory configure for your web server. If you are using Apache, which is the most common one, then in your httpd.conf file there should be a line like ``ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"`` where the last directory in the quotes is the one you have specified. If not then change one or the other to match. Be warned that configuring apache can be complex so changing the one passed to the ZoneMinder configure (and then rebuilding and reinstalling) is recommended in the first instance. If you change the apache config you will need to restart apache for the changes to take effect. If you still cannot see stream reliably then try changing Options->Paths->ZM_PATH_ZMS to just use zms if nph-zms is specified, or vice versa. Also check in your apache error logs.
-
-Also, please check the value of the ZM_PATH_ZMS setting under the Paths Options tab.  It is where you configure the URL to the zms or nph-zms CGI executable.  Under most Debian-based distros this value should be /zm/cgi-bin/nph-zms but in the past may have been /cgi-bin/nph-zms or you may have configured it to be something else.  
+2) The other common cause for being unable to view streams is that you have installed the ZoneMinder cgi binaries (zms and nph-zms) in a different directory than your web server is expecting. Make sure that the --with-cgidir option you use to the ZoneMinder configure script is the same as the CGI directory configure for your web server. If you are using Apache, which is the most common one, then in your httpd.conf file there should be a line like ``ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"`` where the last directory in the quotes is the one you have specified. If not then change one or the other to match. Be warned that configuring apache can be complex so changing the one passed to the ZoneMinder configure (and then rebuilding and reinstalling) is recommended in the first instance. If you change the apache config you will need to restart apache for the changes to take effect. If you still cannot see stream reliably then try changing ``ZM_PATH_ZMS`` in your ``/etc/zm/config`` directory to just use zms if nph-zms is specified, or vice versa. Also check in your apache error logs.
 
 Lastly, please look for errors created by the zmc processes.  If zmc isn't running, then zms will not be able to get an image from it and will exit.
 
@@ -302,6 +206,11 @@ change the 3 to a 1
 	network.http.max-persistent-connections-per-proxy -> 100 again
 	network.http.max-persistent-connections-per-server -> 100 again
 
+
+I can't see more than 6 monitors in montage on my browser
+---------------------------------------------------------
+Browsers such a Chrome and Safari only support upto 6 streams from the same domain. To work around that, take a look at the multi-port configuration discussed in  the ``MIN_STREAMING_PORT`` configuration in :doc:`/userguide/options/options_network`
+
 Why is ZoneMinder using so much CPU?
 ---------------------------------------
 
@@ -315,8 +224,8 @@ The main causes are.
 	* Big image sizes. A image of 640x480 requires at least four times the processing of a 320x240 image. Experiment with different sizes to see what effect it may have. Sometimes a large image is just two interlaced smaller frames so has no real benefit anyway. This is especially true for analog cameras/cards as image height over 320 (NTSC) or 352 PAL) are invariably interlaced.
 	* Capture frame rates. Unless there's a compelling reason in your case there is often little benefit in running cameras at 25fps when 5-10fps would often get you results just as good. Try changing your monitor settings to limit your cameras to lower frame rates. You can still configure ZM to ignore these limits and capture as fast as possible when motion is detected.
 	* Run function. Obviously running in Record or Mocord modes or in Modect with lots of events generates a lot of DB and file activity and so CPU and load will increase.
-	*  Basic default detection zones. By default when a camera is added one detection zone is added which covers the whole image with a default set of parameters. If your camera covers a view in which various regions are unlikely to generate a valid alarm (ie the sky) then I would experiment with reducing the zone sizes or adding inactive zones to blank out areas you don't want to monitor. Additionally the actual settings of the zone themselves may not be optimal. When doing motion detection the number of changed pixels above a threshold is examined, then this is filter, then contiguous regions are calculated to see if an alarm is generated. If any maximum or minimum threshold is exceeded according to your zone settings at any time the calculation stops. If your settings always result in the calculations going through to the last stage before being failed then additional CPU time is used unnecessarily. Make sure your maximum and minimumzone thresholds are set to sensible values and experiment by switching RECORD_EVENT_STATS on and seeing what the actual values of alarmed pixels etc are during sample events.
-	* Optimise your settings. After you've got some settings you're happy with then switching off RECORD_EVENT_STATS will prevent the statistics being written to the database which saves some time. Other settings which might make a difference are ZM_FAST_RGB_DIFFS and the JPEG_xxx_QUALITY ones.
+	*  Basic default detection zones. By default when a camera is added one detection zone is added which covers the whole image with a default set of parameters. If your camera covers a view in which various regions are unlikely to generate a valid alarm (ie the sky) then I would experiment with reducing the zone sizes or adding inactive zones to blank out areas you don't want to monitor. Additionally the actual settings of the zone themselves may not be optimal. When doing motion detection the number of changed pixels above a threshold is examined, then this is filter, then contiguous regions are calculated to see if an alarm is generated. If any maximum or minimum threshold is exceeded according to your zone settings at any time the calculation stops. If your settings always result in the calculations going through to the last stage before being failed then additional CPU time is used unnecessarily. Make sure your maximum and minimumzone thresholds are set to sensible values and experiment by switching ``RECORD_EVENT_STATS`` on and seeing what the actual values of alarmed pixels etc are during sample events.
+	* Optimise your settings. After you've got some settings you're happy with then switching off ``RECORD_EVENT_STATS`` will prevent the statistics being written to the database which saves some time. Other settings which might make a difference are ``ZM_FAST_RGB_DIFFS`` and the ``JPEG_xxx_QUALITY`` ones.
 
 I'm sure there are other things which might make a difference such as what else you have running on the box and memory sizes (make sure there's no swapping going on). Also speed of disk etc will make some difference during event capture and also if you are watching the whole time then you may have a bunch of zms processes running also.
 
@@ -330,17 +239,19 @@ Using the timeline view is only recommended when using FireFox, however even the
 
 This function has from time to time been corrupted in the SVN release or in the stable releases, try and reinstall from a fresh download.
 
+.. _disk_bw_faq:
+
 How much Hard Disk Space / Bandwidth do I need for ZM?
 ---------------------------------------------------------------
-Please see `this excel sheet <http://www.jpwilson.eu/ZM_Utils/ZM%20storage%20calc%20sheet.xls>`__ or  `this online excel sheet <https://docs.google.com/spreadsheets/d/1G2Er8fZ_lWQv9QV8qf9yGCMkiUG03a-UwgLLxzCL0OY/edit#gid=49279749>`__ (both are user contributed excel sheets)
+Please see `this online excel sheet <https://docs.google.com/spreadsheets/d/1iPMCGwlXiW8WnQuewgFhUqBs7ZaPKqXDkBtCQVHR6H0/edit?usp=sharing>`__. Note that this is just an estimate
 
-Or go to `this link <http://www.axis.com/products/video/design_tool/index.html>`__ for the Axis bandwidth calculator. Although this is aimed at Axis cameras it still produces valid results for any kind of IP camera.
+Or go to `this link <http://www.axis.com/products/video/design_tool/v2/>`__ for the Axis bandwidth calculator. Although this is aimed at Axis cameras it still produces valid results for any kind of IP camera.
 
 As a quick guide I have 4 cameras at 320x240 storing 1 fps except during alarm events. After 1 week 60GB of space in the volume where the events are stored (/var/www/html/zm) has been used.
 
 When I try and run ZoneMinder I get lots of audit permission errors in the logs and it won't start
 -------------------------------------------------------------------------------------------------------
-Many Linux distributions nowadays are built with security in mind. One of the latest methods of achieving this is via SELinux (Secure Linux) which controls who is able to run what in a more precise way then traditional accounting and file based permissions (`link <http://en.wikipedia.org/wiki/Selinux>`__).
+Many Linux distributions nowadays are built with security in mind. One of the latest methods of achieving this is via SELinux (Secure Linux) which controls who is able to run what in a more precise way then traditional accounting and file based permissions (`link <https://en.wikipedia.org/wiki/Selinux>`__).
 If you are seeing entries in your system log like:
 
    Jun 11 20:44:02 kernel: audit(1150033442.443:226): avc: denied { read } for pid=5068
@@ -353,38 +264,13 @@ Note that SELinux may cause errors other than those listed above. If you are in
 
 How do I enable ZoneMinder's security?
 -------------------------------------------
-In the console, click on Options. Check the box next to "ZM_OPT_USE_AUTH". You will immediately be asked to login. The default username is 'admin' and the password is 'admin'.
+In the console, click on ``Options->System``. Check the box next to ``ZM_OPT_USE_AUTH``. You will immediately be asked to login. The default username is 'admin' and the password is 'admin'.
 
 To Manage Users:
-In main console, go to Options->Users.
+In main console, go to ``Options->Users``.
 
-You may also consider to use the web server security, for example, htaccess files under Apache scope; You may even use this as an additional/redundant security on top of Zoneminders built-in security features;
+You may also consider to use the web server security, for example, htaccess files under Apache scope; You may even use this as an additional/redundant security on top of Zoneminders built-in security features. Note that if you choose to enable webserver auth, zmNinja may have issues. Please read the `zmNinja FAQ on basic authentication <https://zmninja.readthedocs.io/en/latest/guides/FAQ.html#i-can-t-see-streams-i-use-basic-auth>`__ for more information. Also please note that zmNinja does not support digest authentication.
 
-Why does ZM stop recording once I have 32000 events for my monitor?
-------------------------------------------------------------------------
-Storing more than 32k files in a single folder is a limitation of some filesystems. To avoid this, enable USE_DEEP_STORAGE under Options.
-
-USE_DEEP_STORAGE is now the default for new ZoneMinder systems so this limitation should only apply to users upgrading from a previous version of ZoneMinder.
-
-Versions of ZM from 1.23.0 onwards allow you to have a deeper filesystem with fewer files per individual directory. As well as not being susceptible to the 32k limit, this is also somewhat faster. 
-
-If you have upgraded from a previous version of ZoneMinder and this option is not already enabled, it is very important to follow the steps below to enable it on an existing system. Failure to properly follow these steps **WILL RESULT IN LOSS OF YOUR DATA!**
-
-::
-
-	# Stop ZoneMinder
-	# Backup your event data and the dB if you have the available storage
-	# Enable USE_DEEP_STORAGE under Options.
-	# From the command line, run "sudo zmupdate.pl --migrate-events"
-	# Monitor the output for any events that fail to convert.
-	# After the conversion completes, you can restart ZoneMinder
-
-Note that you can re-run the migrate-events command if any error messages scroll off the screen.
-
-You can read about the lack of a limit in the number of sub-directories in the ext4 filesystem at: `this link <http://kernelnewbies.org/Ext4>`__
-and see what tools may assist in your use of this filesystem `here <http://ext4.wiki.kernel.org/index.php/Ext4_Howto>`__
-If you search for ext3 or reiserfs on the forums you will find various threads on this issue with guidance on
-how to convert.
 
 Managing system load (with IP Cameras in mind)
 ----------------------------------------------------
@@ -410,7 +296,7 @@ Zoneminder runs on Linux, Linux measures system load using "load", which is comp
 
 A load of 1.0 means the processor has "just enough to do right now". Also worth noting that a load of 4.0 means exactly the same for a quad processor machine - each number equals a single processor's workload. A very high load can be fine on a computer that has a stacked workload - such as a machine sending out bulk emails, or working its way through a knotty problem; it'll just keep churning away until it's done. However - Zoneminder needs to process information in real time so it can't afford to stack its jobs, it needs to deal with them right away.
 
-For a better and full explanation of Load: `Please read this <http://en.wikipedia.org/wiki/Load_%28computing%29>`__
+For a better and full explanation of Load: `Please read this <https://en.wikipedia.org/wiki/Load_%28computing%29>`__
 
 My load is too high, how can I reduce it?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -427,7 +313,7 @@ Zoneminder is *very* tweakable and it's possible to tune it to compromise. The f
 
 	* Experiment with using jpeg instead of mjpeg. Some users have reported it gives better performance, but YMMV.
 
-	* Tweak the zones. Keep them as small and as few as possible. Stick to one zone unless you really need more. Read `this <http://www.zoneminder.com/wiki/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ for an easy to understand explanation along with the official Zone guide.
+	* Tweak the zones. Keep them as small and as few as possible. Stick to one zone unless you really need more. Read `this <https://wiki.zoneminder.com/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ for an easy to understand explanation along with the official Zone guide.
 
 	* Schedule. If you are running a linux system at near capacity, you'll need to think carefully about things like backups and scheduled tasks. updatedb - the process which maintains a file database so that 'locate' works quickly, is normally scheduled to run once a day and if on a busy system can create a heavy increase on the load. The same is true for scheduled backups, especially those which compress the files. Re-schedule these tasks to a time when the cpu is less likely to be busy, if possible - and also use the "nice" command to reduce their priority. (crontab and /etc/cron.daily/ are good places to start)
 
@@ -440,73 +326,16 @@ More expensive options:
 	* Faster CPU. Simple but effective. Zoneminder also works very well with multiple processor systems out of the box (if SMP is enabled in your kernel). The load of different cameras is spread across the processors.
 
 
-	* Try building Zoneminder with processor specific instructions that are optimised to the system it will be running on, also increasing the optimisation level of GCC beyond -O2 will help.
+	* Try building Zoneminder with processor specific instructions that are optimised to the system it will be running on, also increasing the optimisation level of GCC beyond -O2 will help.  This topic is beyond the scope of this document.
 
-::
-
-	./configure CFLAGS="-g -O3 -march=athlon-xp -mtune=athlon-xp" CXXFLAGS="-g -O3 -march=athlon-xp -mtune=athlon-xp"
-
-The above command is optimised for an Athlon XP cpu so you will need to use the specific processor tag for your cpu, also the compiler optimisation has been increased to -O3.
-
-You also need to put in your normal ./configure commands as if you were compiling with out this optimisation.
-
-A further note is that the compile must be performed on the system that Zoneminder will be running on as this optimisation will make it hardware specific code.
-
-Processor specific commands can be found in the GCC manual along with some more options that may increase performanc. 
-`<http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html#i386-and-x86_002d64-Options>`__
-
-The below command has been used to compile Zoneminder on a Athlon XP system running CentOS 5.5 and along with the libjpeg-turbo modification to reduce the CPU load in half, libjpeg-turbo reduced the load by 1/3 before the processor optimisation.
-::
-
-	./configure --with-webdir=/var/www/html/zm --with-cgidir=/var/www/cgi-bin CFLAGS="-g -O3 -march=athlon-xp -mtune=athlon-xp" CXXFLAGS="-D__STDC_CONSTANT_MACROS -g -O3 -march=athlon-xp -mtune=athlon-xp" --enable-mmap --sysconfdir=/etc/zm
-
-The following command has been used to compile Zoneminder 1.25 on a CentOS 6.0 system, the native command should choose the processor automatically during compile time, this needs to be performed on the actual system!!.
-
-::
-
-	CFLAGS="-g -O3 -march=native -mtune=native" CXXFLAGS="-D__STDC_CONSTANT_MACROS -g -O3 -march=native -mtune=native" ./configure  --with-webdir=/var/www/html/zm --with-cgidir=/var/www/cgi-bin --with-webuser=apache --with-webgroup=apache ZM_DB_HOST=localhost ZM_DB_NAME=zm ZM_DB_USER=your_zm_user ZM_DB_PASS=your_zm_password ZM_SSL_LIB=openssl
+Processor specific commands can be found in the `GCC manual <https://gcc.gnu.org/onlinedocs/gcc/>`__ along with some more options that may increase performance. 
 
 
 What about disks and bandwidth?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 A typical 100mbit LAN will cope with most setups easily. If you're feeding from cameras over smaller or internet links, obviously fps will be much lower.
 
-Disk and Bandwidth calculators are referenced on the Zoneminder wiki here: http://www.zoneminder.com/wiki/index.php/FAQ#How_much_Hard_Disk_Space_.2F_Bandwidth_do_I_need_for_ZM.3F
-
-
-Building ZoneMinder
---------------------
-
-When running configure I am getting a lot of messages about not being able to compile the ffmpeg libraries
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you see output from configure that looks like this
-
-::
-
-	checking libavcodec/avcodec.h usability... no
-	checking libavcodec/avcodec.h presence... yes
-	configure: WARNING: libavcodec/avcodec.h: present but cannot be compiled
-	configure: WARNING: libavcodec/avcodec.h:     check for missing
-	prerequisite headers?
-	configure: WARNING: libavcodec/avcodec.h: see the Autoconf documentation
-	configure: WARNING: libavcodec/avcodec.h:     section "Present But
-	Cannot Be Compiled"
-	configure: WARNING: libavcodec/avcodec.h: proceeding with the compiler's
-	result
-	configure: WARNING:     ## ------------------------------------- ##
-	configure: WARNING:     ## Report this to support@zoneminder.com ##
-	configure: WARNING:     ## ------------------------------------- ##</pre>
-
-then it is caused not by the ZoneMinder build system but ffmpeg itself. However there is a workaround you can use which is to add ``CPPFLAGS=-D__STDC_CONSTANT_MACROS``
-
-to the ZoneMinder ``./configure`` command which should solve the issue. However this is not a proper 'fix' as such, which can only come from the ffmpeg project itself.
-
-I cannot build ZoneMinder and am getting lots of undefined C++ template errors
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-
-This is almost certainly due to the 'ccache' package which attempts to speed up compilation by caching compiled objects. Unfortunately one of the side effects is that it breaks the GNU g++ template resolution method that ZoneMinder uses in building by prevent files getting recompiled. The simplest way around this is to remove the ccache package using your distros package manager.
+Disk and Bandwidth calculators are referenced in :ref:`disk_bw_faq`.
 
 How do I build for X10 support?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -530,7 +359,7 @@ To save a run state you should first configure your monitors for Modect, Record,
 
 Now you can switch between these two states by selecting them from the same dialog you saved them, or from the command line from issue the command ''zmpkg.pl <run state>'', for example ''zmpkg.pl Daytime''.
 
-The final step you need to take, is scheduling the time the changes take effect. For this you can use `cron <http://en.wikipedia.org/wiki/Cron>`__. A simple entry to change to the Daylight state at at 8am and to the nighttime state at 8pm would be as follows,
+The final step you need to take, is scheduling the time the changes take effect. For this you can use `cron <https://en.wikipedia.org/wiki/Cron>`__. A simple entry to change to the Daylight state at at 8am and to the nighttime state at 8pm would be as follows,
 
 ::
 
@@ -544,50 +373,10 @@ Although the example above describes changing states at different times of day,
 
 How can I use ZoneMinder to trigger something else when there is an alarm?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-ZoneMinder includes a perl API which means you can create a script to interact with the ZM shared memory data and use it in your own scripts to react to ZM alarms or to trigger ZM to generate new alarms. Full details are in the README or by doing ``perldoc ZoneMinder``, ``perldoc ZoneMinder::SharedMem`` etc.
-Below is an example script that checks all monitors for alarms and when one occurs, prints a message to the screen. You can add in your own code to make this reaction a little more useful.
+ZoneMinder includes a perl API which means you can create a script to interact with the ZM shared memory data and use it in your own scripts to react to ZM alarms or to trigger ZM to generate new alarms. Full details are in the README or by doing ``perldoc ZoneMinder``  etc.
 
-::
+ZoneMinder provides a sample alarm script called `zmalarm.pl <https://github.com/ZoneMinder/zoneminder/blob/master/utils/zm-alarm.pl>`__ that you can refer to as a starting point.
 
-	#!/usr/bin/perl -w
-
-	use strict;
-
-	use ZoneMinder;
-
-	$| = 1;
-
-	zmDbgInit( "myscript", level=>0, to_log=>0, to_syslog=>0, to_term=>1 );
-
-	my $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-
-	my $sql = "select M.*, max(E.Id) as LastEventId from Monitors as M left join Events as E on M.Id = E.MonitorId where M.Function != 'None' group by (M.Id)";
-	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-
-	my $res = $sth->execute() or die( "Can't execute '$sql': ".$sth->errstr() );
-	my @monitors;
-	while ( my $monitor = $sth->fetchrow_hashref() )
-	{
-	    push( @monitors, $monitor );
-	}
-
-	while( 1 )
-	{
-	    foreach my $monitor ( @monitors )
-	    {
-		next if ( !zmMemVerify( $monitor ) );
-	 
-		if ( my $last_event_id = zmHasAlarmed( $monitor, $monitor->{LastEventId} ) )
-		{
-		    $monitor->{LastEventId} = $last_event_id;
-		    print( "Monitor ".$monitor->{Name}." has alarmed\n" );
-		    #
-		    # Do your stuff here
-		    #
-		}
-	    }
-	    sleep( 1 );
-	}
 
 Trouble Shooting
 -------------------
@@ -596,13 +385,9 @@ This is also how to obtain the info that we need to help you on the forums.
 
 What logs should I check for errors?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-ZoneMinder creates its own logs and are usually located in the ``/tmp`` directory.
+ZoneMinder creates its own logs and are usually located in the ``/var/log/`` directory. Refer to the logging discussion in :doc:`/userguide/options/options_logging` for more details on where logs are stored and how to enable various log levels.
 
-The ZoneMinder logs for the RPM packages are located in ``/var/log/zm``.
-
-Depending on your problem errors can show up in any of these logs but, usually the logs of interest are ``zmdc.log`` and ``zmpkg.log`` if ZM is not able to start.
-
-Now since ZM is dependent on other components to work, you might not find errors in ZM but in the other components.
+Since ZM is dependent on other components to work, you might not find errors in ZM but in the other components.
 
 :: 
 
@@ -618,8 +403,6 @@ If ZM is not functioning, you should always be able to find an error in at least
 This will append any data entered to any of these logs to your console screen (``-f``). To exit, hit [ctrl -c].
 
 
-More verbose logging for the ZoneMinder binaries is available by enabling the debug option from the control panel and will be placed in the path you have configured for the debug logs. Output can be limited to a specific binary as described in the Debug options page under the "?" marks.
-
 How can I trouble shoot the hardware and/or software?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -643,29 +426,33 @@ The apache web server needs to have the right permissions and configuration to b
 Why am I getting broken images when trying to view events?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Zoneminder and the Apache web server need to have the right permissions. Check this forum topic and similar ones:
-http://www.zoneminder.com/forums/viewtopic.php?p=48754#48754
+Zoneminder and the Apache web server need to have the right permissions. Check `this forum topic <https://forums.zoneminder.com/viewtopic.php?p=48754>`__ and similar ones:
+
 
 
 I can review events for the current day, but ones from yesterday and beyond error out
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you've checked that the `www-data` user has permissions to the storage folders, perhaps your php.ini's timezone setting is incorrect. They _must_ match for certain playback functions. 
+If you've checked that the ``www-data`` user has permissions to the storage folders, perhaps your php.ini's timezone setting is incorrect. They _must_ match for certain playback functions. 
 
-If you're using Linux, this can be found using the following command: ::
+If you're using Linux, this can be found using the following command: 
+
+::
 
   timedatectl | grep "Time zone"
 
-If using FreeBSD, you can use this one-liner: ::
+If using FreeBSD, you can use this one-liner: 
+
+::
 
   cd /usr/share/zoneinfo/ && find * -type f -exec cmp -s {} /etc/localtime \; -print;
   
-Once you know what timezone your system is set to, open `/etc/php.ini` and adjust ``date.timezone`` to the appropriate value. the PHP daemon may need to be restarted for changes to take effect.
+Once you know what timezone your system is set to make sure you set the right time zone in ZM (Available in ``Options->System->TimeZone``)
 
 
 Why is the image from my color camera appearing in black and white?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If you recently upgraded to zoneminder 1.26, there is a per camera option that defaults to black and white and can be mis-set if your upgrade didn't happen right. See this thread: http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21344
+If you recently upgraded to zoneminder 1.26, there is a per camera option that defaults to black and white and can be mis-set if your upgrade didn't happen right. See this thread: https://forums.zoneminder.com/viewtopic.php?f=30&t=21344
 
 This may occur if you have a NTSC analog camera but have configured the source in ZoneMinder as PAL for the Device Format under the source tab.  You may also be mislead because zmu can report the video port as being PAL when the camera is actually NTSC.  Confirm the format of your analog camera by checking it's technical specifications, possibly found with the packaging it came in, on the manufacturers website, or even on the retail website where you purchased the camera.  Change the Device Format setting to NTSC and set it to the lowest resolution of 320 x 240.  If you have confirmed that the camera itself is NTSC format, but don't get a picture using the NTSC setting, consider increasing the shared memory '''kernel.shmall''' and '''kernel.shmmax''' settings in /etc/sysctl.conf to a larger value such as 268435456.  This is also the reason you should start with the 320x240 resolution, so as to minimize the potential of memory problems which would interfere with your attempts to troubleshoot the device format issue.  Once you have obtained a picture in the monitor using the NTSC format, then you can experiment with raising the resolution.
 
@@ -675,39 +462,17 @@ If this camera is attached to a capture card, then you may have selected the wro
 
 Why do I only see black screens with a timestamp when monitoring my camera?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-In the monitor windows where you see the black screen with a timestamp, select settings and enter the Brightness, Contrast, Hue, and Color settings reported for the device by '''zmu -d <device_path> -q -v'''.  32768 may be appropriate values to try for these settings.  After saving the settings, select Settings again to confirm they saved successfully.
+In the monitor windows where you see the black screen with a timestamp, select settings and enter the Brightness, Contrast, Hue, and Color settings reported for the device by ``zmu -d <device_path> -q -v``.  32768 may be appropriate values to try for these settings.  After saving the settings, select Settings again to confirm they saved successfully.
 
-I am getting messages about a backtrace in my logs, what do I do?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If you are seeing entries in your log like the following
-
-::
-
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /lib64/libc.so.6 [0x3347230210]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /lib64/libc.so.6(memset+0xce) [0x334727684e]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /usr/local/bin/zma [0x40ee9a]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /usr/local/bin/zma [0x419946]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /usr/local/bin/zma [0x4213cf]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /usr/local/bin/zma(cos+0x35c) [0x404674]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /lib64/libc.so.6(__libc_start_main+0xf4) [0x334721da44]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: ERR [Backtrace: /usr/local/bin/zma(cos+0xd1) [0x4043e9]]
-	Jan 11 20:25:22 localhost zma_m2[19051]: INF [Backtrace complete]</pre>
-
-then you can help diagnose the problem by running a special command to translate the hex addresses into helpful information. This command is called addr2line and you can type 'man addr2line' for more information.
-Basically addr2line takes two sets of parameters, the first is the name of the binary file, and the second is a list of addresses. Both of these pieces of information are displayed in the logs. The filename is the first part after the 'Backtrace:' tag, in this case /usr/local/bin/zma, though it may well be different in your case. Some of the lines refer to libraries rather than the zma executable but those can be ignored for now, the important part is noting which ZM binary is involved. The binary file is passed in following the -e flag. The addresses to pass to addr2line are those contained in the '[]' pairs. Again you can ignore those that are on a line that refers to a library but it will not hurt if you include them.
-So in the example above, the command would be ``addr2line -e /usr/local/bin/zma 0x40ee9a 0x419946 0x4213cf 0x404674 0x4043e9``
-This should then dump out a more symbolic list containing source file names and line numbers, and it is this information which will be helpful if posted to the forums. Sometimes addr2line fails to produce useful output. This is usually because either the problem is so severe that it has corrupted the stack and prevented useful information from being displayed, or that you have either compiled ZM without the -g flag for debug, or you have stripped the binaries of symbol information after installation. This this case you would need to rebuild temporarily with debug enabled for the information to be useful.
-
-
-This error some times happens when a linked camera looses its link or it is corrupted by the user or some other system event, try deleting the affected cameras and recreating them in the Zoneminder console.
 
 How do I repair the MySQL Database?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 There is two ways to go about this. In most cases you can run from the command prompt ->
-* mysqlcheck --all-databases --auto-repair -p'''your_database_password''' -u '''your_databse_user'''
+``mysqlcheck --all-databases --auto-repair -p your_database_password -u your_databse_user``
 
-If that does not work then you will have to make sure that ZoneMinder is stopped then run the following (nothing should be using the database while running this and you will have to adjust for your correct path if it is different). ->
-* myisamchk --silent --force --fast --update-state -O key_buffer=64M -O sort_buffer=64M -O read_buffer=1M -O write_buffer=1M /var/lib/mysql/*/*.MYI 
+If that does not work then you will have to make sure that ZoneMinder is stopped then run the following (nothing should be using the database while running this and you will have to adjust for your correct path if it is different):
+
+``myisamchk --silent --force --fast --update-state -O key_buffer=64M -O sort_buffer=64M -O read_buffer=1M -O write_buffer=1M /var/lib/mysql/*/*.MYI``
 
 
 How do I repair the MySQL Database when the cli fails?
@@ -715,7 +480,7 @@ How do I repair the MySQL Database when the cli fails?
 In Ubuntu, the commands listed above do not seem to work.  However, actually doing it by hand from within MySQL does.  (But that is beyond the scope of this document)  But that got me thinking...  And phpmyadmin does work.  Bring up a terminal.
 ``sudo apt-get install phpmyadmin``
 
-Now go to http://zoneminder_IP/ and stop the ZM service.  Continue to http://zoneminder_IP/phpmyadmin and select the zoneminder database.  Select and tables marked 'in use' and pick the action 'repare' to fix.  Restart the zoneminder service from the web browser.  Remove or disable the phpmyadmin tool, as it is not always the most secure thing around, and opens your database wide to any skilled hacker.
+Now go to ``http://zoneminder_IP/`` and stop the ZM service.  Continue to ``http://zoneminder_IP/phpmyadmin`` and select the zoneminder database.  Select and tables marked 'in use' and pick the action 'repare' to fix.  Restart the zoneminder service from the web browser.  Remove or disable the phpmyadmin tool, as it is not always the most secure thing around, and opens your database wide to any skilled hacker.
 ``sudo apt-get remove phpmyadmin``
 
 I upgraded by distribution and ZM stopped working
@@ -760,10 +525,13 @@ The ZoneMinder license is described at the end of the documentation and consists
  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.
 
-This means that ZoneMinder is licensed under the terms described `here <http://www.gnu.org/copyleft/gpl.html>`__. There is a comprehensive FAQ covering the GPL at http://www.gnu.org/licenses/gpl-faq.html but in essence you are allowed to redistribute or modify GPL licensed software provided that you release your distribution or modifications freely under the same terms. You are allowed to sell systems based on GPL software. You are not allowed to restrict or reduce the rights of GPL software in your distribution however. Of course if you are just making modifications for your system locally you are not releasing changes so you have no obligations in this case. I recommend reading the GPL FAQ for more in-depth coverage of this issue.
+This means that ZoneMinder is licensed under the terms described `here <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>`__. There is a comprehensive FAQ covering the GPL at https://www.gnu.org/licenses/gpl-faq.html but in essence you are allowed to redistribute or modify GPL licensed software provided that you release your distribution or modifications freely under the same terms. You are allowed to sell systems based on GPL software. You are not allowed to restrict or reduce the rights of GPL software in your distribution however. Of course if you are just making modifications for your system locally you are not releasing changes so you have no obligations in this case. I recommend reading the GPL FAQ for more in-depth coverage of this issue.
 
 Can I use ZoneMinder as part of my commercial product?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The GPL license allows you produce systems based on GPL software provided your systems also adhere to that license and any modifications you make are also released under the same terms.  The GPL does not permit you to include ZoneMinder in proprietary systems (see http://www.gnu.org/licenses/gpl-faq.html#GPLInProprietarySystem for details). If you wish to include ZoneMinder in this kind of system then you will need to license ZoneMinder under different terms. This is sometimes possible and you will need to contact me for further details in these circumstances.
+The GPL license allows you produce systems based on GPL software provided your systems also adhere to that license and any modifications you make are also released under the same terms.  The GPL does not permit you to include ZoneMinder in proprietary systems (see https://www.gnu.org/licenses/gpl-faq.html#GPLInProprietarySystem for details). If you wish to include ZoneMinder in this kind of system then you will need to license ZoneMinder under different terms. This is sometimes possible and you will need to contact me for further details in these circumstances.
 
+I am having issues with zmNinja and/or Event Notification Server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+zmNinja and the Event Notification Server are 3rd party solutions. The developer maintains exhaustive `documentation and FAQs <https://zmninja.readthedocs.io/en/latest/>`__. Please direct your questions there.
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 46da979cf..740e9ec26 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,7 +10,9 @@ ZoneMinder Documentation
    faq
    contributing
 
-Welcome to ZoneMinder's documentation, the following resources are available
+Welcome to ZoneMinder's documentation. Please navigate to one of the links below.
+
+If you are facing issues that are not covered in the documentation, please feel free to check the `ZoneMinder Forums <https://forums.zoneminder.com/viewforum.php?f=26>`__ or join the `ZoneMinder-Chat Slack channel <https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE>`__ if you prefer real time interaction.
 
 :doc:`installationguide/index`
   Many distribution repos only hold older versions of ZoneMinder, current versions contain many bug fixes and updated functionality. Instructions here for installing updated packages or compiling from source.
@@ -27,6 +29,9 @@ Welcome to ZoneMinder's documentation, the following resources are available
 :doc:`contributing`
   How to contribute to ZoneMinder. As a community project we always need help, you don't need to be a coder to test or update documentation.
 
+`Event Notification Server and Machine Learning hooks <https://zmeventnotification.readthedocs.io/en/latest/index.html>`__
+        Documentation for the 3rd party Event Notification Server and Machine Learning for Object/People/Face detection.
+
 
 
 Indices and tables
diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index 74a9ca81d..d09423bd9 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -3,10 +3,161 @@ Debian
 
 .. contents::
 
+Easy Way: Debian Buster
+------------------------
+
+This procedure will guide you through the installation of ZoneMinder on Debian 10 (Buster).
+
+**Step 1:** Make sure your system is up to date
+
+Open a console and use ``su`` command to become root.
+
+::
+
+    apt update
+    apt upgrade
+
+
+**Step 2:** Setup Sudo (optional but recommended)
+
+By default Debian does not come with sudo, so you have to install it and configure it manually.
+This step is optional but recommended and the following instructions assume that you have setup sudo.
+If you prefer to setup ZoneMinder as root, do it at your own risk and adapt the following instructions accordingly.
+
+::
+
+    apt install sudo
+    usermod -a -G sudo <username>
+    exit
+
+Now your terminal session is back under your normal user. You can check that 
+you are now part of the sudo group with the command ``groups``, "sudo" should
+appear in the list. If not, run ``newgrp sudo`` and check again with ``groups``.
+
+
+**Step 3:** Install Apache and MySQL
+
+These are not dependencies for the ZoneMinder package as they could be
+installed elsewhere. If they are not installed yet in your system, you have to
+trigger their installation manually.
+
+::
+
+    sudo apt install apache2 default-mysql-server
+
+**Step 4:** Add ZoneMinder's Package repository to your apt sources
+
+ZoneMinder's Debian packages are not included in Debian's official package
+repositories. To be able to install ZoneMinder with APT, you have to edit the
+list of apt sources and add ZoneMinder's repository.
+
+Add the following to the /etc/apt/sources.list.d/zoneminder.list file
+
+::
+
+    # ZoneMinder repository
+    deb https://zmrepo.zoneminder.com/debian/release-1.34 buster/
+
+You can do this using:
+
+::
+    echo "deb https://zmrepo.zoneminder.com/debian/release-1.34 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list
+
+Because ZoneMinder's package repository provides a secure connection through HTTPS, apt must be enabled for HTTPS.
+::
+
+    sudo apt install apt-transport-https
+
+Ensure you have gnupg installed before importing the apt key in the following step.
+::
+
+    sudo apt install gnupg
+
+
+Finally, download the GPG key for ZoneMinder's repository:
+::
+
+    wget -O - https://zmrepo.zoneminder.com/debian/archive-keyring.gpg | sudo apt-key add -
+
+
+**Step 5:** Install ZoneMinder
+
+::
+
+    sudo apt update
+    sudo apt install zoneminder
+
+**Step 6:** Read the Readme
+
+The rest of the install process is covered in the README.Debian, so feel free to have
+a read.
+
+::
+
+    zcat /usr/share/doc/zoneminder/README.Debian.gz
+
+
+**Step 7:** Enable ZoneMinder service
+
+::
+
+    sudo systemctl enable zoneminder.service
+
+**Step 8:** Configure Apache
+
+The following commands will setup the default /zm virtual directory and configure
+required apache modules.
+
+::
+
+    sudo a2enconf zoneminder
+    sudo a2enmod rewrite # this is enabled by default
+    sudo a2enmod cgi # this is done automatically when installing the package. Redo this command manually only for troubleshooting.
+
+
+**Step 9:** Edit Timezone in PHP
+
+Automated way:
+::
+
+    sudo sed -i "s/;date.timezone =/date.timezone = $(sed 's/\//\\\//' /etc/timezone)/g" /etc/php/7.*/apache2/php.ini
+
+Manual way
+::
+
+    sudo nano /etc/php/7.*/apache2/php.ini
+
+Search for [Date] (Ctrl + w then type Date and press Enter) and change
+date.timezone for your time zone. Don't forget to remove the ; from in front
+of date.timezone.
+
+::
+
+        [Date]
+        ; Defines the default timezone used by the date functions
+        ; http://php.net/date.timezone
+        date.timezone = America/New_York
+
+CTRL+o then [Enter] to save
+
+CTRL+x to exit
+
+
+**Step 10:** Start ZoneMinder
+
+Reload Apache to enable your changes and then start ZoneMinder.
+
+::
+
+    sudo systemctl reload apache2
+    sudo systemctl start zoneminder
+
+You are now ready to go with ZoneMinder. Open a browser and type either ``localhost/zm`` one the local machine or ``{IP-OF-ZM-SERVER}/zm`` if you connect from a remote computer.
+
 Easy Way: Debian Stretch
 ------------------------
 
-This procedure will guide you through the installation of ZoneMinder on Debian 9 (Stretch). This section has been tested with ZoneMinder 1.32.3 on Debian 9.8.
+This procedure will guide you through the installation of ZoneMinder on Debian 9 (Stretch). This section has been tested with ZoneMinder 1.34 on Debian 9.8.
 
 **Step 1:** Make sure your system is up to date
 
@@ -52,7 +203,7 @@ Add the following to the bottom of the file
 ::
 
     # ZoneMinder repository
-    deb https://zmrepo.zoneminder.com/debian/release stretch/
+    deb https://zmrepo.zoneminder.com/debian/release-1.34 stretch/
 
 CTRL+o and <Enter> to save
 CTRL+x to exit
@@ -275,7 +426,6 @@ CTRL+x to exit
 
 **Step 12:** Please check the configuration
 
-Zoneminder 1.32.x
     1. Check path of ZM_PATH in '/etc/zm/conf.d/zmcustom.conf' is ZM_PATH_ZMS=/zm/cgi-bin/nph-zms
         ::
             cat /etc/zm/conf.d/zmcustom.conf
@@ -309,8 +459,8 @@ Reload Apache to enable your changes and then start ZoneMinder.
     ::
 
             {
-                "version": "1.29.0",
-                "apiversion": "1.29.0.1"
+                "version": "1.34.0",
+                "apiversion": "1.34.0.1"
             }
 
 **Congratulations**  Your installation is complete
diff --git a/docs/installationguide/easydocker.rst b/docs/installationguide/easydocker.rst
new file mode 100644
index 000000000..899ce0e5d
--- /dev/null
+++ b/docs/installationguide/easydocker.rst
@@ -0,0 +1,11 @@
+An Easy To Use Docker Image
+===========================
+If you are interested in trying out ZoneMinder quickly, user Dan Landon maintains an easy to use docker image for ZoneMinder. With a few simple configuration changes, it also provides complete Event Notification Server and Machine Learning hook support. Please follow instructions in his repostory. He maintains two repositories:
+
+* If you want to run the latest stable release, please use his `zoneminder repository <https://github.com/dlandon/zoneminder>`__.
+* If you want to run the latest zoneminder master, please use his `zoneminder master repository <https://github.com/dlandon/zoneminder.master-docker>`__.
+
+In both cases, instructions are provided in the repo README files.
+
+If you are looking at building your own native (non docker) binary packages of ZoneMinder for your distro, please refer to the distro specific install guides or  :doc:`packpack`.
+
diff --git a/docs/installationguide/images/zm_first_screen_post_install.png b/docs/installationguide/images/zm_first_screen_post_install.png
index 568d7fcf5..59e2af6d3 100644
Binary files a/docs/installationguide/images/zm_first_screen_post_install.png and b/docs/installationguide/images/zm_first_screen_post_install.png differ
diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
index 4e2288de6..602632c94 100644
--- a/docs/installationguide/index.rst
+++ b/docs/installationguide/index.rst
@@ -1,14 +1,18 @@
 Installation Guide
 ======================================
 
+.. todo:: This entire guide needs to be checked/updated as needed
+
 Contents:
 
 .. toctree::
    :maxdepth: 2
 
+   easydocker 
    packpack
    ubuntu
    debian
    redhat
+   windows_wsl
    multiserver
    dedicateddrive
diff --git a/docs/installationguide/packpack.rst b/docs/installationguide/packpack.rst
index dd54ef4b2..72fdf8661 100644
--- a/docs/installationguide/packpack.rst
+++ b/docs/installationguide/packpack.rst
@@ -1,6 +1,8 @@
 All Distros - A Docker Way to Build ZoneMinder
 ===============================================
 
+.. note:: If you are looking for an easy way to run ZoneMinder and not interested in building your own docker image, please refer to :doc:`easydocker`.
+
 .. contents::
 
 These instructions represent an alternative way to build ZoneMinder for any supported distro.
@@ -124,4 +126,4 @@ More testing needs to be done for Redhat distros but it appears Fedora users can
 
 	sudo systemctl start systemd-binfmt
 
-TO-DO: Verify the details behind enabling qemu emulation on redhat distros. Pull requests are welcome.
+.. todo:: Verify the details behind enabling qemu emulation on redhat distros. Pull requests are welcome.
diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 5b5067058..c18a3412a 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -53,7 +53,7 @@ ZoneMinder releases are now being hosted at RPM Fusion. New users should navigat
 
 Note that RHEL/CentOS 7 users should use yum instead of dnf.
 
-Once ZoneMinder has been installed, it is critically important that you read the README file under /usr/share/doc/zoneminder. ZoneMinder will not run without completing the steps outlined in the README.
+Once ZoneMinder has been installed, it is critically important that you read the README file under /usr/share/doc/zoneminder-common. ZoneMinder will not run without completing the steps outlined in the README.
 
 How to Install Nightly Development Builds
 -----------------------------------------
@@ -101,7 +101,7 @@ Certain commands in these instructions require root privileges while other comma
 
 Set Up Your Environment
 ***********************
-Before you begin, set up an rpmbuild environment by following `this guide <http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment>`_ by the CentOS developers.
+Before you begin, set up an rpmbuild environment by following `this guide <https://wiki.centos.org/HowTos/SetupRpmBuildEnvironment>`_ by the CentOS developers.
 
 In addition, make sure RPM Fusion is enabled as described in the previous section `How to Install ZoneMinder`_.  
 
@@ -191,7 +191,7 @@ Now clone the ZoneMinder git repository from your home folder:
     git clone https://github.com/ZoneMinder/zoneminder
     cd zoneminder
 
-This will create a sub-folder called ZoneMinder, which will contain the latest development source code.
+This will create a sub-folder called zoneminder, which will contain the latest development source code.
 
 If you have previsouly cloned the ZoneMinder git repo and wish to update it to the most recent, then issue these commands instead:
 
diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 582b8e5c5..7b714e51a 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -3,8 +3,8 @@ Ubuntu
 
 .. contents::
 
-Easy Way: Ubuntu 18.04
-----------------------
+Easy Way: Ubuntu 18.04 (Bionic)
+-------------------------------
 These instructions are for a brand new ubuntu 18.04 system which does not have ZM
 installed.
 
@@ -15,6 +15,7 @@ achieve the same result by running:
 
 ::
 
+    sudo apt-get install tasksel
     sudo tasksel install lamp-server
 
 During installation it will ask you to set up a master/root password for the MySQL.
@@ -41,16 +42,7 @@ guide you with a quick search.
 
     ::
 
-        add-apt-repository ppa:iconnor/zoneminder
-
-    Please note that as of 1.32.0 We are creating a new PPA for each major version, as a means to prevent automatic upgrades from one major version to another.  So instead of the above ppa line use the following:
-
-    ::
-
-        add-apt-repository ppa:iconnor/zoneminder-1.32
-
-    If you are on Trusty or Xenial, you may want to add both, as there are some packages for dependencies included in the old ppa.
-  
+        add-apt-repository ppa:iconnor/zoneminder-1.34
 
 Update repo and upgrade.
 
@@ -163,7 +155,7 @@ You may also want to enable to following modules to improve caching performance
         nano /etc/php/7.2/apache2/php.ini
 
 Search for [Date] (Ctrl + w then type Date and press Enter) and change
-date.timezone for your time zone, see [this](http://php.net/manual/en/timezones.php).
+date.timezone for your time zone, see [this](https://www.php.net/manual/en/timezones.php).
 **Don't forget to remove the ; from in front of date.timezone**
 
 ::
@@ -202,8 +194,8 @@ CTRL+x to exit
 
 PPA install may need some tweaking of ZMS_PATH in ZoneMinder options. `Socket_sendto or no live streaming`_
 
-Easy Way: Ubuntu 16.04
-----------------------
+Easy Way: Ubuntu 16.04 (Xenial)
+-------------------------------
 These instructions are for a brand new ubuntu 16.04 system which does not have ZM
 installed.
 
@@ -241,16 +233,8 @@ guide you with a quick search.
     ::
 
         add-apt-repository ppa:iconnor/zoneminder
-
-    Please note that as of 1.32.0 We are creating a new PPA for each major version, as a means to prevent automatic upgrades from one major version to another.  So instead of the above ppa line use the following:
-
-    ::
-
         add-apt-repository ppa:iconnor/zoneminder-1.32
 
-    If you are on Trusty or Xenial, you may want to add both, as there are some packages for dependencies included in the old ppa.
-  
-
 Update repo and upgrade.
 
 ::
@@ -362,7 +346,7 @@ You may also want to enable to following modules to improve caching performance
         nano /etc/php/7.0/apache2/php.ini
 
 Search for [Date] (Ctrl + w then type Date and press Enter) and change
-date.timezone for your time zone, see [this](http://php.net/manual/en/timezones.php).
+date.timezone for your time zone, see [this](https://www.php.net/manual/en/timezones.php).
 **Don't forget to remove the ; from in front of date.timezone**
 
 ::
@@ -401,8 +385,8 @@ CTRL+x to exit
 
 PPA install may need some tweaking of ZMS_PATH in ZoneMinder options. `Socket_sendto or no live streaming`_
 
-Easy Way: Ubuntu 14.x
----------------------
+Easy Way: Ubuntu 14.x (Trusty)
+------------------------------
 **These instructions are for a brand new ubuntu 14.x system which does not have ZM installed.**
 
 **Step 1:** Either run commands in this install using sudo or use the below to become root
@@ -450,7 +434,7 @@ Easy Way: Ubuntu 14.x
         nano /etc/php5/apache2/php.ini
 
 Search for [Date] (Ctrl + w then type Date and press Enter) and change
-date.timezone for your time zone, see [this](http://php.net/manual/en/timezones.php).
+date.timezone for your time zone, see [this](https://www.php.net/manual/en/timezones.php).
 **Don't forget to remove the ; from in front of date.timezone**
 
 ::
diff --git a/docs/installationguide/windows_wsl.rst b/docs/installationguide/windows_wsl.rst
new file mode 100644
index 000000000..6861f522e
--- /dev/null
+++ b/docs/installationguide/windows_wsl.rst
@@ -0,0 +1,10 @@
+Windows 10+ using WSL
+=======================
+
+With Windows 10, Microsoft released the `Window Subsystem for Linux (WSL) <https://docs.microsoft.com/en-us/windows/wsl/faq>`__  that enables you to run native Linux tools directly on Windows, alongside your traditional Windows desktop and modern store apps. To install WSL, please refer to the 
+`installation guide from Microsoft <https://docs.microsoft.com/en-us/windows/wsl/install-win10>`__.
+
+ZoneMinder now runs on Windows 10+ systems which have WSL enabled. This guide will explain how to go about installing an Ubuntu ZM image on Windows 10+.
+
+.. todo:: Isaac to add instructions.
+
diff --git a/docs/userguide/components.rst b/docs/userguide/components.rst
index 48aff0be4..064e27d5f 100644
--- a/docs/userguide/components.rst
+++ b/docs/userguide/components.rst
@@ -17,8 +17,6 @@ Binaries
   This is the ZoneMinder Capture daemon. This binary's job is to sit on a video device and suck frames off it as fast as possible, this should 	run at more or less constant speed.
 **zma**
   This is the ZoneMinder Analysis daemon. This is the component that goes through the captured frames and checks them for motion which might generate an alarm or event. It generally keeps up with the Capture daemon but if very busy may skip some frames to prevent it falling behind.
-**zmf**
-  This is the ZoneMinder Frame daemon. This is an optional daemon that can run in concert with the Analysis daemon and whose function it is to actually write captured frames to disk. This frees up the Analysis daemon to do more analysis (!) and so keep up with the Capture daemon better. If it isn’t running or dies then the Analysis daemon just writes them itself.
 **zms**
   This is the ZoneMinder Streaming server. The web interface connects with this to get real-time or historical streamed images. It runs only when a live monitor stream or event stream is actually being viewed and dies when the event finishes or the associate web page is closed. If you find you have several zms processes running when nothing is being viewed then it is likely you need a patch for apache (see the Troubleshooting section). A non-parsed header version of zms, called nph-zms, is also installed and may be used instead depending on your web server configuration.
 **zmu**
@@ -41,11 +39,11 @@ Finally some perl scripts in the scripts directory. These scripts all have some
 **zmpkg.pl**
   This is the ZoneMinder Package Control script. This is used by the web interface and service scripts to control the execution of the system as a whole.
 **zmdc.pl**
-  This is the ZoneMinder Daemon Control script. This is used by the web interface and the zmpkg.pl script to control and maintain the execution of the capture and analysis daemons, amongst others. You should not need to run this script yourself.
+  This is the ZoneMinder Daemon Control script. This is used by the web interface and the zmpkg.pl script to control and maintain the execution of the capture and analysis daemons, amongst others. You should not need to run this script yourself, although you can use it to start/top individual ZM processes.
 **zmfilter.pl**
-  This script controls the execution of saved filters and will be started and stopped by the web interface based on whether there are filters that have been defined to be autonomous. This script is also responsible for the automatic uploading of events to a 3rd party server.
+  This script controls the execution of saved filters and will be started and stopped by the web interface based on whether there are filters that have been defined to be autonomous(background). This script is also responsible for the automatic uploading of events to a 3rd party server.  Prior to 1.32 there was one zmfilter.pl process.  In 1.32 onwards we start a zmfilter.pl process for each background filter so that the processing time of one filter doesn't delay the processing of another filter.
 **zmaudit.pl**
-  This script is used to check the consistency of the event file system and database. It can delete orphaned events, i.e. ones that appear in one location and not the other as well as checking that all the various event related tables are in line. It can be run interactively or in batch mode either from the command line or a cron job or similar. In the zmconfig.pl there is an option to specify fast event deletes where the web interface only deletes the event entry from the database itself. If this is set then it is this script that tidies up the rest.
+  This script is used to check the consistency of the event file system and database. It can delete orphaned events, i.e. ones that appear in one location and not the other as well as checking that all the various event related tables are in line. It can be run interactively or in batch mode either from the command line or a cron job or similar. In the zmconfig.pl there is an option to specify fast event deletes where the web interface only deletes the event entry from the database itself. If this is set then it is this script that tidies up the rest.  We do not recommend fast event deletion and we do not recommend having zmaudit.pl run in the background.  It is a very ram cpu and disk io intensive program, constantly scanning every event.  Please run it manually or from a cron job on weekends or something.
 **zmwatch.pl**
   This is a simple script purely designed to keep an eye on the capture daemons and restart them if they lockup. It has been known for sync problems in the video drivers to cause this so this script makes sure that nothing important gets missed.
 **zmupdate.pl**
@@ -74,6 +72,9 @@ Finally some perl scripts in the scripts directory. These scripts all have some
 **zm**
   This is the (optional) ZoneMinder init script, see below for details.
 
+**zmeventnotification.pl**
+  This is an optional 3rd party real time event notification server that also provides push notifications for zmNinja as well as machine learning powered object/face-detection. Please see `Event Notification Server Documentation <https://zmeventnotification.readthedocs.io/en/latest/index.html>`__ for more details (Note that the machine learning components are optional, and are developed in Python3)
+
 Finally, there are also a number of ZoneMinder perl modules included. These are used by the scripts above, but can also be used by your own or 3rd party scripts. Full documentation for most modules is available in ‘pod’ form via ‘perldoc’ but the general purpose of each module is as follows.
 
 **ZoneMinder.pm**
@@ -86,9 +87,15 @@ Finally, there are also a number of ZoneMinder perl modules included. These are
   This module contains the defined Debug and Error functions etc, that are used by scripts to produce diagnostic information in a standard format.
 **ZoneMinder/Database.pm**
   This module contains database access definitions and functions. Currently not a lot is in this module but it is included as a placeholder for future development.
+**ZoneMinder/Event.pm**
+  This module contains functions to load, manipulate, delete, copy, move events.
+**ZoneMinder/Filter.pm**
+  This module contains functions to load, execute etc filters.
 **ZoneMinder/SharedMem.pm**
   This module contains standard shared memory access functions. These can be used to access the current state of monitors etc as well as issuing commands to the monitors to switch things on and off. This module effectively provides a ZoneMinder API.
 **ZoneMinder/ConfigAdmin.pm**
   This module is a specialised module that contains the definition, and other information, about the various configuration options. It is not intended for use by 3rd parties.
+**ZoneMinder/Control/\*.pm**
+  These modules contain implementations of the various PTZ protocols.
 **ZoneMinder/Trigger/\*.pm**
   These modules contain definitions of trigger channels and connections used by the zmtrigger.pl script. Although they can be used ‘as is’, they are really intended as examples that can be customised or specialised for different interfaces. Contributed modules for new channels or connections will be welcomed and included in future versions of ZoneMinder.
diff --git a/docs/userguide/configfiles.rst b/docs/userguide/configfiles.rst
new file mode 100644
index 000000000..879d181fd
--- /dev/null
+++ b/docs/userguide/configfiles.rst
@@ -0,0 +1,47 @@
+Configuration Files
+--------------------
+This section describes configuration files that ZoneMinder uses beyond the various Web UI options.
+
+.. _replacement_for_options_path:
+
+System Path Configurations
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+At one point of time, ZoneMinder stored various system path configurations under the Web UI (``Options->Paths``). This was removed a few versions ago and now resides in a configuration file. The motivation for this change can be read in `this discussion <https://github.com/ZoneMinder/zoneminder/pull/1908>`__.
+
+Typically, path configurations now reside in ``/etc/zm``.
+
+Here is an example of the file hierarchy:
+
+::
+
+  /etc/zm
+  ├── conf.d
+  │   ├── 01-system-paths.conf
+  │   ├── 02-multiserver.conf
+  |   ├── 03-custom.conf #optional
+  │   └── README
+  ├── objectconfig.ini # optional
+  ├── zm.conf 
+  └── zmeventnotification.ini #optional
+
+The roles of the files are as follows:
+
+* ``zm.conf`` contains various base configuration entries. You should not edit this file as it may be overwritten on an upgrade.
+* ``zmeventnotification.ini`` is only present if you have installed the ZoneMinder Event Notification Server.
+* ``objectconfig.ini`` is only present if you have installed the machine learning hooks for the Event Notification Server.
+* ``conf.d`` contains additional configuration items as follows:
+  
+  * ``01-system-paths.conf`` contains all the paths that were once part of ``Options->Paths`` in the Web UI. You should not edit this file as it may be overwritten on an upgrade
+  * ``02-multiserver.conf`` file consists of custom variables if you are deploying ZoneMinder in a multi-server configuration (see :doc:`/installationguide/multiserver`) 
+  * ``03-custom.conf`` is an  custom config file that I created to override specific variables in the path files. **This is the recommended way to customize entries**. Anything that you want to change should be in a new file inside ``conf.d``. Note that ZoneMinder will sort all the files alphabetically and run their contents in ascending order. So it doesn't really matter what you name them, as long as you make sure your changes are not overwritten by another file in the sorting sequence. It is therefore good practice to prefix your file names by ``nn-`` where ``nn`` is a monotonically increasing numerical sequence ``01-`` ``02-`` ``03-`` and so forth, so you know the order they will be processed. 
+
+Timezone Configuration
+~~~~~~~~~~~~~~~~~~~~~~~
+Earlier versions of ZoneMinder relied on ``php.ini`` to set Date/Time Zone. This is no longer the case. You can (and must) set the Timezone via the Web UI, starting ZoneMinder version 1.34. See :ref:`here <timezone_config>`.
+
+Database Specific Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. todo:: do we really need to have this section? Not sure if its generic and not specific to ZM
+
+While the ZoneMinder specific database config entries reside in ``/etc/zm/zm.conf`` and related customizations discussed above, general database configuration items can be tweaked in ``/etc/mysql`` (or whichever path your DB server is installed)
\ No newline at end of file
diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst
index 7641cb751..a5b622872 100644
--- a/docs/userguide/definemonitor.rst
+++ b/docs/userguide/definemonitor.rst
@@ -46,6 +46,10 @@ Linked Monitors
     This field allows you to select other monitors on your system that act as triggers for this monitor. So if you have a camera covering one aspect of your property you can force all cameras to record while that camera detects motion or other events. You can either directly enter a comma separated list of monitor ids or click on ‘Select’ to choose a selection. Be very careful not to create circular dependencies with this feature however you will have infinitely persisting alarms which is almost certainly not what you want! To unlink monitors you can ctrl-click. 
 
 Maximum FPS 
+
+    .. warning::
+      Unless you know what you are doing, please leave this field empty, especially if you are configuring a network camera. More often than not, putting a value here adversely affects recording.
+
     On some occasions you may have one or more cameras capable of high capture rates but find that you generally do not require this performance at all times and would prefer to lighten the load on your server. This option permits you to limit the maximum capture rate to a specified value. This may allow you to have more cameras supported on your system by reducing the CPU load or to allocate video bandwidth unevenly between cameras sharing the same video device. This value is only a rough guide and the lower the value you set the less close the actual FPS may approach it especially on shared devices where it can be difficult to synchronise two or more different capture rates precisely. This option controls the maximum FPS in the circumstance where no alarm is occurring only. 
     
     This feature is limited and will only work under the following conditions: 
@@ -56,6 +60,11 @@ Maximum FPS
     Using this field for video streams from IP cameras will cause undesirable results when the value is equal to or less than the frame rate from the camera. Note that placing a value higher than the camera's frame rate is allowed and can help prevent cpu spikes when communication from the camera is lost.
     
 Alarm Maximum FPS 
+
+    .. warning::
+          Unless you know what you are doing, please leave this field empty, especially if you are configuring a network camera. More often than not, putting a value here adversely affects recording.
+      
+
     If you have specified a Maximum FPS it may be that you don’t want this limitation to apply when your monitor is recording motion or other event. This setting allows you to override the Maximum FPS value if this circumstance occurs. As with the Maximum FPS setting leaving this blank implies no limit so if you have set a maximum fps in the previous option then when an alarm occurs this limit would be ignored and ZoneMinder would capture as fast as possible for the duration of the alarm, returning to the limited value after the alarm has concluded. Equally you could set this to the same, or higher (or even lower) value than Maximum FPS for more precise control over the capture rate in the event of an alarm. 
     
     **IMPORTANT:** This field is subject to the same limitations as the Maximum FPS field. Ignoring these limitations will produce undesriable results.
@@ -71,15 +80,15 @@ Source Tab
 
 FFmpeg
 ^^^^^^
-    This is the recommended source type for most modern ip cameras.
+    This is the **recommended** source type for most modern ip cameras.
 
 Source Path 
     Use this field to enter the full URL of the stream or file your camera supports. This is usually an RTSP url. There are several methods to learn this:
 
         * Check the documentation that came with your camera
-        * Look for your camera in the hardware compatibilty list in the wiki http://wiki.zoneminder.com/Hardware_Compatibility_List
+        * Look for your camera in the hardware compatibilty list in the `hardware compatibility wiki <https://wiki.zoneminder.com/Hardware_Compatibility_List>`__
         * Try ZoneMinder's new ONVIF probe feature
-        * Download and install the ONVIF Device Manager onto a Windows machine https://sourceforge.net/projects/onvifdm/
+        * Download and install the `ONVIF Device Manager <https://sourceforge.net/projects/onvifdm/>`__ onto a Windows machine 
         * Use Google to find third party sites, such as ispy, which document this information
 Source Colours 
     Specify the amount of colours in the captured image. 32 bit is the preferred choice here. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. 
@@ -121,7 +130,7 @@ Remote Protocol
 Remote Method
     When HTTP is the Remote Protocol, your choices are Simple and Regexp. Most should choose Simple. When RTSP is the Remote Protocol, your choices are RTP/Unicast, RTP/Multicast, RTP/RTSP, RTP,RTSP,HTTP. Try each of these to determine which works with your camera. Most cameras will use either RTP/Unicast (UDP) or RTP/RTSP (TCP). 
 Remote Host/Port/Path 
-    Use these fields to enter the full URL of the camera. Basically if your camera is at http://camserver.home.net:8192/cameras/camera1.jpg then these fields will be camserver.home.net, 8192 and /cameras/camera1.jpg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the host name in the form <username>:<password>@<hostname>.com. This will usually be 32 or 24 bit colour even if the image looks black and white. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. 
+    Use these fields to enter the full URL of the camera. Basically if your camera is at ``http://camserver.home.net:8192/cameras/camera1.jpg`` then these fields will be camserver.home.net, 8192 and /cameras/camera1.jpg respectively. Leave the port at 80 if there is no special port required. If you require authentication to access your camera then add this onto the host name in the form <username>:<password>@<hostname>.com. This will usually be 32 or 24 bit colour even if the image looks black and white. Look in Supported Hardware > Network Cameras section, how to obtain these strings that may apply to your camera. 
 Remote Image Colours 
     Specify the amount of colours in the captured image. Unlike with local cameras changing this has no controlling effect on the remote camera itself so ensure that your camera is actually capturing to this palette beforehand. 
 Capture Width/Height 
@@ -271,3 +280,7 @@ Default Scale
     If your monitor has been defined with a particularly large or small image size then you can choose a default scale here with which to view the monitor so it is easier or more visible from the web interface. 
 Web Colour 
     Some elements of ZoneMinder now use colours to identify monitors on certain views. You can select which colour is used for each monitor here. Any specification that is valid for HTML colours is valid here, e.g. ‘red’ or ‘#ff0000’. A small swatch next to the input box displays the colour you have chosen. 
+Embed EXIF data into image:
+    Embeds EXIF data into each jpeg frame
+    
+    .. todo:: what about mp4s?
diff --git a/docs/userguide/definezone.rst b/docs/userguide/definezone.rst
index 97f42f864..1d00c71b4 100644
--- a/docs/userguide/definezone.rst
+++ b/docs/userguide/definezone.rst
@@ -40,7 +40,7 @@ Type
 Preset
   The preset chooser sets sensible default values based on computational needs (fast v. best) and sensitivity (low, medium, high.)  It is not required that you select a preset, and you can alter any of the parameters after choosing a preset.  For a small number of monitors with ZoneMinder running on modern equipment, Best, high sensitivity can be chosen as a good starting point.
 
-  It is important to understand that the available presets are intended merely as a starting point. Since every camera's view is unique, they are not guaranteed to work properly in every case. Presets tend to work acceptably for indoor cameras, where the objects of interest are relatively close and there typically are few or no unwanted objects moving within the cameras view. Presets, on the other hand, tend to not work acceptably for outdoor cameras, where the field of view is typically much wider, objects of interest are farther away, and changing weather patterns can cause false triggers. For outdoor cameras in particular, you will almost certainly have to tune your motion detection zone to get desired results. Please refer to `this guide <http://www.zoneminder.com/wiki/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ to learn how to do this.
+  It is important to understand that the available presets are intended merely as a starting point. Since every camera's view is unique, they are not guaranteed to work properly in every case. Presets tend to work acceptably for indoor cameras, where the objects of interest are relatively close and there typically are few or no unwanted objects moving within the cameras view. Presets, on the other hand, tend to not work acceptably for outdoor cameras, where the field of view is typically much wider, objects of interest are farther away, and changing weather patterns can cause false triggers. For outdoor cameras in particular, you will almost certainly have to tune your motion detection zone to get desired results. Please refer to `this guide <https://wiki.zoneminder.com/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ to learn how to do this.
 
 Units
   * Pixels - Selecting this option will allow many of the following values to be entered (or viewed) in units of pixels.
@@ -109,5 +109,5 @@ Extend Alarm Frame Count
   
 Other information
 -----------------
-Refer to `this <http://www.zoneminder.com/wiki/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ user contributed Zone guide for additional information will illustrations if you are new to zones and need more help.
+Refer to `this <https://wiki.zoneminder.com/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ user contributed Zone guide for additional information will illustrations if you are new to zones and need more help.
 
diff --git a/docs/userguide/filterevents.rst b/docs/userguide/filterevents.rst
index d3c4955c9..436034da0 100644
--- a/docs/userguide/filterevents.rst
+++ b/docs/userguide/filterevents.rst
@@ -8,10 +8,7 @@ Filters allow you to define complex conditions with associated actions in ZoneMi
 
 And many more.
 
-The filter window can be accessed from various views, one of which is to simply tap on the filter button in the main web view:
-
-.. image:: images/filter-button.png
-	:width: 600px
+The filter window can be accessed by tapping on the top level filter menu
 
 You can use the filter window to create your own filters or to modify existing ones. You can even save your favourite filters to re-use at a future date. Filtering itself is fairly simple; you first choose how many expressions you'd like your filter to contain. Changing this value will cause the window to redraw with a corresponding row for each expression. You then select what you want to filter on and how the expressions relate by choosing whether they are 'and' or 'or' relationships. For filters comprised of many expressions you will also get the option to bracket parts of the filter to ensure you can express it as desired. Then if you like choose how you want your results sorted and whether you want to limit the amount of events displayed.
 
@@ -22,62 +19,78 @@ Here is what the filter window looks like
 	:width: 800px
 
 * *A*: This is a dropdown list where you can select pre-defined filters. You will notice that ZoneMinder comes with a PurgeWhenFull filter that is configured to delete events if you reach 95% of disk space. 
-* *B* and *C*: This is where you specify conditions that need to match before the filter is executed. You use the "+" and "-" buttons to add/delete conditions
-* *D*: This is where you specify what needs to happen when the conditions match:
+* *B*: If you are creating a new filter, you can type in a name for your filter here
+* *C*: This is where you specify conditions that need to match before the filter is executed. You use the "+" and "-" buttons to add/delete conditions
+* *D*: This allows you to perform sorting and limiting operations on the output before you take an action
+* *E*: This is where you specify what needs to happen when the conditions match:
+
 	* Archive all matches: sets the archive field to 1 in the Database for the matched events. 
 	  Think of 'archiving' as grouping them under a special category - you can view archived 
 	  events later and also make sure archived events don't get deleted, for example
-	* Email details of all matches: Sends an email to the configured address with details about the event. 
-	  The email can be customized as per TBD
-	* Execute command on all matches: Allows you to execute any arbitrary command on the matched events. You can use replacement tokens as subsequent arguents to the command, the last argument will be the absolute path to the event, preceeded by replacement arguents. eg: /usr/bin/script.sh %MN% will excecute as /usr/bin/script.sh MonitorName /path/to/event.
-	* Delete all matches: Deletes all the matched events
-* *E*: Use 'Submit' to 'test' your matching conditions. This will just match and show you what filters match. Use 'Execute' to actually execute the action after matching your conditions. Use 'Save' to save the filter for future use and 'Reset' to clear your settings
+  
+    .. todo ::
+      fill in what update used disk space, copy all matches, move all matches do. For the "create video" filter, put in more details on how it works, any dependencies etc.
 
-.. NOTE:: More details on filter conditions:
+  * Update used disk space:
+  * Create video for all matches: creates a video file of all the events that match 
+  * Execute command on all matches: Allows you to execute any arbitrary command on the matched events. You can use replacement tokens as subsequent arguents to the command, the last argument will be the absolute path to the event, preceeded by replacement arguents. eg: /usr/bin/script.sh %MN% will excecute as /usr/bin/script.sh MonitorName /path/to/event.
+	* Delete all matches: Deletes all the matched events.
+  * Copy all matches:
+  * Move all matches:
+  * Run filter in background:  When checked, ZoneMinder will make sure the filter is checked regularly. For example, if you want to be notified of new events by email, you should make sure this is checked. Filters that are configured to run in the background have a “*” next to it.
+  * Run filter concurrently: Allows this filter to run in its own thread thereby letting other filters run in parallel.
+
+* *F*: Use 'List Matches' to 'test' your matching conditions. This will just match and show you what filters match. Use 'Execute' to actually execute the action after matching your conditions. Use 'Save' to save the filter for future use and 'Reset' to clear your settings
+
+.. note:: More details on filter conditions:
 
 	There are several different elements to an event that you can filter on, some of which require further explanation. These are as follows, 
 	* 'Date/Time' which must evaluate to a date and a time together, 
 	* 'Date' and 'Time' which are variants which may only contain the relevant subsets of this, 
 	* 'Weekday' which as expected is a day of the week.
 
-	All of the preceding elements take a very flexible free format of dates and time based on the PHP strtotime function (http://www.php.net/manual/en/function.strtotime.php). This allows values such as 'last Wednesday' etc to be entered. We recommend acquainting yourself with this function to see what the allowed formats are. However automated filters are run in perl and so are parsed by the Date::Manip package. Not all date formats are available in both so if you are saved your filter to do automatic deletions or other tasks you should make sure that the date and time format you use is compatible with both methods. The safest type of format to use is ‘-3 day’ or similar with easily parseable numbers and units are in English.
+	All of the preceding elements take a very flexible free format of dates and time based on the PHP strtotime function (https://www.php.net/manual/en/function.strtotime.php). This allows values such as 'last Wednesday' etc to be entered. We recommend acquainting yourself with this function to see what the allowed formats are. However automated filters are run in perl and so are parsed by the Date::Manip package. Not all date formats are available in both so if you are saved your filter to do automatic deletions or other tasks you should make sure that the date and time format you use is compatible with both methods. The safest type of format to use is ‘-3 day’ or similar with easily parseable numbers and units are in English.
 
 	The other things you can filter on are all fairly self explanatory, except perhaps for 'Archived' which you can use to include or exclude Archived events. In general you'll probably do most filtering on un-archived events. There are also two elements, Disk Blocks and Disk Percent which don’t directly relate to the events themselves but to the disk partition on which the events are stored. These allow you to specify an amount of disk usage either in blocks or in percentage as returned by the ‘df’ command. They relate to the amount of disk space used and not the amount left free. Once your filter is specified, clicking 'submit' will filter the events according to your specification. As the disk based elements are not event related directly if you create a filter and include the term ‘DiskPercent > 95’ then if your current disk usage is over that amount when you submit the filter then all events will be listed whereas if it is less then none at all will. As such the disk related terms will tend to be used mostly for automatic filters (see below). If you have created a filter you want to keep, you can name it and save it by clicking 'Save'.
 
 	If you do this then the subsequent dialog will also allow you specify whether you want this filter automatically applied in order to delete events or upload events via ftp to another server and mail notifications of events to one or more email accounts. Emails and messages (essentially small emails intended for mobile phones or pagers) have a format defined in the Options screen, and may include a variety of tokens that can be substituted for various details of the event that caused them. This includes links to the event view or the filter as well as the option of attaching images or videos to the email itself. Be aware that tokens that represent links may require you to log in to access the actual page, and sometimes may function differently when viewed outside of the general ZoneMinder context. The tokens you can use are as follows.
 
-	*    %EI%           Id of the event
-	*    %EN%          Name of the event
-	*    %EC%          Cause of the event
-	*    %ED%          Event description
-	*    %ET%          Time of the event
-	*    %EL%          Length of the event
-	*    %EF%          Number of frames in the event
-	*    %EFA%        Number of alarm frames in the event
-	*    %EST%        Total score of the event
-	*    %ESA%       Average score of the event
-	*    %ESM%       Maximum score of the event
-	*    %EP%          Path to the event
-	*    %EPS%       Path to the event stream
-	*    %EPI%         Path to the event images
-	*    %EPI1%       Path to the first alarmed event image
-	*    %EPIM%      Path to the (first) event image with the highest score
-	*    %EI1%         Attach first alarmed event image
-	*    %EIM%        Attach (first) event image with the highest score
-	*    %EV%          Attach event mpeg video
-	*    %MN%         Name of the monitor
-	*    %MET%       Total number of events for the monitor
-	*    %MEH%       Number of events for the monitor in the last hour
-	*    %MED%       Number of events for the monitor in the last day
-	*    %MEW%      Number of events for the monitor in the last week
-	*    %MEM%      Number of events for the monitor in the last month
-	*    %MEA%       Number of archived events for the monitor
-	*    %MP%         Path to the monitor window
-	*    %MPS%       Path to the monitor stream
-	*    %MPI%        Path to the monitor recent image
-	*    %FN%          Name of the current filter that matched
-	*    %FP%          Path to the current filter that matched
-	*    %ZP%          Path to your ZoneMinder console
+    *    %EI%       Id of the event
+    *    %EN%       Name of the event
+    *    %EC%       Cause of the event
+    *    %ED%       Event description
+    *    %ET%       Time of the event
+    *    %EL%       Length of the event
+    *    %EF%       Number of frames in the event
+    *    %EFA%      Number of alarm frames in the event
+    *    %EST%      Total score of the event
+    *    %ESA%      Average score of the event
+    *    %ESM%      Maximum score of the event
+    *    %EP%       Path to the event
+    *    %EPS%      Path to the event stream
+    *    %EPF1%     Path to the frame view for the first alarmed event image
+    *    %EPFM%     Path to the frame view for the (first) event image with the highest score
+    *    %EFMOD%    Path to image containing object detection, in frame view
+    *    %EPI%      Path to the event images
+    *    %EPI1%     Path to the first alarmed event image, suitable for use in img tags
+    *    %EPIM%     Path to the (first) event image with the highest score, suitable for use in img tags
+    *    %EIMOD%    Path to image containing object detection, suitable for use in img tags
+    *    %EI1%      Attach first alarmed event image
+    *    %EIM%      Attach (first) event image with the highest score
+    *    %EV%       Attach event mpeg video
+    *    %MN%       Name of the monitor
+    *    %MET%      Total number of events for the monitor
+    *    %MEH%      Number of events for the monitor in the last hour
+    *    %MED%      Number of events for the monitor in the last day
+    *    %MEW%      Number of events for the monitor in the last week
+    *    %MEM%      Number of events for the monitor in the last month
+    *    %MEA%      Number of archived events for the monitor
+    *    %MP%       Path to the monitor window
+    *    %MPS%      Path to the monitor stream
+    *    %MPI%      Path to the monitor recent image
+    *    %FN%       Name of the current filter that matched
+    *    %FP%       Path to the current filter that matched
+    *    %ZP%       Path to your ZoneMinder console
 
 	Finally you can also specify a script which is run on each matched event. This script should be readable and executable by your web server user. It will get run once per event and the relative path to the directory containing the event in question. Normally this will be of the form <MonitorName>/<EventId> so from this path you can derive both the monitor name and event id and perform any action you wish. Note that arbitrary commands are not allowed to be specified in the filter, for security the only thing it may contain is the full path to an executable. What that contains is entirely up to you however.
 
@@ -87,15 +100,8 @@ Here is what the filter window looks like
 Saving filters
 -----------------
 
-.. image:: images/filter-save.png
-    :width: 400px
-
 When saving filters, if you want the filter to run in the background make sure you select the "Run filter in background" option. When checked, ZoneMinder will make sure the filter is checked regularly. For example, if you want to be notified of new events by email, you should make sure this is checked. Filters that are configured to run in the background have a "*" next to it.
 
-For example:
-
-.. image:: images/filter-choosefilter.png
-    :width: 400px
 
 How filters actually work
 --------------------------
diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
index 713a667b5..99f2ea4ba 100644
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@@ -5,32 +5,146 @@ Having followed the :doc:`/installationguide/index` for your distribution you sh
 
 .. image::  ../installationguide/images/zm_first_screen_post_install.png
 
+.. _timezone_config:
+
+Setting Timezone
+^^^^^^^^^^^^^^^^^
+Previous versions of ZoneMinder required the user to set up Timezone correctly in ``php.ini``. This is no longer the case. Starting 1.34, ZoneMinder allows you to specify the TimeZone in the UI. Please make sure it is set up correctly. The Timezone can be changed by selecting ``Options->System->Timezone``
+
+.. image:: images/getting-started-timezone.png
 
 Enabling Authentication
 ^^^^^^^^^^^^^^^^^^^^^^^
 We strongly recommend enabling authentication right away. There are some situations where certain users don't enable authentication, such as instances where the server is in a LAN not directly exposed to the Internet, and is only accessible via VPN etc., but in most cases, authentication should be enabled. So let's do that right away.
 
-* Click on the Options link on the top right corner of the web interface
-* You will now be presented with a screen full of options. Click on the "System" tab
+* Click on the Options link on the top bar of the web interface
+* You will now be presented with a sidebar full of options. Click on the "System" link
 	
 .. image:: images/getting-started-enable-auth.png
 
 * The relevant portions to change are marked in red above
 * Enable OPT_USE_AUTH - this automatically switches to authentication mode with a default user (more on that later)
 * Select a random string for AUTH_HASH_SECRET - this is used to make the authentication logic more secure, so 
-  please generate your own string and please don't use the same value in the example.
+  please generate your own string and make sure it is sufficiently randomized and long. Note that if you plan to use APIs with ZoneMinder (needed by zmNinja/other apps), it is mandatory that you have this field populated
 * The other options highlighed above should already be set, but if not, please make sure they are
+* Note that if you are planning to use zmNinja and plan to use ZM authentication, you must also:
+
+  * set ``AUTH_RELAY`` to hashed
+  * Enable ``AUTH_HASH_LOGINS``
+  
 
 * Click on Save at the bottom and that's it! The next time you refresh that page, you will now be presented with a login screen. Job well done!
 
 .. image:: images/getting-started-login.png
 
-.. NOTE:: The default login/password is "admin/admin"
+.. note:: The default login/password is "admin/admin"
 
 
-Switching to flat theme
-^^^^^^^^^^^^^^^^^^^^^^^
-What you see is what is called a "classic" skin. Zoneminder has a host of configuration options that you can customize over time. This guide is meant to get you started the easiest possible way, so we will not go into all the details. However, it is worthwhile to note that Zoneminder also has a 'flat' theme that depending on your preferences may look more modern. So let's use that as an example of introducing you to the Options menu
+Understanding the Web Console
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Before we proceed, lets spend a few minutes understanding the key functions of the web console. 
+For the sake of illustration, we are going to use a populated zoneminder configuration with several monitors and events.
+
+.. image:: images/getting-started-understand-console.png
+
+This screen is called the "console" screen in ZoneMinder and shows a summary of your monitors, associated events and more information.
+
+* **A**: The options menu lets you configure many aspects of ZoneMinder. Refer to :doc:`options`.
+* **B**: This brings up a color coded log window that shows various system and component level logs. This window is useful if you are trying to diagnose issues. Refer to :doc:`logging`.
+* **C**: ZoneMinder allows you to group monitors for logical separation. This option lets you create new groups, associate monitors to them and edit/delete existing groups.
+* **D**: Filters are a powerful mechanism to perform actions when certain conditions are met. ZoneMinder comes with some preset filters that keep a tab of disk space and others. Many users create their own filters for more advanced actions like sending emails when certain events occur and more. Refer to :doc:`filterevents`.
+* **E**: The Cycle option allows you to rotate between live views of each cofigured monitor.
+* **F**: The Montage option shows a collage of your monitors. You can customize them including moving them around.
+* **G**: Montage Review allows you to simultaneously view past events for different monitors. Note that this is a very resource intensive page and its performance will vary based on your system capabilities.
+* **H**: Audit Events Report is more of a power user feature. This option looks for recording gaps in events and recording issues in mp4 files.
+* **I**: This is the user you are currently logged in as. 
+* **J**: ZoneMinder allows you to maintain "run states". If you click on the "Running" text, ZoneMinder brings up a popup that allows you to define additional "states" (referred to as runstates). A runstate is essentially a snapshot that records the state of each monitor and you can switch between states easily. For example, you might have a run state defined that switches all monitors to "monitor" mode in which they are not recording anything while another state that sets some of the monitors to "modect". Why would you want this? A great example is to disable recording when you are at home and enable when you are away, based on time of day or other triggers. You can switch states by selecting an appropriate state manually, or do it automatically via cron jobs, for example. An example of using cron to automatically  switch is provided in the :ref:`FAQ <runstate_cron_example>`.  More esoteric examples of switching run states based on phone location can be found `here <https://forums.zoneminder.com/viewtopic.php?f=9&t=23026>`__.
+
+
+Here is an example of multiple run states that I've defined. Each one of these runstates changes the mode of specific monitors depending on time of day and other conditions. Use your imagination to decide which conditions require state changes.
+
+.. image:: images/runstates.png
+
+* **K**: This line shows you system health information
+* **L**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Nodect = Don't record till an external entity via zmtrigger tells Zoneminder to (this is advanced usage).
+* **M**: This is the "source" column that tells you the type of the camera - if its an IP camera, a USB camera or more. In this example, they are all IP cameras. Green means the monitor is running. Red  means there is something wrong with that camera. 
+* **N**: This is the core of ZoneMinder - recording events. It gives you a count of how many events were recorded over the hour, day, week, month.
+* **O**: These are the "Zones". Zones are areas within the camera that you mark as 'hotspots' for motion detection. Simply put, when you first configure your monitors (cameras), by default Zoneminder uses the entire field of view of the camera to detect motion. You may not want this. You may want to create "zones" specifically for detecting motion and ignore others. For example, lets consider a room with a fan that spins. You surely don't want to consider the fan moving continuously a reason for triggering a record? Probably not - in that case, you'd leave the fan out while making your zones.
+* **P**: This is a "visual filter" which lets you 'filter' the console display based on text you enter. While this may not be particularly useful for small systems, ZoneMinder is also used in mega-installations will well over 200+ cameras and this visual filter helps reduce the monitors you are seeing at one time.
+
+Adding Monitors
+^^^^^^^^^^^^^^^
+Now that we have a basic understanding of the web console, lets go about adding a new camera (monitor). For this example, lets assume we have an IP camera that streams RTSP at LAN IP address 192.168.1.33. 
+
+.. sidebar:: Note
+  
+  This is meant to be a simple example. For a more detailed explanation of other options available when creating a monitor, please see :doc:`/userguide/definemonitor`
+
+The first thing we will need to know is how to access that camera's video feed. You will need to consult your camera's manual or check their forum. Zoneminder community users also have a frequently updated list right `here <https://wiki.zoneminder.com/index.php/Hardware_Compatibility_List>`__ that lists information about many cameras. If you don't find your list there and can't seem to find it elsewhere, feel free to register and ask in the `user forums <https://forums.zoneminder.com/>`__.
+
+The camera we are using as an example here is a Foscam 9831W which is a 1280x960 RTSP camera, and the URL to access it's feed is *username:password@IPADDRESS:PORT/videoMain*
+
+Let's get started:
+
+Click on the "Add" button below:
+
+.. image:: images/getting-started-modern-look.png
+    :width: 600px
+
+This brings up the new monitor window:
+
+.. image:: images/getting-started-add-monitor-general.png
+	:width: 600px
+
+* We've given it a name of 'Garage', because, well, its better than Monitor-1 and this is my Garage camera.
+
+* There are various source types. As a brief introduction you'd want to use 'Local' if your camera is physically attached to your ZM server (like a USB camera, for example), and one of 'Remote', 'FFMpeg', 'Libvlc' or 'cURL' for a remote camera (not necessarily, but usually). For this example, let's go with 'FFMpeg'. 
+
+.. note::
+	As a  thumb rule, if you have a camera accessible via IP and it does HTTP or RTSP, 
+	start with FFMpeg first and libvlc if it doesn't work (:doc:`/userguide/definemonitor` 
+	covers other modes in more details). If you are wondering what 'File' does, well, ZoneMinder was 
+	built with compatibility in mind. Take a look at `this post 
+	<https://wiki.zoneminder.com/index.php/How_to_use_ZoneMinder_with_cameras_it_may_not_directly_support>`__  to see how file can be used for leisure reading.
+
+* In this example, the Function is 'Modect', which means it will start recording if motion is detected on that camera feed. The parameters for what constitutes motion detected is specific in :doc:`definezone`
+
+* In Analysis FPS, we've put in 5FPS here. Note that you should not put an FPS that is greater than the camera FPS. In my case, 5FPS is sufficient for my needs
+
+.. note::
+  Leave Maximum FPS and Alarm Maximum FPS **empty** if you are configuring an IP camera. In older versions of ZoneMinder, you were encouraged to put a value here, but that is no longer recommended. Infact, if you see your feed going much slower than the feed is supposed to go, or you get a lot of buffering/display issues, make sure this is empty. If you need to control camera FPS, please do it directly on the camera (via its own web interface, for example)
+
+
+* We are done for the General tab. Let's move to the next tab
+
+.. image:: images/getting-started-add-monitor-source.png
+	:width: 800px
+
+* Let's select a protocol of RTSP and a remote method of RTP/RTSP (this is an RTSP camera)
+* Note that starting ZM 1.34, GPUs are supported. In my case, I have an NVIDIA GeForce GTX1050i. These ``cuda`` and ``cuvid`` parameters are what my system supports to use the NVIDIA hardware decoder and GPU resources. If you don't have a GPU, or don't know how to configure your ffmpeg to support it, leave it empty for now. In future, we will add a section on how to set up a GPU
+
+**NOTE**: It is entirely possible that ``cuda`` and ``cuvid`` don't work for you and you need different values. Isaac uses ``cuda`` in ``DecoderHWAccelName`` and leaves ``DecoderHWAccelDevice`` empty. Try that too.
+
+.. todo::
+  add GPU docs
+
+That's pretty much it. Click on Save. We are not going to explore the other tabs in this simple guide.
+
+You now have a configured monitor:
+
+.. image:: images/getting-started-add-monitor-modect-ready.png
+
+
+And then, finally, to see if everything works, if you click on the garage monitor you just added, you should be able to see its live feed. If you don't, inspect your webserver logs and your ZoneMinder logs to see what is going on.
+
+
+Switching to another theme
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. todo::
+  Fix theme text after I clearly understand that System->CSS is doing
+
+When you first install ZoneMinder, you see is what is called a "classic" skin. Zoneminder has a host of configuration options that you can customize over time. This guide is meant to get you started the easiest possible way, so we will not go into all the details. However, it is worthwhile to note that Zoneminder also has a 'flat' theme that depending on your preferences may look more modern. So let's use that as an example of introducing you to the Options menu
 
 * Click on the Options link on the top right of the web interface in the image above
 * This will bring you to the options window as shown below. Click on the "System" tab and then select the 
@@ -51,98 +165,6 @@ Congratulations! You now have a modern looking interface.
 
 .. image:: images/getting-started-modern-look.png
 
-Understanding the Web Console
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Before we proceed, lets spend a few minutes understanding the key functions of the web console. 
-For the sake of illustration, we are going to use a populated zoneminder configuration with several monitors and events.
-Obviously, this does not reflect your current web console - which is essentially void of any useful information till now,
-as we are yet to add things. Let's take a small break and understand what the various functions are before we configure our
-own empty screen.
-
-.. image:: images/getting-started-understand-console.png
-
-* **A**: This is the username that is logged in. You are logged in as 'admin' here
-* **B**: Click here to explore the various options of ZoneMinder and how to configure them. You already used this to enable authentication and change style above. Over time, you will find this to have many other things you will want to customize.
-* **C**: This link, when clicked, opens up a color coded log window of what is going on in Zoneminder and often gives you good insight into what is going wrong or right. Note that the color here is red - that is an indication that some error occurred in ZoneMinder. You should click it and investigate.
-* **D**: This is the core of ZoneMinder - recording events. It gives you a count of how many events were recorded over the hour, day, week, month.
-* **E**: These are the "Zones". Zones are areas within the camera that you mark as 'hotspots' for motion detection. Simply put, when you first configure your monitors (cameras), by default Zoneminder uses the entire field of view of the camera to detect motion. You may not want this. You may want to create "zones" specifically for detecting motion and ignore others. For example, lets consider a room with a fan that spins. You surely don't want to consider the fan moving continuously a reason for triggering a record? Probably not - in that case, you'd leave the fan out while making your zones.
-* **F**: This is the "source" column that tells you the type of the camera - if its an IP camera, a USB camera or more. In this example, they are all IP cameras. Note the color red on item F ? Well that means there is something wrong with that camera. No wonder the log also shows red. Good indication for you to tap on logs and investigate
-* **G**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Nodect = Don't record till an external entity via zmtrigger tells Zoneminder to (this is advanced usage).
-* **H**: If you click on these links you can view a "Montage" of all your configured monitors or cycle through each one
-* **I**: One of the most often missed features is the ability of ZoneMinder to maintain "run states". If you click on the "Running" text, ZoneMinder brings up a popup that allows you to define additional "states" (referred to as runstates). A runstate is essentially a snapshot that records the state of each monitor and you can switch between states easily. For example, you might have a run state defined that switches all monitors to "monitor" mode in which they are not recording anything while another state that sets some of the monitors to "modect". Why would you want this? A great example is to disable recording when you are at home and enable when you are away, based on time of day or other triggers. You can switch states by selecting an appropriate state manually, or do it automatically via cron jobs, for example. An example of using cron to automatically  switch is provided in the :ref:`FAQ <runstate_cron_example>`.  More esoteric examples of switching run states based on phone location can be found `here <https://forums.zoneminder.com/viewtopic.php?f=9&t=23026>`__.
-
-Here is an example of multiple run states that I've defined. Each one of these runstates changes the mode of specific monitors depending on time of day and other conditions. Use your imagination to decide which conditions require state changes.
-
-.. image:: images/runstates.png
-
-
-
-Adding Monitors
-^^^^^^^^^^^^^^^
-Now that we have a basic understanding of the web console, lets go about adding a new camera (monitor). For this example, lets assume we have an IP camera that streams RTSP at LAN IP address 192.168.1.33. 
-
-The first thing we will need to know is how to access that camera's video feed. You will need to consult your camera's manual or check their forum. Zoneminder community users also have a frequently updated list right `here <http://www.zoneminder.com/wiki/index.php/Hardware_Compatibility_List>`__ that lists information about many cameras. If you don't find your list there and can't seem to find it elsewhere, feel free to register and ask in the `user foums <http://www.zoneminder.com/forums/>`__.
-
-The camera we are using as an example here is a Foscam 9831W which is a 1280x960 RTSP camera, and the URL to access it's feed is *username:password@IPADDRESS:PORT/videoMain*
-
-Let's get started:
-
-Click on the "Add new monitor" button below:
-
-.. image:: images/getting-started-modern-look.png
-
-This brings up the new monitor window:
-
-.. image:: images/getting-started-add-monitor-general.png
-	:width: 800px
-
-* We've given it a name of 'Garage', because, well, its better than Monitor-1 and this is my Garage camera.
-
-* There are various source types. As a brief introduction you'd want to use 'Local' if your camera is physically attached to your ZM server (like a USB camera, for example), and one of 'Remote', 'FFMpeg', 'Libvlc' or 'cURL' for a remote camera (not necessarily, but usually). For this example, let's go with 'Remote'. 
-
-.. NOTE::
-	As a  thumb rule, if you have a camera accessible via IP and it does HTTP or RTSP, 
-	start with Remote, then try FFMpeg and libvlc if it doesn't work (:doc:`/userguide/definemonitor` 
-	covers other modes in more details). If you are wondering what 'File' does, well, ZoneMinder was 
-	built with compatibility in mind. Take a look at `this post 
-	<http://www.zoneminder.com/wiki/index.php/How_to_use_ZoneMinder_with_cameras_it_may_not_directly_support>`__  to see how file can be used for leisure reading.
-
-* Let's leave the Function as 'Monitor' just so we can use this as an example to change it later another way. Practically, feel free to select your mode right now - Modect, Record etc depending on what you want ZoneMinder to do with this camera
-
-* We've put in MaxFPS and AlarmFPS as 20 here. **You can leave this empty too**. Whatever you do here, *it's important to make sure these values are higher than the FPS of the camera*. The reason we've added a value here is that as of Aug 2015, if a camera goes offline, ZoneMinder eats up a lot of CPU  trying to reach it and putting a larger value here than the actual FPS helps in that specific situation. 
-
-.. NOTE::
-	We strongly recommend not putting in a lower FPS here that the one configured inside your camera.
-	Zoneminder should not be used to manage camera frame rate. That always causes many problems. It's
-	much better you set the value directly in-camera and either leave this blank or specify a higher FPS
-	here. In this case, our actual camera FPS is 3 and we've set this value here to 10.
-
-* We are done for the General tab. Let's move to the next tab
-
-.. image:: images/getting-started-add-monitor-source.png
-	:width: 800px
-
-* Let's select a protocol of RTSP and a remote method of RTP/RTSP (this is an RTSP camera)
-* The other boxes are mostly self-explanatory
-
-That's pretty much it. Click on Save. We are not going to explore the other tabs in this simple guide.
-
-You now have a configured monitor:
-
-.. image:: images/getting-started-add-monitor-orange.png
-
-If you want to change its mode from Monitor to say, Modect (Motion Detect), later all you need to do is click on the Function column that says 'Monitor' and change it to 'Modect' like so:
-
-
-.. image:: images/getting-started-add-monitor-modect.png
-
-and we now have:
-
-.. image:: images/getting-started-add-monitor-modect-ready.png
-
-And then, finally, to see if everything works, lets click on the monitor name ('Garage' in this example) and that should bring up a live feed just like this:
-
-.. image:: images/getting-started-add-monitor-live.png
 
 
 Conclusion
diff --git a/docs/userguide/images/filter-button.png b/docs/userguide/images/filter-button.png
deleted file mode 100644
index a480b1900..000000000
Binary files a/docs/userguide/images/filter-button.png and /dev/null differ
diff --git a/docs/userguide/images/filter-filterview.png b/docs/userguide/images/filter-filterview.png
index 561996668..e09f34b4d 100644
Binary files a/docs/userguide/images/filter-filterview.png and b/docs/userguide/images/filter-filterview.png differ
diff --git a/docs/userguide/images/filter-save.png b/docs/userguide/images/filter-save.png
deleted file mode 100644
index 96db574c6..000000000
Binary files a/docs/userguide/images/filter-save.png and /dev/null differ
diff --git a/docs/userguide/images/getting-started-add-monitor-general.png b/docs/userguide/images/getting-started-add-monitor-general.png
index 9b722907d..cf4c93487 100644
Binary files a/docs/userguide/images/getting-started-add-monitor-general.png and b/docs/userguide/images/getting-started-add-monitor-general.png differ
diff --git a/docs/userguide/images/getting-started-add-monitor-live.png b/docs/userguide/images/getting-started-add-monitor-live.png
deleted file mode 100644
index a1d7f4100..000000000
Binary files a/docs/userguide/images/getting-started-add-monitor-live.png and /dev/null differ
diff --git a/docs/userguide/images/getting-started-add-monitor-modect-ready.png b/docs/userguide/images/getting-started-add-monitor-modect-ready.png
index 338a0e097..fcac21140 100644
Binary files a/docs/userguide/images/getting-started-add-monitor-modect-ready.png and b/docs/userguide/images/getting-started-add-monitor-modect-ready.png differ
diff --git a/docs/userguide/images/getting-started-add-monitor-modect.png b/docs/userguide/images/getting-started-add-monitor-modect.png
deleted file mode 100644
index bc6795b37..000000000
Binary files a/docs/userguide/images/getting-started-add-monitor-modect.png and /dev/null differ
diff --git a/docs/userguide/images/getting-started-add-monitor-orange.png b/docs/userguide/images/getting-started-add-monitor-orange.png
deleted file mode 100644
index 9d5e227aa..000000000
Binary files a/docs/userguide/images/getting-started-add-monitor-orange.png and /dev/null differ
diff --git a/docs/userguide/images/getting-started-add-monitor-source.png b/docs/userguide/images/getting-started-add-monitor-source.png
index e8b19925e..a3b9324f5 100644
Binary files a/docs/userguide/images/getting-started-add-monitor-source.png and b/docs/userguide/images/getting-started-add-monitor-source.png differ
diff --git a/docs/userguide/images/getting-started-audit-event.png b/docs/userguide/images/getting-started-audit-event.png
new file mode 100644
index 000000000..91e1386d8
Binary files /dev/null and b/docs/userguide/images/getting-started-audit-event.png differ
diff --git a/docs/userguide/images/getting-started-enable-auth.png b/docs/userguide/images/getting-started-enable-auth.png
index 9160ffecc..ec376c478 100644
Binary files a/docs/userguide/images/getting-started-enable-auth.png and b/docs/userguide/images/getting-started-enable-auth.png differ
diff --git a/docs/userguide/images/getting-started-login.png b/docs/userguide/images/getting-started-login.png
index d981048c0..6b6c8e05d 100644
Binary files a/docs/userguide/images/getting-started-login.png and b/docs/userguide/images/getting-started-login.png differ
diff --git a/docs/userguide/images/getting-started-modern-look.png b/docs/userguide/images/getting-started-modern-look.png
index 34dbcdfc8..6cb62718c 100644
Binary files a/docs/userguide/images/getting-started-modern-look.png and b/docs/userguide/images/getting-started-modern-look.png differ
diff --git a/docs/userguide/images/getting-started-timezone.png b/docs/userguide/images/getting-started-timezone.png
new file mode 100644
index 000000000..e372eb8b0
Binary files /dev/null and b/docs/userguide/images/getting-started-timezone.png differ
diff --git a/docs/userguide/images/getting-started-understand-console.png b/docs/userguide/images/getting-started-understand-console.png
index f332b4977..89c735992 100644
Binary files a/docs/userguide/images/getting-started-understand-console.png and b/docs/userguide/images/getting-started-understand-console.png differ
diff --git a/docs/userguide/images/viewevents-stream.png b/docs/userguide/images/viewevents-stream.png
index 672a74e4d..a1448e0bc 100644
Binary files a/docs/userguide/images/viewevents-stream.png and b/docs/userguide/images/viewevents-stream.png differ
diff --git a/docs/userguide/images/viewmonitor-main.png b/docs/userguide/images/viewmonitor-main.png
index 74354f0b0..80791ebb6 100644
Binary files a/docs/userguide/images/viewmonitor-main.png and b/docs/userguide/images/viewmonitor-main.png differ
diff --git a/docs/userguide/images/viewmonitor-stream.png b/docs/userguide/images/viewmonitor-stream.png
index 126a67bb2..58c35952c 100644
Binary files a/docs/userguide/images/viewmonitor-stream.png and b/docs/userguide/images/viewmonitor-stream.png differ
diff --git a/docs/userguide/images/zm-system-overview.jpg b/docs/userguide/images/zm-system-overview.jpg
index de02dcf9e..61594a337 100644
Binary files a/docs/userguide/images/zm-system-overview.jpg and b/docs/userguide/images/zm-system-overview.jpg differ
diff --git a/docs/userguide/images/zm-system-overview.xml b/docs/userguide/images/zm-system-overview.xml
index e4314666a..8cbd3b3ca 100644
--- a/docs/userguide/images/zm-system-overview.xml
+++ b/docs/userguide/images/zm-system-overview.xml
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mxGraphModel dx="854" dy="428" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="826" background="#ffffff" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" value="" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="340" y="80" width="250" height="180" as="geometry"/></mxCell><mxCell id="3" value="ZMC1" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="515" y="100" width="60" height="30" as="geometry"/></mxCell><mxCell id="4" value="ZMC2" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="515" y="140" width="60" height="30" as="geometry"/></mxCell><mxCell id="5" value="ZMCn" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="515" y="220" width="60" height="30" as="geometry"/></mxCell><mxCell id="8" value="" style="endArrow=none;html=1;exitX=0.5;exitY=0;entryX=0.5;entryY=1;endFill=0;dashed=1;" parent="1" source="5" target="4" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="520" y="220" as="sourcePoint"/><mxPoint x="570" y="170" as="targetPoint"/></mxGeometry></mxCell><mxCell id="9" value="ZMA1" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="440" y="100" width="50" height="30" as="geometry"/></mxCell><mxCell id="10" value="ZMA2" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="440" y="140" width="50" height="30" as="geometry"/></mxCell><mxCell id="11" value="ZMAn" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="440" y="220" width="50" height="30" as="geometry"/></mxCell><mxCell id="12" value="" style="endArrow=none;html=1;exitX=0.5;exitY=0;entryX=0.5;entryY=1;endFill=0;dashed=1;" parent="1" source="11" target="10" edge="1"><mxGeometry x="470" y="170" width="50" height="50" as="geometry"><mxPoint x="445" y="220" as="sourcePoint"/><mxPoint x="495" y="170" as="targetPoint"/></mxGeometry></mxCell><mxCell id="13" value="ZMF1" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1"><mxGeometry x="380" y="100" width="60" height="30" as="geometry"/></mxCell><mxCell id="14" value="ZMF2" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1"><mxGeometry x="380" y="140" width="60" height="30" as="geometry"/></mxCell><mxCell id="15" value="ZMFn" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1"><mxGeometry x="380" y="220" width="60" height="30" as="geometry"/></mxCell><mxCell id="16" value="" style="endArrow=none;html=1;entryX=0.5;entryY=1;endFill=0;dashed=1;" parent="1" source="15" edge="1"><mxGeometry x="392" y="170" width="50" height="50" as="geometry"><mxPoint x="392.2777777777778" y="220.13888888888886" as="sourcePoint"/><mxPoint x="411.7222222222223" y="170.13888888888886" as="targetPoint"/></mxGeometry></mxCell><mxCell id="20" value="" style="endArrow=none;html=1;entryX=0;entryY=0.5;exitX=1;exitY=0.5;endFill=0;startArrow=classic;startFill=1;" parent="1" source="9" target="3" edge="1"><mxGeometry x="450" y="145" width="50" height="50" as="geometry"><mxPoint x="430" y="245" as="sourcePoint"/><mxPoint x="450" y="245" as="targetPoint"/></mxGeometry></mxCell><mxCell id="21" value="" style="endArrow=none;html=1;entryX=0;entryY=0.5;exitX=1;exitY=0.5;endFill=0;startArrow=classic;startFill=1;" parent="1" source="10" target="4" edge="1"><mxGeometry x="460" y="155" width="50" height="50" as="geometry"><mxPoint x="440" y="255" as="sourcePoint"/><mxPoint x="460" y="255" as="targetPoint"/></mxGeometry></mxCell><mxCell id="22" value="" style="endArrow=none;html=1;entryX=0;entryY=0.5;exitX=1;exitY=0.5;endFill=0;startArrow=classic;startFill=1;" parent="1" source="11" target="5" edge="1"><mxGeometry x="470" y="165" width="50" height="50" as="geometry"><mxPoint x="510" y="165" as="sourcePoint"/><mxPoint x="525" y="165" as="targetPoint"/></mxGeometry></mxCell><mxCell id="23" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.video_conversation;rotation=-180;" parent="1" vertex="1"><mxGeometry x="640" y="107" width="30" height="15" as="geometry"/></mxCell><mxCell id="26" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.video_conversation;rotation=-180;" parent="1" vertex="1"><mxGeometry x="640" y="148" width="30" height="15" as="geometry"/></mxCell><mxCell id="27" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.video_conversation;rotation=-180;" parent="1" vertex="1"><mxGeometry x="640" y="228" width="30" height="15" as="geometry"/></mxCell><mxCell id="28" value="zmwatch.pl" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="518" y="324" width="65" height="30" as="geometry"/></mxCell><mxCell id="33" value="zmdc.pl" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="415" y="324" width="65" height="30" as="geometry"/></mxCell><mxCell id="34" value="" style="endArrow=classic;html=1;exitX=0.462;exitY=0;exitPerimeter=0;" parent="1" source="28" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="549" y="290" as="sourcePoint"/><mxPoint x="548" y="253" as="targetPoint"/></mxGeometry></mxCell><mxCell id="36" value="monitor process&lt;div&gt;watchdog&lt;/div&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fillColor=none;" parent="34" connectable="0" vertex="1"><mxGeometry x="-0.027" y="-2" relative="1" as="geometry"><mxPoint x="20" y="14" as="offset"/></mxGeometry></mxCell><mxCell id="35" value="" style="whiteSpace=wrap;html=1;fillColor=none;" parent="1" vertex="1"><mxGeometry x="509" y="91" width="73" height="162" as="geometry"/></mxCell><mxCell id="37" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;entryX=0;entryY=0.92;entryPerimeter=0;exitX=1;exitY=0.25;" parent="1" source="33" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="485" y="310" as="sourcePoint"/><mxPoint x="510" y="250" as="targetPoint"/></mxGeometry></mxCell><mxCell id="40" value="monitor process&lt;div&gt;control&lt;/div&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fillColor=none;" parent="37" connectable="0" vertex="1"><mxGeometry x="-0.6134" y="10" relative="1" as="geometry"><mxPoint x="15" y="-48" as="offset"/></mxGeometry></mxCell><mxCell id="39" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;entryX=1;entryY=0.5;" parent="1" source="28" target="33" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="240" y="224" as="sourcePoint"/><mxPoint x="290" y="174" as="targetPoint"/></mxGeometry></mxCell><mxCell id="41" value="" style="endArrow=classic;html=1;green;strokeWidth=3;shadow=0;" parent="1" source="23" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="639.9038461538462" y="116.19230769230774" as="sourcePoint"/><mxPoint x="575" y="115" as="targetPoint"/></mxGeometry></mxCell><mxCell id="44" value="video" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fillColor=none;" parent="41" connectable="0" vertex="1"><mxGeometry x="-0.2874" y="-2" relative="1" as="geometry"><mxPoint as="offset"/></mxGeometry></mxCell><mxCell id="42" value="" style="endArrow=classic;html=1;green;strokeWidth=3;shadow=0;entryX=1;entryY=0.5;" parent="1" source="26" target="4" edge="1"><mxGeometry x="585" y="124.59375" width="50" height="50" as="geometry"><mxPoint x="649.9999999999998" y="124.59375" as="sourcePoint"/><mxPoint x="585" y="125" as="targetPoint"/></mxGeometry></mxCell><mxCell id="45" value="video" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fillColor=none;" parent="42" connectable="0" vertex="1"><mxGeometry relative="1" as="geometry"><mxPoint x="13" y="1" as="offset"/></mxGeometry></mxCell><mxCell id="43" value="" style="endArrow=classic;html=1;green;strokeWidth=3;shadow=0;entryX=1;entryY=0.5;" parent="1" source="27" target="5" edge="1"><mxGeometry x="595" y="134.59375" width="50" height="50" as="geometry"><mxPoint x="640" y="230" as="sourcePoint"/><mxPoint x="585" y="164.80769230769232" as="targetPoint"/></mxGeometry></mxCell><mxCell id="46" value="video" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fillColor=none;" parent="43" connectable="0" vertex="1"><mxGeometry relative="1" as="geometry"><mxPoint x="11" y="-3" as="offset"/></mxGeometry></mxCell><mxCell id="47" value="" style="endArrow=none;html=1;strokeWidth=1;orange;shadow=0;endFill=0;startArrow=classic;startFill=1;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="465" y="100" as="sourcePoint"/><mxPoint x="465" y="60" as="targetPoint"/></mxGeometry></mxCell><mxCell id="48" value="&lt;div style=&quot;text-align: left&quot;&gt;&lt;span style=&quot;font-size: 10px ; line-height: 1.2&quot;&gt;Analyze for motion&lt;/span&gt;&lt;/div&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;" parent="1" vertex="1"><mxGeometry x="438" y="16" width="85" height="40" as="geometry"/></mxCell><mxCell id="50" value="" style="endArrow=none;html=1;strokeWidth=1;orange;shadow=0;exitX=0.5;exitY=0;endFill=0;startArrow=classic;startFill=1;" parent="1" source="35" edge="1"><mxGeometry x="475" y="69.99999999999994" width="50" height="50" as="geometry"><mxPoint x="475" y="109.99999999999994" as="sourcePoint"/><mxPoint x="546" y="50" as="targetPoint"/></mxGeometry></mxCell><mxCell id="51" value="&lt;div style=&quot;text-align: left&quot;&gt;&lt;span style=&quot;font-size: 10px ; line-height: 1.2&quot;&gt;capture video, convert to frames&lt;/span&gt;&lt;/div&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;" parent="1" vertex="1"><mxGeometry x="509" y="16" width="85" height="40" as="geometry"/></mxCell><mxCell id="52" value="DB" style="shape=cylinder;whiteSpace=wrap;html=1;fillColor=none;" parent="1" vertex="1"><mxGeometry x="259" y="155" width="40" height="55" as="geometry"/></mxCell><mxCell id="53" value="" style="endArrow=none;html=1;shadow=0;strokeWidth=1;edgeStyle=orthogonalEdgeStyle;entryX=0;entryY=0.5;startArrow=classic;startFill=1;endFill=0;" parent="1" target="13" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="300" y="190" as="sourcePoint"/><mxPoint x="300" y="90" as="targetPoint"/><Array as="points"><mxPoint x="315" y="190"/><mxPoint x="315" y="115"/></Array></mxGeometry></mxCell><mxCell id="54" value="" style="endArrow=none;html=1;strokeWidth=1;orange;shadow=0;startArrow=classic;startFill=1;endFill=0;" parent="1" edge="1"><mxGeometry x="330" y="74.99999999999994" width="50" height="50" as="geometry"><mxPoint x="330" y="114.99999999999994" as="sourcePoint"/><mxPoint x="330" y="74.99999999999994" as="targetPoint"/></mxGeometry></mxCell><mxCell id="55" value="&lt;div style=&quot;text-align: left&quot;&gt;&lt;span style=&quot;font-size: 10px ; line-height: 1.2&quot;&gt;store frames to disk &amp;amp; catalog in DB&lt;/span&gt;&lt;/div&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;" parent="1" vertex="1"><mxGeometry x="299" y="40" width="101" height="40" as="geometry"/></mxCell><mxCell id="57" value="zmtrigger.pl" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="640" y="315" width="75" height="30" as="geometry"/></mxCell><mxCell id="58" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;entryX=1;entryY=0.981;entryPerimeter=0;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="640" y="330" as="sourcePoint"/><mxPoint x="591.9444444444446" y="250.00000000000006" as="targetPoint"/></mxGeometry></mxCell><mxCell id="59" value="external trigger &amp;nbsp;to&amp;nbsp;&lt;div&gt;start/stop recording&lt;/div&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;shadow=0;glass=0;fillColor=#DEDEDE;gradientColor=none;" parent="58" connectable="0" vertex="1"><mxGeometry x="-0.6324" relative="1" as="geometry"><mxPoint x="39" y="-60" as="offset"/></mxGeometry></mxCell><mxCell id="60" value="Web Server" style="whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="310" y="440" width="370" height="30" as="geometry"/></mxCell><mxCell id="61" value="ZM GUI (php + JS)" style="whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="310" y="410" width="370" height="30" as="geometry"/></mxCell><mxCell id="62" value="ZM API" style="whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="310" y="350" width="70" height="27" as="geometry"/></mxCell><mxCell id="63" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;entryX=1;entryY=0.818;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="317" y="350" as="sourcePoint"/><mxPoint x="297" y="200" as="targetPoint"/><Array as="points"><mxPoint x="317" y="290"/></Array></mxGeometry></mxCell><mxCell id="64" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;entryX=0;entryY=0.5;exitX=1;exitY=0.5;startArrow=classic;startFill=1;" parent="1" source="62" target="33" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="350" y="380" as="sourcePoint"/><mxPoint x="400" y="330" as="targetPoint"/></mxGeometry></mxCell><mxCell id="65" value="user/admin" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="783" y="500" width="30" height="60" as="geometry"/></mxCell><mxCell id="68" value="" style="edgeStyle=elbowEdgeStyle;elbow=vertical;endArrow=classic;html=1;shadow=0;strokeWidth=1;entryX=0.5;entryY=1;exitX=0;exitY=0.5;" parent="1" source="61" target="52" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="270" y="425" as="sourcePoint"/><mxPoint x="320" y="390" as="targetPoint"/><Array as="points"><mxPoint x="260" y="425"/></Array></mxGeometry></mxCell><mxCell id="69" value="zmpkg.pl" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="489" y="370" width="65" height="30" as="geometry"/></mxCell><mxCell id="70" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;" parent="1" target="33" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="490" y="390" as="sourcePoint"/><mxPoint x="410" y="350" as="targetPoint"/><Array as="points"><mxPoint x="440" y="380"/></Array></mxGeometry></mxCell><mxCell id="71" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;entryX=1;entryY=0.25;" parent="1" target="69" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="590" y="410" as="sourcePoint"/><mxPoint x="660" y="370" as="targetPoint"/><Array as="points"><mxPoint x="590" y="390"/></Array></mxGeometry></mxCell><mxCell id="72" value="start/stop/restart/status" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="71" connectable="0" vertex="1"><mxGeometry x="-0.502" relative="1" as="geometry"><mxPoint x="40" y="-3" as="offset"/></mxGeometry></mxCell><mxCell id="73" value="" style="edgeStyle=elbowEdgeStyle;elbow=vertical;endArrow=classic;html=1;shadow=0;strokeWidth=1;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="489" y="395" as="sourcePoint"/><mxPoint x="294" y="210" as="targetPoint"/><Array as="points"><mxPoint x="390" y="395"/></Array></mxGeometry></mxCell><mxCell id="74" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.lightbulb;glass=0;" parent="1" vertex="1"><mxGeometry x="767" y="270" width="14" height="15" as="geometry"/></mxCell><mxCell id="77" value="&lt;font style=&quot;font-size: 8px&quot;&gt;user script&lt;/font&gt;" style="shape=note;whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;size=5;" parent="1" vertex="1"><mxGeometry x="767" y="345" width="20" height="30" as="geometry"/></mxCell><mxCell id="78" value="" style="endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=0.25;exitY=0;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="774.2543352601158" y="345.08670520231215" as="sourcePoint"/><mxPoint x="774" y="290" as="targetPoint"/></mxGeometry></mxCell><mxCell id="80" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=0;exitY=0.5;" parent="1" source="77" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="760" y="360" as="sourcePoint"/><mxPoint x="720" y="330" as="targetPoint"/></mxGeometry></mxCell><mxCell id="81" value="trigger" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="80" connectable="0" vertex="1"><mxGeometry x="-0.4607" y="-3" relative="1" as="geometry"><mxPoint as="offset"/></mxGeometry></mxCell><mxCell id="82" value="&lt;font style=&quot;font-size: 8px&quot;&gt;any 3rd party device&lt;/font&gt;" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;shadow=0;glass=0;" parent="1" vertex="1"><mxGeometry x="739" y="235" width="74" height="33" as="geometry"/></mxCell><mxCell id="84" value="zmcontrol.pl" style="whiteSpace=wrap;html=1;" parent="1" vertex="1"><mxGeometry x="708" y="395" width="75" height="30" as="geometry"/></mxCell><mxCell id="90" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=1;exitY=0.5;" parent="1" source="61" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="680" y="450" as="sourcePoint"/><mxPoint x="710" y="410" as="targetPoint"/></mxGeometry></mxCell><mxCell id="91" value="&lt;font style=&quot;font-size: 8px&quot;&gt;camera specific protocol server (perl package)&lt;/font&gt;" style="whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="813" y="390" width="93" height="30" as="geometry"/></mxCell><mxCell id="92" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=1;exitY=0.75;entryX=0;entryY=0.25;" parent="1" source="84" target="91" edge="1"><mxGeometry x="690" y="420" width="50" height="50" as="geometry"><mxPoint x="690" y="435" as="sourcePoint"/><mxPoint x="720" y="420" as="targetPoint"/><Array as="points"><mxPoint x="800" y="400"/></Array></mxGeometry></mxCell><mxCell id="93" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="862" y="390" as="sourcePoint"/><mxPoint x="690" y="160" as="targetPoint"/><Array as="points"><mxPoint x="862" y="260"/></Array></mxGeometry></mxCell><mxCell id="95" value="camera PTZ" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="93" connectable="0" vertex="1"><mxGeometry x="0.5813" y="2" relative="1" as="geometry"><mxPoint as="offset"/></mxGeometry></mxCell><mxCell id="94" value="" style="shape=link;html=1;shadow=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;strokeWidth=1;exitX=0;exitY=0.25;" parent="1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="685.1666666666667" y="249.33333333333326" as="sourcePoint"/><mxPoint x="686" y="96" as="targetPoint"/></mxGeometry></mxCell><mxCell id="96" value="" style="shape=link;html=1;shadow=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;strokeWidth=1;" parent="1" edge="1"><mxGeometry x="240.16666666666674" y="71" width="50" height="50" as="geometry"><mxPoint x="241" y="440" as="sourcePoint"/><mxPoint x="241" y="170" as="targetPoint"/></mxGeometry></mxCell><mxCell id="98" value="zmupdate.pl - upgrades ZM" style="whiteSpace=wrap;html=1;rotation=-90;" parent="1" vertex="1"><mxGeometry x="169" y="243" width="110" height="30" as="geometry"/></mxCell><mxCell id="99" value="zmfilter.pl" style="whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="349" y="285" width="70" height="27" as="geometry"/></mxCell><mxCell id="100" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=0;exitY=0.5;entryX=1;entryY=0.7;" parent="1" source="99" target="52" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="370" y="310" as="sourcePoint"/><mxPoint x="420" y="260" as="targetPoint"/></mxGeometry></mxCell><mxCell id="101" value="process filters" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="100" connectable="0" vertex="1"><mxGeometry x="-0.7097" y="-12" relative="1" as="geometry"><mxPoint x="33" y="-13" as="offset"/></mxGeometry></mxCell><mxCell id="105" value="&lt;font style=&quot;font-size: 11px&quot;&gt;Filesystem&lt;/font&gt;" style="shape=document;whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="219" y="57" width="60" height="50" as="geometry"/></mxCell><mxCell id="107" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=0;exitY=0.25;entryX=1;entryY=0.5;" parent="1" source="13" target="105" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="260" y="170" as="sourcePoint"/><mxPoint x="310" y="120" as="targetPoint"/><Array as="points"><mxPoint x="310" y="108"/><mxPoint x="310" y="82"/></Array></mxGeometry></mxCell><mxCell id="108" value="zmaudit.pl" style="whiteSpace=wrap;html=1;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="1" vertex="1"><mxGeometry x="229" y="117" width="70" height="27" as="geometry"/></mxCell><mxCell id="109" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=0.5;exitY=0;entryX=1;entryY=0.75;" parent="1" source="108" target="105" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="290" y="110" as="sourcePoint"/><mxPoint x="340" y="60" as="targetPoint"/><Array as="points"><mxPoint x="290" y="117"/><mxPoint x="290" y="94"/></Array></mxGeometry></mxCell><mxCell id="110" value="" style="edgeStyle=elbowEdgeStyle;elbow=vertical;endArrow=classic;html=1;shadow=0;strokeWidth=1;exitX=0.25;exitY=1;" parent="1" source="108" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="150" y="170" as="sourcePoint"/><mxPoint x="260" y="170" as="targetPoint"/><Array as="points"><mxPoint x="247" y="170"/></Array></mxGeometry></mxCell><mxCell id="114" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="292" y="114" width="14" height="7" as="geometry"/></mxCell><mxCell id="115" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="410" y="282" width="14" height="7" as="geometry"/></mxCell><mxCell id="116" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="708" y="311" width="14" height="7" as="geometry"/></mxCell><mxCell id="117" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="575" y="324" width="14" height="7" as="geometry"/></mxCell><mxCell id="118" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;rotation=-90;" parent="1" vertex="1"><mxGeometry x="205" y="203" width="14" height="7" as="geometry"/></mxCell><mxCell id="119" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="569" y="87" width="14" height="7" as="geometry"/></mxCell><mxCell id="120" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="480" y="96" width="14" height="7" as="geometry"/></mxCell><mxCell id="121" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="424" y="96" width="14" height="7" as="geometry"/></mxCell><mxCell id="122" value="" style="html=1;verticalLabelPosition=bottom;verticalAlign=top;strokeWidth=2;strokeColor=#0080F0;fillColor=#ffffff;shadow=0;dashed=0;shape=mxgraph.ios7.icons.eye;glass=0;" parent="1" vertex="1"><mxGeometry x="250" y="526" width="14" height="7" as="geometry"/></mxCell><mxCell id="123" value="" style="edgeStyle=elbowEdgeStyle;elbow=horizontal;endArrow=classic;html=1;shadow=0;strokeWidth=1;entryX=1;entryY=0.5;" parent="1" target="60" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="790" y="530" as="sourcePoint"/><mxPoint x="750" y="500" as="targetPoint"/></mxGeometry></mxCell><mxCell id="124" value="http://server.com/zm" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;shadow=0;glass=0;fillColor=none;gradientColor=none;" parent="123" connectable="0" vertex="1"><mxGeometry x="0.0991" y="-2" relative="1" as="geometry"><mxPoint as="offset"/></mxGeometry></mxCell><mxCell id="125" value="monitored by zmdc.pl, will be started if crashed" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;shadow=0;glass=0;" parent="1" vertex="1"><mxGeometry x="251" y="517" width="291" height="20" as="geometry"/></mxCell></root></mxGraphModel>
\ No newline at end of file
+<mxfile host="www.draw.io" modified="2019-10-24T14:13:30.620Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.2 Safari/605.1.15" etag="0GmeyKPOKwMtENqCOGEB" version="12.1.4" type="device" pages="1"><diagram id="M4RMzO6OEYmREEY0n8Gi" name="Page-1">7V1Zk6s2Fv41XZU82AWI9bGXdCZTuVW3pieVe/MyRRvazTS2HMC9/fqRAGF0JGyBhU33XKfS1yxmOct3VkkX6Hr1+msWbh6/4ChOLywjer1ANxeWZZqBTf6he96qPR4yqx3LLInqk3Y77pL3uN5p1Hu3SRTn3IkFxmmRbPidC7xex4uC2xdmGX7hT3vAKX/XTbiMhR13izAV9/6ZRMUjey832B34R5wsH+tb+5ZbHbgPF0/LDG/X9f0uLPRQfqrDq5Bdq37R/DGM8EtrF/rlAl1nGBfVt9XrdZxS2jKyVb+77TjaPHcWrwuVH1jVD57DdBuzJy6fq3hjtHh5TIr4bhMu6PYL4fcFunosVinZMslX8Y71QzzHWRG/tnbVT/BrjFdxkb2RU+qjNqNGLS1+vfnSIr1X73tsUd1kJ4Y1u5fNpXevTL7Uby2nABIo8NeXa/MMVHBMh6OCaYhkcCVUQBqIYMuIcA5REIhgn44IjowI6wkQoUGLExDBPwwI8Tq6pBhLttZ4HfOvH78mxTfy3Zg79dZ3ukW/r8mjtA7Rze/sV+voNqHPVJ4ZhfljHB2iZ4632SLmWFeE2TIuOJGOIw7pRZq3aOpIaMr2ZXEaFskzbx9khK7v8BUn5Hl3LAUQ17CUXaJ6m/pXbcCGF/L4CzXAyC5U0UC4UMn35rWVRCGQ6MPlOZDRtsE7S5BRxjsd+sA8Ep4KZ7GSkAoSaByNCqaMCufARkgFGTaORgUFb2mC4MiY10ZHJtYH4ZGRvQt2FOFTHSltu8P49UVKO3Dkj6wfKS0RJHoKRsP+NvN3YvKtJUCtI5xg5OR9CnaLRRrmebJgu+vTlEUmECUG9RQYB6KVM5bAIIAI7E69BcY5cCGNAiPi6ccWGIYnQzwwRn4XSIwzmsRAG+IMlRj3wIU0SszRtmdqEiOxSs6RRskdS2Ics+NOvd13y9l/IY0SI2Y2BIlpyQd1wZJFmP4e3sfpV5wnRYLX5Ng9Lgq8ap1wmSZLeqDAm5L3GX5qkmRWs+capzgrb4IMwzduqfg8EBFp7a8TY+QXLAnG+TdGdWRDH3X1uqSJxnmCc2+eLPA6nz8nUYz/Q76S58rD6mGvMlzUX29mNDukxeV0hfDDE8QMScTMdLrFTNXlZHnFH0zUzUTbPx0TvR9MHIWJTbrqFEwUM2Pvq5ewWDzON6nAzlMkCX2OFoj5W+0koSPSQkcgjETT8r6KFuchhA2ypSclhJg4FyjQ8sp2LpM0KWC7FkwLkO9f4ywhDxZn9b5OkrW9KyatU0l/2gGvuMHQ9KfNS73lIP5C+vwnJJreFV4nBQFNQv4ML+I8v7DctKBQmTyTr0v6tYSECC/ZIXKb1lFBOoiQF7w8ZHGevIf35Qklv9FVWAP9grCcyoFgAVZJFNEfXKXUZlw1RUgZxrexvw4TRJFigl0XWOvHudhlOpTVc2bMDWYAa6bNLC1CZUGLzl8APzzk8dFCIBaF+kKcEr37w7/Ba1RgCqDnIYkldC0NqKfgz1Dguas34/Qev/yy23FV7iAHHnGWvON1EaZVqLkfJzsC2MBi2xAp5WGt5aiCKFLNeZ0GRG0fGDpzKIiaMG0xWmaUOWw9QZTADvFd0w+OoZ5GDHVNBslNFKpFqIDzNGP2VS+KiqVEETBU3SRJjqoGBvNCyGwp6Tlzlrh097R03xIiH2DtVHW/8byaqgi4kEbd75fklnJ9mcXxWghuEQxV1dg8LZa6KJgHBvJt13ToX4vni+nOzYAEKZ5b/oVsUu8XAAlHGAtr5LcYDJWpgY+C10xeteC15Xs8Xh/r9GoFZNs6mWoej86uiM49S0sO8JxMy547AfLGKhe4NlHt1sffd/feGi28zHgaLUY/H0ujraM1+lj3CvG84n+vR5cV6jyT0WVP1OWeRT8HtnWgsXUZeF4wbzhYb1177jPzTv+CyFyjGouZrI+lxujsamzythwkHfXosUpWZV+Fn1deugdn4ZpqFdRinTX9iXjTtgu0yxiopvBC7ni5EVmvdSsV0mK8+/eWjgi5ogo6qxXwkpyRxg/F7uguQVJdJd+Ea+llHvC6mOXlqBt6FdPYvJJ/yl8aabKOZ4xB5dG5Jd7ich2mb+T3dGwNTeWscFns2+Vrqnvzz9M7jcMXMGuJl0CGOiTJcrWYnP2QVglJcl5pCDvFvUddCgG3zxUslC8pS9l7LJTySIZj+xGVoWRPQ+tYjUOod5cQUGjeN2dD1fR3mcHI25DfuH8JzOWuO17y1pElcD4IQC3CTbHNKEDVrs515UBQ/aUOKKbQlYWrOP8BWnvKSqcELTEncSPSm/WhLN6IHEQl3c5SfyNxCE8oSbeqLcMRDa0oTr+ITwLvbQwXsb5du8NZ8YiXmJj7dgFPEc95IzB1FxIZIDU+tEkBjmc1YWm6A6IJQcO31mkbekK+54HhYMnA2Ptcwvn19k7sqicYbC/6dcMMdztOLH6MfGCggWefxpGA9yXipMWRUHyfEfwKWVPFB/Er8gKXXgXzHSpPIkryJ3ohyw1X1PxUf6nHERZhSpuBjIQ+0c3VD2+jbUQD3ohKRjSahjmSuyGmW95XRZYsl3F2nkZGmGls4Lrd0zNSI6OjMu5be0vPIT+kI90c+M2OrpYfSUBKvt+8tjfeehoGMOTcO6evIsjK4Kx0YM4De/fhY0vyuHOj/XFHcWRcMJCHeWLaHBOx/4QAaZwRr5YieKX0bfxe3+f0H4rt/B5Jr1LpdVA4p234lLELnEXJeroNoJzWLale1t/BqICbX+h/9JwsjBJy54NRFEMRPR1PTSP3sX49n4ebmWNk710x5fZnfE923MXZMxWufuZEiUc1H5TZ09siIdAoaLtoLtokJJubR4dRcmWzDpDtX//4jfz9afO4KXWW+ln/vPv5k5AYnZbEYtKlJPHl198+Bz2RI/qUMmKyyvRRxFTJy0zFifJNv8uJ+iQlQWR6clHo3zPJX8iCtUVt+Rxwn0CvG+Sq5GfOJp+9xqXrLCgxDJxw+28jukyU4cx3yqlJ40DcoC/L44pZnm1OPaHbMFol4txBLLO/XaWXCzpAYPBI2MkZJY+NzmlKdmojyGHvwSCjpCuyZ7TWqfKSyY462/zVdFk2q4Q1KV22QLBrw/5N5fwtKDMgWK/QZZYAZtj1YE5tZkmMzt9Xm6flmYYT+3xOEklmuhprODG71aQMdCdNJ2wv7eCAaijby65wQrOOwSmJmIHXpWOeylicqYQmVtv3M+aehlRuW1YZ3uxN77rnHS8P5NceOtTTBTNUIcVJ8PrKL3xgpDl08cQ8BZ93vc3i3Y6w2OaCeE800drX+WSarCXH6hiWHrzluT9Kf7SnK7uiz5HthJupmEHoywQDXU2LNQOwzATEI12upgAjejtUPIUMyAeeiSmlEnS/Te8B3nTKaY8Q1gcSwJrQ2rV6W5RkHVMvebKREVVxjTZ0cOzr6PTwaaMH7OWo0hFGvsiSTdEq11UX7ajXMfKvcUFBZfykePUSN3tDYHU++qDpB0nmZbUkiKQlvOk3ufwgl7LxGi3oNU4drL3AI66ujZBjuYZpOmB6L2TODd/1DMcyLGQKeqWK5PQuYIJlT62oPwBu/SnGs8Mmkig3d0FHuXUw6mgHFAzEhKiDS1WdtanEg8ECzD8qCxnMTClmmfu6C35HdK7LXfDFqLlpFvmc0QXTWC3Rhe0aYOIvpEVOZ3DSGiheWuINXww5tXgd4ZpSCWVRRfqCbkXxc0KAQtEFmVIXaKcUavBVPKcj6mjX8iU+J0LdEqW8Do4YKbyv6mmpzpOY9gzgEQSnaw8NpmzIxeqwkkF2p+X+uT5vy+yh3Qoe7ChSjNUHQGQgyyprgMhFuIqzkP58Ey+SByIX5WRxBV7QOeGMvG6pM37axFlacnrxFC7jn1UB9EN0Mvlg7pAmN9KSx0AyxaMWfZfZvmnqu8d57qCJRH2uR4b3bW88UEUIpsIwa6+4NtGASUngndDQcNDqeGTdnjqsIWvu8A6m2HrXKXgTMTk+mHNucJUUiqOpOGlGbykCD8waZLRJkdiy1Jiir//+S5CoTxL0BcfPr1MfJe4XNFvWcaKqNaQLRKde4CnL76bJ+mmvtqsOQQXDXeHEGGrpqf2GbCJ44vrO3HR3H9DNagdz1PpYIO2oDDY+P0YpGC19GSgsvnJucRkuE7uZZXmm8TE3Kzdrd2Ga6TabrrKh3dngQmOuiCpbA2S7icIiLnMCxoz8v91Q4C3HBtOhFP1Cj/ayKYGmNEqzanmjiJLSnSlhqpZIQtbcR4xVMWiU7TQiMwRXs/AlmZiRxpg085pNytPtX1PxVAMzJkAT7uhFcPjq0G4tOHHIiJPPNePqW3LUzMdvVAr6aXuoGiXSUubwDDA+aMYWCj5WrhC47BhtVabRPRuHahLPNGVZPOK3xPlbXsSrvr0VEV5sVyW3TtBfocEgWCZvEBxxeIfb02lStwc9F2PJ4yUlLWcRxmnj3Ruy8ItRq07pd6K2OTh/kwEWxVAeoQGXDR0puybcp35g1eeqS5260igNvTinL9xGSfFhfT7L4lXcNEUdH8/nE53oU+v44ZXroYOnnHpvxGXKmCCsmzLUx0OgV3qkVKn4vN7ex4Ln16kybZBg6gpbNA5DlPcK9ljzfFqLLJpgkLCQCFHOqMCV2EcaNNJMeQ7uo0/oPne7d/wWX2hvumlqv2+AiAcavXXYOVMWivzg115+wRGKTd/aKfj1uVcnH4VfQhuXKWbYR+PX516IfBR+wQXUZMtLj8YvhQETn4pfY5Q/LAOMdzDURi5pYaBC4PapGKhD4UC5yhcD7bHYZSkEKT/YBefLAIGjuGLAaOyyfrCrNxqCINGxTsivKTbpHZ29ZsHyRLIAHkjkOENnBvagpCjOejckULfEQP2xKDZldemWTulQdnzPF0RNrdv3lSA1n6UuaWnsxDMCMOvYpFagbVYtFVeGJ9hoGff0Xd5X0aKsGFyX6lNe4D4uX6HsnCrPTB4owbIKVA8LxuccKtWs1cSUVVKeaPrZufqEhhpkuHq6u/vmEpFKgm/ev17++Pv+edYwuAPc5QvLlPrWGMfdOb9jaotLBv43Loq3u2pQfLgtMM/ePZ0o/WcN4pYuFZHfUgR+ZYVTJfj378n7Q57hv+4WT4unIMJf3v+eyTTqfRU/k5da44KOoilDqwEVuMZh2aXGBcmU0K9TWF04tt3xJHMeN++juyWtg3r/n7msoxjpeS5gpCtj5DjupJyNaNo+5tywgraf2b2QxZ75BoZjnDD5wAHQ2w80Ahaey+d14fS4QytfDl0DqXM1DGSCPhBdy1/A6RI0T2PQoSmiz10ai4vdAMuqa+s+2zVs3X75nbIQ46cP0xyovJKFstPNq80+HNrXNqhtfYsZL6WzYA4GAw5x2Mlmhmk73+50alK+4CimZ/wP</diagram></mxfile>
\ No newline at end of file
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 35bfcf39d..905a87292 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -15,4 +15,5 @@ User Guide
    cameracontrol
    mobile
    logging
+   configfiles
 
diff --git a/docs/userguide/logging.rst b/docs/userguide/logging.rst
index 4256079ae..a6dfdb0c0 100644
--- a/docs/userguide/logging.rst
+++ b/docs/userguide/logging.rst
@@ -1,18 +1,33 @@
 Logging
 =======
 
-Most components of ZoneMinder can emit informational, warning, error and debug messages in a standard format. These messages can be logged in one or more locations. By default all messages produced by scripts are logged in <script name>.log files which are placed in the directory defined by the ZM_PATH_LOGS configuration variable. This is initially defined as ‘/tmp’ though it can be overridden (see the Options and Users section above). So for example, the zmpkg.pl script will output messages to /tmp/zmpkg.pl, an example of these messages is::
+.. note::
+  Understanding how logging works in ZoneMinder is key to being able to isolate/pinpoint issues well. Please refer to :doc:`/userguide/options/options_logging` to read about how to customize logging.
 
-  03/01/06 13:46:00.166046 zmpkg[11148].INF [Command: start]
+Most components of ZoneMinder can emit informational, warning, error and debug messages in a standard format. These messages can be logged in one or more locations. By default all messages produced by scripts are logged in <script name>.log files which are placed in the directory defined by the ``ZM_PATH_LOGS`` configuration variable. This is initially defined as ``/var/log/zm`` (on debian based systems) though it can be overridden to a custom path (the path is usually defined in ``/etc/zm/conf.d/01-system-paths.conf``, but to override it, you should create your own config file, not overwrite this file). So for example, the ``zmdc.pl`` script will output messages to ``/var/log/zmdc.log``, an example of these messages is::
+
+  10/24/2019 08:01:19.291513 zmdc[6414].INF [ZMServer:408] [Starting pending process, zma -m 2]
+  10/24/2019 08:01:19.296575 zmdc[6414].INF [ZMServer:408] ['zma -m 2' starting at 19/10/24 08:01:19, pid = 15740]
+  10/24/2019 08:01:19.296927 zmdc[15740].INF [ZMServer:408] ['zma -m 2' started at 19/10/24 08:01:19]
 
 where the first part refers to the date and time of the entry, the next section is the name (or an abbreviated version) of the script, followed by the process id in square brackets, a severity code (INF, WAR, ERR or DBG) and the debug text. If you change the location of the log directory, ensure it refers to an existing directory which the web user has permissions to write to. Also ensure that no logs are present in that directory the web user does not have permission to open. This can happen if you run commands or scripts as the root user for testing at some point. If this occurs then subsequent non-privileged runs will fails due to being unable to open the log files.
 
-As well as specific script logging above, information, warning and error messages are logged via the system syslog service. This is a standard component on Linux systems and allows logging of all sorts of messages in a standard way and using a standard format. On most systems, unless otherwise configured, messages produced by ZoneMinder will go to the /var/log/messages file. On some distributions they may end up in another file, but usually still in /var/log. Messages in this file are similar to those in the script log files but differ slightly. For example the above event in the system log file looks like::
+As well as specific script logging above, information, warning and error messages are logged via the system syslog service. This is a standard component on Linux systems and allows logging of all sorts of messages in a standard way and using a standard format. On most systems, unless otherwise configured, messages produced by ZoneMinder will go to the ``/var/log/messages`` or ``/var/log/syslog`` file. On some distributions they may end up in another file, but usually still in /var/log. Messages in this file are similar to those in the script log files but differ slightly. For example the above event in the system log file looks like::
  
   Jan  3 13:46:00 shuttle52 zmpkg[11148]: INF [Command: start]
 
 where you can see that the date is formatted differently (and only to 1 second precision) and there is an additional field for the hostname (as syslog can operate over a network). As well as ZoneMinder entries in this file you may also see entries from various other system components. You should ensure that your syslogd daemon is running for syslog messages to be correctly handled.
 
+
+Customizing logging properly in ZoneMinder
+-------------------------------------------
+
+.. todo:
+  Is this all valid anymore ?
+
+
+Other Notes
+-------------
 A number of users have asked how to suppress or redirect ZoneMinder messages that are written to this file. This most often occurs due to not wanting other system messages to be overwhelmed and obscured by the ZoneMinder produced ones (which can be quite frequent by default). In order to control syslog messages you need to locate and edit the syslog.conf file on your system. This will often be in the /etc directory. This file allows configuration of syslog so that certain classes and categories of messages are routed to different files or highlighted to a console, or just ignored. Full details of the format of this file is outside the scope of this document (typing ‘man syslog.conf’ will give you more information) but the most often requested changes are easy to implement.
 
 The syslog service uses the concept of priorities and facilities where the former refers to the importance of the message and the latter refers to that part of the system from which it originated. Standard priorities include ‘info’, ‘warning’, ‘err’ and ‘debug’ and ZoneMinder uses these priorities when generating the corresponding class of message. Standard facilities include ‘mail’, ‘cron’ and ‘security’ etc but as well this, there are eight ‘local’ facilities that can be used by machine specific message generators. ZoneMinder produces it’s messages via the ‘local1’ facility.
diff --git a/docs/userguide/mobile.rst b/docs/userguide/mobile.rst
index b6feb805d..c6da91642 100644
--- a/docs/userguide/mobile.rst
+++ b/docs/userguide/mobile.rst
@@ -6,17 +6,15 @@ Here are some options for using ZoneMinder on Mobile devices:
 Third party mobile clients
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 * zmNinja  (`source code <https://github.com/pliablepixels/zmNinja>`__,  needs APIs to be installed to work)
-	* Available in App Store and Play Store - `website <http://pliablepixels.github.io/zmNinja/>`__
-* zmView (limited, free) and zmView Pro  (more features, paid) 
-	* Available in App Store and Play Store, relies on ZM skins `website <http://html5-clouds.com/?q=node/55>`__
+	* Available in App Store, Play Store and for Desktops - `website <http://pliablepixels.github.io/zmNinja/>`__
 
 Using the existing web console
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 * You can directly use the ZoneMinder interface by launching a browser and going to the ZoneMinder server just like you do on the Desktop
-* ZoneMinder also has a "mobile skin" that offers limited functionality (not all views are present in this skin). You can point your  mobile browser to ``http://yourzoneminderip/zm/index.php?skin=mobile``  and bookmark it. **Note however that 1.29 is the last release that will support the mobile skin. It's use is deprecated**
 
 Discontinued clients
 ^^^^^^^^^^^^^^^^^^^^
 The following are a list of clients that do not work and have not been updated:
 
 * eyeZM
+* zmView 
\ No newline at end of file
diff --git a/docs/userguide/options.rst b/docs/userguide/options.rst
index 873002a0d..31f349dc3 100644
--- a/docs/userguide/options.rst
+++ b/docs/userguide/options.rst
@@ -5,13 +5,16 @@ The various options you can specify are displayed in a tabbed dialog with each g
 
 If you have changed the value of an option you should then ‘save’ it. A number of the option groups will then prompt you to let you know that the option(s) you have changed will require a system restart. This is not done automatically in case you will be changing many values in the same session, however once you have made all of your changes you should restart ZoneMinder as soon as possible. The reason for this is that web and some scripts will pick up the new changes immediately but some of the daemons will still be using the old values and this can lead to data inconsistency or loss.
 
+.. note:: If you are looking for ``Options->Paths`` documentation, it was moved to a configuration file starting ZoneMinder 1.32. See :ref:`here <replacement_for_options_path>`.
+
 .. toctree::
 
    options/options_display
    options/options_system
    options/options_config
+   options/options_api
    options/options_servers
-   options/options_paths
+   options/options_storage
    options/options_web
    options/options_images
    options/options_logging
diff --git a/docs/userguide/options/images/Options_API.png b/docs/userguide/options/images/Options_API.png
new file mode 100644
index 000000000..68fb211ca
Binary files /dev/null and b/docs/userguide/options/images/Options_API.png differ
diff --git a/docs/userguide/options/images/Options_BW.png b/docs/userguide/options/images/Options_BW.png
index 614944b41..30dd06f84 100644
Binary files a/docs/userguide/options/images/Options_BW.png and b/docs/userguide/options/images/Options_BW.png differ
diff --git a/docs/userguide/options/images/Options_BW_Phone.png b/docs/userguide/options/images/Options_BW_Phone.png
deleted file mode 100644
index dd3e27a50..000000000
Binary files a/docs/userguide/options/images/Options_BW_Phone.png and /dev/null differ
diff --git a/docs/userguide/options/images/Options_Config.png b/docs/userguide/options/images/Options_Config.png
index d61ecf32e..7b86f9db1 100644
Binary files a/docs/userguide/options/images/Options_Config.png and b/docs/userguide/options/images/Options_Config.png differ
diff --git a/docs/userguide/options/images/Options_Display.png b/docs/userguide/options/images/Options_Display.png
index 05ad5b506..e6577ae9d 100644
Binary files a/docs/userguide/options/images/Options_Display.png and b/docs/userguide/options/images/Options_Display.png differ
diff --git a/docs/userguide/options/images/Options_FIFO.gif b/docs/userguide/options/images/Options_FIFO.gif
new file mode 100644
index 000000000..ac9d69847
Binary files /dev/null and b/docs/userguide/options/images/Options_FIFO.gif differ
diff --git a/docs/userguide/options/images/Options_Logging.png b/docs/userguide/options/images/Options_Logging.png
deleted file mode 100644
index a0b00d767..000000000
Binary files a/docs/userguide/options/images/Options_Logging.png and /dev/null differ
diff --git a/docs/userguide/options/images/Options_Logging_A.png b/docs/userguide/options/images/Options_Logging_A.png
new file mode 100644
index 000000000..d36063202
Binary files /dev/null and b/docs/userguide/options/images/Options_Logging_A.png differ
diff --git a/docs/userguide/options/images/Options_Logging_B.png b/docs/userguide/options/images/Options_Logging_B.png
new file mode 100644
index 000000000..260b16c22
Binary files /dev/null and b/docs/userguide/options/images/Options_Logging_B.png differ
diff --git a/docs/userguide/options/images/Options_Network.png b/docs/userguide/options/images/Options_Network.png
index d94ab9992..e1dbc1c4f 100644
Binary files a/docs/userguide/options/images/Options_Network.png and b/docs/userguide/options/images/Options_Network.png differ
diff --git a/docs/userguide/options/images/Options_Paths.png b/docs/userguide/options/images/Options_Paths.png
deleted file mode 100644
index 6da6da4b9..000000000
Binary files a/docs/userguide/options/images/Options_Paths.png and /dev/null differ
diff --git a/docs/userguide/options/images/Options_Storage.png b/docs/userguide/options/images/Options_Storage.png
new file mode 100644
index 000000000..d568200ee
Binary files /dev/null and b/docs/userguide/options/images/Options_Storage.png differ
diff --git a/docs/userguide/options/images/Options_System.png b/docs/userguide/options/images/Options_System.png
index f100dd7f0..966dfb96b 100644
Binary files a/docs/userguide/options/images/Options_System.png and b/docs/userguide/options/images/Options_System.png differ
diff --git a/docs/userguide/options/images/Options_Users.png b/docs/userguide/options/images/Options_Users.png
index 31a697cc1..86abaf98d 100644
Binary files a/docs/userguide/options/images/Options_Users.png and b/docs/userguide/options/images/Options_Users.png differ
diff --git a/docs/userguide/options/images/Options_Users_Example.png b/docs/userguide/options/images/Options_Users_Example.png
new file mode 100644
index 000000000..49893ae5b
Binary files /dev/null and b/docs/userguide/options/images/Options_Users_Example.png differ
diff --git a/docs/userguide/options/images/Options_X10.png b/docs/userguide/options/images/Options_X10.png
index 34e9e87ad..31ec8b809 100644
Binary files a/docs/userguide/options/images/Options_X10.png and b/docs/userguide/options/images/Options_X10.png differ
diff --git a/docs/userguide/options/images/Options_email.png b/docs/userguide/options/images/Options_email.png
index c1c17f569..98456437e 100644
Binary files a/docs/userguide/options/images/Options_email.png and b/docs/userguide/options/images/Options_email.png differ
diff --git a/docs/userguide/options/images/Options_eyezm.png b/docs/userguide/options/images/Options_eyezm.png
deleted file mode 100644
index 397a92d3b..000000000
Binary files a/docs/userguide/options/images/Options_eyezm.png and /dev/null differ
diff --git a/docs/userguide/options/images/Options_images.png b/docs/userguide/options/images/Options_images.png
index 2f73ee7a0..9073f7ecf 100644
Binary files a/docs/userguide/options/images/Options_images.png and b/docs/userguide/options/images/Options_images.png differ
diff --git a/docs/userguide/options/images/Options_upload.png b/docs/userguide/options/images/Options_upload.png
index 46cd6dd89..f6a397bef 100644
Binary files a/docs/userguide/options/images/Options_upload.png and b/docs/userguide/options/images/Options_upload.png differ
diff --git a/docs/userguide/options/images/Options_web.png b/docs/userguide/options/images/Options_web.png
index 2376030f0..2a258d92e 100644
Binary files a/docs/userguide/options/images/Options_web.png and b/docs/userguide/options/images/Options_web.png differ
diff --git a/docs/userguide/options/options_api.rst b/docs/userguide/options/options_api.rst
new file mode 100644
index 000000000..669fcffd3
--- /dev/null
+++ b/docs/userguide/options/options_api.rst
@@ -0,0 +1,13 @@
+Options - API
+---------------
+
+.. note::
+  The ZoneMinder web interface does not use APIs and therefore, the tokens discussed here don't apply to the ZoneMinder UI. These only appy to apps that use the ZoneMinder API, like zmNinja.
+
+The API option screen allows you enable/disable APIs on a per user basis. Furthermore, it also allows you to "revoke" tokens allotted to users. Starting ZoneMinder 1.34, the API ecosystem was overhauled and we now support JWT tokens with a concept of refresh tokens and access tokens. This allows for authentication without the need for sending passwords with each authentication request. For a more detailed understanding of how this works, please refer to :doc:`/api`. Over time, more control will be added to this screen.
+
+
+.. image:: images/Options_API.png
+
+The "Revoke All Tokens" button can be used to globally invalidate access tokens for all users. If tokens are revoked, the user(s) will need to re-authenticate with login and password.
+As of today, refresh tokens last for 24 hours and access tokens for 1 hour. 
diff --git a/docs/userguide/options/options_bw.rst b/docs/userguide/options/options_bw.rst
index 8dddf9f85..60be6095f 100644
--- a/docs/userguide/options/options_bw.rst
+++ b/docs/userguide/options/options_bw.rst
@@ -1,9 +1,13 @@
 Options - High, Medium and Low B/W
 ----------------------------------
 
+There are a number of options that are grouped into bandwidth categories, this allows you to configure the ZoneMinder client to work optimally over the various access methods you might to access the client. You may want to use different modes depending on your network to preserve bandwidth.
+
+A partial screenshot is shown below:
+
 .. image:: images/Options_BW.png
 
-There are now a number of options that are grouped into bandwidth categories, this allows you to configure the ZoneMinder client to work optimally over the various access methods you might to access the client. The following options are available in H, M and L options. These 3 groups control what happens when the client is running in 'high', 'medium' and 'low' bandwidth mode respectively. In most cases the default values will be suitable as a starting point.
+The following options are available in H, M and L options. These 3 groups control what happens when the client is running in 'high', 'medium' and 'low' bandwidth mode respectively. In most cases the default values will be suitable as a starting point.
 
 High - You should set these options for when accessing the ZoneMinder client over a local network or high speed link.
 
diff --git a/docs/userguide/options/options_config.rst b/docs/userguide/options/options_config.rst
index 0f419e2ab..648987773 100644
--- a/docs/userguide/options/options_config.rst
+++ b/docs/userguide/options/options_config.rst
@@ -1,10 +1,15 @@
 Options - Config
 ----------------
+The config screen allows the admin to change various configuration parameters related to image capturing and storage.
+
+A partial screenshot is shown below:
 
 .. image:: images/Options_Config.png
 
 TIMESTAMP_ON_CAPTURE - ZoneMinder can add a timestamp to images in two ways. The default method, when this option is set, is that each image is timestamped immediately when captured and so the image held in memory is marked right away. The second method does not timestamp the images until they are either saved as part of an event or accessed over the web. The timestamp used in both methods will contain the same time as this is preserved along with the image. The first method ensures that an image is timestamped regardless of any other circumstances but will result in all images being timestamped even those never saved or viewed. The second method necessitates that saved images are copied before being saved otherwise two timestamps perhaps at different scales may be applied. This has the (perhaps) desirable side effect that the timestamp is always applied at the same resolution so an image that has scaling applied will still have a legible and correctly scaled timestamp.
 
+TIMESTAMP_CODE_CHAR - There are a few codes one can use to tell ZoneMinder to insert data into the timestamp of each image. Traditionally, the percent (%) character has been used to identify these codes since the current character codes do not conflict with the strftime codes, which can also be used in the timestamp. While this works well for Linux, this does not work well for BSD operating systems. Changing the default character to something else, such as an exclamation point (!), resolves the issue. Note this only affects the timestamp codes built into ZoneMinder. It has no effect on the family of strftime codes one can use.
+
 CPU_EXTENSIONS - When advanced processor extensions such as SSE2 or SSSE3 are available, ZoneMinder can use them, which should increase performance and reduce system load. Enabling this option on processors that do not support the advanced processors extensions used by ZoneMinder is harmless and will have no effect.
 
 FAST_IMAGE_BLENDS - To detect alarms ZoneMinder needs to blend the captured image with the stored reference image to update it for comparison with the next image. The reference blend percentage specified for the monitor controls how much the new image affects the reference image. There are two methods that are available for this. If this option is set then fast calculation which does not use any multiplication or division is used. This calculation is extremely fast, however it limits the possible blend percentages to 50%, 25%, 12.5%, 6.25%, 3.25% and 1.5%. Any other blend percentage will be rounded to the nearest possible one. The alternative is to switch this option off and use standard blending instead, which is slower.
@@ -15,7 +20,7 @@ MAX_SUSPEND_TIME - ZoneMinder allows monitors to have motion detection to be sus
 
 STRICT_VIDEO_CONFIG - With some video devices errors can be reported in setting the various video attributes when in fact the operation was successful. Switching this option off will still allow these errors to be reported but will not cause them to kill the video capture daemon. Note however that doing this will cause all errors to be ignored including those which are genuine and which may cause the video capture to not function correctly. Use this option with caution.
 
-SIGNAL_CHECK_POINTS - For locally attached video cameras ZoneMinder can check for signal loss by looking at a number of random points on each captured image. If all of these points are set to the same fixed colour then the camera is assumed to have lost signal. When this happens any open events are closed and a short one frame signal loss event is generated, as is another when the signal returns. This option defines how many points on each image to check. Note that this is a maximum, any points found to not have the check colour will abort any further checks so in most cases on a couple of points will actually be checked. Network and file based cameras are never checked.
+LD_PRELOAD - Some older cameras require the use of the v4l1 compat library. This setting allows the setting of the path to the library, so that it can be loaded by zmdc.pl before launching zmc.
 
 V4L_MULTI_BUFFER - Performance when using Video 4 Linux devices is usually best if multiple buffers are used allowing the next image to be captured while the previous one is being processed. If you have multiple devices on a card sharing one input that requires switching then this approach can sometimes cause frames from one source to be mixed up with frames from another. Switching this option off prevents multi buffering resulting in slower but more stable image capture. This option is ignored for non-local cameras or if only one input is present on a capture chip. This option addresses a similar problem to the ZM_CAPTURES_PER_FRAME option and you should normally change the value of only one of the options at a time.  If you have different capture cards that need different values you can ovveride them in each individual monitor on the source page.
 
@@ -27,12 +32,10 @@ BULK_FRAME_INTERVAL - Traditionally ZoneMinder writes an entry into the Frames d
 
 EVENT_CLOSE_MODE - When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section. This option controls what happens when an alarm occurs in Mocord mode. The 'time' setting means that the event will be closed at the end of the section regardless of alarm activity. The 'idle' setting means that the event will be closed at the end of the section if there is no alarm activity occurring at the time otherwise it will be closed once the alarm is over meaning the event may end up being longer than the normal section length. The 'alarm' setting means that if an alarm occurs during the event, the event will be closed once the alarm is over regardless of when this occurs. This has the effect of limiting the number of alarms to one per event and the events will be shorter than the section length if an alarm has occurred.
 
-CREATE_ANALYSIS_IMAGES - By default during an alarm ZoneMinder records both the raw captured image and one that has been analysed and had areas where motion was detected outlined. This can be very useful during zone configuration or in analysing why events occurred. However it also incurs some overhead and in a stable system may no longer be necessary. This parameter allows you to switch the generation of these images off.
-
 WEIGHTED_ALARM_CENTRES - ZoneMinder will always calculate the centre point of an alarm in a zone to give some indication of where on the screen it is. This can be used by the experimental motion tracking feature or your own custom extensions. In the alarmed or filtered pixels mode this is a simple midpoint between the extents of the detected pxiesl. However in the blob method this can instead be calculated using weighted pixel locations to give more accurate positioning for irregularly shaped blobs. This method, while more precise is also slower and so is turned off by default.
 
 EVENT_IMAGE_DIGITS - As event images are captured they are stored to the filesystem with a numerical index. By default this index has three digits so the numbers start 001, 002 etc. This works works for most scenarios as events with more than 999 frames are rarely captured. However if you have extremely long events and use external applications then you may wish to increase this to ensure correct sorting of images in listings etc. Warning, increasing this value on a live system may render existing events unviewable as the event will have been saved with the previous scheme. Decreasing this value should have no ill effects.
 
 DEFAULT_ASPECT_RATIO - When specifying the dimensions of monitors you can click a checkbox to ensure that the width stays in the correct ratio to the height, or vice versa. This setting allows you to indicate what the ratio of these settings should be. This should be specified in the format <width value>:<height value> and the default of 4:3 normally be acceptable but 11:9 is another common setting. If the checkbox is not clicked when specifying monitor dimensions this setting has no effect.
 
-USER_SELF_EDIT - Ordinarily only users with system edit privilege are able to change users details. Switching this option on allows ordinary users to change their passwords and their language settings
\ No newline at end of file
+USER_SELF_EDIT - Ordinarily only users with system edit privilege are able to change users details. Switching this option on allows ordinary users to change their passwords and their language settings
diff --git a/docs/userguide/options/options_display.rst b/docs/userguide/options/options_display.rst
index db76b7505..f9c5ad137 100644
--- a/docs/userguide/options/options_display.rst
+++ b/docs/userguide/options/options_display.rst
@@ -1,13 +1,11 @@
 Options - Display
 -----------------
 
+This option screen allows user to select the skin for ZoneMinder. Currently available styles  are:
+
 .. image:: images/Options_Display.png
 
-This option screen allows user to select the skin for ZoneMinder. Currently available skins are:
-
-* Classic
-* Flat
-* XML (Deprecated in favour of web/API)
-* Mobile (Deprecated)
+
+
 
 
diff --git a/docs/userguide/options/options_email.rst b/docs/userguide/options/options_email.rst
index 741ae0b6d..eef35bfa2 100644
--- a/docs/userguide/options/options_email.rst
+++ b/docs/userguide/options/options_email.rst
@@ -11,6 +11,9 @@ EMAIL_SUBJECT - This option is used to define the subject of the email that is s
 
 EMAIL_BODY - This option is used to define the content of the email that is sent for any events that match the appropriate filters.
 
+.. todo:: 
+  check if any other tags have been added
+
 +--------+--------------------------------------------------------+
 | Token  | Description                                            |
 +========+========================================================+
@@ -50,6 +53,9 @@ EMAIL_BODY - This option is used to define the content of the email that is sent
 +--------+--------------------------------------------------------+
 | %EIM%  | Attach (first) event image with the highest score      |
 +--------+--------------------------------------------------------+
+| %EIMOD%| Attach image of object detected. Requires event notfn. |
+|        | server setup and machine learning hooks                |
++--------+--------------------------------------------------------+
 | %EV%   | Attach event mpeg video                                |
 +--------+--------------------------------------------------------+
 | %MN%   | Name of the monitor                                    |
@@ -93,4 +99,8 @@ EMAIL_HOST - If you have chosen SMTP as the method by which to send notification
 
 FROM_EMAIL - The emails or messages that will be sent to you informing you of events can appear to come from a designated email address to help you with mail filtering etc. An address of something like ZoneMinder\@your.domain is recommended.
 
-URL - The emails or messages that will be sent to you informing you of events can include a link to the events themselves for easy viewing. If you intend to use this feature then set this option to the url of your installation as it would appear from where you read your email, e.g. http://host.your.domain/zm.php.
\ No newline at end of file
+URL - The emails or messages that will be sent to you informing you of events can include a link to the events themselves for easy viewing. If you intend to use this feature then set this option to the url of your installation as it would appear from where you read your email, e.g. ``http://host.your.domain/zm/index.php``.
+
+SSMTP_MAIL - SSMTP is a lightweight and efficient method to send email. The SSMTP application is not installed by default. NEW_MAIL_MODULES must also be enabled. Please visit the ZoneMinder `SSMTP Wiki page <http://www.zoneminder.com/wiki/index.php/How_to_get_ssmtp_working_with_Zoneminder>`__ for setup and configuration help. 
+
+SSMTP_PATH - The path to the SSMTP application. If path is not defined. Zoneminder will try to determine the path via shell command. Example path: /usr/sbin/ssmtp.
\ No newline at end of file
diff --git a/docs/userguide/options/options_images.rst b/docs/userguide/options/options_images.rst
index 1b17d8336..da7906e12 100644
--- a/docs/userguide/options/options_images.rst
+++ b/docs/userguide/options/options_images.rst
@@ -1,33 +1,32 @@
 Options - Images
 ----------------
 
+This screen lets you control various image quality settings for live and recorded events. A partial screenshot is shown below:
+
 .. image:: images/Options_images.png
 
-OPT_FFMPEG - ZoneMinder can optionally encode a series of video images into an MPEG encoded movie file for viewing, downloading or storage. This option allows you to specify whether you have the ffmpeg tools installed. Note that creating MPEG files can be fairly CPU and disk intensive and is not a required option as events can still be reviewed as video streams without it.
 
-PATH_FFMPEG - This path should point to where ffmpeg has been installed.
+COLOUR_JPEG_FILES - Cameras that capture in greyscale can write their captured images to jpeg files with a corresponding greyscale colour space. This saves a small amount of disk space over colour ones. However some tools such as ffmpeg either fail to work with this colour space or have to convert it beforehand. Setting this option to yes uses up a little more space but makes creation of MPEG files much faster.
 
-FFMPEG_INPUT_OPTIONS - Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the input to ffmpeg (options that are given before the -i option). Check the ffmpeg documentation for a full list of options which may be used here.
+ADD_JPEG_COMMENTS - JPEG files may have a number of extra fields added to the file header. The comment field may have any kind of text added. This options allows you to have the same text that is used to annotate the image additionally included as a file header comment. If you archive event images to other locations this may help you locate images for particular events or times if you use software that can read comment headers.
 
-FFMPEG_OUTPUT_OPTIONS - Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the output from ffmpeg (options that are given after the -i option). Check the ffmpeg documentation for a full list of options which may be used here. The most common one will often be to force an output frame rate supported by the video encoder.
+JPEG_FILE_QUALITY - When ZoneMinder detects an event it will save the images associated with that event to files. These files are in the JPEG format and can be viewed or streamed later. This option specifies what image quality should be used to save these files. A higher number means better quality but less compression so will take up more disk space and take longer to view over a slow connection. By contrast a low number means smaller, quicker to view, files but at the price of lower quality images. This setting applies to all images written except if the capture image has caused an alarm and the alarm file quality option is set at a higher value when that is used instead.
 
-FFMPEG_FORMATS - Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a '*' after a format indicates that this will be the default format used for web video, adding '**' defines the default format for phone video.
-
-FFMPEG_OPEN_TIMEOUT - When Ffmpeg is opening a stream, it can take a long time before failing; certain circumstances even seem to be able to lock indefinitely. This option allows you to set a maximum time in seconds to pass before closing the stream and trying to reopen it again.
+JPEG_ALARM_FILE_QUALITY - This value is equivalent to the regular jpeg file quality setting above except that it only applies to images saved while in an alarm state and then only if this value is set to a higher quality setting than the ordinary file setting. If set to a lower value then it is ignored. Thus leaving it at the default of 0 effectively means to use the regular file quality setting for all saved images. This is to prevent accidentally saving important images at a worse quality setting.
 
 JPEG_STREAM_QUALITY - When viewing a 'live' stream for a monitor ZoneMinder will grab an image from the buffer and encode it into JPEG format before sending it. This option specifies what image quality should be used to encode these images. A higher number means better quality but less compression so will take longer to view over a slow connection. By contrast a low number means quicker to view images but at the price of lower quality images. This option does not apply when viewing events or still images as these are usually just read from disk and so will be encoded at the quality specified by the previous options.
 
 MPEG_TIMED_FRAMES - When using streamed MPEG based video, either for live monitor streams or events, ZoneMinder can send the streams in two ways. If this option is selected then the timestamp for each frame, taken from it's capture time, is included in the stream. This means that where the frame rate varies, for instance around an alarm, the stream will still maintain it's 'real' timing. If this option is not selected then an approximate frame rate is calculated and that is used to schedule frames instead. This option should be selected unless you encounter problems with your preferred streaming method.
 
-MPEG_LIVE_FORMAT - When using MPEG mode ZoneMinder can output live video. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player but I'm currently not sure what, if anything, works on a Linux platform. If you find out please let me know! If this option is left blank then live streams will revert to being in motion jpeg format
+MPEG_LIVE_FORMAT - When using MPEG mode ZoneMinder can output live video. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player but I'm currently not sure what, if anything, works on a Linux platform. If you find out please let me know! If this option is left blank then live streams will revert to being in motion jpeg format.
 
-MPEG_REPLAY_FORMAT - When using MPEG mode ZoneMinder can replay events in encoded video format. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player and 'mpg', or 'avi' etc should work under Linux. If you know any more then please let me know! If this option is left blank then live streams will revert to being in motion jpeg format
+MPEG_REPLAY_FORMAT - When using MPEG mode ZoneMinder can replay events in encoded video format. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player and 'mpg', or 'avi' etc should work under Linux. If you know any more then please let me know! If this option is left blank then live streams will revert to being in motion jpeg format.
 
 RAND_STREAM - Some browsers can cache the streams used by ZoneMinder. In order to prevent this a harmless random string can be appended to the url to make each invocation of the stream appear unique.
 
-OPT_CAMBOZOLA - Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed.
+OPT_CAMBOZOLA - Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from `this link <http://www.charliemouse.com/code/cambozola/>`__  however if it is not installed still images at a lower refresh rate can still be viewed. Note that practically, if you are not using an old version of IE, you will likely not need this.
 
-PATH_CAMBOZOLA - Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed. Leave this as 'cambozola.jar' if cambozola is installed in the same directory as the ZoneMinder web client files.
+PATH_CAMBOZOLA - Leave this as 'cambozola.jar' if cambozola is installed in the same directory as the ZoneMinder web client files.
 
 RELOAD_CAMBOZOLA - Cambozola allows for the viewing of streaming MJPEG however it caches the entire stream into cache space on the computer, setting this to a number > 0 will cause it to automatically reload after that many seconds to avoid filling up a hard drive.
 
@@ -42,3 +41,13 @@ FFMPEG_OUTPUT_OPTIONS - Ffmpeg can take many options on the command line to cont
 FFMPEG_FORMATS - Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a '*' after a format indicates that this will be the default format used for web video, adding '**' defines the default format for phone video.
 
 FFMPEG_OPEN_TIMEOUT - When Ffmpeg is opening a stream, it can take a long time before failing; certain circumstances even seem to be able to lock indefinitely. This option allows you to set a maximum time in seconds to pass before closing the stream and trying to reopen it again.
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/userguide/options/options_logging.rst b/docs/userguide/options/options_logging.rst
index d2ddff2c3..4d12b18b5 100644
--- a/docs/userguide/options/options_logging.rst
+++ b/docs/userguide/options/options_logging.rst
@@ -1,8 +1,38 @@
 Options - Logging
 -----------------
 
-.. image:: images/Options_Logging.png
+ZoneMinder has a powerful logging system. Understanding how to configure logging will help you track issues better. The logging options are accessed via ``Options->Logging``. Let's follow along with an example. But before that, here is a basic construct of how logging works:
 
+* Every component of ZoneMinder can generate different types of logs. Typically, ``ERR`` refers to an error condition that you should look at (in some cases, they are transient during startup/shutdown in which case they are usually benign). ``INF`` logs are informational, ``WAR`` are warning logs that might have a potential to cause issues, whilst ``DBG`` are debug logs that are useful when you need to debug a problems
+* You can decide where these logs are written. Typically ZoneMinder writes logs to multiple sources:
+  * Syslog 
+  * Database
+  * individual files belonging to each component inside the logging folder configured
+
+Consider for example, that you are trying to figure out why your "zmc 11" (i.e. Monitor 11) is not working. Obviously, you need to enable debug logs if you are not able to figure out what is going on with standard info logs. But you wouldn't want to write debug logs to the Database. Maybe, you also don't want it polluting your syslog and only want to write debug logs to the debug file of _that_ component (``/var/log/zm/zmc_m11.log`` for example). That is where customizing your logging is useful.
+
+Logging example
+~~~~~~~~~~~~~~~~~
+
+.. image:: images/Options_Logging_A.png
+
+In the example above, I've configured my logging as follows:
+
+* I only want to log INFO level logs to Syslog
+* I want DEBUG logs to only go to the conmponent file
+* When it comes to my WEBLOG (what I see in the ZM Log window) and Database log, I only want FATAL logs (you may want to set this to WAR or INF)
+* I don't want to save FFMPEG logs (this was a new feature added). FFMPEG generates a log of logs on its own that you should only enable if you are trying to figure out video playback related issues
+* I have enabled LOG_DEBUG (unless you enable this, DEBUG logs won't be logged)
+* The ``LOG_DEBUG_TARGET`` is useful if you don't want to enable DEBUG logs for every component. In this case, I'm only interested in debugging the ZM Event Server and Monitor 11. Nothing else will have debug logs enabled.
+* I prefer to keep the ``LOG_DEBUG_FILE`` to empty. This creates nicely separate files in my log folder with component names
+
+The other logging parameters are left to their defaults, like so:
+
+.. image:: images/Options_Logging_B.png
+
+
+A more comprehensive explanation of the various log options
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 LOG_LEVEL_SYSLOG - ZoneMinder logging is now more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that goes to the system log. ZoneMinder binaries have always logged to the system log but now scripts and web logging is also included. To preserve the previous behaviour you should ensure this value is set to Info or Warning. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can severely affect system performance. If you want debug you will also need to set a level and component below
 
 LOG_LEVEL_FILE - ZoneMinder logging is now more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that goes to individual log files written by specific components. This is how logging worked previously and although useful for tracking down issues in specific components it also resulted in many disparate log files. To preserve this behaviour you should ensure this value is set to Info or Warning. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can severely affect system performance though file output has less impact than the other options. If you want debug you will also need to set a level and component below
@@ -39,4 +69,38 @@ RECORD_EVENT_STATS - This version of ZoneMinder records detailed information abo
 
 RECORD_DIAG_IMAGES - In addition to recording event statistics you can also record the intermediate diagnostic images that display the results of the various checks and processing that occur when trying to determine if an alarm event has taken place. There are several of these images generated for each frame and zone for each alarm or alert frame so this can have a massive impact on performance. Only switch this setting on for debug or analysis purposes and remember to switch it off again once no longer required.
 
-DUMP_CORES - When an unrecoverable error occurs in a ZoneMinder binary process is has traditionally been trapped and the details written to logs to aid in remote analysis. However in some cases it is easier to diagnose the error if a core file, which is a memory dump of the process at the time of the error, is created. This can be interactively analysed in the debugger and may reveal more or better information than that available from the logs. This option is recommended for advanced users only otherwise leave at the default. Note using this option to trigger core files will mean that there will be no indication in the binary logs that a process has died, they will just stop, however the zmdc log will still contain an entry. Also note that you may have to explicitly enable core file creation on your system via the 'ulimit -c' command or other means otherwise no file will be created regardless of the value of this option.
+RECORD_DIAG_IMAGES_FIFO - Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client (like a web browser) listening for them. If there is no active client connected, FIFO images are skipped. Note that this feature also needs RECORD_DIAG_IMAGES to be on.  **Note:** Your monitor needs to be in some recording mode (modect/mocord/etc.)
+
+In addition to creating diagnostic images, this feature also adds a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
+
+Once you turn on ``RECORD_DIAG_IMAGES`` and the new ``RECORD_DIAG_IMAGES_FIFO`` in the logging options you can then use 3 new remote stream urls:
+
+* The delta images as an MJPEG stream (great to see where it is seeing the motion!): ``https://portal/zm/cgi-bin/nph-zms?mode=jpeg&bitrate=2&buffer=0&source=fifo&format=delta&monitor=1&maxfps=5&<auth>`` (change monitor, portal to your values. ``<auth>`` could be ``&user=user&pass=pass`` or ``&auth=authval`` or ``&token=access_token``)
+
+* The reference images as an MJPEG stream: ``https://portal/zm/cgi-bin/nph-zms?mode=jpeg&bitrate=2&buffer=0&source=fifo&format=reference&monitor=1&maxfps=5&<auth>`` (change monitor, portal to your values. ``<auth>`` could be ``&user=user&pass=pass`` or ``&auth=authval`` or ``&token=access_token``)
+
+* text json raw stream: ``https://portal/zm/cgi-bin/nph-zms?&buffer=0&source=fifo&format=raw&monitor=1&<auth>`` (change monitor, portal to your values, ``<auth>`` could be ``&user=user&pass=pass`` or ``&auth=authval`` or ``&token=access_token``)
+
+This will output a text stream on the browser like:
+
+::
+
+  {"zone":5,"type":"ALRM","pixels":778661,"avg_diff":50}
+  {"zone":5,"type":"FILT","pixels":762704}
+  {"zone":5,"type":"RBLB","pixels":728102,"blobs":5}
+  {"zone":5,"type":"FBLB","pixels":728021,"blobs":2}
+  {"zone":6,"type":"ALRM","pixels":130844,"avg_diff":44}
+  {"zone":6,"type":"FILT","pixels":128608}
+  
+
+There are four types of events right now: Alarm (ALRM), Filter (FILT), Raw Blob (RBLB) and Filtered Blobs (FBLB) that correspond to those stages of analysis. It will show the number of pixels detected (along with average pixel difference against the threshold) and number of blobs at each stage.
+
+For example, here is a delta image stream from one of my monitors showing in live mode:
+
+``https://myserver/cgi-bin/nph-zms?mode=jpeg&bitrate=2&buffer=0&source=fifo&format=delta&monitor=8&maxfps=5&user=admin&pass=mypass``
+
+.. image:: images/Options_FIFO.gif
+
+
+
+DUMP_CORES - When an unrecoverable error occurs in a ZoneMinder binary process is has traditionally been trapped and the details written to logs to aid in remote analysis. However in some cases it is easier to diagnose the error if a core file, which is a memory dump of the process at the time of the error, is created. This can be interactively analysed in the debugger and may reveal more or better information than that available from the logs. This option is recommended for advanced users only otherwise leave at the default. Note using this option to trigger core files will mean that there will be no indication in the binary logs that a process has died, they will just stop, however the zmdc log will still contain an entry. Also note that you may have to explicitly enable core file creation on your system via the 'ulimit -c' command or other means otherwise no file will be created regardless of the value of this option.
\ No newline at end of file
diff --git a/docs/userguide/options/options_network.rst b/docs/userguide/options/options_network.rst
index 0ff0704f7..6f0aaf93c 100644
--- a/docs/userguide/options/options_network.rst
+++ b/docs/userguide/options/options_network.rst
@@ -9,6 +9,8 @@ HTTP_UA - When ZoneMinder communicates with remote cameras it will identify itse
 
 HTTP_TIMEOUT - When retrieving remote images ZoneMinder will wait for this length of time before deciding that an image is not going to arrive and taking steps to retry. This timeout is in milliseconds (1000 per second) and will apply to each part of an image if it is not sent in one whole chunk.
 
+MIN_STREAMING_PORT - ZoneMinder supports a concept called multi-port streaming. The core concept is that modern browsers like Chrome limit the number of simultaneous connections allowed from a specific domain (host name+port). In the case of Chrome this value is 6, which means you can't see more than 6 simultaneous streams from your server at one time. However, if the streams originated from different ports (or sub domains), this limitation would not apply. When you enable this option with a value (in this case, ``30000``), the streams from the monitors will originate from ``30000`` plus the monitor ID, effectively overcoming this limitation. **Note that this also needs additional setup your webserver configuration before this can start to work**. Please refer to `this article <https://medium.com/zmninja/multi-port-storage-areas-and-more-d5836a336c93>`__ on how to setup multi port streaming on Apache. 
+
 MIN_RTP_PORT - When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the minimum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting.
 
 MAX_RTP_PORT - When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the maximum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting. You should also ensure that you have opened up at least two ports for each monitor that will be connecting to unicasting network cameras.
\ No newline at end of file
diff --git a/docs/userguide/options/options_paths.rst b/docs/userguide/options/options_paths.rst
deleted file mode 100644
index 1d4911f70..000000000
--- a/docs/userguide/options/options_paths.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Options - Paths
----------------
-
-.. image:: images/Options_Paths.png
-
-ZM_DIR_EVENTS - This is the path to the events directory where all the event images and other miscellaneous files are stored. CAUTION: The directory you specify here cannot be outside the web root. This is a common mistake. Most users should never change this value. If you intend to record events to a second disk or network share, then you should mount the drive or share directly to the ZoneMinder events folder or follow the instructions in the ZoneMinder Wiki titled Using a dedicated Hard Drive.
-
-USE_DEEP_STORAGE - Traditionally ZoneMinder stores all events for a monitor in one directory for that monitor. This is simple and efficient except when you have very large amounts of events. Some filesystems are unable to store more than 32k files in one directory and even without this limitation, large numbers of files in a directory can slow creation and deletion of files. This option allows you to select an alternate method of storing events by year/month/day/hour/min/second which has the effect of separating events out into more directories, resulting in less per directory, and also making it easier to manually navigate to any events that may have happened at a particular time or date.
-
-DIR_SOUNDS - ZoneMinder can optionally play a sound file when an alarm is detected. This indicates where to look for this file. CAUTION: The directory you specify here cannot be outside the web root. Most users should never change this value.
-
-PATH_ZMS - The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.
-
-PATH_MAP - ZoneMinder has historically used IPC shared memory for shared data between processes. This has it's advantages and limitations. This version of ZoneMinder can use an alternate method, mapped memory, instead with can be enabled with the --enable--mmap directive to configure. This requires less system configuration and is generally more flexible. However it requires each shared data segment to map onto a filesystem file. This option indicates where those mapped files go. You should ensure that this location has sufficient space for these files and for the best performance it should be a tmpfs file system or ramdisk otherwise disk access may render this method slower than the regular shared memory one.
-
-PATH_SOCKS - ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.
-
-PATH_LOGS - There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.
-
-PATH_SWAP - Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.
diff --git a/docs/userguide/options/options_servers.rst b/docs/userguide/options/options_servers.rst
index 83e146871..3e107518b 100644
--- a/docs/userguide/options/options_servers.rst
+++ b/docs/userguide/options/options_servers.rst
@@ -1,6 +1,8 @@
 Options - Servers
 -----------------
 
+.. todo:: needs to be refreshed
+
 .. image:: images/Options_Servers.png
 
 Servers tab is used for setting up multiple ZoneMinder servers sharing the same database and using a shared file share for all event data. To add a new server use the Add Server button. All that is required is a Name for the Server and Hostname.
diff --git a/docs/userguide/options/options_storage.rst b/docs/userguide/options/options_storage.rst
new file mode 100644
index 000000000..623ad50d5
--- /dev/null
+++ b/docs/userguide/options/options_storage.rst
@@ -0,0 +1,48 @@
+Options - Storage
+--------------------
+
+.. image:: images/Options_Storage.png
+
+Storage tab is used to setup storage areas for recorded Events. To add a new area use the Add New Storage button.
+
+By default storage on local drive is automatically set up on installion. When no area is specified events will be 
+stored to a default built-in location, which for example on Ubuntu is /var/cache/zoneminder/events.
+
+Name: Storage names - can be anything
+
+Path: String path to storage location for example /media/Videos
+
+Url: Used for S3 communication - format ``s3fs://ACCESS_KEY_ID:SECRET_ACCESS_KEY@s3.ca-central-1.amazonaws.com/bucket-name/events``
+
+Supported storage types:
+    - Local
+      - Local/mounted or network storage in local network
+    - s3fs
+      - S3 mounted drive
+
+Some users may require more advanced storage such as S3 provided by amazon or others.
+
+S3 storage setup
+----------------
+
+You must use s3fs to mount the S3 bucket in your fs tree.  Telling ZoneMinder that the location is S3 will let it use
+more efficient code to send and delete the event data.  
+
+Refer to this guide for installation and configuration of s3fs - https://github.com/s3fs-fuse/s3fs-fuse
+
+Adding credentials to passwd_file
+
+Create credentials file ``echo ACCESS_KEY_ID:SECRET_ACCESS_KEY > /etc/passwd-s3fs``
+
+Set file permissions ``chmod 600 /etc/passwd-s3fs``
+
+
+S3 mounting with fstab 
+    ``s3fs#bucket_name /media/S3 fuse _netdev,allow_other,uid=33,url=https://s3.ca-central-1.amazonaws.com,passwd_file=/etc/passwd-s3fs,umask=022 0 0``
+
+Setting up storage.
+    1. Click on Add new Storage
+    2. Set path to ``/media/S3``
+    3. Add Url ``s3fs://username:password@s3.ca-central-1.amazonaws.com/bucket-name/events``
+    4. Set type to s3fs
+    5. Save settings and monitor logs for errors
diff --git a/docs/userguide/options/options_system.rst b/docs/userguide/options/options_system.rst
index 4f108442c..33c59cf1c 100644
--- a/docs/userguide/options/options_system.rst
+++ b/docs/userguide/options/options_system.rst
@@ -1,45 +1,82 @@
 Options - System
 ----------------
+This screen allows the admin to configure various core operations of the system. 
+
+A partial screenshot is shown below:
 
 .. image:: images/Options_System.png
 
+SKIN_DEFAULT - ZoneMinder allows the use of many different web interfaces. This option allows you to set the default skin used by the website. Users can change their skin later, this merely sets the default.
+
+CSS_DEFAULT - ZoneMinder allows the use of many different web interfaces, and some skins allow the use of different set of CSS files to control the appearance. This option allows you to set the default set of css files used by the website. Users can change their css later, this merely sets the default.
+
 LANG_DEFAULT - ZoneMinder allows the web interface to use languages other than English if the appropriate language file has been created and is present. This option allows you to change the default language that is used from the shipped language, British English, to another language.
 
 OPT_USE_AUTH - ZoneMinder can run in two modes. The simplest is an entirely unauthenticated mode where anyone can access ZoneMinder and perform all tasks. This is most suitable for installations where the web server access is limited in other ways. The other mode enables user accounts with varying sets of permissions. Users must login or authenticate to access ZoneMinder and are limited by their defined permissions. Authenticated mode alone should not be relied up for securing Internet connected ZoneMinder.
 
-AUTH_TYPE - ZoneMinder can use two methods to authenticate users when running in authenticated mode. The first is a builtin method where ZoneMinder provides facilities for users to log in and maintains track of their identity. The second method allows interworking with other methods such as http basic authentication which passes an independently authentication 'remote' user via http. In this case ZoneMinder would use the supplied user without additional authentication provided such a user is configured ion ZoneMinder.
+AUTH_TYPE - ZoneMinder can use two methods to authenticate users when running in authenticated mode. The first is a builtin method where ZoneMinder provides facilities for users to log in and maintains track of their identity. The second method allows interworking with other methods such as http basic authentication which passes an independently authenticated 'remote' user via http. In this case ZoneMinder would use the supplied user without additional authentication provided such a user is configured in ZoneMinder.
 
 AUTH_RELAY - When ZoneMinder is running in authenticated mode it can pass user details between the web pages and the back end processes. There are two methods for doing this. This first is to use a time limited hashed string which contains no direct username or password details, the second method is to pass the username and passwords around in plaintext. This method is not recommend except where you do not have the md5 libraries available on your system or you have a completely isolated system with no external access. You can also switch off authentication relaying if your system is isolated in other ways.
 
-AUTH_HASH_SECRET - When ZoneMinder is running in hashed authenticated mode it is necessary to generate hashed strings containing encrypted sensitive information such as usernames and password. Although these string are reasonably secure the addition of a random secret increases security substantially.
+AUTH_HASH_SECRET - When ZoneMinder is running in hashed authenticated mode it is necessary to generate hashed strings containing encrypted sensitive information such as usernames and passwords. Although these strings are reasonably secure the addition of a random secret increases security substantially. Note that if you are using the new token based APIs, then this field is mandatory with ZM 1.34 and above.
 
-AUTH_HASH_IPS - When ZoneMinder is running in hashed authenticated mode it can optionally include the requesting IP address in the resultant hash. This adds an extra level of security as only requests from that address may use that authentication key. However in some circumstances, such as access over mobile networks, the requesting address can change for each request which will cause most requests to fail. This option allows you to control whether IP addresses are included in the authentication hash on your system. If you experience intermitent problems with authentication, switching this option off may help.
+AUTH_HASH_IPS - When ZoneMinder is running in hashed authenticated mode it can optionally include the requesting IP address in the resultant hash. This adds an extra level of security as only requests from that address may use that authentication key. However in some circumstances, such as access over mobile networks, the requesting address can change for each request which will cause most requests to fail. This option allows you to control whether IP addresses are included in the authentication hash on your system. If you experience intermitent problems with authentication, switching this option off may help. It is recommended you keep this off if you use mobile apps like zmNinja over mobile carrier networks - several APNs change the IP very frequently which may result in authentication failures.
+
+AUTH_HASH_TTL - Time before ZM auth will expire (does not apply to API tokens). The default has traditionally been 2 hours. A new hash will automatically be regenerated at half this value.
 
 AUTH_HASH_LOGINS - The normal process for logging into ZoneMinder is via the login screen with username and password. In some circumstances it may be desirable to allow access directly to one or more pages, for instance from a third party application. If this option is enabled then adding an 'auth' parameter to any request will include a shortcut login bypassing the login screen, if not already logged in. As authentication hashes are time and, optionally, IP limited, this can allow short-term access to ZoneMinder screens from other web pages etc. In order to use this, the calling application will have to generate the authentication hash itself and ensure it is valid. If you use this option you should ensure that you have modified the ZM_AUTH_HASH_SECRET to something unique to your system.
 
-OPT_FAST_DELETE - Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if your are trying to do a lot of events at once. It is recommended that you set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later.
+ENABLE_CSRF_MAGIC - CSRF stands for Cross-Site Request Forgery which, under specific circumstances, can allow an attacker to perform any task your ZoneMinder user account has permission to perform. To accomplish this, the attacker must write a very specific web page and get you to navigate to it, while you are logged into the ZoneMinder web console at the same time. Enabling ZM_ENABLE_CSRF_MAGIC will help mitigate these kinds of attacks. If you are using zmNinja and face access issues, you might try turning this off.
 
-FILTER_RELOAD_DELAY - ZoneMinder allows you to save filters to the database which allow events that match certain criteria to be emailed, deleted or uploaded to a remote machine etc. The zmfilter daemon loads these and does the actual operation. This option determines how often in seconds the filters are reloaded from the database to get the latest versions or new filters. If you don't change filters very often this value can be set to a large value.
+OPT_USE_API - A global setting to enable/disable ZoneMinder APIs. If you are using mobile apps like zmNinja, this needs to be enabled
+
+.. note:: If you are using zmNinja along with authentication, please make sure ``AUTH_HASH_LOGINS`` is enabled, ``OPT_USE_API`` is elabled, ``AUTH_RELAY`` is set to hashed, ``AUTH_HASH_IPS`` is off and a valid ``AUTH_HASHED_SECRET`` is specified.
+
+OPT_USE_LEGACY_AUTH - Starting version 1.34.0, ZoneMinder uses a more secure Authentication mechanism using JWT tokens. Older versions used a less secure MD5 based auth hash. It is recommended you turn this off after you are sure you don't need it. If you are using a 3rd party app that relies on the older API auth mechanisms, you will have to update that app if you turn this off. Note that zmNinja 1.3.057 onwards supports the new token system.
+
+OPT_USE_EVENT_NOTIFICATION - zmeventnotification is a 3rd party event notification server that is used to get notifications for alarms detected by ZoneMinder in real time. zmNinja requires this server for push notifications to mobile phones. This option only enables the server if it is already installed. Please visit the `Event Notification Server project site <https://github.com/pliablepixels/zmeventserver>`__ for installation instructions.
+
+OPT_USE_GOOG_RECAPTCHA - This option allows you to include a google reCaptcha validation at login. This means in addition to providing a valid username and password, you will also have to pass the reCaptcha test. Please note that enabling this option results in the zoneminder login page reaching out to google servers for captcha validation. Also please note that enabling this option may break 3rd party clients if they rely on web based logins (Note that zmNinja now uses the API based token method and will not be affected if reCAPTCHA is enabled). If you enable this, you also need to specify your site and secret key (please refer to context help in the ZoneMinder system screen).
+
+SYSTEM_SHUTDOWN - this option puts a poweroff icon in the header of the ZM UI for users with System privilege accessi. This icon will allow the user to shutdown the full system via the ZM UI. The system will need to have sudo installed and the following added to /etc/sudoers:
+
+:: 
+  
+  www-data ALL=NOPASSWD: /sbin/shutdown
+
+to perform the shutdown or reboot
+
+OPT_FAST_DELETE - Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if youxr are trying to do a lot of events at once. **NOTE**: It is recommended that you keep this option OFF, unless you are running on an old or low-powered system.
+
+FILTER_RELOAD_DELAY - ZoneMinder allows you to save filters to the database which allow events that match certain criteria to be emailed, deleted or uploaded to a remote machine etc. The zmfilter daemon loads these and does the actual operation. This option determines how often in seconds the filters are reloaded from the database to get the latest versions or new filters. If you don't change filters very often this value can be set to a large value. As of 1.34.0 filters should be automatically reloaded when saving a filter so this setting should have little effect.
 
 FILTER_EXECUTE_INTERVAL - ZoneMinder allows you to save filters to the database which allow events that match certain criteria to be emailed, deleted or uploaded to a remote machine etc. The zmfilter daemon loads these and does the actual operation. This option determines how often the filters are executed on the saved event in the database. If you want a rapid response to new events this should be a smaller value, however this may increase the overall load on the system and affect performance of other elements.
 
 MAX_RESTART_DELAY - The zmdc (zm daemon control) process controls when processeses are started or stopped and will attempt to restart any that fail. If a daemon fails frequently then a delay is introduced between each restart attempt. If the daemon stills fails then this delay is increased to prevent extra load being placed on the system by continual restarts. This option controls what this maximum delay is.
 
+STATUS_UPDATE_INTERVAL - The zmstats daemon performs various db queries related to collecting system statistics that may take a long time in the background. This option decides how often this update is scheduled.
+
 WATCH_CHECK_INTERVAL - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines how often the daemons are checked.
 
-WATCH_MAX_DELAY - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines the maximum delay to allow since the last captured frame. The daemon will be restarted if it has not captured any images after this period though the actual restart may take slightly longer in conjunction with the check interval value above.
+WATCH_MAX_DELAY - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines the maximum delay to allow since the last captured frame. The daemon will be restarted if it has not captured any images after this period though the actual restart may take slightly longer in conjunction with the check interval value above.  Please note that some cameras can take up to 30 seconds to get a valid image, so this setting should be larger than that.
 
-RUN_AUDIT - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. This option controls whether zmaudit is run in the background and performs these checks and fixes continuously. This is recommended for most systems however if you have a very large number of events the process of scanning the database and filesystem may take a long time and impact performance. In this case you may prefer to not have zmaudit running unconditionally and schedule occasional checks at other, more convenient, times.
+RUN_AUDIT - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. This option controls whether zmaudit is run in the background and performs these checks and fixes continuously. It is recommended you keep this **OFF** in most systems and run it manually if needed after a system crash.
 
 AUDIT_CHECK_INTERVAL - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. The default check interval of 900 seconds (15 minutes) is fine for most systems however if you have a very large number of events the process of scanning the database and filesystem may take a long time and impact performance. In this case you may prefer to make this interval much larger to reduce the impact on your system. This option determines how often these checks are performed.
 
+AUDIT_MIN_AGE - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. Event files or db records that are younger than this setting will not be deleted and a warning will be given
+
 OPT_CONTROL - ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.
 
 OPT_TRIGGERS - ZoneMinder can interact with external systems which prompt or cancel alarms. This is done via the zmtrigger.pl script. This option indicates whether you want to use these external triggers. Most people will say no here.
 
-CHECK_FOR_UPDATES - From ZoneMinder version 1.17.0 onwards new versions are expected to be more frequent. To save checking manually for each new version ZoneMinder can check with the zoneminder.com website to determine the most recent release. These checks are infrequent, about once per week, and no personal or system information is transmitted other than your current version number. If you do not wish these checks to take place or your ZoneMinder system has no internet access you can switch these check off with this configuration variable
+CHECK_FOR_UPDATES - To save checking manually for each new version ZoneMinder can check with the zoneminder.com website to determine the most recent release. These checks are infrequent, about once per week, and no personal or system information is transmitted other than your current version number. If you do not wish these checks to take place or your ZoneMinder system has no internet access you can switch these check off with this configuration variable.
 
-UPDATE_CHECK_PROXY - If you use a proxy to access the internet then ZoneMinder needs to know so it can access zoneminder.com to check for updates. If you do use a proxy enter the full proxy url here in the form of http://<proxy host>:<proxy port>/
+TELEMETRY_DATA - Enable collection of usage information of the local system and send it to the ZoneMinder development team. This data will be used to determine things like who and where our customers are, how big their systems are, the underlying hardware and operating system, etc. This is being done for the sole purpose of creating a better product for our target audience. This script is intended to be completely transparent to the end user, and can be disabled from the web console under Options. For more details on what information we collect, please refer to Zoneminder's privacy statement (available in the contextual help of TELEMETRY_DATA on your installation).
+
+UPDATE_CHECK_PROXY - If you use a proxy to access the internet then ZoneMinder needs to know so it can access zoneminder.com to check for updates. If you do use a proxy enter the full proxy url here in the form of ``http://<proxy host>:<proxy port>/``.
 
 SHM_KEY - ZoneMinder uses shared memory to speed up communication between modules. To identify the right area to use shared memory keys are used. This option controls what the base key is, each monitor will have it's Id or'ed with this to get the actual key used. You will not normally need to change this value unless it clashes with another instance of ZoneMinder on the same machine. Only the first four hex digits are used, the lower four will be masked out and ignored.
 
+COOKIE_LIFETIME - This will affect how long a session will be valid for since the last request. Keeping this short helps prevent session hijacking. Keeping it long allows you to stay logged in longer without refreshing the view. We recommend you keep this to the default of ``3600`` if you are not sure.
+
diff --git a/docs/userguide/options/options_upload.rst b/docs/userguide/options/options_upload.rst
index da4baa076..30c22103e 100644
--- a/docs/userguide/options/options_upload.rst
+++ b/docs/userguide/options/options_upload.rst
@@ -1,9 +1,11 @@
 Options - Upload
 ----------------
 
+A partial screenshot of the upload options is shown below:
+
 .. image:: images/Options_upload.png
 
-OPT_UPLOAD - In ZoneMinder you can create event filters that specify whether events that match certain criteria should be uploaded to a remote server for archiving. This option specifies whether this functionality should be available
+OPT_UPLOAD - In ZoneMinder you can create event filters that specify whether events that match certain criteria should be uploaded to a remote server for archiving. This option specifies whether this functionality should be available.
 
 UPLOAD_ARCH_FORMAT - Uploaded events may be stored in either .tar or .zip format, this option specifies which. Note that to use this you will need to have the Archive::Tar and/or Archive::Zip perl modules installed.
 
@@ -27,6 +29,8 @@ UPLOAD_REM_DIR - You can use filters to instruct ZoneMinder to upload events to
 
 UPLOAD_TIMEOUT - You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the maximum inactivity timeout (in seconds) that should be tolerated before ZoneMinder determines that the transfer has failed and closes down the connection.
 
+UPLOAD_STRICT - You can require SFTP uploads to verify the host key of the remote server for protection against man-in-the-middle attacks. You will need to add the server's key to the known_hosts file. On most systems, this will be ``~/.ssh/known_hosts``, where ``~`` is the home directory of the web server running ZoneMinder.
+
 UPLOAD_FTP_PASSIVE - You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates that ftp transfers should be done in passive mode. This uses a single connection for all ftp activity and, whilst slower than active transfers, is more robust and likely to work from behind filewalls. This option is ignored for SFTP transfers.
 
 UPLOAD_DEBUG - You can use filters to instruct ZoneMinder to upload events to a remote server. If you are having (or expecting) troubles with uploading events then setting this to 'yes' permits additional information to be generated by the underlying transfer modules and included in the logs.
\ No newline at end of file
diff --git a/docs/userguide/options/options_users.rst b/docs/userguide/options/options_users.rst
index 4599cea9b..def8744d7 100644
--- a/docs/userguide/options/options_users.rst
+++ b/docs/userguide/options/options_users.rst
@@ -5,6 +5,41 @@ Options - Users
 
 In this section you will see a list of the current users defined on the system. You can also add or delete users from here. It is recommended you do not delete the admin user unless you have created another fully privileged user to take over the same role. Each user is defined with a name and password (which is hidden) as well as an enabled setting which you can use to temporarily enable or disable users, for example a guest user for limited time access. As well as that there is a language setting that allows you to define user specific languages. Setting a language here that is different than the system language will mean that when that user logs in they will have the web interface presented in their own language rather than the system default, if it is available.
 
-There are also five values that define the user permissions, these are ‘Stream’, ‘Events’, ‘Control’, ‘Monitors’ and ‘System’ Each can have values of ‘None’, ‘View’ or ‘Edit’ apart from ‘Stream’ which has no ‘Edit’ setting. These values cover access to the following areas; ‘Stream’ defines whether a user is allowed to view the ‘live’ video feeds coming from the cameras. You may wish to allow a user to view historical events only in which case this setting should be ‘none’. The ‘Events’ setting determines whether a user can view and modify or delete any retained historical events. The ‘Control’ setting allows you to indicate whether the user is able to control any Pan/Tilt/Zoom type cameras you may have on your system. The ‘Monitors’ setting specifies whether a user can see the current monitor settings and change them. Finally the ‘System’ setting determines whether a user can view or modify the system settings as a whole, such as options and users or controlling the running of the system as a whole.
+This screen allows you to configure various permissions on a per user basis. The permissions as of today are defined as follows:
 
-As well as these settings there is also a ‘Bandwidth’ setting which can be used to limit the maximum bandwidth that a user can view at and a ‘Monitor Ids’ setting that can be used for non-’System’ users to restrict them to only being able to access streams, events or monitors for the given monitors ids as a comma separated list with no spaces. If a user with ‘Monitors’ edit privileges is limited to specific monitors here they will not be able to add or delete monitors but only change the details of those they have access to. If a user has ‘System’ privileges then the ‘Monitors Ids’ setting is ignored and has no effect.’
\ No newline at end of file
+- Streams
+  - None: the user has no access to view live streams from the defined monitors 
+  - View: the user has access to only view live streams from the defined monitors
+  - Edit: the user has access to edit live streams from the defined monitors
+
+- Events
+  - These permissions relate to the ability to view events from the defined monitors. The permission levels are the same as the Streams permissions, except that they apply to recorded events
+
+- Control
+  - These permissions relate to the ability to control Pan/Tilt/Zoom (PTZ) of the defined monitors. The permission levels are the same as the Streams permissions, except that they apply to PTZ
+
+- Monitors
+  - specifies whether a user can see the current monitor settings and change them. The permissions levels are the same as the Streams permissions, except that they apply to monitor settings
+
+- Groups
+  - specifies whether a user can see monitor groups and change them. The permissions levels are the same as the Streams permissions, except that they apply to groups
+
+- System
+  - Determines whether a user can view or modify the system settings as a whole, such as options and users or controlling the running of the system as a whole. The permissions levels are the same as the Streams permissions, except that they apply to groups.
+
+  .. note:: if you are using zmNinja, users are required to have 'View' access to system because multi-server information is only available as part of this permission
+
+- Bandwidth
+  - Specifies the maximum bandwith that this user can configure (Low, Medium or High)
+
+- API enabled 
+  - Specifies if the ZoneMinder API is enabled for this user (needs to be on, if you are using a mobile app such as zmNinja)
+
+Finally, you can specify a list of monitors this user is allowed to access using the 'Restriced Monitors' list. You can select multiple monitors by shift+click(or command+click) on multiple monitors. If a user with ‘Monitors’ edit privileges is limited to specific monitors here they will not be able to add or delete monitors but only change the details of those they have access to. If a user has ‘System’ privileges then the ‘Monitors Ids’ setting is ignored and has no effect.
+
+
+Here is an example of a restricted user, for example:
+
+.. image:: images/Options_Users_Example.png
+
+This user "home" is enabled, can view live streams and events, but only from "DoorBell" and "DeckCamera". This user also cannot control PTZ. 
\ No newline at end of file
diff --git a/docs/userguide/options/options_web.rst b/docs/userguide/options/options_web.rst
index 9425e3fe8..6766a2248 100644
--- a/docs/userguide/options/options_web.rst
+++ b/docs/userguide/options/options_web.rst
@@ -1,11 +1,28 @@
 Options - Web
 -------------
+This screen lets you customize several aspects of the web interface of ZoneMinder. A partial screenshot is shown below:
 
 .. image:: images/Options_web.png
 
+
+WEB_TITLE - 
+
+.. todo ::
+  not quite sure what this does. Seems to change the "target" name - not sure what effect it is supposed to have.
+
 WEB_TITLE_PREFIX - If you have more than one installation of ZoneMinder it can be helpful to display different titles for each one. Changing this option allows you to customise the window titles to include further information to aid identification.
 
-WEB_RESIZE_CONSOLE - Traditionally the main ZoneMinder web console window has resized itself to shrink to a size small enough to list only the monitors that are actually present. This is intended to make the window more unobtrusize but may not be to everyones tastes, especially if opened in a tab in browsers which support this kind if layout. Switch this option off to have the console window size left to the users preference
+HOME_URL - the link to navigate to, when a user clicks on the top left title.
+
+HOME_CONTENT - The actual text that is shown on the top left corner. You can choose to leave it empty and put in a logo in a custom CSS as well.
+
+WEB_CONSOLE_BANNER - Allows the administrator to place an arbitrary text message near the top of the web console. This is useful for the developers to display a message which indicates the running instance of ZoneMinder is a development snapshot, but it can also be used for any other purpose as well.
+
+WEB_EVENT_DISK_SPACE - Adds another column to the listing of events showing the disk space used by the event. This will impart a small overhead as it will call du on the event directory. In practice this overhead is fairly small but may be noticeable on IO-constrained systems.
+
+WEB_RESIZE_CONSOLE - Traditionally the main ZoneMinder web console window has resized itself to shrink to a size small enough to list only the monitors that are actually present. This is intended to make the window more unobtrusize but may not be to everyones tastes, especially if opened in a tab in browsers which support this kind if layout. Switch this option off to have the console window size left to the users preference.
+
+WEB_ID_ON_CONSOLE - Some find it useful to have the monitor id always visible on the console. This option will add a column listing it. Note that if it is disabled, you can always hover over the monitor to see the id as well.
 
 WEB_POPUP_ON_ALARM - When viewing a live monitor stream you can specify whether you want the window to pop to the front if an alarm occurs when the window is minimised or behind another window. This is most useful if your monitors are over doors for example when they can pop up if someone comes to the doorway.
 
@@ -27,4 +44,8 @@ WEB_LIST_THUMB_WIDTH - This options controls the width of the thumbnail images t
 
 WEB_LIST_THUMB_HEIGHT - This options controls the height of the thumbnail images that appear in the event lists. It should be fairly small to fit in with the rest of the table. If you prefer you can specify a width instead in the previous option but you should only use one of the width or height and the other option should be set to zero. If both width and height are specified then width will be used and height ignored.
 
-WEB_USE_OBJECT_TAGS - There are two methods of including media content in web pages. The most common way is use the EMBED tag which is able to give some indication of the type of content. However this is not a standard part of HTML. The official method is to use OBJECT tags which are able to give more information allowing the correct media viewers etc to be loaded. However these are less widely supported and content may be specifically tailored to a particular platform or player. This option controls whether media content is enclosed in EMBED tags only or whether, where appropriate, it is additionally wrapped in OBJECT tags. Currently OBJECT tags are only used in a limited number of circumstances but they may become more widespread in the future. It is suggested that you leave this option on unless you encounter problems playing some content.
\ No newline at end of file
+WEB_USE_OBJECT_TAGS - There are two methods of including media content in web pages. The most common way is use the EMBED tag which is able to give some indication of the type of content. However this is not a standard part of HTML. The official method is to use OBJECT tags which are able to give more information allowing the correct media viewers etc to be loaded. However these are less widely supported and content may be specifically tailored to a particular platform or player. This option controls whether media content is enclosed in EMBED tags only or whether, where appropriate, it is additionally wrapped in OBJECT tags. Currently OBJECT tags are only used in a limited number of circumstances but they may become more widespread in the future. It is suggested that you leave this option on unless you encounter problems playing some content.
+
+WEB_XFRAME_WARN - When creating a Web Site monitor, if the target web site has X-Frame-Options set to sameorigin in the header, the site will not display in ZoneMinder. This is a design feature in most modern browsers. When this condition occurs, ZoneMinder will write a warning to the log file. To get around this, one can install a browser plugin or extension to ignore X-Frame headers, and then the page will display properly. Once the plugin or extension has ben installed, the end user may choose to turn this warning off
+
+WEB_FILTER_SOURCE - This option only affects monitors with a source type of Ffmpeg, Libvlc, or WebSite. This setting controls what information is displayed in the Source column on the console. Selecting 'None' will not filter anything. The entire source string will be displayed, which may contain sensitive information. Selecting 'NoCredentials' will strip out usernames and passwords from the string. If there are any port numbers in the string and they are common (80, 554, etc) then those will be removed as well. Selecting 'Hostname' will filter out all information except for the hostname or ip address. When in doubt, stay with the default 'Hostname'. This feature uses the php function 'url_parts' to identify the various pieces of the url. If the url in question is unusual or not standard in some way, then filtering may not produce the desired results.
\ No newline at end of file
diff --git a/docs/userguide/viewevents.rst b/docs/userguide/viewevents.rst
index 70eea0032..8376a860b 100644
--- a/docs/userguide/viewevents.rst
+++ b/docs/userguide/viewevents.rst
@@ -17,20 +17,4 @@ Here is an example of viewing an event stream:
 .. image:: images/viewevents-stream.png
 	:width: 650px
 
-* **A**: Administrative Event options on the event including viewing individual frames
-* **B**: The actual image stream
-* **C**: Navigation control
-* **D**: You can switch between watching a single event or Continuous mode (where it advances to the next event after playback is complete)
-* **E**: Event progress bar - how much of the current event has been played back
-
-You will notice for the first time that alarm images now contain an overlay outlining the blobs that represent the alarmed area. This outline is in the colour defined for that zone and lets you see what it was that caused the alarm. Clicking on one of the thumbnails will take you to a full size window where you can see the image in all its detail and scroll through the various images that make up the event. If you have the ZM_RECORD_EVENT_STATS option on, you will be able to click the 'Stats' link here and get some analysis of the cause of the event. 
-
-More details on the Administrative Event options (A)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Should you determine that you don't wish to keep the event, clicking on Delete will erase it from the database and file system. Returning to the event window, other options here are renaming the event to something more meaningful, refreshing the window to replay the event stream, deleting the event, switching between streamed and still versions of the event (if supported) and generating an MPEG video of the event (if supported).
-
-These last two options require further explanation. Archiving an event means that it is kept to one side and not displayed in the normal event listings unless you specifically ask to view the archived events. This is useful for keeping events that you think may be important or just wish to protect. Once an event is archived it can be deleted or unarchived but you cannot accidentally delete it when viewing normal unarchived events.
-
-The final option of generating an MPEG video is still somewhat experimental and its usefulness may vary. It uses the open source ffmpeg encoder to generate short videos, which will be downloaded to your browsing machine or viewed in place. When using the ffmpeg encoder, ZoneMinder will attempt to match the duration of the video with the duration of the event. Ffmpeg has a particularly rich set of options and you can specify during configuration which additional options you may wish to include to suit your preferences. In particular you may need to specify additional, or different, options if you are creating videos of events with particularly slow frame rates as some codecs only support certain ranges of frame rates. A common value for FFMPEG_OUTPUT_OPTIONS under Options > Images might be ``'-r 25 -b 800k'`` for 25 fps and 800 kbps.  Details of these options can be found in the `documentation <http://ffmpeg.org/ffmpeg-doc.html>`__ for the encoders and is outside the scope of this document.
-
-Building an MPEG video, especially for a large event, can take some time and should not be undertaken lightly as the effect on your host box of many CPU intensive encoders will not be good. However once a video has been created for an event it will be kept so subsequent viewing will not incur the generation overhead. Videos can also be included in notification emails, however care should be taken when using this option as for many frequent events the penalty in CPU and disk space can quickly mount up.
+The image above shows a typical window for an event that was recorded as an MP4 video
diff --git a/misc/logcheck b/misc/logcheck
index e59948e86..820108a66 100644
--- a/misc/logcheck
+++ b/misc/logcheck
@@ -28,3 +28,4 @@ zmtelemetry\[[[:digit:]]+\]: INF \[Telemetry data uploaded successfully.\]$
 zmtelemetry\[[[:digit:]]+\]: INF \[Sending data to ZoneMinder Telemetry server.\]$
 zmtelemetry\[[[:digit:]]+\]: INF \[Collec?ting data to send to ZoneMinder Telemetry server.\]$
 web_php\[[[:digit:]]+\]: INF \[Login successful for user "[[:alnum:]]+"\]$
+zmeventnotification\[[[:digit:]]+\]: INF
diff --git a/onvif/modules/lib/ONVIF/Client.pm b/onvif/modules/lib/ONVIF/Client.pm
index 00137b90a..c7ce21092 100644
--- a/onvif/modules/lib/ONVIF/Client.pm
+++ b/onvif/modules/lib/ONVIF/Client.pm
@@ -44,6 +44,10 @@ require ONVIF::Deserializer::XSD;
 require ONVIF::Device::Interfaces::Device::DevicePort;
 require ONVIF::Media::Interfaces::Media::MediaPort;
 require ONVIF::PTZ::Interfaces::PTZ::PTZPort;
+require ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort;
+require ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort;
+
+require WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort;
 
 use Data::Dump qw(dump);
 
@@ -70,44 +74,39 @@ my %services_of      :ATTR(:default<{}>);
 
 my %serializer_of    :ATTR();
 my %soap_version_of  :ATTR(:default<('1.1')>);
+my $verbose;
 
 # =========================================================================
 # private methods
 
-sub service
-{
+sub service {
   my ($self, $serviceName, $attr) = @_;
-#print "service: " . $services_of{${$self}}{$serviceName}{$attr} . "\n";
+  #print "service: " . $services_of{${$self}}{$serviceName}{$attr} . "\n";
 # Please note that the Std::Class::Fast docs say not to use ident.
   $services_of{ident $self}{$serviceName}{$attr};
 }
 
-sub set_service
-{
+sub set_service {
   my ($self, $serviceName, $attr, $value) = @_;
   $services_of{ident $self}{$serviceName}{$attr} = $value;
 }
 
-sub serializer
-{
+sub serializer {
   my ($self) = @_;
   $serializer_of{ident $self};
 }
 
-sub set_serializer
-{
+sub set_serializer {
   my ($self, $serializer) = @_;
   $serializer_of{ident $self} = $serializer;
 }
 
-sub soap_version
-{
+sub soap_version {
   my ($self) = @_;
   $soap_version_of{ident $self};
 }
 
-sub set_soap_version
-{
+sub set_soap_version {
   my ($self, $soap_version) = @_;
   $soap_version_of{ident $self} = $soap_version;
 
@@ -120,49 +119,50 @@ sub get_service_urls {
 
   my $result = $self->service('device', 'ep')->GetServices( {
     IncludeCapability =>  'true', # boolean
-    },,
+    }
   );
   if ( $result ) {
-    foreach  my $svc ( @{ $result->get_Service() } ) {
+    print "Have results from GetServices\n" if $verbose;
+    foreach my $svc ( @{ $result->get_Service() } ) {
       my $short_name = $namespace_map{$svc->get_Namespace()};    
       my $url_svc = $svc->get_XAddr()->get_value();
-      if(defined $short_name && defined $url_svc) {
-#      print "Got $short_name service\n";
+      if ( defined $short_name && defined $url_svc ) {
+        print "Got $short_name service $url_svc\n" if $verbose;
         $self->set_service($short_name, 'url', $url_svc);
       }
     }
- # } else {
-    #print "No results from GetServices: $result\n";
+  } else {
+    print "No results from GetServices\n" if $verbose;
   }
 
   # Some devices do not support getServices, so we have to try getCapabilities
 
   $result = $self->service('device', 'ep')->GetCapabilities( {}, , );
-  if ( ! $result ) {
-    print "No results from GetCapabilities: $result\n";
+  if ( !$result ) {
+    print "No results from GetCapabilities: $result\n" if $verbose;
     return;
   }
+  print "Have results from GetCapabilities: $result\n" if $verbose;
   # Result is a GetCapabilitiesResponse
   foreach my $capabilities ( @{ $result->get_Capabilities() } ) {
     foreach my $capability ( 'PTZ', 'Media', 'Imaging', 'Events', 'Device' ) {
       if ( my $function = $capabilities->can( "get_$capability" ) ) {
         my $Services = $function->( $capabilities );
-        if ( ! $Services ) {
-          print "Nothing returned ffrom get_$capability\n";
+        if ( !$Services ) {
+          #print "Nothing returned from get_$capability\n";
         } else {
           foreach my $svc ( @{ $Services } ) {
             # The capability versions don't have a namespace, so just lowercase them.
             my $short_name = lc $capability;
             my $url_svc = $svc->get_XAddr()->get_value();
-            if( defined $url_svc) {
-#      print "Got $short_name service\n";
+            if ( defined $url_svc ) {
+              #print "Got $short_name service\n";
               $self->set_service($short_name, 'url', $url_svc);
             }
           } # end foreach svr
         }
       } else {
         print "No $capability function\n";
-
       } # end if has a get_ function
     } # end foreach capability
   } # end foreach capabilities
@@ -188,16 +188,13 @@ sub http_digest {
   };
 }  
 
-# =========================================================================
-
-
-sub BUILD
-{
+sub BUILD {
   my ($self,  $ident, $args_ref) = @_;
   
-  my $url_svc_device = $args_ref->{'url_svc_device'};
-  my $soap_version = $args_ref->{'soap_version'};
-  if(! $soap_version) {
+  $verbose = $args_ref->{verbose};
+  my $url_svc_device = $args_ref->{url_svc_device};
+  my $soap_version = $args_ref->{soap_version};
+  if ( !$soap_version ) {
     $soap_version = '1.1';
   }
   $self->set_soap_version($soap_version);
@@ -212,14 +209,13 @@ sub BUILD
 #   deserializer_args => { strict => 0 }
   });
 
-  $services_of{$ident}{'device'} = { url => $url_svc_device, ep => $svc_device };
-
-  $self->get_service_urls();
+  $services_of{$ident}{device} = { url => $url_svc_device, ep => $svc_device };
 
+  # Can't, don't have credentials yet
+  # $self->get_service_urls();
 }
 
-sub get_users
-{
+sub get_users {
   my ($self) = @_;
 
   my $result = $self->service('device', 'ep')->GetUsers( { },, );
@@ -228,8 +224,7 @@ sub get_users
 #  print $result . "\n";
 }
 
-sub create_user
-{
+sub create_user {
   my ($self, $username, $password) = @_;
   
   my $result = $self->service('device', 'ep')->CreateUsers( { 
@@ -245,16 +240,14 @@ sub create_user
 
   die $result if not $result;
 #  print $result . "\n";
-  
 }
 
-sub set_credentials
-{
+sub set_credentials {
   my ($self, $username, $password, $create_if_not_exists) = @_;
 
 #  TODO: snyc device and client time  
 
-  if ($create_if_not_exists) {
+  if ( $create_if_not_exists ) {
 #  If GetUsers() is ok but empty then CreateUsers()
 #    if(not get_users()) {
 #      create_user($username, $password);
@@ -271,31 +264,51 @@ sub set_credentials
 }
 
 # use this after set_credentials
-sub create_services
-{
+sub create_services {
   my ($self) = @_;
 
-  if(defined $self->service('media', 'url'))  {
+  $self->get_service_urls();
+
+  if ( defined $self->service('media', 'url') ) {
     $self->set_service('media', 'ep', ONVIF::Media::Interfaces::Media::MediaPort->new({
       proxy => $self->service('media', 'url'),
       serializer => $self->serializer(),
 #      transport => $transport
     }));
   }
-  if(defined $self->service('ptz', 'url'))  {
+  if ( defined $self->service('ptz', 'url') ) {
     $self->set_service('ptz', 'ep', ONVIF::PTZ::Interfaces::PTZ::PTZPort->new({
       proxy => $self->service('ptz', 'url'),
       serializer => $self->serializer(),
 #      transport => $transport
     }));
   }
-}
+  if ( defined $self->service('events', 'url') ) {
+    $self->set_service('events', 'ep', WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort->new({
+      proxy => $self->service('events', 'url'),
+      serializer => $self->serializer(),
+#      transport => $transport
+    }));
+  }
+  if ( defined $self->service('analytics', 'url') ) {
+    $self->set_service('analytics', 'ep', ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort->new({
+      proxy => $self->service('analytics', 'url'),
+      serializer => $self->serializer(),
+#      transport => $transport
+    }));
+    $self->set_service('rules', 'ep', ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort->new({
+      proxy => $self->service('analytics', 'url'),
+      serializer => $self->serializer(),
+#      transport => $transport
+    }));
+  }
+} # end sub create_services
 
-sub get_endpoint
-{
+sub get_endpoint {
   my ($self, $serviceType) = @_;
   
   $self->service($serviceType, 'ep');
 }
 
 1;
+__END__
diff --git a/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm b/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm
index 218a4caa5..bb43daeec 100644
--- a/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm
+++ b/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm
@@ -274,8 +274,8 @@ sub _initialize {
             $_method =~s{\-}{_}xg;
             if ( $list->[-1]->can( $_method ) ) {
               $list->[-1]->$_method( $current );
-            } else {
-              print ( "ERror " . $list->[-1] . " cannot $_method\n" );
+              #} else {
+              #print ( "ERror " . $list->[-1] . " cannot $_method\n" );
             }
 
             $current = pop @$list;          # step up in object hierarchy
diff --git a/onvif/modules/lib/ONVIF/Deserializer/XSD.pm b/onvif/modules/lib/ONVIF/Deserializer/XSD.pm
index 215a3cb4d..e74129425 100644
--- a/onvif/modules/lib/ONVIF/Deserializer/XSD.pm
+++ b/onvif/modules/lib/ONVIF/Deserializer/XSD.pm
@@ -33,16 +33,15 @@ use ONVIF::Deserializer::MessageParser;
 
 use SOAP::WSDL::Factory::Deserializer;
 
-SOAP::WSDL::Factory::Deserializer->register('1.1', __PACKAGE__ );
-SOAP::WSDL::Factory::Deserializer->register('1.2', __PACKAGE__ );
+SOAP::WSDL::Factory::Deserializer->register('1.1', __PACKAGE__);
+SOAP::WSDL::Factory::Deserializer->register('1.2', __PACKAGE__);
 
 ## we get the soap version from the message parser
 my %soap_version_of :ATTR( :default<()>);
 
-
 sub soap_version {
   my ($self) = @_;
-  if($SOAP::WSDL::Deserializer::XSD::parser_of{ident $self}) {
+  if ( $SOAP::WSDL::Deserializer::XSD::parser_of{ident $self} ) {
     return $SOAP::WSDL::Deserializer::XSD::parser_of{ident $self}->soap_version();
   }
   return '';
@@ -52,7 +51,7 @@ sub deserialize {
     my ($self, $content) = @_;
 
     my $parser = $SOAP::WSDL::Deserializer::XSD::parser_of{ ${ $self } };
-    if(not $parser) {
+    if ( not $parser ) {
       $parser = ONVIF::Deserializer::MessageParser->new({
           strict => $SOAP::WSDL::Deserializer::XSD::strict_of{ ${ $self } }
       });
@@ -61,8 +60,8 @@ sub deserialize {
 
     $parser->class_resolver( 
         $self->SOAP::WSDL::Deserializer::XSD::get_class_resolver() );
-    eval { $parser->parse_string( $content ) };
-    if ($@) {
+    eval { $parser->parse_string($content) };
+    if ( $@ ) {
         return $self->generate_fault({
             code => 'SOAP-ENV:Server',
             role => 'urn:localhost',
@@ -79,12 +78,9 @@ sub generate_fault {
     return SOAP::WSDL::SOAP::Typelib::Fault11->new({
             faultcode => $args_from_ref->{ code } || 'SOAP-ENV:Client',
             faultactor => $args_from_ref->{ role } || 'urn:localhost',
-            faultstring => $args_from_ref->{ message } || "Unknown error"
+            faultstring => $args_from_ref->{ message } || 'Unknown error'
     });
 }
 
 1;
-
 __END__
-
-
diff --git a/onvif/modules/lib/WSDiscovery/TransportUDP.pm b/onvif/modules/lib/WSDiscovery/TransportUDP.pm
index 33308db13..5125ac9f0 100644
--- a/onvif/modules/lib/WSDiscovery/TransportUDP.pm
+++ b/onvif/modules/lib/WSDiscovery/TransportUDP.pm
@@ -43,7 +43,7 @@ my %message_of :ATTR(:name<message>     :default<()>);
 my %is_success_of :ATTR(:name<is_success> :default<()>);
 
 my %local_addr_of :ATTR(:name<local_addr> :init_arg<local_addr> :default<()>);
-
+my $net_interface;
 
 # create methods normally inherited from SOAP::Client
 SUBFACTORY: {
@@ -60,14 +60,22 @@ sub _notify_response
   
 }
 
+sub set_net_interface {
+	my $self = shift;
+	$net_interface = shift;
+}
+
 sub send_multi() {
   my ($self, $address, $port, $utf8_string) = @_;
 
   my $destination = $address . ':' . $port;
-  my $socket = IO::Socket::Multicast->new(PROTO => 'udp', 
-      LocalPort=>$port, PeerAddr=>$destination, ReuseAddr=>1)
-      
-      or die 'Cannot open multicast socket to ' . ${address} . ':' . ${port};
+  my $socket = IO::Socket::Multicast->new(
+			PROTO => 'udp',
+      LocalPort=>$port,
+			PeerAddr=>$destination,
+			ReuseAddr=>1
+			) or die 'Cannot open multicast socket to ' . ${address} . ':' . ${port};
+	$_ = $socket->mcast_if($net_interface) if $net_interface;
 
   my $bytes = $utf8_string;
   utf8::encode($bytes);
@@ -80,14 +88,16 @@ sub receive_multi() {
   my ($self, $address, $port) = @_;
   my $data = undef;
   
-  my $socket = IO::Socket::Multicast->new(PROTO => 'udp', 
-      LocalPort=>$port, ReuseAddr=>1);
-	$socket->mcast_add($address);
+  my $socket = IO::Socket::Multicast->new(
+			PROTO => 'udp',
+      LocalPort=>$port,
+			ReuseAddr=>1);
+	$socket->mcast_add($address, $net_interface);
   
   my $readbits = '';
   vec($readbits, $socket->fileno, 1) = 1;
   
-  if(select($readbits, undef, undef, WAIT_TIME/1000)) {
+  if ( select($readbits, undef, undef, WAIT_TIME/1000) ) {
      $socket->recv($data, 9999);
      return $data;
   }
@@ -98,15 +108,19 @@ sub receive_uni() {
   my ($self, $address, $port, $localaddr) = @_;
   my $data = undef;
   
-  my $socket = IO::Socket::Multicast->new(PROTO => 'udp', 
-      LocalAddr => $localaddr, LocalPort=>$port, ReuseAddr=>1);
+  my $socket = IO::Socket::Multicast->new(
+			PROTO => 'udp',
+			LocalAddr => $localaddr,
+			LocalPort=>$port,
+			ReuseAddr=>1
+			);
       
-	$socket->mcast_add($address);
+	$socket->mcast_add($address, $net_interface);
   
   my $readbits = '';
   vec($readbits, $socket->fileno, 1) = 1;
   
-  if(select($readbits, undef, undef, WAIT_TIME/1000)) {
+  if ( select($readbits, undef, undef, WAIT_TIME/1000) ) {
      $socket->recv($data, 9999);
      return $data;
   }
@@ -114,50 +128,51 @@ sub receive_uni() {
 }
  
 sub send_receive {
-    my ($self, %parameters) = @_;
-    my ($envelope, $soap_action, $endpoint, $encoding, $content_type) =
-        @parameters{qw(envelope action endpoint encoding content_type)};
+	my ($self, %parameters) = @_;
+	my ($envelope, $soap_action, $endpoint, $encoding, $content_type) =
+		@parameters{qw(envelope action endpoint encoding content_type)};
 
-    my ($address,$port) = ($endpoint =~ /([^:\/]+):([0-9]+)/);
+	my ($address,$port) = ($endpoint =~ /([^:\/]+):([0-9]+)/);
 
-    #warn "address = ${address}";
-    #warn "port = ${port}";
+#warn "address = ${address}";
+#warn "port = ${port}";
 
-    $self->send_multi($address, $port, $envelope);
+	$self->send_multi($address, $port, $envelope);
 
-    my $localaddr = $self->get_local_addr();
+	my $localaddr = $self->get_local_addr();
+#warn "localddr $localaddr";
 
-    my ($response, $last_response);
-    my $wait = WAIT_COUNT;
-    while ( $wait >= 0 ) {
-      if($localaddr) {
-        if($response = $self->receive_uni($address, $port, $localaddr)) {
-          $last_response = $response;
-          $self->_notify_response($response);
-        }
-        $wait --;
-      }
-      if($response = $self->receive_multi($address, $port)) {
-        $last_response = $response;
-        $self->_notify_response($response);
-      }
-      $wait --;
-    }
-    
-    if($last_response) {
-      $self->set_code();
-      $self->set_message("");
-      $self->set_is_success(1);
-      $self->set_status('OK');
-    }
-    else{
-      $self->set_code();
-      $self->set_message("Timed out waiting for response");
-      $self->set_is_success(0);
-      $self->set_status('TIMEOUT');
-    }
+	my ($response, $last_response);
+	my $wait = WAIT_COUNT;
+	while ( $wait >= 0 ) {
+		if ( $localaddr ) {
+			if ( $response = $self->receive_uni($address, $port, $localaddr) ) {
+				$last_response = $response;
+				$self->_notify_response($response);
+			}
+			$wait --;
+		}
+		if ( $response = $self->receive_multi($address, $port) ) {
+			$last_response = $response;
+			$self->_notify_response($response);
+		}
+		$wait --;
+	}
 
-    return $last_response;
+	if ( $last_response ) {
+		$self->set_code();
+		$self->set_message('');
+		$self->set_is_success(1);
+		$self->set_status('OK');
+	} else {
+		$self->set_code();
+		$self->set_message('Timed out waiting for response');
+		$self->set_is_success(0);
+		$self->set_status('TIMEOUT');
+	}
+
+	return $last_response;
 }
 
 1;
+__END__
diff --git a/onvif/proxy/lib/ONVIF/Media/Interfaces/Media/MediaPort.pm b/onvif/proxy/lib/ONVIF/Media/Interfaces/Media/MediaPort.pm
index ecb985b30..2591a6010 100644
--- a/onvif/proxy/lib/ONVIF/Media/Interfaces/Media/MediaPort.pm
+++ b/onvif/proxy/lib/ONVIF/Media/Interfaces/Media/MediaPort.pm
@@ -7,1997 +7,1965 @@ use base qw(SOAP::WSDL::Client::Base);
 
 # only load if it hasn't been loaded before
 require ONVIF::Media::Typemaps::Media
-    if not ONVIF::Media::Typemaps::Media->can('get_class');
+if not ONVIF::Media::Typemaps::Media->can('get_class');
 
 sub START {
-    $_[0]->set_proxy('http://www.examples.com/Media/') if not $_[2]->{proxy};
-    $_[0]->set_class_resolver('ONVIF::Media::Typemaps::Media')
-        if not $_[2]->{class_resolver};
+  $_[0]->set_proxy('http://www.examples.com/Media/') if not $_[2]->{proxy};
+  $_[0]->set_class_resolver('ONVIF::Media::Typemaps::Media')
+  if not $_[2]->{class_resolver};
 
-    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+  $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
 }
 
 sub GetServiceCapabilities {
-    my ($self, $body, $header) = @_;
-    die "GetServiceCapabilities must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetServiceCapabilities',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetServiceCapabilities',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetServiceCapabilities must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetServiceCapabilities',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetServiceCapabilities',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetServiceCapabilities )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetServiceCapabilities )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoSources {
-    my ($self, $body, $header) = @_;
-    die "GetVideoSources must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoSources',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdlGetVideoSources/',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoSources must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoSources',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdlGetVideoSources/',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoSources )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoSources )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioSources {
-    my ($self, $body, $header) = @_;
-    die "GetAudioSources must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioSources',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioSources',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioSources must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioSources',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioSources',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioSources )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioSources )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
-
 sub GetAudioOutputs {
-    my ($self, $body, $header) = @_;
-    die "GetAudioOutputs must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioOutputs',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputs',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioOutputs must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioOutputs',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputs',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputs )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputs )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
-
 sub CreateProfile {
-    my ($self, $body, $header) = @_;
-    die "CreateProfile must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'CreateProfile',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/CreateProfile',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "CreateProfile must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'CreateProfile',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/CreateProfile',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::CreateProfile )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::CreateProfile )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetProfile {
-    my ($self, $body, $header) = @_;
-    die "GetProfile must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetProfile',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdlGetProfile/',
-        style => 'document',
-        body => {
-            
-
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetProfile )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+  my ($self, $body, $header) = @_;
+  die "GetProfile must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetProfile',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdlGetProfile/',
+      style => 'document',
+      body => {
+        use             => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetProfile )],
+      },
+      header => {
+      },
+      headerfault => {
+      }
     }, $body, $header);
 }
 
-
 sub GetProfiles {
-    my ($self, $body, $header) = @_;
-    die "GetProfiles must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetProfiles',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetProfiles',
-        style => 'document',
-        body => {
-            
-
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetProfiles )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+  my ($self, $body, $header) = @_;
+  die "GetProfiles must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetProfiles',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetProfiles',
+      style => 'document',
+      body => {
+        use             => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetProfiles )],
+      },
+      header => {
+      },
+      headerfault => {
+      }
     }, $body, $header);
 }
 
 
 sub AddVideoEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddVideoEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddVideoEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddVideoEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddVideoEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddVideoEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddVideoEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub AddVideoSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddVideoSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddVideoSourceConfiguration',
-        style => 'document',
-        body => {
-            
-
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddVideoSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+  my ($self, $body, $header) = @_;
+  die "AddVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddVideoSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddVideoSourceConfiguration',
+      style => 'document',
+      body => {
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddVideoSourceConfiguration )],
+      },
+      header => {
+      },
+      headerfault => {
+      }
     }, $body, $header);
 }
 
-
 sub AddAudioEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddAudioEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioEncoderConfiguration',
-        style => 'document',
-        body => {
-            
-
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddAudioEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+  my ($self, $body, $header) = @_;
+  die "AddAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddAudioEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioEncoderConfiguration',
+      style => 'document',
+      body => {
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddAudioEncoderConfiguration )],
+      },
+      header => {
+      },
+      headerfault => {
+      }
     }, $body, $header);
 }
 
 
 sub AddAudioSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddAudioSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddAudioSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddAudioSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddAudioSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub AddPTZConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddPTZConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddPTZConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddPTZConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddPTZConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddPTZConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddPTZConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddPTZConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddPTZConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub AddVideoAnalyticsConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddVideoAnalyticsConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddVideoAnalyticsConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddVideoAnalyticsConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddVideoAnalyticsConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddVideoAnalyticsConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddVideoAnalyticsConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub AddMetadataConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddMetadataConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddMetadataConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddMetadataConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddMetadataConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddMetadataConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddMetadataConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub AddAudioOutputConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddAudioOutputConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioOutputConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddAudioOutputConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioOutputConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddAudioOutputConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddAudioOutputConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub AddAudioDecoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "AddAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'AddAudioDecoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioDecoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "AddAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'AddAudioDecoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/AddAudioDecoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::AddAudioDecoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::AddAudioDecoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveVideoEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveVideoEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveVideoEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveVideoEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveVideoEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveVideoEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveVideoEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveVideoSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveVideoSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveVideoSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveVideoSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveVideoSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveVideoSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveVideoSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveAudioEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveAudioEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveAudioEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveAudioSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveAudioSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveAudioSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemovePTZConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemovePTZConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemovePTZConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemovePTZConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemovePTZConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemovePTZConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemovePTZConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemovePTZConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemovePTZConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveVideoAnalyticsConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveVideoAnalyticsConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveVideoAnalyticsConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveVideoAnalyticsConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveVideoAnalyticsConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveVideoAnalyticsConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveVideoAnalyticsConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveMetadataConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveMetadataConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveMetadataConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveMetadataConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveMetadataConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveMetadataConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveMetadataConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveAudioOutputConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveAudioOutputConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioOutputConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveAudioOutputConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioOutputConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioOutputConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioOutputConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub RemoveAudioDecoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "RemoveAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'RemoveAudioDecoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioDecoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "RemoveAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'RemoveAudioDecoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/RemoveAudioDecoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioDecoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::RemoveAudioDecoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub DeleteProfile {
-    my ($self, $body, $header) = @_;
-    die "DeleteProfile must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'DeleteProfile',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/DeleteProfile',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "DeleteProfile must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'DeleteProfile',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/DeleteProfile',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::DeleteProfile )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::DeleteProfile )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoSourceConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetVideoSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoSourceConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoSourceConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoEncoderConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetVideoEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoEncoderConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoEncoderConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoEncoderConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoEncoderConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioSourceConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetAudioSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioSourceConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdlGetAudioSourceConfigurations/',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioSourceConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdlGetAudioSourceConfigurations/',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioSourceConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioSourceConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioEncoderConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetAudioEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioEncoderConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioEncoderConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioEncoderConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioEncoderConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoAnalyticsConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetVideoAnalyticsConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoAnalyticsConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoAnalyticsConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoAnalyticsConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoAnalyticsConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoAnalyticsConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetMetadataConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetMetadataConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetMetadataConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetMetadataConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetMetadataConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetMetadataConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetMetadataConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioOutputConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetAudioOutputConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioOutputConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioOutputConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioOutputConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioDecoderConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetAudioDecoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioDecoderConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioDecoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioDecoderConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioDecoderConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioDecoderConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoAnalyticsConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoAnalyticsConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoAnalyticsConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoAnalyticsConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoAnalyticsConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetMetadataConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetMetadataConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetMetadataConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetMetadataConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetMetadataConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetMetadataConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetMetadataConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioOutputConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioOutputConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioOutputConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioDecoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "GetAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioDecoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioDecoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioDecoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioDecoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleVideoEncoderConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleVideoEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleVideoEncoderConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoEncoderConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleVideoEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleVideoEncoderConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoEncoderConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleVideoEncoderConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleVideoEncoderConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleVideoSourceConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleVideoSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleVideoSourceConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoSourceConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleVideoSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleVideoSourceConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoSourceConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleVideoSourceConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleVideoSourceConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleAudioEncoderConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleAudioEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleAudioEncoderConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioEncoderConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleAudioEncoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleAudioEncoderConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioEncoderConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioEncoderConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioEncoderConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleAudioSourceConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleAudioSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleAudioSourceConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioSourceConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleAudioSourceConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleAudioSourceConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioSourceConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioSourceConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioSourceConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleVideoAnalyticsConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleVideoAnalyticsConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleVideoAnalyticsConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoAnalyticsConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleVideoAnalyticsConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleVideoAnalyticsConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoAnalyticsConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleVideoAnalyticsConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleVideoAnalyticsConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleMetadataConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleMetadataConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleMetadataConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleMetadataConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleMetadataConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleMetadataConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleMetadataConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleMetadataConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleMetadataConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleAudioOutputConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleAudioOutputConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleAudioOutputConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioOutputConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleAudioOutputConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleAudioOutputConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioOutputConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioOutputConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioOutputConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetCompatibleAudioDecoderConfigurations {
-    my ($self, $body, $header) = @_;
-    die "GetCompatibleAudioDecoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCompatibleAudioDecoderConfigurations',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioDecoderConfigurations',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetCompatibleAudioDecoderConfigurations must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetCompatibleAudioDecoderConfigurations',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioDecoderConfigurations',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioDecoderConfigurations )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetCompatibleAudioDecoderConfigurations )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetVideoSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetVideoSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetVideoSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetVideoSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetVideoSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetVideoSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetVideoEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetVideoEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetVideoEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetVideoEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetVideoEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetVideoEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetAudioSourceConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetAudioSourceConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioSourceConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetAudioSourceConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetAudioSourceConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioSourceConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetAudioSourceConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetAudioSourceConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetAudioEncoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetAudioEncoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioEncoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetAudioEncoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetAudioEncoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioEncoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetAudioEncoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetAudioEncoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetVideoAnalyticsConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetVideoAnalyticsConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoAnalyticsConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetVideoAnalyticsConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetVideoAnalyticsConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoAnalyticsConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetVideoAnalyticsConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetVideoAnalyticsConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetMetadataConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetMetadataConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetMetadataConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetMetadataConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetMetadataConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetMetadataConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetMetadataConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetMetadataConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetAudioOutputConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetAudioOutputConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioOutputConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetAudioOutputConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetAudioOutputConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioOutputConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetAudioOutputConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetAudioOutputConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetAudioDecoderConfiguration {
-    my ($self, $body, $header) = @_;
-    die "SetAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetAudioDecoderConfiguration',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioDecoderConfiguration',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetAudioDecoderConfiguration must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetAudioDecoderConfiguration',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetAudioDecoderConfiguration',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetAudioDecoderConfiguration )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetAudioDecoderConfiguration )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoSourceConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetVideoSourceConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoSourceConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdlGetVideoSourceConfigurationOptions/',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoSourceConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoSourceConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdlGetVideoSourceConfigurationOptions/',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoEncoderConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetVideoEncoderConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoEncoderConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurationOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoEncoderConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoEncoderConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurationOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoEncoderConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoEncoderConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioSourceConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetAudioSourceConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioSourceConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfigurationOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioSourceConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioSourceConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfigurationOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioSourceConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioSourceConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioEncoderConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetAudioEncoderConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioEncoderConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurationOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioEncoderConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioEncoderConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurationOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioEncoderConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioEncoderConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetMetadataConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetMetadataConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetMetadataConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurationOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetMetadataConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetMetadataConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurationOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetMetadataConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetMetadataConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioOutputConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetAudioOutputConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioOutputConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurationOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioOutputConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioOutputConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurationOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioOutputConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetAudioDecoderConfigurationOptions {
-    my ($self, $body, $header) = @_;
-    die "GetAudioDecoderConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetAudioDecoderConfigurationOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurationOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetAudioDecoderConfigurationOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetAudioDecoderConfigurationOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurationOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetAudioDecoderConfigurationOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetAudioDecoderConfigurationOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetGuaranteedNumberOfVideoEncoderInstances {
-    my ($self, $body, $header) = @_;
-    die "GetGuaranteedNumberOfVideoEncoderInstances must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetGuaranteedNumberOfVideoEncoderInstances',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetGuaranteedNumberOfVideoEncoderInstances',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetGuaranteedNumberOfVideoEncoderInstances must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetGuaranteedNumberOfVideoEncoderInstances',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetGuaranteedNumberOfVideoEncoderInstances',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetGuaranteedNumberOfVideoEncoderInstances )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetGuaranteedNumberOfVideoEncoderInstances )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetStreamUri {
-    my ($self, $body, $header) = @_;
-    die "GetStreamUri must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetStreamUri',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetStreamUri',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetStreamUri must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetStreamUri',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetStreamUri',
+      style => 'document',
+      body => {
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetStreamUri )],
+      },
+      header => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetStreamUri )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub StartMulticastStreaming {
-    my ($self, $body, $header) = @_;
-    die "StartMulticastStreaming must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'StartMulticastStreaming',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/StartMulticastStreaming',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "StartMulticastStreaming must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'StartMulticastStreaming',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/StartMulticastStreaming',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::StartMulticastStreaming )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::StartMulticastStreaming )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub StopMulticastStreaming {
-    my ($self, $body, $header) = @_;
-    die "StopMulticastStreaming must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'StopMulticastStreaming',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/StopMulticastStreaming',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "StopMulticastStreaming must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'StopMulticastStreaming',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/StopMulticastStreaming',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::StopMulticastStreaming )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::StopMulticastStreaming )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetSynchronizationPoint {
-    my ($self, $body, $header) = @_;
-    die "SetSynchronizationPoint must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetSynchronizationPoint',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetSynchronizationPoint',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetSynchronizationPoint must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetSynchronizationPoint',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetSynchronizationPoint',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetSynchronizationPoint )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetSynchronizationPoint )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetSnapshotUri {
-    my ($self, $body, $header) = @_;
-    die "GetSnapshotUri must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetSnapshotUri',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetSnapshotUri',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetSnapshotUri must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetSnapshotUri',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetSnapshotUri',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetSnapshotUri )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetSnapshotUri )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetVideoSourceModes {
-    my ($self, $body, $header) = @_;
-    die "GetVideoSourceModes must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetVideoSourceModes',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoSourceModes',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetVideoSourceModes must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetVideoSourceModes',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetVideoSourceModes',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceModes )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetVideoSourceModes )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetVideoSourceMode {
-    my ($self, $body, $header) = @_;
-    die "SetVideoSourceMode must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetVideoSourceMode',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoSourceMode',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetVideoSourceMode must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetVideoSourceMode',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetVideoSourceMode',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetVideoSourceMode )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetVideoSourceMode )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetOSDs {
-    my ($self, $body, $header) = @_;
-    die "GetOSDs must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetOSDs',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetOSDs',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetOSDs must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetOSDs',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetOSDs',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetOSDs )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetOSDs )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetOSD {
-    my ($self, $body, $header) = @_;
-    die "GetOSD must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetOSD',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetOSD',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetOSD must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetOSD',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetOSD',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetOSD )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetOSD )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub GetOSDOptions {
-    my ($self, $body, $header) = @_;
-    die "GetOSDOptions must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetOSDOptions',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetOSDOptions',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "GetOSDOptions must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'GetOSDOptions',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/GetOSDOptions',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::GetOSDOptions )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::GetOSDOptions )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub SetOSD {
-    my ($self, $body, $header) = @_;
-    die "SetOSD must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'SetOSD',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetOSD',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "SetOSD must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'SetOSD',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/SetOSD',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::SetOSD )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::SetOSD )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub CreateOSD {
-    my ($self, $body, $header) = @_;
-    die "CreateOSD must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'CreateOSD',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/CreateOSD',
-        style => 'document',
-        body => {
-            
+  my ($self, $body, $header) = @_;
+  die "CreateOSD must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'CreateOSD',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/CreateOSD',
+      style => 'document',
+      body => {
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::CreateOSD )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::CreateOSD )],
+      },
+      header => {
+
+      },
+      headerfault => {
+
+      }
     }, $body, $header);
 }
 
 
 sub DeleteOSD {
-    my ($self, $body, $header) = @_;
-    die "DeleteOSD must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'DeleteOSD',
-        soap_action => 'http://www.onvif.org/ver10/media/wsdl/DeleteOSD',
-        style => 'document',
-        body => {
-            
-
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( ONVIF::Media::Elements::DeleteOSD )],
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
+  my ($self, $body, $header) = @_;
+  die "DeleteOSD must be called as object method (\$self is <$self>)" if not blessed($self);
+  return $self->SUPER::call({
+      operation => 'DeleteOSD',
+      soap_action => 'http://www.onvif.org/ver10/media/wsdl/DeleteOSD',
+      style => 'document',
+      body => {
+        use            => 'literal',
+        namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+        encodingStyle   => '',
+        parts           =>  [qw( ONVIF::Media::Elements::DeleteOSD )],
+      },
+      header => {
+      },
+      headerfault => {
+      }
     }, $body, $header);
 }
 
-
-
-
 1;
-
-
-
 __END__
 
 =pod
diff --git a/onvif/proxy/lib/WSDiscovery11/Attributes/Id.pm b/onvif/proxy/lib/WSDiscovery11/Attributes/Id.pm
new file mode 100644
index 000000000..56d5115e4
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Attributes/Id.pm
@@ -0,0 +1,54 @@
+
+package WSDiscovery::Attributes::Id;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Id');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::ID
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Attributes::Id
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Attributes::Id->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Attributes/IsReferenceParameter.pm b/onvif/proxy/lib/WSDiscovery11/Attributes/IsReferenceParameter.pm
new file mode 100644
index 000000000..c04039b1f
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Attributes/IsReferenceParameter.pm
@@ -0,0 +1,54 @@
+
+package WSDiscovery::Attributes::IsReferenceParameter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('IsReferenceParameter');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Attributes::IsReferenceParameter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Attributes::IsReferenceParameter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Action.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Action.pm
new file mode 100644
index 000000000..a24d6fdd9
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Action.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::Action;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('Action');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Action
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Action from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Action->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/AppSequence.pm b/onvif/proxy/lib/WSDiscovery11/Elements/AppSequence.pm
new file mode 100644
index 000000000..63be6d678
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/AppSequence.pm
@@ -0,0 +1,58 @@
+
+package WSDiscovery::Elements::AppSequence;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('AppSequence');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AppSequenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::AppSequence
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::AppSequence->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::AppSequenceType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Bye.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Bye.pm
new file mode 100644
index 000000000..a89c3b48c
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Bye.pm
@@ -0,0 +1,69 @@
+
+package WSDiscovery::Elements::Bye;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Bye');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ByeType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Bye
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Bye->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ByeType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+   XAddrs => $some_value, # UriListType
+   MetadataVersion =>  $some_value, # unsignedInt
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/EndpointReference.pm b/onvif/proxy/lib/WSDiscovery11/Elements/EndpointReference.pm
new file mode 100644
index 000000000..96c690bb4
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/EndpointReference.pm
@@ -0,0 +1,63 @@
+
+package WSDiscovery::Elements::EndpointReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('EndpointReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::EndpointReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+EndpointReference from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::EndpointReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSDiscovery::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/FaultTo.pm b/onvif/proxy/lib/WSDiscovery11/Elements/FaultTo.pm
new file mode 100644
index 000000000..530f9a4a4
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/FaultTo.pm
@@ -0,0 +1,63 @@
+
+package WSDiscovery::Elements::FaultTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('FaultTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::FaultTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FaultTo from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::FaultTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSDiscovery::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/From.pm b/onvif/proxy/lib/WSDiscovery11/Elements/From.pm
new file mode 100644
index 000000000..727c6a7ef
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/From.pm
@@ -0,0 +1,63 @@
+
+package WSDiscovery::Elements::From;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('From');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::From
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+From from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::From->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSDiscovery::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Hello.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Hello.pm
new file mode 100644
index 000000000..894f8482d
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Hello.pm
@@ -0,0 +1,69 @@
+
+package WSDiscovery::Elements::Hello;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Hello');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::HelloType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Hello
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Hello->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::HelloType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+   XAddrs => $some_value, # UriListType
+   MetadataVersion =>  $some_value, # unsignedInt
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/MessageID.pm b/onvif/proxy/lib/WSDiscovery11/Elements/MessageID.pm
new file mode 100644
index 000000000..54dfa6a50
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/MessageID.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::MessageID;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('MessageID');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::MessageID
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MessageID from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::MessageID->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Metadata.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Metadata.pm
new file mode 100644
index 000000000..1567ef36a
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Metadata.pm
@@ -0,0 +1,58 @@
+
+package WSDiscovery::Elements::Metadata;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('Metadata');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::MetadataType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Metadata
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Metadata from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Metadata->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::MetadataType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/MetadataVersion.pm b/onvif/proxy/lib/WSDiscovery11/Elements/MetadataVersion.pm
new file mode 100644
index 000000000..acb6c5246
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/MetadataVersion.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::MetadataVersion;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('MetadataVersion');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::MetadataVersion
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::MetadataVersion->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # unsignedInt
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Probe.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Probe.pm
new file mode 100644
index 000000000..b5b780a24
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Probe.pm
@@ -0,0 +1,60 @@
+
+package WSDiscovery::Elements::Probe;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Probe');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ProbeType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Probe
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Probe->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProbeType
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ProbeMatches.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ProbeMatches.pm
new file mode 100644
index 000000000..5cf9f8fac
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ProbeMatches.pm
@@ -0,0 +1,71 @@
+
+package WSDiscovery::Elements::ProbeMatches;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('ProbeMatches');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ProbeMatchesType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ProbeMatches
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ProbeMatches->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSDiscovery::Types::MetadataType
+       },
+     },
+     Types => $some_value, # QNameListType
+     Scopes =>  { value => $some_value },
+     XAddrs => $some_value, # UriListType
+     MetadataVersion =>  $some_value, # unsignedInt
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ProblemAction.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ProblemAction.pm
new file mode 100644
index 000000000..2512b7e91
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ProblemAction.pm
@@ -0,0 +1,60 @@
+
+package WSDiscovery::Elements::ProblemAction;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemAction');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ProblemActionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ProblemAction
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemAction from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ProblemAction->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProblemActionType
+   Action =>  { value => $some_value },
+   SoapAction =>  $some_value, # anyURI
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ProblemHeaderQName.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ProblemHeaderQName.pm
new file mode 100644
index 000000000..bd6f34982
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ProblemHeaderQName.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::ProblemHeaderQName;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemHeaderQName');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AttributedQNameType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ProblemHeaderQName
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemHeaderQName from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ProblemHeaderQName->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ProblemIRI.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ProblemIRI.pm
new file mode 100644
index 000000000..70fe19410
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ProblemIRI.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::ProblemIRI;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemIRI');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ProblemIRI
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ProblemIRI->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ReferenceParameters.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ReferenceParameters.pm
new file mode 100644
index 000000000..1f8cd7cbc
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ReferenceParameters.pm
@@ -0,0 +1,58 @@
+
+package WSDiscovery::Elements::ReferenceParameters;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ReferenceParameters');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ReferenceParametersType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ReferenceParameters
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReferenceParameters from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ReferenceParameters->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ReferenceParametersType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/RelatesTo.pm b/onvif/proxy/lib/WSDiscovery11/Elements/RelatesTo.pm
new file mode 100644
index 000000000..ffdf501aa
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/RelatesTo.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::RelatesTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('RelatesTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::RelatesToType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::RelatesTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::RelatesTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ReplyTo.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ReplyTo.pm
new file mode 100644
index 000000000..428378c5e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ReplyTo.pm
@@ -0,0 +1,63 @@
+
+package WSDiscovery::Elements::ReplyTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ReplyTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ReplyTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReplyTo from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ReplyTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSDiscovery::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Resolve.pm
new file mode 100644
index 000000000..57849ce57
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Resolve.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery::Elements::Resolve;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Resolve');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ResolveType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Resolve
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Resolve from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Resolve->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/ResolveMatches.pm b/onvif/proxy/lib/WSDiscovery11/Elements/ResolveMatches.pm
new file mode 100644
index 000000000..cfaabc989
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/ResolveMatches.pm
@@ -0,0 +1,71 @@
+
+package WSDiscovery::Elements::ResolveMatches;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('ResolveMatches');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ResolveMatchesType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::ResolveMatches
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::ResolveMatches->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSDiscovery::Types::MetadataType
+       },
+     },
+     Types => $some_value, # QNameListType
+     Scopes =>  { value => $some_value },
+     XAddrs => $some_value, # UriListType
+     MetadataVersion =>  $some_value, # unsignedInt
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/RetryAfter.pm b/onvif/proxy/lib/WSDiscovery11/Elements/RetryAfter.pm
new file mode 100644
index 000000000..980eeab2d
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/RetryAfter.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::RetryAfter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('RetryAfter');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AttributedUnsignedLongType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::RetryAfter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::RetryAfter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Scopes.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Scopes.pm
new file mode 100644
index 000000000..1dde55ce1
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Scopes.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::Scopes;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Scopes');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::ScopesType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Scopes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Scopes->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Security.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Security.pm
new file mode 100644
index 000000000..f9d4aff4d
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Security.pm
@@ -0,0 +1,60 @@
+
+package WSDiscovery::Elements::Security;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Security');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::SecurityType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Security
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Security->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::SecurityType
+   Sig =>  { # WSDiscovery::Types::SigType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Sig.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Sig.pm
new file mode 100644
index 000000000..6ddab0bed
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Sig.pm
@@ -0,0 +1,58 @@
+
+package WSDiscovery::Elements::Sig;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Sig');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::SigType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Sig
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Sig->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::SigType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/SupportedMatchingRules.pm b/onvif/proxy/lib/WSDiscovery11/Elements/SupportedMatchingRules.pm
new file mode 100644
index 000000000..908566429
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/SupportedMatchingRules.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::SupportedMatchingRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('SupportedMatchingRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::UriListType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::SupportedMatchingRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::SupportedMatchingRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+$some_value, # UriListType
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/To.pm b/onvif/proxy/lib/WSDiscovery11/Elements/To.pm
new file mode 100644
index 000000000..d435b934d
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/To.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::To;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('To');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::To
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+To from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::To->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/Types.pm b/onvif/proxy/lib/WSDiscovery11/Elements/Types.pm
new file mode 100644
index 000000000..15667a3a0
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/Types.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::Types;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('Types');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::QNameListType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::Types
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::Types->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+$some_value, # QNameListType
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Elements/XAddrs.pm b/onvif/proxy/lib/WSDiscovery11/Elements/XAddrs.pm
new file mode 100644
index 000000000..bc0c8d998
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Elements/XAddrs.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery::Elements::XAddrs;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+
+__PACKAGE__->__set_name('XAddrs');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery::Types::UriListType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Elements::XAddrs
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery::Elements::XAddrs->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+$some_value, # UriListType
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Interfaces/WSDiscovery/WSDiscoveryPort.pm b/onvif/proxy/lib/WSDiscovery11/Interfaces/WSDiscovery/WSDiscoveryPort.pm
new file mode 100644
index 000000000..a7dcd3532
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Interfaces/WSDiscovery/WSDiscoveryPort.pm
@@ -0,0 +1,131 @@
+package WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require WSDiscovery::Typemaps::WSDiscovery
+    if not WSDiscovery::Typemaps::WSDiscovery->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('soap.udp://239.255.255.250:3702/') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('WSDiscovery::Typemaps::WSDiscovery')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub ProbeOp {
+    my ($self, $body, $header) = @_;
+    die "ProbeOp must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'ProbeOp',
+        soap_action => 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSDiscovery::Elements::Probe )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
+
+=head1 SYNOPSIS
+
+ use WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
+ my $interface = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new();
+
+ my $response;
+ $response = $interface->ProbeOp();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the WSDiscovery web service
+located at soap.udp://239.255.255.250:3702/.
+
+=head1 SERVICE WSDiscovery
+
+
+
+=head2 Port WSDiscoveryPort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 ProbeOp
+
+
+
+Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatches> object.
+
+ $response = $interface->ProbeOp( { # WSDiscovery::Types::ProbeType
+    Types => $some_value, # QNameListType
+    Scopes =>  { value => $some_value },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Wed Jul  2 11:45:24 2014
+
+=cut
diff --git a/onvif/proxy/lib/WSDiscovery11/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery11/Typemaps/WSDiscovery.pm
new file mode 100644
index 000000000..136550e96
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Typemaps/WSDiscovery.pm
@@ -0,0 +1,59 @@
+
+package WSDiscovery::Typemaps::WSDiscovery;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery::Types::UriListType',
+               'ProbeMatches/ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'ProbeMatches/ProbeMatch/EndpointReference/Metadata' => 'WSDiscovery::Types::MetadataType',
+               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery::Types::ScopesType',
+               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery::Types::AttributedURIType',
+               'Probe/Types' => 'WSDiscovery::Types::QNameListType',
+               'Probe' => 'WSDiscovery::Elements::Probe',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
+               'Probe/Scopes' => 'WSDiscovery::Types::ScopesType',
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery::Types::ReferenceParametersType',
+               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery::Types::EndpointReferenceType',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'ProbeMatches' => 'WSDiscovery::Elements::ProbeMatches',
+               'MessageID' => 'WSDiscovery::Elements::MessageID',
+               'RelatesTo' => '__SKIP__',
+               'To' => '__SKIP__',
+               'Action' => '__SKIP__',
+               'AppSequence' => '__SKIP__',
+              }; 
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Typemaps::WSDiscovery - typemap for WSDiscovery
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/AppSequenceType.pm b/onvif/proxy/lib/WSDiscovery11/Types/AppSequenceType.pm
new file mode 100644
index 000000000..18e8ea8c3
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/AppSequenceType.pm
@@ -0,0 +1,138 @@
+package WSDiscovery::Types::AppSequenceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw();
+
+package WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %InstanceId_of :ATTR(:get<InstanceId>);
+my %SequenceId_of :ATTR(:get<SequenceId>);
+my %MessageNumber_of :ATTR(:get<MessageNumber>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        InstanceId
+        SequenceId
+        MessageNumber
+    ) ],
+    {
+
+        InstanceId => \%InstanceId_of,
+
+        SequenceId => \%SequenceId_of,
+
+        MessageNumber => \%MessageNumber_of,
+    },
+    {
+        InstanceId => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
+        SequenceId => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        MessageNumber => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::AppSequenceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AppSequenceType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::AppSequenceType
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * InstanceId
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt|SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt>.
+
+=item * SequenceId
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+=item * MessageNumber
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt|SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/AttributedQNameType.pm b/onvif/proxy/lib/WSDiscovery11/Types/AttributedQNameType.pm
new file mode 100644
index 000000000..dd2d1522c
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/AttributedQNameType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery::Types::AttributedQNameType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::AttributedQNameType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedQNameType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/AttributedURIType.pm b/onvif/proxy/lib/WSDiscovery11/Types/AttributedURIType.pm
new file mode 100644
index 000000000..5cab1a8c9
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/AttributedURIType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery::Types::AttributedURIType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::AttributedURIType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedURIType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/AttributedUnsignedLongType.pm b/onvif/proxy/lib/WSDiscovery11/Types/AttributedUnsignedLongType.pm
new file mode 100644
index 000000000..c2a947795
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/AttributedUnsignedLongType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery::Types::AttributedUnsignedLongType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::AttributedUnsignedLongType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedUnsignedLongType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ByeType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ByeType.pm
new file mode 100644
index 000000000..9c384fb2a
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ByeType.pm
@@ -0,0 +1,180 @@
+package WSDiscovery::Types::ByeType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EndpointReference_of :ATTR(:get<EndpointReference>);
+my %Types_of :ATTR(:get<Types>);
+my %Scopes_of :ATTR(:get<Scopes>);
+my %XAddrs_of :ATTR(:get<XAddrs>);
+my %MetadataVersion_of :ATTR(:get<MetadataVersion>);
+
+__PACKAGE__->_factory(
+    [ qw(        EndpointReference
+        Types
+        Scopes
+        XAddrs
+        MetadataVersion
+
+    ) ],
+    {
+        'EndpointReference' => \%EndpointReference_of,
+        'Types' => \%Types_of,
+        'Scopes' => \%Scopes_of,
+        'XAddrs' => \%XAddrs_of,
+        'MetadataVersion' => \%MetadataVersion_of,
+    },
+    {
+        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+
+        'Types' => 'WSDiscovery::Elements::Types',
+
+        'Scopes' => 'WSDiscovery::Elements::Scopes',
+
+        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+
+        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+
+    },
+    {
+
+        'EndpointReference' => '',
+        'Types' => '',
+        'Scopes' => '',
+        'XAddrs' => '',
+        'MetadataVersion' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ByeType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ByeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EndpointReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Types
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Scopes
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * XAddrs
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * MetadataVersion
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ByeType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+   XAddrs => $some_value, # UriListType
+   MetadataVersion =>  $some_value, # unsignedInt
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSDiscovery11/Types/EndpointReferenceType.pm
new file mode 100644
index 000000000..59411fa37
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/EndpointReferenceType.pm
@@ -0,0 +1,137 @@
+package WSDiscovery::Types::EndpointReferenceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
+my %Metadata_of :ATTR(:get<Metadata>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        ReferenceParameters
+        Metadata
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'ReferenceParameters' => \%ReferenceParameters_of,
+        'Metadata' => \%Metadata_of,
+    },
+    {
+        'Address' => 'WSDiscovery::Types::AttributedURIType',
+        'ReferenceParameters' => 'WSDiscovery::Elements::ReferenceParameters',
+
+        'Metadata' => 'WSDiscovery::Elements::Metadata',
+
+    },
+    {
+
+        'Address' => 'Address',
+        'ReferenceParameters' => '',
+        'Metadata' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::EndpointReferenceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EndpointReferenceType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * ReferenceParameters
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Metadata
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSDiscovery::Types::MetadataType
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/FaultCodeOpenType.pm b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodeOpenType.pm
new file mode 100644
index 000000000..52f5d2c8f
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodeOpenType.pm
@@ -0,0 +1,76 @@
+package WSDiscovery::Types::FaultCodeOpenType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultCodeOpenType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/FaultCodeType.pm b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodeType.pm
new file mode 100644
index 000000000..4cc63eb8b
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodeType.pm
@@ -0,0 +1,65 @@
+package WSDiscovery::Types::FaultCodeType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultCodeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/FaultCodesOpenEnumType.pm b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodesOpenEnumType.pm
new file mode 100644
index 000000000..89d8704e8
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodesOpenEnumType.pm
@@ -0,0 +1,76 @@
+package WSDiscovery::Types::FaultCodesOpenEnumType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultCodesOpenEnumType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/FaultCodesType.pm b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodesType.pm
new file mode 100644
index 000000000..a042be3cf
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/FaultCodesType.pm
@@ -0,0 +1,65 @@
+package WSDiscovery::Types::FaultCodesType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultCodesType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/HelloType.pm b/onvif/proxy/lib/WSDiscovery11/Types/HelloType.pm
new file mode 100644
index 000000000..1842faf6a
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/HelloType.pm
@@ -0,0 +1,180 @@
+package WSDiscovery::Types::HelloType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EndpointReference_of :ATTR(:get<EndpointReference>);
+my %Types_of :ATTR(:get<Types>);
+my %Scopes_of :ATTR(:get<Scopes>);
+my %XAddrs_of :ATTR(:get<XAddrs>);
+my %MetadataVersion_of :ATTR(:get<MetadataVersion>);
+
+__PACKAGE__->_factory(
+    [ qw(        EndpointReference
+        Types
+        Scopes
+        XAddrs
+        MetadataVersion
+
+    ) ],
+    {
+        'EndpointReference' => \%EndpointReference_of,
+        'Types' => \%Types_of,
+        'Scopes' => \%Scopes_of,
+        'XAddrs' => \%XAddrs_of,
+        'MetadataVersion' => \%MetadataVersion_of,
+    },
+    {
+        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+
+        'Types' => 'WSDiscovery::Elements::Types',
+
+        'Scopes' => 'WSDiscovery::Elements::Scopes',
+
+        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+
+        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+
+    },
+    {
+
+        'EndpointReference' => '',
+        'Types' => '',
+        'Scopes' => '',
+        'XAddrs' => '',
+        'MetadataVersion' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::HelloType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+HelloType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EndpointReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Types
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Scopes
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * XAddrs
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * MetadataVersion
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::HelloType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+   XAddrs => $some_value, # UriListType
+   MetadataVersion =>  $some_value, # unsignedInt
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/MetadataType.pm b/onvif/proxy/lib/WSDiscovery11/Types/MetadataType.pm
new file mode 100644
index 000000000..072161f78
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/MetadataType.pm
@@ -0,0 +1,94 @@
+package WSDiscovery::Types::MetadataType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::MetadataType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::MetadataType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ProbeMatchType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ProbeMatchType.pm
new file mode 100644
index 000000000..c85d98849
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ProbeMatchType.pm
@@ -0,0 +1,180 @@
+package WSDiscovery::Types::ProbeMatchType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EndpointReference_of :ATTR(:get<EndpointReference>);
+my %Types_of :ATTR(:get<Types>);
+my %Scopes_of :ATTR(:get<Scopes>);
+my %XAddrs_of :ATTR(:get<XAddrs>);
+my %MetadataVersion_of :ATTR(:get<MetadataVersion>);
+
+__PACKAGE__->_factory(
+    [ qw(        EndpointReference
+        Types
+        Scopes
+        XAddrs
+        MetadataVersion
+
+    ) ],
+    {
+        'EndpointReference' => \%EndpointReference_of,
+        'Types' => \%Types_of,
+        'Scopes' => \%Scopes_of,
+        'XAddrs' => \%XAddrs_of,
+        'MetadataVersion' => \%MetadataVersion_of,
+    },
+    {
+        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+
+        'Types' => 'WSDiscovery::Elements::Types',
+
+        'Scopes' => 'WSDiscovery::Elements::Scopes',
+
+        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+
+        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+
+    },
+    {
+
+        'EndpointReference' => '',
+        'Types' => '',
+        'Scopes' => '',
+        'XAddrs' => '',
+        'MetadataVersion' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ProbeMatchType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProbeMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EndpointReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Types
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Scopes
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * XAddrs
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * MetadataVersion
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProbeMatchType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+   XAddrs => $some_value, # UriListType
+   MetadataVersion =>  $some_value, # unsignedInt
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ProbeMatchesType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ProbeMatchesType.pm
new file mode 100644
index 000000000..200edc6a4
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ProbeMatchesType.pm
@@ -0,0 +1,115 @@
+package WSDiscovery::Types::ProbeMatchesType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ProbeMatch_of :ATTR(:get<ProbeMatch>);
+
+__PACKAGE__->_factory(
+    [ qw(        ProbeMatch
+
+    ) ],
+    {
+        'ProbeMatch' => \%ProbeMatch_of,
+    },
+    {
+        'ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
+    },
+    {
+
+        'ProbeMatch' => 'ProbeMatch',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ProbeMatchesType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProbeMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ProbeMatch
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSDiscovery::Types::MetadataType
+       },
+     },
+     Types => $some_value, # QNameListType
+     Scopes =>  { value => $some_value },
+     XAddrs => $some_value, # UriListType
+     MetadataVersion =>  $some_value, # unsignedInt
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ProbeType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ProbeType.pm
new file mode 100644
index 000000000..60dfa0bf3
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ProbeType.pm
@@ -0,0 +1,126 @@
+package WSDiscovery::Types::ProbeType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Types_of :ATTR(:get<Types>);
+my %Scopes_of :ATTR(:get<Scopes>);
+
+__PACKAGE__->_factory(
+    [ qw(        Types
+        Scopes
+
+    ) ],
+    {
+        'Types' => \%Types_of,
+        'Scopes' => \%Scopes_of,
+    },
+    {
+        'Types' => 'WSDiscovery::Elements::Types',
+
+        'Scopes' => 'WSDiscovery::Elements::Scopes',
+
+    },
+    {
+
+        'Types' => '',
+        'Scopes' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ProbeType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProbeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Types
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Scopes
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProbeType
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ProblemActionType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ProblemActionType.pm
new file mode 100644
index 000000000..1426017f4
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ProblemActionType.pm
@@ -0,0 +1,119 @@
+package WSDiscovery::Types::ProblemActionType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Action_of :ATTR(:get<Action>);
+my %SoapAction_of :ATTR(:get<SoapAction>);
+
+__PACKAGE__->_factory(
+    [ qw(        Action
+        SoapAction
+
+    ) ],
+    {
+        'Action' => \%Action_of,
+        'SoapAction' => \%SoapAction_of,
+    },
+    {
+        'Action' => 'WSDiscovery::Elements::Action',
+
+        'SoapAction' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'Action' => '',
+        'SoapAction' => 'SoapAction',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ProblemActionType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProblemActionType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Action
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * SoapAction
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ProblemActionType
+   Action =>  { value => $some_value },
+   SoapAction =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/QNameListType.pm b/onvif/proxy/lib/WSDiscovery11/Types/QNameListType.pm
new file mode 100644
index 000000000..fef443675
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/QNameListType.pm
@@ -0,0 +1,75 @@
+package WSDiscovery::Types::QNameListType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+QNameListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ReferenceParametersType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ReferenceParametersType.pm
new file mode 100644
index 000000000..d6569a66b
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ReferenceParametersType.pm
@@ -0,0 +1,94 @@
+package WSDiscovery::Types::ReferenceParametersType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ReferenceParametersType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReferenceParametersType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ReferenceParametersType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/RelatesToType.pm b/onvif/proxy/lib/WSDiscovery11/Types/RelatesToType.pm
new file mode 100644
index 000000000..068d00ce6
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/RelatesToType.pm
@@ -0,0 +1,118 @@
+package WSDiscovery::Types::RelatesToType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+package WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %RelationshipType_of :ATTR(:get<RelationshipType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        RelationshipType
+    ) ],
+    {
+
+        RelationshipType => \%RelationshipType_of,
+    },
+    {
+        RelationshipType => 'WSDiscovery::Types::RelationshipTypeOpenEnum',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::RelatesToType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelatesToType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * RelationshipType
+
+
+
+This attribute is of type L<WSDiscovery::Types::RelationshipTypeOpenEnum|WSDiscovery::Types::RelationshipTypeOpenEnum>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/RelationshipType.pm b/onvif/proxy/lib/WSDiscovery11/Types/RelationshipType.pm
new file mode 100644
index 000000000..022f9b27e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/RelationshipType.pm
@@ -0,0 +1,65 @@
+package WSDiscovery::Types::RelationshipType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/RelationshipTypeOpenEnum.pm b/onvif/proxy/lib/WSDiscovery11/Types/RelationshipTypeOpenEnum.pm
new file mode 100644
index 000000000..dc3e004c2
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/RelationshipTypeOpenEnum.pm
@@ -0,0 +1,76 @@
+package WSDiscovery::Types::RelationshipTypeOpenEnum;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipTypeOpenEnum from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ResolveMatchType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ResolveMatchType.pm
new file mode 100644
index 000000000..03216f066
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ResolveMatchType.pm
@@ -0,0 +1,180 @@
+package WSDiscovery::Types::ResolveMatchType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EndpointReference_of :ATTR(:get<EndpointReference>);
+my %Types_of :ATTR(:get<Types>);
+my %Scopes_of :ATTR(:get<Scopes>);
+my %XAddrs_of :ATTR(:get<XAddrs>);
+my %MetadataVersion_of :ATTR(:get<MetadataVersion>);
+
+__PACKAGE__->_factory(
+    [ qw(        EndpointReference
+        Types
+        Scopes
+        XAddrs
+        MetadataVersion
+
+    ) ],
+    {
+        'EndpointReference' => \%EndpointReference_of,
+        'Types' => \%Types_of,
+        'Scopes' => \%Scopes_of,
+        'XAddrs' => \%XAddrs_of,
+        'MetadataVersion' => \%MetadataVersion_of,
+    },
+    {
+        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+
+        'Types' => 'WSDiscovery::Elements::Types',
+
+        'Scopes' => 'WSDiscovery::Elements::Scopes',
+
+        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+
+        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+
+    },
+    {
+
+        'EndpointReference' => '',
+        'Types' => '',
+        'Scopes' => '',
+        'XAddrs' => '',
+        'MetadataVersion' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ResolveMatchType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ResolveMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EndpointReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Types
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Scopes
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * XAddrs
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * MetadataVersion
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ResolveMatchType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+   Types => $some_value, # QNameListType
+   Scopes =>  { value => $some_value },
+   XAddrs => $some_value, # UriListType
+   MetadataVersion =>  $some_value, # unsignedInt
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ResolveMatchesType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ResolveMatchesType.pm
new file mode 100644
index 000000000..3e0db0619
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ResolveMatchesType.pm
@@ -0,0 +1,115 @@
+package WSDiscovery::Types::ResolveMatchesType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolveMatch_of :ATTR(:get<ResolveMatch>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolveMatch
+
+    ) ],
+    {
+        'ResolveMatch' => \%ResolveMatch_of,
+    },
+    {
+        'ResolveMatch' => 'WSDiscovery::Types::ResolveMatchType',
+    },
+    {
+
+        'ResolveMatch' => 'ResolveMatch',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ResolveMatchesType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ResolveMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolveMatch
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSDiscovery::Types::MetadataType
+       },
+     },
+     Types => $some_value, # QNameListType
+     Scopes =>  { value => $some_value },
+     XAddrs => $some_value, # UriListType
+     MetadataVersion =>  $some_value, # unsignedInt
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ResolveType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ResolveType.pm
new file mode 100644
index 000000000..f1ddd13f5
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ResolveType.pm
@@ -0,0 +1,116 @@
+package WSDiscovery::Types::ResolveType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EndpointReference_of :ATTR(:get<EndpointReference>);
+
+__PACKAGE__->_factory(
+    [ qw(        EndpointReference
+
+    ) ],
+    {
+        'EndpointReference' => \%EndpointReference_of,
+    },
+    {
+        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+
+    },
+    {
+
+        'EndpointReference' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ResolveType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ResolveType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EndpointReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSDiscovery::Types::MetadataType
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/ScopesType.pm b/onvif/proxy/lib/WSDiscovery11/Types/ScopesType.pm
new file mode 100644
index 000000000..84cdfa057
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/ScopesType.pm
@@ -0,0 +1,118 @@
+package WSDiscovery::Types::ScopesType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    WSDiscovery::Types::UriListType
+);
+
+package WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %MatchBy_of :ATTR(:get<MatchBy>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        MatchBy
+    ) ],
+    {
+
+        MatchBy => \%MatchBy_of,
+    },
+    {
+        MatchBy => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::ScopesType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ScopesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * MatchBy
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/SecurityType.pm b/onvif/proxy/lib/WSDiscovery11/Types/SecurityType.pm
new file mode 100644
index 000000000..968033307
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/SecurityType.pm
@@ -0,0 +1,111 @@
+package WSDiscovery::Types::SecurityType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Sig_of :ATTR(:get<Sig>);
+
+__PACKAGE__->_factory(
+    [ qw(        Sig
+
+    ) ],
+    {
+        'Sig' => \%Sig_of,
+    },
+    {
+        'Sig' => 'WSDiscovery::Elements::Sig',
+
+    },
+    {
+
+        'Sig' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::SecurityType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Sig
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::SecurityType
+   Sig =>  { # WSDiscovery::Types::SigType
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/SigType.pm b/onvif/proxy/lib/WSDiscovery11/Types/SigType.pm
new file mode 100644
index 000000000..71eb613df
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/SigType.pm
@@ -0,0 +1,172 @@
+package WSDiscovery::Types::SigType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::SigType::_SigType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSDiscovery::Types::SigType::_SigType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Scheme_of :ATTR(:get<Scheme>);
+my %KeyId_of :ATTR(:get<KeyId>);
+my %Refs_of :ATTR(:get<Refs>);
+my %Sig_of :ATTR(:get<Sig>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Scheme
+        KeyId
+        Refs
+        Sig
+    ) ],
+    {
+
+        Scheme => \%Scheme_of,
+
+        KeyId => \%KeyId_of,
+
+        Refs => \%Refs_of,
+
+        Sig => \%Sig_of,
+    },
+    {
+        Scheme => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        KeyId => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary',
+        Refs => 'SOAP::WSDL::XSD::Typelib::Builtin::IDREFS',
+        Sig => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery::Types::SigType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SigType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery::Types::SigType
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery::Types::SigType::_SigType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Scheme
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+=item * KeyId
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::base64Binary|SOAP::WSDL::XSD::Typelib::Builtin::base64Binary>.
+
+=item * Refs
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::IDREFS|SOAP::WSDL::XSD::Typelib::Builtin::IDREFS>.
+
+=item * Sig
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::base64Binary|SOAP::WSDL::XSD::Typelib::Builtin::base64Binary>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery11/Types/UriListType.pm b/onvif/proxy/lib/WSDiscovery11/Types/UriListType.pm
new file mode 100644
index 000000000..1a04cfbee
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery11/Types/UriListType.pm
@@ -0,0 +1,75 @@
+package WSDiscovery::Types::UriListType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+UriListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
index ee55035ca..5a8f4d0b1 100644
--- a/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
+++ b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
@@ -20,18 +20,16 @@ sub START {
 sub Subscribe {
     my ($self, $body, $header) = @_;
     die "Subscribe must be called as object method (\$self is <$self>)" if not blessed($self);
+#print " proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm Subscribe\n";
     return $self->SUPER::call({
         operation => 'Subscribe',
         soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Subscribe',
         style => 'document',
         body => {
-            
-
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( WSNotification::Elements::Subscribe )],
-
+           use            => 'literal',
+					 namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+					 encodingStyle   => '',
+					 parts           =>  [qw( WSNotification::Elements::Subscribe )],
         },
         header => {
             
@@ -42,39 +40,30 @@ sub Subscribe {
     }, $body, $header);
 }
 
-
 sub GetCurrentMessage {
-    my ($self, $body, $header) = @_;
-    die "GetCurrentMessage must be called as object method (\$self is <$self>)" if not blessed($self);
-    return $self->SUPER::call({
-        operation => 'GetCurrentMessage',
-        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/GetCurrentMessage',
-        style => 'document',
-        body => {
-            
+	my ($self, $body, $header) = @_;
+	die "GetCurrentMessage must be called as object method (\$self is <$self>)" if not blessed($self);
+	return $self->SUPER::call({
+			operation => 'GetCurrentMessage',
+			soap_action => 'http://docs.oasis-open.org/wsn/bw-2/GetCurrentMessage',
+			style => 'document',
+			body => {
+			use            => 'literal',
+			namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+			encodingStyle   => '',
+			parts           =>  [qw( WSNotification::Elements::GetCurrentMessage )],
 
-           'use'            => 'literal',
-            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
-            encodingStyle   => '',
-            parts           =>  [qw( WSNotification::Elements::GetCurrentMessage )],
+			},
+			header => {
 
-        },
-        header => {
-            
-        },
-        headerfault => {
-            
-        }
-    }, $body, $header);
+			},
+			headerfault => {
+
+			}
+			}, $body, $header);
 }
 
-
-
-
 1;
-
-
-
 __END__
 
 =pod
diff --git a/onvif/wsdl/analytics.wsdl b/onvif/wsdl/analytics.wsdl
new file mode 100644
index 000000000..b2c0f6ae7
--- /dev/null
+++ b/onvif/wsdl/analytics.wsdl
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
+<!--
+	Copyright (c) 2008-2012 by ONVIF: Open Network Video Interface Forum. All rights reserved.
+	
+	Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
+	
+	THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+	IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
+-->
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tan="http://www.onvif.org/ver20/analytics/wsdl" targetNamespace="http://www.onvif.org/ver20/analytics/wsdl">
+	<wsdl:types>
+		<xs:schema targetNamespace="http://www.onvif.org/ver20/analytics/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="2.2">
+			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
+			<!--  Message Request/Responses elements  -->
+			<!--===============================-->
+			<xs:element name="GetServiceCapabilities">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetServiceCapabilitiesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Capabilities" type="tan:Capabilities">
+							<xs:annotation>
+								<xs:documentation>The capabilities for the analytics service is returned in the Capabilities element.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:complexType name="Capabilities">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:attribute name="RuleSupport" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indication that the device supports the rules interface and the rules syntax.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="AnalyticsModuleSupport" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indication that the device supports the scene analytics module interface.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="CellBasedSceneDescriptionSupported" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indication that the device produces the cell based scene description</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<xs:element name="Capabilities" type="tan:Capabilities"/>
+			<!--===============================-->
+			<xs:element name="GetSupportedRules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>
+									References an existing Video Analytics configuration. The list of available tokens can be obtained
+									via the Media service GetVideoAnalyticsConfigurations method.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSupportedRulesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SupportedRules" type="tt:SupportedRules"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateRules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Rule" type="tt:Config" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateRulesResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteRules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="RuleName" type="xs:string" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>References the specific rule to be deleted (e.g. "MyLineDetector"). </xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteRulesResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="ModifyRules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Rule" type="tt:Config" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ModifyRulesResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetRules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetRulesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Rule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSupportedAnalyticsModules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSupportedAnalyticsModulesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SupportedAnalyticsModules" type="tt:SupportedAnalyticsModules"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateAnalyticsModules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="AnalyticsModule" type="tt:Config" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateAnalyticsModulesResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteAnalyticsModules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing Video Analytics configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="AnalyticsModuleName" type="xs:string" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Name of the AnalyticsModule to be deleted.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteAnalyticsModulesResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="ModifyAnalyticsModules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="AnalyticsModule" type="tt:Config" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ModifyAnalyticsModulesResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAnalyticsModules">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to an existing VideoAnalyticsConfiguration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAnalyticsModulesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="AnalyticsModule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="GetServiceCapabilitiesRequest">
+		<wsdl:part name="parameters" element="tan:GetServiceCapabilities"/>
+	</wsdl:message>
+	<wsdl:message name="GetServiceCapabilitiesResponse">
+		<wsdl:part name="parameters" element="tan:GetServiceCapabilitiesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSupportedRulesRequest">
+		<wsdl:part name="parameters" element="tan:GetSupportedRules"/>
+	</wsdl:message>
+	<wsdl:message name="GetSupportedRulesResponse">
+		<wsdl:part name="parameters" element="tan:GetSupportedRulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreateRulesRequest">
+		<wsdl:part name="parameters" element="tan:CreateRules"/>
+	</wsdl:message>
+	<wsdl:message name="CreateRulesResponse">
+		<wsdl:part name="parameters" element="tan:CreateRulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteRulesRequest">
+		<wsdl:part name="parameters" element="tan:DeleteRules"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteRulesResponse">
+		<wsdl:part name="parameters" element="tan:DeleteRulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetRulesRequest">
+		<wsdl:part name="parameters" element="tan:GetRules"/>
+	</wsdl:message>
+	<wsdl:message name="GetRulesResponse">
+		<wsdl:part name="parameters" element="tan:GetRulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSupportedAnalyticsModulesResponse">
+		<wsdl:part name="parameters" element="tan:GetSupportedAnalyticsModulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSupportedAnalyticsModulesRequest">
+		<wsdl:part name="parameters" element="tan:GetSupportedAnalyticsModules"/>
+	</wsdl:message>
+	<wsdl:message name="CreateAnalyticsModulesRequest">
+		<wsdl:part name="parameters" element="tan:CreateAnalyticsModules"/>
+	</wsdl:message>
+	<wsdl:message name="CreateAnalyticsModulesResponse">
+		<wsdl:part name="parameters" element="tan:CreateAnalyticsModulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteAnalyticsModulesRequest">
+		<wsdl:part name="parameters" element="tan:DeleteAnalyticsModules"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteAnalyticsModulesResponse">
+		<wsdl:part name="parameters" element="tan:DeleteAnalyticsModulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAnalyticsModulesRequest">
+		<wsdl:part name="parameters" element="tan:GetAnalyticsModules"/>
+	</wsdl:message>
+	<wsdl:message name="GetAnalyticsModulesResponse">
+		<wsdl:part name="parameters" element="tan:GetAnalyticsModulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="ModifyRulesRequest">
+		<wsdl:part name="parameters" element="tan:ModifyRules"/>
+	</wsdl:message>
+	<wsdl:message name="ModifyRulesResponse">
+		<wsdl:part name="parameters" element="tan:ModifyRulesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="ModifyAnalyticsModulesRequest">
+		<wsdl:part name="parameters" element="tan:ModifyAnalyticsModules"/>
+	</wsdl:message>
+	<wsdl:message name="ModifyAnalyticsModulesResponse">
+		<wsdl:part name="parameters" element="tan:ModifyAnalyticsModulesResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="RuleEnginePort">
+		<wsdl:operation name="GetSupportedRules">
+			<wsdl:documentation>
+				List all rules that are supported by the given VideoAnalyticsConfiguration.
+				The result of this method may depend on the overall Video analytics configuration of the device,
+				which is available via the current set of profiles. 
+			</wsdl:documentation>
+			<wsdl:input message="tan:GetSupportedRulesRequest"/>
+			<wsdl:output message="tan:GetSupportedRulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreateRules">
+			<wsdl:documentation>
+				Add one or more rules to an existing VideoAnalyticsConfiguration.
+				The available supported types can be retrieved via <a href="#op.GetSupportedRules">GetSupportedRules</a>, 
+				where the Name of the supported rule correspond to the type of an rule instance.<br/>
+				Pass unique module names which can be later used as reference. 
+				The Parameters of the rules must match those of the corresponding description.
+				<br/>
+				Although this method is mandatory a device implementation must not support adding rules. 
+				Instead it can provide a fixed set of predefined configurations via the media service function 
+				<a href="media.wsdl#op.GetCompatibleVideoAnalyticsConfigurations">GetCompatibleVideoAnalyticsConfigurations</a>.
+			</wsdl:documentation>
+			<wsdl:input message="tan:CreateRulesRequest"/>
+			<wsdl:output message="tan:CreateRulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteRules">
+			<wsdl:documentation>
+				Remove one or more rules from a VideoAnalyticsConfiguration.
+			</wsdl:documentation>
+			<wsdl:input message="tan:DeleteRulesRequest"/>
+			<wsdl:output message="tan:DeleteRulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetRules">
+			<wsdl:documentation>
+				List the currently assigned set of rules of a VideoAnalyticsConfiguration.
+			</wsdl:documentation>
+			<wsdl:input message="tan:GetRulesRequest"/>
+			<wsdl:output message="tan:GetRulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="ModifyRules">
+			<wsdl:documentation>
+				Modify one or more rules of a VideoAnalyticsConfiguration. The rules are referenced by their names.
+			</wsdl:documentation>
+			<wsdl:input message="tan:ModifyRulesRequest"/>
+			<wsdl:output message="tan:ModifyRulesResponse"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:portType name="AnalyticsEnginePort">
+		<wsdl:operation name="GetServiceCapabilities">
+			<wsdl:documentation>Returns the capabilities of the analytics service. The result is returned in a typed answer.</wsdl:documentation>
+			<wsdl:input message="tan:GetServiceCapabilitiesRequest"/>
+			<wsdl:output message="tan:GetServiceCapabilitiesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSupportedAnalyticsModules">
+			<wsdl:documentation>
+				List all analytics modules that are supported by the given VideoAnalyticsConfiguration.
+				The result of this method may depend on the overall Video analytics configuration of the device,
+				which is available via the current set of profiles. 
+			</wsdl:documentation>
+			<wsdl:input message="tan:GetSupportedAnalyticsModulesRequest"/>
+			<wsdl:output message="tan:GetSupportedAnalyticsModulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreateAnalyticsModules">
+			<wsdl:documentation>
+				Add one or more analytics modules to an existing VideoAnalyticsConfiguration.
+				The available supported types can be retrieved via <a href="#op.GetSupportedAnalyticsModules">GetSupportedAnalyticsModules</a>, 
+				where the Name of the supported AnalyticsModules correspond to the type of an AnalyticsModule instance.<br/>
+				Pass unique module names which can be later used as reference. The Parameters of the analytics module must match those of the corresponding AnalyticsModuleDescription.
+				<br/>
+				Although this method is mandatory a device implementation must not support adding modules. 
+				Instead it can provide a fixed set of predefined configurations via the media service function 
+				<a href="media.wsdl#op.GetCompatibleVideoAnalyticsConfigurations">GetCompatibleVideoAnalyticsConfigurations</a>.
+				<br/>
+				The device shall ensure that a corresponding analytics engine starts operation when a client
+				subscribes directly or indirectly for events produced by the analytics or rule engine or when a
+				client requests the corresponding scene description stream.
+				An analytics module must be attached to a Video source using the media profiles before it can be used.
+				In case differing analytics configurations are attached to the same profile it is undefined which
+				of the analytics module configuration becomes active if no stream is activated or multiple streams
+				with different profiles are activated at the same time.
+			</wsdl:documentation>
+			<wsdl:input message="tan:CreateAnalyticsModulesRequest"/>
+			<wsdl:output message="tan:CreateAnalyticsModulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteAnalyticsModules">
+			<wsdl:documentation>
+				Remove one or more analytics modules from a VideoAnalyticsConfiguration referenced by their names.<br/>
+			</wsdl:documentation>
+			<wsdl:input message="tan:DeleteAnalyticsModulesRequest"/>
+			<wsdl:output message="tan:DeleteAnalyticsModulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAnalyticsModules">
+			<wsdl:documentation>
+				List the currently assigned set of analytics modules of a VideoAnalyticsConfiguration.
+			</wsdl:documentation>
+			<wsdl:input message="tan:GetAnalyticsModulesRequest"/>
+			<wsdl:output message="tan:GetAnalyticsModulesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="ModifyAnalyticsModules">
+			<wsdl:documentation>
+				Modify the settings of one or more analytics modules of a VideoAnalyticsConfiguration. The modules are referenced by their names.
+				It is allowed to pass only a subset to be modified.
+			</wsdl:documentation>
+			<wsdl:input message="tan:ModifyAnalyticsModulesRequest"/>
+			<wsdl:output message="tan:ModifyAnalyticsModulesResponse"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="RuleEngineBinding" type="tan:RuleEnginePort">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="GetSupportedRules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/GetSupportedRules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreateRules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/CreateRules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteRules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/DeleteRules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetRules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/GetRules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="ModifyRules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/ModifyRules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:binding name="AnalyticsEngineBinding" type="tan:AnalyticsEnginePort">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="GetServiceCapabilities">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/GetServiceCapabilities"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetSupportedAnalyticsModules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/GetSupportedAnalyticsModules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreateAnalyticsModules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/CreateAnalyticsModules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteAnalyticsModules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/DeleteAnalyticsModules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAnalyticsModules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/GetAnalyticsModules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="ModifyAnalyticsModules">
+			<soap:operation soapAction="http://www.onvif.org/ver20/analytics/wsdl/ModifyAnalyticsModules"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+  
+  <wsdl:service name="Analytics">
+    <wsdl:port name="RuleEnginePort" binding="tan:RuleEngineBinding" >
+      <soap:address
+        location="http://www.examples.com/Analytics/" />
+    </wsdl:port>
+    <wsdl:port name="AnalyticsEnginePort" binding="tan:AnalyticsEngineBinding" >
+      <soap:address
+        location="http://www.examples.com/Analytics/" />
+    </wsdl:port>
+  </wsdl:service>
+
+</wsdl:definitions>
diff --git a/onvif/wsdl/b-2.xsd b/onvif/wsdl/b-2.xsd
new file mode 100644
index 000000000..6af08aee9
--- /dev/null
+++ b/onvif/wsdl/b-2.xsd
@@ -0,0 +1,586 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+-->
+
+<xsd:schema 
+  targetNamespace="http://docs.oasis-open.org/wsn/b-2"   
+  xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+  xmlns:wsa="http://www.w3.org/2005/08/addressing"
+  xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
+  xmlns:wstop="http://docs.oasis-open.org/wsn/t-1"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  elementFormDefault="qualified"  attributeFormDefault="unqualified">
+
+<!-- ======================== Imports  ============================ -->
+  
+  <xsd:import namespace="http://www.w3.org/2005/08/addressing"
+              schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd" 
+  />
+
+  <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
+              schemaLocation="file:wsdl/bf-2.xsd"/>
+<!--              schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd"  /> -->
+  <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1"
+              schemaLocation="file:wsdl/t-1.xsd" 
+  />
+  
+<!-- ===================== Misc. Helper Types ===================== -->
+
+  <xsd:complexType name="QueryExpressionType" mixed="true">
+    <xsd:sequence>
+      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
+    </xsd:sequence>
+    <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="TopicExpressionType" mixed="true">
+    <xsd:sequence>
+      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
+    </xsd:sequence>
+    <xsd:attribute name="Dialect" type="xsd:anyURI" use="required" />
+    <xsd:anyAttribute/>
+  </xsd:complexType>
+
+  <xsd:complexType name="FilterType">
+    <xsd:sequence>
+<!-- extension for zonemider ONVIF -->
+      <xsd:element ref="wsnt:TopicExpression"        
+                   minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element ref="wsnt:MessageContent"        
+                   minOccurs="0" maxOccurs="unbounded" />
+<!-- end extension -->
+      <xsd:any minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="SubscriptionPolicyType">
+    <xsd:sequence>
+      <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+<!-- =============== Resource Property Related  =================== -->
+<!-- ======== Resource Properties for NotificationProducer ======== -->
+  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
+  <xsd:element name="FixedTopicSet" type="xsd:boolean" default="true"/>
+  <xsd:element name="TopicExpressionDialect" type="xsd:anyURI"/>
+              
+  <xsd:element name="NotificationProducerRP">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="wsnt:TopicExpression"        
+                     minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element ref="wsnt:FixedTopicSet"        
+                     minOccurs="0" maxOccurs="1" />
+        <xsd:element ref="wsnt:TopicExpressionDialect"
+                     minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element ref="wstop:TopicSet"
+                     minOccurs="0" maxOccurs="1" />
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+<!-- ======== Resource Properties for SubscriptionManager ========= -->       
+  <xsd:element name="ConsumerReference" 
+               type="wsa:EndpointReferenceType" />
+  <xsd:element name="Filter" type="wsnt:FilterType" />
+  <xsd:element name="SubscriptionPolicy"                                                                                                                                                                   		      type="wsnt:SubscriptionPolicyType" />
+
+
+  <xsd:element name="CreationTime" type="xsd:dateTime" />
+  
+  <xsd:element name="SubscriptionManagerRP" >
+    <xsd:complexType>
+      <xsd:sequence>
+         <xsd:element ref="wsnt:ConsumerReference"        
+                      minOccurs="1" maxOccurs="1" />
+         <xsd:element ref="wsnt:Filter"
+                      minOccurs="0" maxOccurs="1" />
+         <xsd:element ref="wsnt:SubscriptionPolicy" 
+                      minOccurs="0" maxOccurs="1" />
+         <xsd:element ref="wsnt:CreationTime" 
+                      minOccurs="0" maxOccurs="1" />
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+<!-- ================= Notification Metadata  ===================== -->
+  <xsd:element name="SubscriptionReference" 
+               type="wsa:EndpointReferenceType" />
+  <xsd:element name="Topic" 
+               type="wsnt:TopicExpressionType" />
+  <xsd:element name="ProducerReference" 
+               type="wsa:EndpointReferenceType" />
+
+<!-- ================== Message Helper Types  ===================== -->
+  <xsd:complexType name="NotificationMessageHolderType" >
+    <xsd:sequence>
+      <xsd:element ref="wsnt:SubscriptionReference" 
+                   minOccurs="0" maxOccurs="1" />
+      <xsd:element ref="wsnt:Topic" 
+                   minOccurs="0" maxOccurs="1" />
+      <xsd:element ref="wsnt:ProducerReference" 
+                   minOccurs="0" maxOccurs="1" />
+      <xsd:element name="Message">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:any namespace="##any" processContents="lax"
+                     minOccurs="1" maxOccurs="1"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:element name="NotificationMessage"
+               type="wsnt:NotificationMessageHolderType"/>
+
+<!-- ========== Message Types for NotificationConsumer  =========== -->
+  <xsd:element name="Notify" >
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="wsnt:NotificationMessage"
+                     minOccurs="1" maxOccurs="unbounded" />
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+<!-- ========== Message Types for NotificationProducer  =========== -->
+
+  <xsd:simpleType name="AbsoluteOrRelativeTimeType">
+    <xsd:union memberTypes="xsd:dateTime xsd:duration" />
+  </xsd:simpleType>
+
+  <xsd:element name="CurrentTime" type="xsd:dateTime" />
+
+  <xsd:element name="TerminationTime" 
+               nillable="true" type="xsd:dateTime" />
+
+  <xsd:element name="ProducerProperties"
+               type="wsnt:QueryExpressionType" />
+
+  <xsd:element name="MessageContent"
+               type="wsnt:QueryExpressionType" />
+
+  <xsd:element name="UseRaw"><xsd:complexType/></xsd:element>
+
+  <xsd:element name="Subscribe" >
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="ConsumerReference" 
+                     type="wsa:EndpointReferenceType"
+                     minOccurs="1" maxOccurs="1" />
+        <xsd:element name="Filter" 
+                     type="wsnt:FilterType" 
+                     minOccurs="0" maxOccurs="1" />
+        <xsd:element name="InitialTerminationTime" 
+                     type="wsnt:AbsoluteOrRelativeTimeType"
+                     nillable="true"
+                     minOccurs="0" maxOccurs="1" />
+        <xsd:element name="SubscriptionPolicy"
+                     minOccurs="0" maxOccurs="1">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:any namespace="##any" processContents="lax"
+                       minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+        
+  <xsd:element name="SubscribeResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="SubscriptionReference" 
+                     type="wsa:EndpointReferenceType"
+                     minOccurs="1" maxOccurs="1" />
+        <xsd:element ref="wsnt:CurrentTime"
+                     minOccurs="0" maxOccurs="1" />
+        <xsd:element ref="wsnt:TerminationTime"
+                     minOccurs="0" maxOccurs="1" />
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+                  
+  <xsd:element name="GetCurrentMessage">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="Topic" 
+                     type="wsnt:TopicExpressionType" />
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="GetCurrentMessageResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="SubscribeCreationFailedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="SubscribeCreationFailedFault" 
+               type="wsnt:SubscribeCreationFailedFaultType"/>
+
+  <xsd:complexType name="InvalidFilterFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType">
+        <xsd:sequence>
+          <xsd:element name="UnknownFilter" type="xsd:QName"
+                       minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="InvalidFilterFault"
+               type="wsnt:InvalidFilterFaultType"/>
+
+  <xsd:complexType name="TopicExpressionDialectUnknownFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="TopicExpressionDialectUnknownFault" 
+               type="wsnt:TopicExpressionDialectUnknownFaultType"/>
+
+  <xsd:complexType name="InvalidTopicExpressionFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="InvalidTopicExpressionFault" 
+               type="wsnt:InvalidTopicExpressionFaultType"/>
+
+  <xsd:complexType name="TopicNotSupportedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="TopicNotSupportedFault" 
+               type="wsnt:TopicNotSupportedFaultType"/>
+
+  <xsd:complexType name="MultipleTopicsSpecifiedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="MultipleTopicsSpecifiedFault" 
+               type="wsnt:MultipleTopicsSpecifiedFaultType"/>
+
+  <xsd:complexType name="InvalidProducerPropertiesExpressionFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="InvalidProducerPropertiesExpressionFault" 
+             type="wsnt:InvalidProducerPropertiesExpressionFaultType"/>
+
+  <xsd:complexType name="InvalidMessageContentExpressionFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="InvalidMessageContentExpressionFault" 
+             type="wsnt:InvalidMessageContentExpressionFaultType"/>
+
+  <xsd:complexType name="UnrecognizedPolicyRequestFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType">
+		<xsd:sequence>
+             <xsd:element name="UnrecognizedPolicy" type="xsd:QName"
+                           minOccurs="0" maxOccurs="unbounded"/>
+         </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="UnrecognizedPolicyRequestFault" 
+             type="wsnt:UnrecognizedPolicyRequestFaultType"/>
+
+  <xsd:complexType name="UnsupportedPolicyRequestFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType">
+		<xsd:sequence>
+             <xsd:element name="UnsupportedPolicy" type="xsd:QName"
+                           minOccurs="0" maxOccurs="unbounded"/>
+         </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="UnsupportedPolicyRequestFault" 
+             type="wsnt:UnsupportedPolicyRequestFaultType"/>
+
+  <xsd:complexType name="NotifyMessageNotSupportedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="NotifyMessageNotSupportedFault" 
+             type="wsnt:NotifyMessageNotSupportedFaultType"/>
+
+  <xsd:complexType name="UnacceptableInitialTerminationTimeFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType">
+        <xsd:sequence>
+          <xsd:element name="MinimumTime" type="xsd:dateTime"/>
+          <xsd:element name="MaximumTime" type="xsd:dateTime"
+              minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="UnacceptableInitialTerminationTimeFault"
+              type="wsnt:UnacceptableInitialTerminationTimeFaultType"/>
+
+  <xsd:complexType name="NoCurrentMessageOnTopicFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="NoCurrentMessageOnTopicFault" 
+               type="wsnt:NoCurrentMessageOnTopicFaultType"/>
+
+<!-- ======== Message Types for PullPoint  ======================== -->
+  <xsd:element name="GetMessages">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="MaximumNumber" 
+                     type="xsd:nonNegativeInteger"
+                     minOccurs="0"/>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="GetMessagesResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="wsnt:NotificationMessage" 
+                     minOccurs="0" maxOccurs="unbounded" />
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="DestroyPullPoint">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="DestroyPullPointResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="UnableToGetMessagesFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+  <xsd:element name="UnableToGetMessagesFault" 
+               type="wsnt:UnableToGetMessagesFaultType"/>
+
+<xsd:complexType name="UnableToDestroyPullPointFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+  <xsd:element name="UnableToDestroyPullPointFault" 
+               type="wsnt:UnableToDestroyPullPointFaultType"/>
+
+<!-- ======== Message Types for Create PullPoint  ================= -->
+  <xsd:element name="CreatePullPoint">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="CreatePullPointResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="PullPoint"
+                     type="wsa:EndpointReferenceType"/>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="UnableToCreatePullPointFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="UnableToCreatePullPointFault" 
+               type="wsnt:UnableToCreatePullPointFaultType"/>
+
+<!-- ======== Message Types for Base SubscriptionManager  ========= -->
+  <xsd:element name="Renew">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="TerminationTime" 
+                     type="wsnt:AbsoluteOrRelativeTimeType"
+                     nillable="true"
+                     minOccurs="1" maxOccurs="1" />
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="RenewResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="wsnt:TerminationTime" 
+                      minOccurs="1" maxOccurs="1" />
+        <xsd:element ref="wsnt:CurrentTime" 
+                      minOccurs="0" maxOccurs="1" />
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="UnacceptableTerminationTimeFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType">
+        <xsd:sequence>
+          <xsd:element name="MinimumTime" type="xsd:dateTime"/>
+          <xsd:element name="MaximumTime" type="xsd:dateTime"
+              minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="UnacceptableTerminationTimeFault"
+              type="wsnt:UnacceptableTerminationTimeFaultType"/>
+
+  <xsd:element name="Unsubscribe">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="UnsubscribeResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="UnableToDestroySubscriptionFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="UnableToDestroySubscriptionFault" 
+               type="wsnt:UnableToDestroySubscriptionFaultType"/>
+
+<!-- ====== Message Types for Pausable SubscriptionManager  ======= -->
+
+  <xsd:element name="PauseSubscription">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="PauseSubscriptionResponse" >
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="ResumeSubscription">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="ResumeSubscriptionResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="PauseFailedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="PauseFailedFault" 
+               type="wsnt:PauseFailedFaultType"/>
+
+  <xsd:complexType name="ResumeFailedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="ResumeFailedFault" 
+               type="wsnt:ResumeFailedFaultType"/>
+
+</xsd:schema>
diff --git a/onvif/wsdl/bf-2.xsd b/onvif/wsdl/bf-2.xsd
new file mode 100644
index 000000000..4efefea72
--- /dev/null
+++ b/onvif/wsdl/bf-2.xsd
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+   OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this specification, can be obtained from the OASIS Executive Director. 
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
+
+Copyright (C) OASIS Open (2005). All Rights Reserved. 
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+
+<xsd:schema 
+  xmlns="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:wsa="http://www.w3.org/2005/08/addressing"
+  xmlns:wsrf-bf=
+    "http://docs.oasis-open.org/wsrf/bf-2" 
+  elementFormDefault="qualified" attributeFormDefault="unqualified" 
+  targetNamespace=
+    "http://docs.oasis-open.org/wsrf/bf-2">
+  <xsd:import
+     namespace="http://www.w3.org/2005/08/addressing" 
+     schemaLocation=
+              "http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
+              
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" 
+              schemaLocation="http://www.w3.org/2001/xml.xsd">
+    <xsd:annotation>
+      <xsd:documentation>
+        Get access to the xml: attribute groups for xml:lang as declared on 'schema'
+        and 'documentation' below
+      </xsd:documentation> 
+    </xsd:annotation>
+  </xsd:import>
+<!-- ====================== BaseFault Types ======================= -->
+      
+  <xsd:element name="BaseFault" type="wsrf-bf:BaseFaultType"/>
+  
+  <xsd:complexType name="BaseFaultType">
+    <xsd:sequence>
+      <xsd:any namespace="##other" processContents="lax"
+              minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="Timestamp" type="xsd:dateTime" 
+               minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="Originator" type="wsa:EndpointReferenceType" 
+               minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="ErrorCode" 
+               minOccurs="0" maxOccurs="1">
+        <xsd:complexType>
+          <xsd:complexContent mixed="true">
+            <xsd:extension base="xsd:anyType">
+              <xsd:attribute name="dialect" type="xsd:anyURI"
+                         use="required"/>
+            </xsd:extension>
+          </xsd:complexContent>
+        </xsd:complexType>      
+      </xsd:element>
+
+      <xsd:element name="Description" 
+               minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:attribute ref="xml:lang" use="optional"/> 
+        <!--      <xsd:anyAttribute processContents="lax" />-->
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="FaultCause" minOccurs="0" maxOccurs="1">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:any namespace="##other" processContents="lax" 
+                     minOccurs="1" maxOccurs="1"/>
+          </xsd:sequence>
+        </xsd:complexType> 
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:anyAttribute namespace="##other" processContents="lax"/>
+ </xsd:complexType>
+</xsd:schema>
diff --git a/onvif/wsdl/br-2.xsd b/onvif/wsdl/br-2.xsd
new file mode 100644
index 000000000..3ed96e022
--- /dev/null
+++ b/onvif/wsdl/br-2.xsd
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+-->
+
+<xsd:schema 
+  xmlns="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:wsa="http://www.w3.org/2005/08/addressing"
+  xmlns:wsn-br="http://docs.oasis-open.org/wsn/br-2"
+  xmlns:wsn-b="http://docs.oasis-open.org/wsn/b-2"
+  xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"      
+  xmlns:wstop="http://docs.oasis-open.org/wsn/t-1"
+  targetNamespace="http://docs.oasis-open.org/wsn/br-2"   
+  elementFormDefault="qualified"  
+  attributeFormDefault="unqualified">
+
+<!-- ======================== Imports  ============================ -->
+  
+   <xsd:import namespace="http://www.w3.org/2005/08/addressing"
+              schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
+
+   <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
+              schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd"/>
+
+   <xsd:import namespace="http://docs.oasis-open.org/wsn/b-2"
+              schemaLocation="http://docs.oasis-open.org/wsn/b-2.xsd"/>
+
+   <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1"
+              schemaLocation="http://docs.oasis-open.org/wsn/t-1.xsd"/>
+
+<!-- ======== Resource Properties for NotificationBroker ========== -->
+   <xsd:element name="RequiresRegistration" type="xsd:boolean"/>         
+
+<!-- ====== Resource Properties for PublisherRegistration ========= -->
+   <xsd:element name="PublisherReference" 
+                      type="wsa:EndpointReferenceType"/>
+   <xsd:element name="ConsumerReference" 
+                      type="wsa:EndpointReferenceType"/>
+   <xsd:element name="Topic"
+                      type="wsn-b:TopicExpressionType"/>
+   <xsd:element name="Demand" 
+                      type="xsd:boolean"/>
+   <xsd:element name="CreationTime" 
+                      type="xsd:dateTime"/>
+   <xsd:element name="NotificationBrokerRP">
+            <xsd:complexType>
+               <xsd:sequence>
+         <!-- From NotificationProducer -->
+                  <xsd:element ref="wsn-b:TopicExpression"        
+                     minOccurs="0" maxOccurs="unbounded" />
+        		  <xsd:element ref="wsn-b:FixedTopicSet"        
+                     minOccurs="0" maxOccurs="1" />
+        		  <xsd:element ref="wsn-b:TopicExpressionDialect"
+                     minOccurs="0" maxOccurs="unbounded" />
+                  <xsd:element ref="wstop:TopicSet"
+                     minOccurs="0" maxOccurs="1" />
+         <!-- NotificationBroker specific  -->
+                  <xsd:element ref="wsn-br:RequiresRegistration"        
+                               minOccurs="1" maxOccurs="1" />        
+               </xsd:sequence>
+            </xsd:complexType>
+   </xsd:element>
+ 
+<!-- ====== Resource Properties for PublisherRegistration ========= -->
+   <xsd:element name="PublisherRegistrationRP">
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element ref="wsn-br:PublisherReference"        
+                               minOccurs="0" maxOccurs="1" />
+                  <xsd:element ref="wsn-br:Topic"        
+                               minOccurs="0" maxOccurs="unbounded" />
+                  <xsd:element ref="wsn-br:Demand"        
+                               minOccurs="1" maxOccurs="1" />
+                  <xsd:element ref="wsn-br:CreationTime"        
+                               minOccurs="0" maxOccurs="1" />
+               </xsd:sequence>
+            </xsd:complexType>
+   </xsd:element>
+
+<!-- ========== Message Types for NotificationBroker  ============ -->
+   <xsd:element name="RegisterPublisher">
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="PublisherReference" 
+                               type="wsa:EndpointReferenceType" 
+                               minOccurs="0" maxOccurs="1" />
+                  <xsd:element name="Topic" 
+                               type="wsn-b:TopicExpressionType"
+                               minOccurs="0" maxOccurs="unbounded" />
+                  <xsd:element name="Demand" 
+                               type="xsd:boolean" default="false" 
+                               minOccurs="0" maxOccurs="1" />
+                  <xsd:element name="InitialTerminationTime" 
+                               type="xsd:dateTime"
+                               minOccurs="0" maxOccurs="1" />
+                  <xsd:any namespace="##other" processContents="lax"
+                       minOccurs="0" maxOccurs="unbounded"/>
+               </xsd:sequence>
+            </xsd:complexType>
+   </xsd:element>
+
+   <xsd:element name="RegisterPublisherResponse"> 
+            <xsd:complexType>
+               <xsd:sequence>
+                  <xsd:element name="PublisherRegistrationReference" 
+                               type="wsa:EndpointReferenceType"
+                               minOccurs="1" maxOccurs="1" />
+			  <xsd:element name="ConsumerReference" 
+                               type="wsa:EndpointReferenceType"
+                               minOccurs="0" maxOccurs="1" />
+
+               </xsd:sequence>
+            </xsd:complexType>
+   </xsd:element>
+     
+   <xsd:complexType name="PublisherRegistrationRejectedFaultType">
+            <xsd:complexContent>
+               <xsd:extension base="wsrf-bf:BaseFaultType"/>
+            </xsd:complexContent>
+         </xsd:complexType>
+   <xsd:element name="PublisherRegistrationRejectedFault" 
+                type="wsn-br:PublisherRegistrationRejectedFaultType"/>
+   
+   <xsd:complexType name="PublisherRegistrationFailedFaultType">
+            <xsd:complexContent>
+               <xsd:extension base="wsrf-bf:BaseFaultType"/>
+            </xsd:complexContent>
+         </xsd:complexType>
+   <xsd:element name="PublisherRegistrationFailedFault" 
+                type="wsn-br:PublisherRegistrationFailedFaultType"/>
+
+  
+
+   <xsd:element name="DestroyRegistration">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="DestroyRegistrationResponse">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##other" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:complexType name="ResourceNotDestroyedFaultType">
+    <xsd:complexContent>
+      <xsd:extension base="wsrf-bf:BaseFaultType"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="ResourceNotDestroyedFault" 
+               type="wsn-br:ResourceNotDestroyedFaultType"/>
+
+ </xsd:schema>
\ No newline at end of file
diff --git a/onvif/wsdl/brw-2.wsdl b/onvif/wsdl/brw-2.wsdl
new file mode 100644
index 000000000..675bab2df
--- /dev/null
+++ b/onvif/wsdl/brw-2.wsdl
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+-->
+
+<wsdl:definitions name="WS-BrokeredNotification"
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:wsa="http://www.w3.org/2005/08/addressing"
+  xmlns:wsn-br="http://docs.oasis-open.org/wsn/br-2" 
+  xmlns:wsn-brw="http://docs.oasis-open.org/wsn/brw-2"
+  xmlns:wsn-b="http://docs.oasis-open.org/wsn/b-2"
+  xmlns:wsn-bw="http://docs.oasis-open.org/wsn/bw-2"
+  xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"   
+  xmlns:wsrf-rw="http://docs.oasis-open.org/wsrf/rw-2" 
+  targetNamespace="http://docs.oasis-open.org/wsn/brw-2">
+
+<!-- ========================== Imports =========================== -->
+<wsdl:import namespace="http://docs.oasis-open.org/wsrf/rw-2" 
+       location="http://docs.oasis-open.org/wsrf/rw-2.wsdl"/>
+       
+   <wsdl:import namespace="http://docs.oasis-open.org/wsn/bw-2" 
+       location="http://docs.oasis-open.org/wsn/bw-2.wsdl"/>
+
+<!-- ===================== Types Definitions ====================== -->
+   <wsdl:types>
+     <xsd:schema>
+       <xsd:import
+         namespace="http://docs.oasis-open.org/wsn/br-2" 
+         schemaLocation="http://docs.oasis-open.org/wsn/br-2.xsd"/>
+     </xsd:schema>
+   </wsdl:types>
+
+<!-- ========== NotificationBroker::RegisterPublisher =============
+   RegisterPublisher(PublisherReference, TopicExpression* ,
+                     [Demand], [InitialTerminationTime])
+   returns: WS-Resource qualified EPR to a PublisherRegistration --> 
+   <wsdl:message name="RegisterPublisherRequest">
+      <wsdl:part name="RegisterPublisherRequest" 
+                 element="wsn-br:RegisterPublisher"/>
+   </wsdl:message>
+
+   <wsdl:message name="RegisterPublisherResponse">
+      <wsdl:part name="RegisterPublisherResponse" 
+                 element="wsn-br:RegisterPublisherResponse"/>
+   </wsdl:message>
+      
+   <wsdl:message name="PublisherRegistrationRejectedFault">
+      <wsdl:part name="PublisherRegistrationRejectedFault"             
+            element="wsn-br:PublisherRegistrationRejectedFault"/>
+   </wsdl:message> 
+
+   <wsdl:message name="PublisherRegistrationFailedFault">
+      <wsdl:part name="PublisherRegistrationFailedFault"
+            element="wsn-br:PublisherRegistrationFailedFault"/>
+   </wsdl:message> 
+
+   <wsdl:message name="DestroyRegistrationRequest">
+      <wsdl:part name="DestroyRegistrationRequest" 
+            element="wsn-br:DestroyRegistration"/>
+   </wsdl:message>
+
+   <wsdl:message name="DestroyRegistrationResponse">
+      <wsdl:part name="DestroyRegistrationResponse"
+            element="wsn-br:DestroyRegistrationResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="ResourceNotDestroyedFault">
+      <wsdl:part name="ResourceNotDestroyedFault"
+            element="wsn-br:ResourceNotDestroyedFault"/>
+   </wsdl:message> 
+
+<!-- =================== PortType Definitions ===================== -->
+
+<!-- ========== RegisterPublisher ============ -->
+<wsdl:portType name="RegisterPublisher">
+    <wsdl:operation name="RegisterPublisher">
+         <wsdl:input  message="wsn-brw:RegisterPublisherRequest"/>
+         <wsdl:output message="wsn-brw:RegisterPublisherResponse"/>
+         <wsdl:fault  name="ResourceUnknownFault"
+                      message="wsrf-rw:ResourceUnknownFault"/>
+         <wsdl:fault  name="InvalidTopicExpressionFault" 
+                      message="wsn-bw:InvalidTopicExpressionFault"/>
+         <wsdl:fault  name="TopicNotSupportedFault" 
+                      message="wsn-bw:TopicNotSupportedFault"/>
+         <wsdl:fault  name="PublisherRegistrationRejectedFault" 
+                 message="wsn-brw:PublisherRegistrationRejectedFault"/>
+	     <wsdl:fault  name="PublisherRegistrationFailedFault" 
+                 message="wsn-brw:PublisherRegistrationFailedFault"/>
+		<wsdl:fault  name="UnacceptableInitialTerminationTimeFault" 
+             message="wsn-bw:UnacceptableInitialTerminationTimeFault"/>
+    </wsdl:operation>
+  </wsdl:portType>
+
+<!-- ========== NotificationBroker PortType Definition ============ -->
+   <wsdl:portType name="NotificationBroker">
+      <!-- ============= extends NotificationConsumer ============= -->
+      <wsdl:operation name="Notify">
+         <wsdl:input message="wsn-bw:Notify" />
+      </wsdl:operation>
+      
+      <!-- ============= extends NotificationProducer ============= -->
+      <wsdl:operation name="Subscribe">
+         <wsdl:input  message="wsn-bw:SubscribeRequest" />
+         <wsdl:output message="wsn-bw:SubscribeResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="InvalidFilterFault" 
+                   message="wsn-bw:InvalidFilterFault"/>
+         <wsdl:fault  name="TopicExpressionDialectUnknownFault" 
+                   message="wsn-bw:TopicExpressionDialectUnknownFault"/>
+         <wsdl:fault  name="InvalidTopicExpressionFault" 
+                      message="wsn-bw:InvalidTopicExpressionFault" />
+         <wsdl:fault  name="TopicNotSupportedFault" 
+                      message="wsn-bw:TopicNotSupportedFault" />
+         <wsdl:fault  name="InvalidProducerPropertiesExpressionFault" 
+             message="wsn-bw:InvalidProducerPropertiesExpressionFault"/>
+         <wsdl:fault  name="InvalidMessageContentExpressionFault" 
+             message="wsn-bw:InvalidMessageContentExpressionFault"/>
+         <wsdl:fault  name="UnacceptableInitialTerminationTimeFault" 
+             message="wsn-bw:UnacceptableInitialTerminationTimeFault"/>
+	      <wsdl:fault  name="UnrecognizedPolicyRequestFault" 
+             message="wsn-bw:UnrecognizedPolicyRequestFault"/>
+         <wsdl:fault  name="UnsupportedPolicyRequestFault" 
+             message="wsn-bw:UnsupportedPolicyRequestFault"/>
+         <wsdl:fault  name="NotifyMessageNotSupportedFault" 
+             message="wsn-bw:NotifyMessageNotSupportedFault"/>
+         <wsdl:fault  name="SubscribeCreationFailedFault" 
+                      message="wsn-bw:SubscribeCreationFailedFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="GetCurrentMessage">
+         <wsdl:input  message="wsn-bw:GetCurrentMessageRequest"/>
+         <wsdl:output message="wsn-bw:GetCurrentMessageResponse"/>
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault"/>
+         <wsdl:fault  name="TopicExpressionDialectUnknownFault" 
+                  message="wsn-bw:TopicExpressionDialectUnknownFault"/>
+         <wsdl:fault  name="InvalidTopicExpressionFault" 
+                      message="wsn-bw:InvalidTopicExpressionFault"/>
+         <wsdl:fault  name="TopicNotSupportedFault" 
+                      message="wsn-bw:TopicNotSupportedFault"/>
+         <wsdl:fault  name="NoCurrentMessageOnTopicFault" 
+                      message="wsn-bw:NoCurrentMessageOnTopicFault"/>
+         <wsdl:fault  name="MultipleTopicsSpecifiedFault" 
+                      message="wsn-bw:MultipleTopicsSpecifiedFault"/>
+      </wsdl:operation>
+      
+      <!-- ========= extends RegisterPublisher ======= -->      
+      <wsdl:operation name="RegisterPublisher">
+         <wsdl:input  message="wsn-brw:RegisterPublisherRequest"/>
+         <wsdl:output message="wsn-brw:RegisterPublisherResponse"/>
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault"/>
+         <wsdl:fault  name="InvalidTopicExpressionFault" 
+                      message="wsn-bw:InvalidTopicExpressionFault"/>
+         <wsdl:fault  name="TopicNotSupportedFault" 
+                      message="wsn-bw:TopicNotSupportedFault"/>
+         <wsdl:fault  name="PublisherRegistrationRejectedFault" 
+                 message="wsn-brw:PublisherRegistrationRejectedFault"/>
+         <wsdl:fault  name="PublisherRegistrationFailedFault" 
+                   message="wsn-brw:PublisherRegistrationFailedFault"/>
+         <wsdl:fault  name="UnacceptableInitialTerminationTimeFault" 
+             message="wsn-bw:UnacceptableInitialTerminationTimeFault"/>
+      </wsdl:operation>
+
+   </wsdl:portType>
+
+<!-- ===== PublisherRegistrationManager PortType Definition ====== -->
+   <wsdl:portType name="PublisherRegistrationManager">
+      
+   <!--===DestroyRegistration:ImmediateResourceTermination==========-->
+      <wsdl:operation name="DestroyRegistration">
+         <wsdl:input  name="DestroyRegistrationRequest" 
+                      message="wsn-brw:DestroyRegistrationRequest" />
+         <wsdl:output name="DestroyRegistrationResponse" 
+                      message="wsn-brw:DestroyRegistrationResponse" />
+      <wsdl:fault name="ResourceUnknownFault"
+                message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="ResourceNotDestroyedFault" 
+                      message="wsn-brw:ResourceNotDestroyedFault" />
+      </wsdl:operation>
+   </wsdl:portType>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/onvif/wsdl/bw-2.wsdl b/onvif/wsdl/bw-2.wsdl
new file mode 100644
index 000000000..fad3f2957
--- /dev/null
+++ b/onvif/wsdl/bw-2.wsdl
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+-->
+<wsdl:definitions name="WS-BaseNotification"
+  targetNamespace="http://docs.oasis-open.org/wsn/bw-2"
+  xmlns:wsntw="http://docs.oasis-open.org/wsn/bw-2"
+  xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+  xmlns:wsa="http://www.w3.org/2005/08/addressing" 
+  xmlns:wsrf-rw="http://docs.oasis-open.org/wsrf/rw-2"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ 
+<!-- ========================== Imports =========================== --> 
+<!--
+ <wsdl:import 
+       namespace="http://docs.oasis-open.org/wsrf/rw-2" 
+       location="http://docs.oasis-open.org/wsrf/rw-2.wsdl"/>
+-->
+<!-- ===================== Types Definitions ====================== -->
+   <wsdl:types>
+     <xsd:schema>
+       <xsd:import
+         namespace="http://docs.oasis-open.org/wsn/b-2" 
+         schemaLocation="file:wsdl/b-2.xsd"/>
+<!--         schemaLocation="http://docs.oasis-open.org/wsn/b-2.xsd"/> -->
+     </xsd:schema>
+   </wsdl:types>
+
+<!-- ================ NotificationConsumer::Notify ================ 
+  Notify(
+    NotificationMessage
+      (SubscriptionReference, TopicExpression, ProducerReference,
+       Message)*
+  returns: n/a (one way)
+-->
+  <wsdl:message name="Notify">
+    <wsdl:part name="Notify" element="wsnt:Notify"/>
+  </wsdl:message>
+
+<!-- ============== NotificationProducer::Subscribe =============== 
+  Subscribe(
+   (ConsumerEndpointReference, [Filter], [SubscriptionPolicy], 
+   [InitialTerminationTime])   
+  returns: WS-Resource qualified EPR to a Subscription
+-->
+   <wsdl:message name="SubscribeRequest" >
+     <wsdl:part name="SubscribeRequest" 
+                element="wsnt:Subscribe"/>
+   </wsdl:message>
+
+   <wsdl:message name="SubscribeResponse">
+      <wsdl:part name="SubscribeResponse" 
+                 element="wsnt:SubscribeResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="SubscribeCreationFailedFault">
+      <wsdl:part name="SubscribeCreationFailedFault"
+            element="wsnt:SubscribeCreationFailedFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="TopicExpressionDialectUnknownFault">
+      <wsdl:part name="TopicExpressionDialectUnknownFault"
+            element="wsnt:TopicExpressionDialectUnknownFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="InvalidFilterFault">
+      <wsdl:part name="InvalidFilterFault"
+            element="wsnt:InvalidFilterFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="InvalidProducerPropertiesExpressionFault">
+      <wsdl:part name="InvalidProducerPropertiesExpressionFault"
+            element="wsnt:InvalidProducerPropertiesExpressionFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="InvalidMessageContentExpressionFault">
+      <wsdl:part name="InvalidMessageContentExpressionFault"
+            element="wsnt:InvalidMessageContentExpressionFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="UnrecognizedPolicyRequestFault">
+      <wsdl:part name="UnrecognizedPolicyRequestFault"
+            element="wsnt:UnrecognizedPolicyRequestFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="UnsupportedPolicyRequestFault">
+      <wsdl:part name="UnsupportedPolicyRequestFault"
+            element="wsnt:UnsupportedPolicyRequestFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="NotifyMessageNotSupportedFault">
+      <wsdl:part name="NotifyMessageNotSupportedFault"
+            element="wsnt:NotifyMessageNotSupportedFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="UnacceptableInitialTerminationTimeFault">
+      <wsdl:part name="UnacceptableInitialTerminationTimeFault"
+            element="wsnt:UnacceptableInitialTerminationTimeFault"/>
+   </wsdl:message> 
+
+<!-- ========== NotificationProducer::GetCurrentMessage =========== 
+  GetCurrentMessage(topicExpression)
+  returns: a NotificationMessage (xsd:any)
+-->
+   <wsdl:message name="GetCurrentMessageRequest">
+      <wsdl:part name="GetCurrentMessageRequest" 
+            element="wsnt:GetCurrentMessage"/>
+   </wsdl:message>
+
+   <wsdl:message name="GetCurrentMessageResponse">
+      <wsdl:part name="GetCurrentMessageResponse" 
+            element="wsnt:GetCurrentMessageResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="InvalidTopicExpressionFault">
+      <wsdl:part name="InvalidTopicExpressionFault"
+            element="wsnt:InvalidTopicExpressionFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="TopicNotSupportedFault">
+      <wsdl:part name="TopicNotSupportedFault"
+            element="wsnt:TopicNotSupportedFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="MultipleTopicsSpecifiedFault">
+      <wsdl:part name="MultipleTopicsSpecifiedFault"
+            element="wsnt:MultipleTopicsSpecifiedFault" />
+   </wsdl:message> 
+
+   <wsdl:message name="NoCurrentMessageOnTopicFault">
+      <wsdl:part name="NoCurrentMessageOnTopicFault"
+            element="wsnt:NoCurrentMessageOnTopicFault" />
+   </wsdl:message> 
+
+<!-- ========== PullPoint::GetMessages =========== 
+  GetMessages(MaximumNumber)
+  returns: NotificationMessage list
+-->
+   <wsdl:message name="GetMessagesRequest">
+      <wsdl:part name="GetMessagesRequest" 
+            element="wsnt:GetMessages"/>
+   </wsdl:message>
+
+   <wsdl:message name="GetMessagesResponse">
+      <wsdl:part name="GetMessagesResponse" 
+            element="wsnt:GetMessagesResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="UnableToGetMessagesFault">
+      <wsdl:part name="UnableToGetMessagesFault"
+            element="wsnt:UnableToGetMessagesFault"/>
+   </wsdl:message> 
+
+
+<!-- ========== PullPoint::DestroyPullPoint =========== 
+  DestroyPullPoint()
+  returns: void
+-->
+   <wsdl:message name="DestroyPullPointRequest">
+      <wsdl:part name="DestroyPullPointRequest" 
+            element="wsnt:DestroyPullPoint"/>
+   </wsdl:message>
+
+   <wsdl:message name="DestroyPullPointResponse">
+      <wsdl:part name="DestroyPullPointResponse" 
+            element="wsnt:DestroyPullPointResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="UnableToDestroyPullPointFault">
+      <wsdl:part name="UnableToDestroyPullPointFault"
+            element="wsnt:UnableToDestroyPullPointFault"/>
+   </wsdl:message> 
+
+<!-- ========== PullPoint::CreatePullPoint =========== 
+  CreatePullPoint()
+  returns: PullPoint (wsa:EndpointReference)
+-->
+   <wsdl:message name="CreatePullPointRequest">
+      <wsdl:part name="CreatePullPointRequest" 
+            element="wsnt:CreatePullPoint"/>
+   </wsdl:message>
+
+   <wsdl:message name="CreatePullPointResponse">
+      <wsdl:part name="CreatePullPointResponse" 
+            element="wsnt:CreatePullPointResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="UnableToCreatePullPointFault">
+      <wsdl:part name="UnableToCreatePullPointFault"
+            element="wsnt:UnableToCreatePullPointFault"/>
+   </wsdl:message> 
+
+<!-- ================ SubscriptionManager::Renew ==================
+   Renew( Duration | AbsoluteTime)
+   returns: (New Termination Time [CurrentTime])
+-->
+   <wsdl:message name="RenewRequest">
+      <wsdl:part name="RenewRequest" 
+                 element="wsnt:Renew"/>
+    </wsdl:message>
+
+   <wsdl:message name="RenewResponse">
+      <wsdl:part name="RenewResponse" 
+                 element="wsnt:RenewResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="UnacceptableTerminationTimeFault">
+      <wsdl:part name="UnacceptableTerminationTimeFault"
+            element="wsnt:UnacceptableTerminationTimeFault" />
+   </wsdl:message> 
+
+<!-- ============== SubscriptionManager::Unsubscribe ===============
+   Unsubscribe()
+   returns: empty
+-->
+   <wsdl:message name="UnsubscribeRequest">
+      <wsdl:part name="UnsubscribeRequest" 
+                 element="wsnt:Unsubscribe"/>
+    </wsdl:message>
+
+   <wsdl:message name="UnsubscribeResponse">
+      <wsdl:part name="UnsubscribeResponse" 
+                 element="wsnt:UnsubscribeResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="UnableToDestroySubscriptionFault">
+      <wsdl:part name="UnableToDestroySubscriptionFault"
+            element="wsnt:UnableToDestroySubscriptionFault" />
+   </wsdl:message>
+
+<!-- ========== SubscriptionManager::PauseSubscription ============
+   PauseSubscription()
+   returns: empty
+-->
+   <wsdl:message name="PauseSubscriptionRequest">
+      <wsdl:part name="PauseSubscriptionRequest" 
+                 element="wsnt:PauseSubscription"/>
+    </wsdl:message>
+
+   <wsdl:message name="PauseSubscriptionResponse">
+      <wsdl:part name="PauseSubscriptionResponse" 
+                 element="wsnt:PauseSubscriptionResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="PauseFailedFault">
+      <wsdl:part name="PauseFailedFault"
+            element="wsnt:PauseFailedFault" />
+   </wsdl:message> 
+
+<!-- ========= SubscriptionManager::ResumeSubscription ============
+   ResumeSubscription()
+   returns: empty
+-->
+   <wsdl:message name="ResumeSubscriptionRequest">
+      <wsdl:part name="ResumeSubscriptionRequest" 
+                 element="wsnt:ResumeSubscription"/>
+   </wsdl:message>
+
+   <wsdl:message name="ResumeSubscriptionResponse">
+      <wsdl:part name="ResumeSubscriptionResponse" 
+                 element="wsnt:ResumeSubscriptionResponse"/>
+   </wsdl:message>
+
+   <wsdl:message name="ResumeFailedFault">
+      <wsdl:part name="ResumeFailedFault"
+            element="wsnt:ResumeFailedFault" />
+   </wsdl:message> 
+      
+<!-- =================== PortType Definitions ===================== -->
+<!-- ========= NotificationConsumer PortType Definition =========== -->
+  <wsdl:portType name="NotificationConsumer">
+    <wsdl:operation name="Notify">
+      <wsdl:input message="wsntw:Notify" />
+    </wsdl:operation>
+  </wsdl:portType>
+  
+<!-- ========= NotificationProducer PortType Definition =========== -->
+  <wsdl:portType name="NotificationProducer">
+      <wsdl:operation name="Subscribe">
+         <wsdl:input  message="wsntw:SubscribeRequest" />
+         <wsdl:output message="wsntw:SubscribeResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="InvalidFilterFault" 
+                   message="wsntw:InvalidFilterFault"/>
+         <wsdl:fault  name="TopicExpressionDialectUnknownFault" 
+                   message="wsntw:TopicExpressionDialectUnknownFault"/>
+         <wsdl:fault  name="InvalidTopicExpressionFault" 
+                      message="wsntw:InvalidTopicExpressionFault" />
+         <wsdl:fault  name="TopicNotSupportedFault" 
+                      message="wsntw:TopicNotSupportedFault" />
+         <wsdl:fault  name="InvalidProducerPropertiesExpressionFault" 
+             message="wsntw:InvalidProducerPropertiesExpressionFault"/>
+         <wsdl:fault  name="InvalidMessageContentExpressionFault" 
+             message="wsntw:InvalidMessageContentExpressionFault"/>
+         <wsdl:fault  name="UnacceptableInitialTerminationTimeFault" 
+             message="wsntw:UnacceptableInitialTerminationTimeFault"/>
+         <wsdl:fault  name="UnrecognizedPolicyRequestFault" 
+             message="wsntw:UnrecognizedPolicyRequestFault"/>
+         <wsdl:fault  name="UnsupportedPolicyRequestFault" 
+             message="wsntw:UnsupportedPolicyRequestFault"/>
+         <wsdl:fault  name="NotifyMessageNotSupportedFault" 
+             message="wsntw:NotifyMessageNotSupportedFault"/>
+         <wsdl:fault  name="SubscribeCreationFailedFault" 
+                      message="wsntw:SubscribeCreationFailedFault"/>
+      </wsdl:operation>
+
+      <wsdl:operation name="GetCurrentMessage">
+         <wsdl:input  message="wsntw:GetCurrentMessageRequest"/>
+         <wsdl:output message="wsntw:GetCurrentMessageResponse"/>
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="TopicExpressionDialectUnknownFault" 
+                   message="wsntw:TopicExpressionDialectUnknownFault"/>
+         <wsdl:fault  name="InvalidTopicExpressionFault" 
+                      message="wsntw:InvalidTopicExpressionFault" />
+         <wsdl:fault  name="TopicNotSupportedFault" 
+                      message="wsntw:TopicNotSupportedFault" />
+         <wsdl:fault  name="NoCurrentMessageOnTopicFault" 
+                      message="wsntw:NoCurrentMessageOnTopicFault" />
+         <wsdl:fault  name="MultipleTopicsSpecifiedFault" 
+                      message="wsntw:MultipleTopicsSpecifiedFault" />
+      </wsdl:operation>
+   </wsdl:portType>
+
+<!-- ========== PullPoint PortType Definition ===================== -->
+   <wsdl:portType name="PullPoint">
+      <wsdl:operation name="GetMessages">
+         <wsdl:input  name="GetMessagesRequest" 
+                      message="wsntw:GetMessagesRequest" />
+         <wsdl:output name="GetMessagesResponse" 
+                      message="wsntw:GetMessagesResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" /> 
+         <wsdl:fault  name="UnableToGetMessagesFault" 
+                      message="wsntw:UnableToGetMessagesFault" />
+      </wsdl:operation>
+
+      <wsdl:operation name="DestroyPullPoint">
+         <wsdl:input  name="DestroyPullPointRequest" 
+                      message="wsntw:DestroyPullPointRequest" />
+         <wsdl:output name="DestroyPullPointResponse" 
+                      message="wsntw:DestroyPullPointResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault"/>
+         <wsdl:fault  name="UnableToDestroyPullPointFault" 
+                      message="wsntw:UnableToDestroyPullPointFault" />
+      </wsdl:operation>
+
+      <wsdl:operation name="Notify">
+         <wsdl:input message="wsntw:Notify"/>
+      </wsdl:operation>
+   </wsdl:portType>
+
+<!-- ========== CreatePullPoint PortType Definition =============== -->
+   <wsdl:portType name="CreatePullPoint">
+      <wsdl:operation name="CreatePullPoint">
+         <wsdl:input  name="CreatePullPointRequest" 
+                      message="wsntw:CreatePullPointRequest" />
+         <wsdl:output name="CreatePullPointResponse" 
+                      message="wsntw:CreatePullPointResponse" />
+         <wsdl:fault  name="UnableToCreatePullPointFault" 
+                      message="wsntw:UnableToCreatePullPointFault" />
+      </wsdl:operation>
+   </wsdl:portType>
+
+<!-- ========== SubscriptionManager PortType Definition =========== -->
+   <wsdl:portType name="SubscriptionManager">
+      <wsdl:operation name="Renew">
+         <wsdl:input  name="RenewRequest" 
+                      message="wsntw:RenewRequest" />
+         <wsdl:output name="RenewResponse" 
+                      message="wsntw:RenewResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="UnacceptableTerminationTimeFault" 
+                      message=
+                      "wsntw:UnacceptableTerminationTimeFault" />     
+      </wsdl:operation>
+      <wsdl:operation name="Unsubscribe">
+         <wsdl:input  name="UnsubscribeRequest" 
+                      message="wsntw:UnsubscribeRequest" />
+         <wsdl:output name="UnsubscribeResponse" 
+                      message="wsntw:UnsubscribeResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="UnableToDestroySubscriptionFault" 
+                      message=
+                      "wsntw:UnableToDestroySubscriptionFault" />     
+      </wsdl:operation>
+    </wsdl:portType> 
+
+<!-- ====== PausableSubscriptionManager PortType Definition ======= -->
+   <wsdl:portType name="PausableSubscriptionManager">
+      <!-- ============== Extends: SubscriptionManager ============ -->
+      <wsdl:operation name="Renew">
+         <wsdl:input  name="RenewRequest" 
+                      message="wsntw:RenewRequest" />
+         <wsdl:output name="RenewResponse" 
+                      message="wsntw:RenewResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="UnacceptableTerminationTimeFault" 
+                      message=
+                      "wsntw:UnacceptableTerminationTimeFault" />     
+      </wsdl:operation>
+      <wsdl:operation name="Unsubscribe">
+         <wsdl:input  name="UnsubscribeRequest" 
+                      message="wsntw:UnsubscribeRequest" />
+         <wsdl:output name="UnsubscribeResponse" 
+                      message="wsntw:UnsubscribeResponse" />
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="UnableToDestroySubscriptionFault" 
+                      message=
+                      "wsntw:UnableToDestroySubscriptionFault" />     
+      </wsdl:operation>
+
+      <!-- === PausableSubscriptionManager specific operations === -->
+      <wsdl:operation name="PauseSubscription">
+         <wsdl:input  message="wsntw:PauseSubscriptionRequest"/>
+         <wsdl:output message="wsntw:PauseSubscriptionResponse"/>
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="PauseFailedFault"
+                      message="wsntw:PauseFailedFault" />        
+      </wsdl:operation>
+      <wsdl:operation name="ResumeSubscription">
+         <wsdl:input  message="wsntw:ResumeSubscriptionRequest"/>
+         <wsdl:output message="wsntw:ResumeSubscriptionResponse"/>
+         <wsdl:fault  name="ResourceUnknownFault" 
+                      message="wsrf-rw:ResourceUnknownFault" />
+         <wsdl:fault  name="ResumeFailedFault"
+                      message="wsntw:ResumeFailedFault" />        
+      </wsdl:operation>        
+   </wsdl:portType>
+</wsdl:definitions>
diff --git a/onvif/wsdl/devicemgmt.wsdl b/onvif/wsdl/devicemgmt.wsdl
new file mode 100644
index 000000000..d7f7379c1
--- /dev/null
+++ b/onvif/wsdl/devicemgmt.wsdl
@@ -0,0 +1,3786 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
+<!--
+Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
+
+Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
+-->
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tds="http://www.onvif.org/ver10/device/wsdl" targetNamespace="http://www.onvif.org/ver10/device/wsdl">
+	<wsdl:types>
+		<xs:schema targetNamespace="http://www.onvif.org/ver10/device/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tds="http://www.onvif.org/ver10/device/wsdl" elementFormDefault="qualified" version="2.4.2">
+			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
+			<!--===============================-->
+			<xs:element name="GetServices">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="IncludeCapability" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>Indicates if the service capabilities (untyped) should be included in the response.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetServicesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Service" type="tds:Service" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Each Service element contains information about one service.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:complexType name="Service">
+				<xs:sequence>
+					<xs:element name="Namespace" type="xs:anyURI">
+						<xs:annotation>
+							<xs:documentation>Namespace of the service being described. This parameter allows to match the service capabilities to the service. Note that only one set of capabilities is supported per namespace.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="XAddr" type="xs:anyURI">
+						<xs:annotation>
+							<xs:documentation>The transport addresses where the service can be reached. The scheme and IP part shall match the one used in the request (i.e. the GetServices request).</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Capabilities" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:any namespace="##any" processContents="lax">
+									<xs:annotation>
+										<xs:documentation>The placeholder for the service capabilities. The service capability element shall be returned here. For example for the device service that would be the tds:DeviceServiceCapabilities element (not complextype).</xs:documentation>
+									</xs:annotation>
+								</xs:any>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Version" type="tt:OnvifVersion">
+						<xs:annotation>
+							<xs:documentation>The version of the service (not the ONVIF core spec version).</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:element name="GetServiceCapabilities">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetServiceCapabilitiesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Capabilities" type="tds:DeviceServiceCapabilities">
+							<xs:annotation>
+								<xs:documentation>The capabilities for the device service is returned in the Capabilities element.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:complexType name="DeviceServiceCapabilities">
+				<xs:sequence>
+					<xs:element name="Network" type="tds:NetworkCapabilities">
+						<xs:annotation>
+							<xs:documentation>Network capabilities.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Security" type="tds:SecurityCapabilities">
+						<xs:annotation>
+							<xs:documentation>Security capabilities.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="System" type="tds:SystemCapabilities">
+						<xs:annotation>
+							<xs:documentation>System capabilities.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Misc" type="tds:MiscCapabilities" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Capabilities that do not fit in any of the other categories.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+			</xs:complexType>
+			<xs:element name="Capabilities" type="tds:DeviceServiceCapabilities"/>
+			<!--===============================-->
+			<xs:complexType name="NetworkCapabilities">
+				<xs:attribute name="IPFilter" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for IP filtering.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="ZeroConfiguration" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for zeroconf.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="IPVersion6" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for IPv6.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="DynDNS" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for dynamic DNS configuration.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="Dot11Configuration" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for IEEE 802.11 configuration.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="Dot1XConfigurations" type="xs:int">
+					<xs:annotation>
+						<xs:documentation>Indicates the maximum number of Dot1X configurations supported by the device</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="HostnameFromDHCP" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for retrieval of hostname from DHCP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="NTP" type="xs:int">
+					<xs:annotation>
+						<xs:documentation>Maximum number of NTP servers supported by the devices SetNTP command.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="DHCPv6" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for Stateful IPv6 DHCP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:simpleType name="EAPMethodTypes">
+				<xs:list itemType="xs:int"/>
+			</xs:simpleType>
+			<xs:complexType name="SecurityCapabilities">
+				<xs:attribute name="TLS1.0" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for TLS 1.0.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="TLS1.1" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for TLS 1.1.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="TLS1.2" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for TLS 1.2.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="OnboardKeyGeneration" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for onboard key generation.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="AccessPolicyConfig" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for access policy configuration.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="DefaultAccessPolicy" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for the ONVIF default access policy.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="Dot1X" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for IEEE 802.1X configuration.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="RemoteUserHandling" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for remote user configuration. Used when accessing another device.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="X.509Token" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS-Security X.509 token.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="SAMLToken" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS-Security SAML token.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="KerberosToken" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS-Security Kerberos token.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="UsernameToken" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS-Security Username token.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="HttpDigest" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS over HTTP digest authenticated communication layer.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="RELToken" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS-Security REL token.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="SupportedEAPMethods" type="tds:EAPMethodTypes">
+					<xs:annotation>
+						<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="MaxUsers" type="xs:int">
+					<xs:annotation>
+						<xs:documentation>The maximum number of users that the device supports.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:complexType name="SystemCapabilities">
+				<xs:attribute name="DiscoveryResolve" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS Discovery resolve requests.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="DiscoveryBye" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for WS-Discovery Bye.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="RemoteDiscovery" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for remote discovery.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="SystemBackup" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for system backup through MTOM.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="SystemLogging" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for retrieval of system logging through MTOM.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="FirmwareUpgrade" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for firmware upgrade through MTOM.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="HttpFirmwareUpgrade" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for system backup through MTOM.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="HttpSystemBackup" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for system backup through HTTP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="HttpSystemLogging" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for retrieval of system logging through HTTP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="HttpSupportInformation" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for retrieving support information through HTTP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:complexType name="MiscCapabilities">
+				<xs:attribute name="AuxiliaryCommands" type="tt:StringAttrList">
+					<xs:annotation>
+						<xs:documentation>Lists of commands supported by SendAuxiliaryCommand.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:element name="GetDeviceInformation">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDeviceInformationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Manufacturer" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>The manufactor of the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Model" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>The device model.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="FirmwareVersion" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>The firmware version in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="SerialNumber" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>The serial number of the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="HardwareId" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>The hardware ID of the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetSystemDateAndTime">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DateTimeType" type="tt:SetDateTimeType">
+							<xs:annotation>
+								<xs:documentation>Defines if the date and time is set via NTP or manually.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="DaylightSavings" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>Automatically adjust Daylight savings if defined in TimeZone.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>The time zone in POSIX 1003.1 format</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Date and time in UTC. If time is obtained via NTP, UTCDateTime has no meaning</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetSystemDateAndTimeResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSystemDateAndTime">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSystemDateAndTimeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SystemDateAndTime" type="tt:SystemDateTime">
+							<xs:annotation>
+								<xs:documentation>Contains information whether system date and time are set manually or by NTP, daylight savings is on or off, time zone in POSIX 1003.1 format and system date and time in UTC and also local system date and time.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetSystemFactoryDefault">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="FactoryDefault" type="tt:FactoryDefaultType">
+							<xs:annotation>
+								<xs:documentation>Specifies the factory default action type.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetSystemFactoryDefaultResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="UpgradeSystemFirmware">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Firmware" type="tt:AttachmentData"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="UpgradeSystemFirmwareResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Message" type="xs:string" minOccurs="0" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SystemReboot">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SystemRebootResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Message" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>Contains the reboot message sent by the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RestoreSystem">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="BackupFiles" type="tt:BackupFile" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RestoreSystemResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSystemBackup">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSystemBackupResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="BackupFiles" type="tt:BackupFile" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSystemSupportInformation">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSystemSupportInformationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SupportInformation" type="tt:SupportInformation">
+							<xs:annotation>
+								<xs:documentation>Contains the arbitary device diagnostics information.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSystemLog">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="LogType" type="tt:SystemLogType">
+							<xs:annotation>
+								<xs:documentation>Specifies the type of system log to get.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSystemLogResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SystemLog" type="tt:SystemLog">
+							<xs:annotation>
+								<xs:documentation>Contains the system log information.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetScopes">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetScopesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Scopes" type="tt:Scope" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of URI definining the device scopes. Scope parameters can be of two types: fixed and configurable. Fixed parameters can not be altered.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetScopes">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Scopes" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of scope parameters that will replace all existing configurable scope parameters.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetScopesResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddScopes">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of new configurable scope parameters that will be added to the existing configurable scope.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddScopesResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveScopes">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of URIs that should be removed from the device scope.<br/>
+									Note that the response message always will match the request or an error will be returned. The use of the response is for that reason deprecated.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveScopesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of URIs that has been removed from the device scope</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDiscoveryMode">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDiscoveryModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DiscoveryMode" type="tt:DiscoveryMode">
+							<xs:annotation>
+								<xs:documentation>
+									Indicator of discovery mode: Discoverable, NonDiscoverable.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetDiscoveryMode">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DiscoveryMode" type="tt:DiscoveryMode">
+							<xs:annotation>
+								<xs:documentation>
+									Indicator of discovery mode: Discoverable, NonDiscoverable.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetDiscoveryModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetRemoteDiscoveryMode">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetRemoteDiscoveryModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RemoteDiscoveryMode" type="tt:DiscoveryMode">
+							<xs:annotation>
+								<xs:documentation>
+									Indicator of discovery mode: Discoverable, NonDiscoverable.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetRemoteDiscoveryMode">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RemoteDiscoveryMode" type="tt:DiscoveryMode">
+							<xs:annotation>
+								<xs:documentation>
+									Indicator of discovery mode: Discoverable, NonDiscoverable.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetRemoteDiscoveryModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDPAddresses">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDPAddressesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DPAddress" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetDPAddresses">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DPAddress" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetDPAddressesResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetEndpointReference">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetEndpointReferenceResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="GUID" type="xs:string"/>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetRemoteUser">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetRemoteUserResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RemoteUser" type="tt:RemoteUser" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetRemoteUser">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RemoteUser" type="tt:RemoteUser" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetRemoteUserResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetUsers">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetUsersResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="User" type="tt:User" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of the onvif users and following information is included in each entry: username and user level.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateUsers">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="User" type="tt:User" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Creates new device users and corresponding credentials. Each user entry includes: username, password and user level. Either all users are created successfully or a fault message MUST be returned without creating any user. If trying to create several users with exactly the same username the request is rejected and no users are created. If password is missing, then fault message Too weak password is returned.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateUsersResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteUsers">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Username" type="xs:string" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Deletes users on an device and there may exist users that cannot be deleted to ensure access to the unit. Either all users are deleted successfully or a fault message MUST be returned and no users be deleted. If a username exists multiple times in the request, then a fault message is returned.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteUsersResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetUser">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="User" type="tt:User" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Updates the credentials for one or several users on an device. Either all change requests are processed successfully or a fault message MUST be returned. If the request contains the same username multiple times, a fault message is returned. </xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetUserResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetWsdlUrl">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetWsdlUrlResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="WsdlUrl" type="xs:anyURI"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCapabilities">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Category" type="tt:CapabilityCategory" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									List of categories to retrieve capability information on.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCapabilitiesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Capabilities" type="tt:Capabilities">
+							<xs:annotation>
+								<xs:documentation>
+									Capability information.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetHostname">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetHostnameResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="HostnameInformation" type="tt:HostnameInformation">
+							<xs:annotation>
+								<xs:documentation>Contains the hostname information.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetHostname">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Name" type="xs:token">
+							<xs:annotation>
+								<xs:documentation>The hostname to set.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetHostnameResponse">
+				<xs:complexType>
+					<xs:sequence>
+				    </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetHostnameFromDHCP">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="FromDHCP" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>True if the hostname shall be obtained via DHCP.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetHostnameFromDHCPResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RebootNeeded" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>
+									Indicates whether or not a reboot is required after configuration updates.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDNS">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDNSResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DNSInformation" type="tt:DNSInformation">
+							<xs:annotation>
+								<xs:documentation>
+									DNS information.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetDNS">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="FromDHCP" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>
+									Indicate if the DNS address is to be retrieved using DHCP.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									DNS search domain.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									DNS address(es) set manually.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetDNSResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetNTP">
+				<xs:complexType>
+					<xs:sequence>
+				    </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetNTPResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NTPInformation" type="tt:NTPInformation">
+							<xs:annotation>
+								<xs:documentation>
+									NTP information.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetNTP">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="FromDHCP" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>
+									Indicate if NTP address information is to be retrieved using DHCP.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									Manual NTP settings.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetNTPResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDynamicDNS">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDynamicDNSResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="DynamicDNSInformation" type="tt:DynamicDNSInformation">
+							<xs:annotation>
+								<xs:documentation>
+									Dynamic DNS information.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetDynamicDNS">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Type" type="tt:DynamicDNSType">
+							<xs:annotation>
+								<xs:documentation>
+									Dynamic DNS type.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Name" type="tt:DNSName" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>
+									DNS name.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="TTL" type="xs:duration" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>
+									DNS record time to live.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetDynamicDNSResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetNetworkInterfaces">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetNetworkInterfacesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NetworkInterfaces" type="tt:NetworkInterface" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									List of network interfaces.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetNetworkInterfaces">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="InterfaceToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>
+									Symbolic network interface name.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="NetworkInterface" type="tt:NetworkInterfaceSetConfiguration">
+							<xs:annotation>
+								<xs:documentation>
+									Network interface name.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetNetworkInterfacesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RebootNeeded" type="xs:boolean" minOccurs="1" maxOccurs="1">
+							<xs:annotation>
+								<xs:documentation>
+									Indicates whether or not a reboot is required after configuration updates.
+									If a device responds with RebootNeeded set to false, the device can be reached
+									via the new IP address without further action. A client should be aware that a device
+									may not be responsive for a short period of time until it signals availability at
+									the new address via the discovery Hello messages.
+									If a device responds with RebootNeeded set to true, it will be further available under
+									its previous IP address. The settings will only be activated when the device is
+									rebooted via the SystemReboot command.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetNetworkProtocols">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetNetworkProtocolsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NetworkProtocols" type="tt:NetworkProtocol" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains an array of defined protocols supported by the device. There are three protocols defined; HTTP, HTTPS and RTSP. The following parameters can be retrieved for each protocol: port and enable/disable.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetNetworkProtocols">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NetworkProtocols" type="tt:NetworkProtocol" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Configures one or more defined network protocols supported by the device. There are currently three protocols defined; HTTP, HTTPS and RTSP. The following parameters can be set for each protocol: port and enable/disable.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetNetworkProtocolsResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetNetworkDefaultGateway">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetNetworkDefaultGatewayResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NetworkGateway" type="tt:NetworkGateway">
+							<xs:annotation>
+								<xs:documentation>Gets the default IPv4 and IPv6 gateway settings from the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetNetworkDefaultGateway">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Sets IPv4 gateway address used as default setting.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Sets IPv6 gateway address used as default setting.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetNetworkDefaultGatewayResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetZeroConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetZeroConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ZeroConfiguration" type="tt:NetworkZeroConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the zero-configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetZeroConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="InterfaceToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Unique identifier referencing the physical interface.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Enabled" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>Specifies if the zero-configuration should be enabled or not.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetZeroConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetIPAddressFilter">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetIPAddressFilterResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetIPAddressFilter">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetIPAddressFilterResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddIPAddressFilter">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddIPAddressFilterResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveIPAddressFilter">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveIPAddressFilterResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAccessPolicy">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAccessPolicyResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PolicyFile" type="tt:BinaryData"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetAccessPolicy">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PolicyFile" type="tt:BinaryData"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetAccessPolicyResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateCertificate">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateID" type="xs:token" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Certificate id.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Subject" type="xs:string" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Identification of the entity associated with the public-key.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ValidNotBefore" type="xs:dateTime" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Certificate validity start date.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ValidNotAfter" type="xs:dateTime" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Certificate expiry start date.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateCertificateResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NvtCertificate" type="tt:Certificate">
+							<xs:annotation>
+								<xs:documentation>
+									base64 encoded DER representation of certificate.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCertificates">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCertificatesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NvtCertificate" type="tt:Certificate" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									Id and base64 encoded DER representation of all available certificates.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCertificatesStatus">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCertificatesStatusResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateStatus" type="tt:CertificateStatus" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									Indicates if a certificate is used in an optional HTTPS configuration of the device.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetCertificatesStatus">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateStatus" type="tt:CertificateStatus" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									Indicates if a certificate is to be used in an optional HTTPS configuration of the device.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetCertificatesStatusResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteCertificates">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateID" type="xs:token" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									List of ids of certificates to delete.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteCertificatesResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetPkcs10Request">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateID" type="xs:token">
+							<xs:annotation>
+								<xs:documentation>
+									List of ids of certificates to delete.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Subject" type="xs:string" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>
+									Relative Dinstinguished Name(RDN) CommonName(CN).
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Attributes" type="tt:BinaryData" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>
+									Optional base64 encoded DER attributes.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetPkcs10RequestResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Pkcs10Request" type="tt:BinaryData">
+							<xs:annotation>
+								<xs:documentation>
+									base64 encoded DER representation of certificate.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="LoadCertificates">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NVTCertificate" type="tt:Certificate" minOccurs="1" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>
+									Optional id and base64 encoded DER representation of certificate.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="LoadCertificatesResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetClientCertificateMode">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetClientCertificateModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Enabled" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>
+									Indicates whether or not client certificates are required by device.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetClientCertificateMode">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Enabled" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>
+									Indicates whether or not client certificates are required by device.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetClientCertificateModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCACertificates">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCACertificatesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CACertificate" type="tt:Certificate" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="LoadCertificateWithPrivateKey">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateWithPrivateKey" type="tt:CertificateWithPrivateKey" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="LoadCertificateWithPrivateKeyResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCertificateInformation">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateID" type="xs:token" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCertificateInformationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CertificateInformation" type="tt:CertificateInformation" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="LoadCACertificates">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="CACertificate" type="tt:Certificate" minOccurs="1" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="LoadCACertificatesResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateDot1XConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateDot1XConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetDot1XConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetDot1XConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDot1XConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDot1XConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDot1XConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+			</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDot1XConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteDot1XConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteDot1XConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetRelayOutputs">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetRelayOutputsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RelayOutputs" type="tt:RelayOutput" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetRelayOutputSettings">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RelayOutputToken" type="tt:ReferenceToken"/>
+						<xs:element name="Properties" type="tt:RelayOutputSettings"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetRelayOutputSettingsResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetRelayOutputState">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="RelayOutputToken" type="tt:ReferenceToken" minOccurs="1" maxOccurs="1"/>
+						<xs:element name="LogicalState" type="tt:RelayLogicalState" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetRelayOutputStateResponse">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SendAuxiliaryCommand">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="AuxiliaryCommand" type="tt:AuxiliaryData" minOccurs="1" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SendAuxiliaryCommandResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="AuxiliaryCommandResponse" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="1"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDot11Capabilities">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDot11CapabilitiesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Capabilities" type="tt:Dot11Capabilities"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetDot11Status">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="InterfaceToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetDot11StatusResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Status" type="tt:Dot11Status"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="ScanAvailableDot11Networks">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="InterfaceToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ScanAvailableDot11NetworksResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Networks" type="tt:Dot11AvailableNetworks" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSystemUris">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSystemUrisResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SystemLogUris" type="tt:SystemLogUriList" minOccurs="0" maxOccurs="1"/>
+						<xs:element name="SupportInfoUri" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
+						<xs:element name="SystemBackupUri" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
+						<xs:element name="Extension" minOccurs="0">
+							<xs:complexType>
+								<xs:sequence>
+									<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+								</xs:sequence>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="StartFirmwareUpgrade">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="StartFirmwareUpgradeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="UploadUri" type="xs:anyURI"/>
+						<xs:element name="UploadDelay" type="xs:duration"/>
+						<xs:element name="ExpectedDownTime" type="xs:duration"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="StartSystemRestore">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="StartSystemRestoreResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="UploadUri" type="xs:anyURI"/>
+						<xs:element name="ExpectedDownTime" type="xs:duration"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="GetServicesRequest">
+		<wsdl:part name="parameters" element="tds:GetServices"/>
+	</wsdl:message>
+	<wsdl:message name="GetServicesResponse">
+		<wsdl:part name="parameters" element="tds:GetServicesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetServiceCapabilitiesRequest">
+		<wsdl:part name="parameters" element="tds:GetServiceCapabilities"/>
+	</wsdl:message>
+	<wsdl:message name="GetServiceCapabilitiesResponse">
+		<wsdl:part name="parameters" element="tds:GetServiceCapabilitiesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDeviceInformationRequest">
+		<wsdl:part name="parameters" element="tds:GetDeviceInformation"/>
+	</wsdl:message>
+	<wsdl:message name="GetDeviceInformationResponse">
+		<wsdl:part name="parameters" element="tds:GetDeviceInformationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetSystemDateAndTimeRequest">
+		<wsdl:part name="parameters" element="tds:SetSystemDateAndTime"/>
+	</wsdl:message>
+	<wsdl:message name="SetSystemDateAndTimeResponse">
+		<wsdl:part name="parameters" element="tds:SetSystemDateAndTimeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemDateAndTimeRequest">
+		<wsdl:part name="parameters" element="tds:GetSystemDateAndTime"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemDateAndTimeResponse">
+		<wsdl:part name="parameters" element="tds:GetSystemDateAndTimeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetSystemFactoryDefaultRequest">
+		<wsdl:part name="parameters" element="tds:SetSystemFactoryDefault"/>
+	</wsdl:message>
+	<wsdl:message name="SetSystemFactoryDefaultResponse">
+		<wsdl:part name="parameters" element="tds:SetSystemFactoryDefaultResponse"/>
+	</wsdl:message>
+	<wsdl:message name="UpgradeSystemFirmwareRequest">
+		<wsdl:part name="parameters" element="tds:UpgradeSystemFirmware"/>
+	</wsdl:message>
+	<wsdl:message name="UpgradeSystemFirmwareResponse">
+		<wsdl:part name="parameters" element="tds:UpgradeSystemFirmwareResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SystemRebootRequest">
+		<wsdl:part name="parameters" element="tds:SystemReboot"/>
+	</wsdl:message>
+	<wsdl:message name="SystemRebootResponse">
+		<wsdl:part name="parameters" element="tds:SystemRebootResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemBackupRequest">
+		<wsdl:part name="parameters" element="tds:GetSystemBackup"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemBackupResponse">
+		<wsdl:part name="parameters" element="tds:GetSystemBackupResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RestoreSystemRequest">
+		<wsdl:part name="parameters" element="tds:RestoreSystem"/>
+	</wsdl:message>
+	<wsdl:message name="RestoreSystemResponse">
+		<wsdl:part name="parameters" element="tds:RestoreSystemResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemSupportInformationRequest">
+		<wsdl:part name="parameters" element="tds:GetSystemSupportInformation"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemSupportInformationResponse">
+		<wsdl:part name="parameters" element="tds:GetSystemSupportInformationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemLogRequest">
+		<wsdl:part name="parameters" element="tds:GetSystemLog"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemLogResponse">
+		<wsdl:part name="parameters" element="tds:GetSystemLogResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetScopesRequest">
+		<wsdl:part name="parameters" element="tds:GetScopes"/>
+	</wsdl:message>
+	<wsdl:message name="GetScopesResponse">
+		<wsdl:part name="parameters" element="tds:GetScopesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetScopesRequest">
+		<wsdl:part name="parameters" element="tds:SetScopes"/>
+	</wsdl:message>
+	<wsdl:message name="SetScopesResponse">
+		<wsdl:part name="parameters" element="tds:SetScopesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddScopesRequest">
+		<wsdl:part name="parameters" element="tds:AddScopes"/>
+	</wsdl:message>
+	<wsdl:message name="AddScopesResponse">
+		<wsdl:part name="parameters" element="tds:AddScopesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveScopesRequest">
+		<wsdl:part name="parameters" element="tds:RemoveScopes"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveScopesResponse">
+		<wsdl:part name="parameters" element="tds:RemoveScopesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDiscoveryModeRequest">
+		<wsdl:part name="parameters" element="tds:GetDiscoveryMode"/>
+	</wsdl:message>
+	<wsdl:message name="GetDiscoveryModeResponse">
+		<wsdl:part name="parameters" element="tds:GetDiscoveryModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetDiscoveryModeRequest">
+		<wsdl:part name="parameters" element="tds:SetDiscoveryMode"/>
+	</wsdl:message>
+	<wsdl:message name="SetDiscoveryModeResponse">
+		<wsdl:part name="parameters" element="tds:SetDiscoveryModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetRemoteDiscoveryModeRequest">
+		<wsdl:part name="parameters" element="tds:GetRemoteDiscoveryMode"/>
+	</wsdl:message>
+	<wsdl:message name="GetRemoteDiscoveryModeResponse">
+		<wsdl:part name="parameters" element="tds:GetRemoteDiscoveryModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetRemoteDiscoveryModeRequest">
+		<wsdl:part name="parameters" element="tds:SetRemoteDiscoveryMode"/>
+	</wsdl:message>
+	<wsdl:message name="SetRemoteDiscoveryModeResponse">
+		<wsdl:part name="parameters" element="tds:SetRemoteDiscoveryModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDPAddressesRequest">
+		<wsdl:part name="parameters" element="tds:GetDPAddresses"/>
+	</wsdl:message>
+	<wsdl:message name="GetDPAddressesResponse">
+		<wsdl:part name="parameters" element="tds:GetDPAddressesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetDPAddressesRequest">
+		<wsdl:part name="parameters" element="tds:SetDPAddresses"/>
+	</wsdl:message>
+	<wsdl:message name="SetDPAddressesResponse">
+		<wsdl:part name="parameters" element="tds:SetDPAddressesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetEndpointReferenceRequest">
+		<wsdl:part name="parameters" element="tds:GetEndpointReference"/>
+	</wsdl:message>
+	<wsdl:message name="GetEndpointReferenceResponse">
+		<wsdl:part name="parameters" element="tds:GetEndpointReferenceResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetRemoteUserRequest">
+		<wsdl:part name="parameters" element="tds:GetRemoteUser"/>
+	</wsdl:message>
+	<wsdl:message name="GetRemoteUserResponse">
+		<wsdl:part name="parameters" element="tds:GetRemoteUserResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetRemoteUserRequest">
+		<wsdl:part name="parameters" element="tds:SetRemoteUser"/>
+	</wsdl:message>
+	<wsdl:message name="SetRemoteUserResponse">
+		<wsdl:part name="parameters" element="tds:SetRemoteUserResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetUsersRequest">
+		<wsdl:part name="parameters" element="tds:GetUsers"/>
+	</wsdl:message>
+	<wsdl:message name="GetUsersResponse">
+		<wsdl:part name="parameters" element="tds:GetUsersResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreateUsersRequest">
+		<wsdl:part name="parameters" element="tds:CreateUsers"/>
+	</wsdl:message>
+	<wsdl:message name="CreateUsersResponse">
+		<wsdl:part name="parameters" element="tds:CreateUsersResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteUsersRequest">
+		<wsdl:part name="parameters" element="tds:DeleteUsers"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteUsersResponse">
+		<wsdl:part name="parameters" element="tds:DeleteUsersResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetUserRequest">
+		<wsdl:part name="parameters" element="tds:SetUser"/>
+	</wsdl:message>
+	<wsdl:message name="SetUserResponse">
+		<wsdl:part name="parameters" element="tds:SetUserResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetWsdlUrlRequest">
+		<wsdl:part name="parameters" element="tds:GetWsdlUrl"/>
+	</wsdl:message>
+	<wsdl:message name="GetWsdlUrlResponse">
+		<wsdl:part name="parameters" element="tds:GetWsdlUrlResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCapabilitiesRequest">
+		<wsdl:part name="parameters" element="tds:GetCapabilities"/>
+	</wsdl:message>
+	<wsdl:message name="GetCapabilitiesResponse">
+		<wsdl:part name="parameters" element="tds:GetCapabilitiesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetHostnameRequest">
+		<wsdl:part name="parameters" element="tds:GetHostname"/>
+	</wsdl:message>
+	<wsdl:message name="GetHostnameResponse">
+		<wsdl:part name="parameters" element="tds:GetHostnameResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetHostnameRequest">
+		<wsdl:part name="parameters" element="tds:SetHostname"/>
+	</wsdl:message>
+	<wsdl:message name="SetHostnameResponse">
+		<wsdl:part name="parameters" element="tds:SetHostnameResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetHostnameFromDHCPRequest">
+		<wsdl:part name="parameters" element="tds:SetHostnameFromDHCP"/>
+	</wsdl:message>
+	<wsdl:message name="SetHostnameFromDHCPResponse">
+		<wsdl:part name="parameters" element="tds:SetHostnameFromDHCPResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDNSRequest">
+		<wsdl:part name="parameters" element="tds:GetDNS"/>
+	</wsdl:message>
+	<wsdl:message name="GetDNSResponse">
+		<wsdl:part name="parameters" element="tds:GetDNSResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetDNSRequest">
+		<wsdl:part name="parameters" element="tds:SetDNS"/>
+	</wsdl:message>
+	<wsdl:message name="SetDNSResponse">
+		<wsdl:part name="parameters" element="tds:SetDNSResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetNTPRequest">
+		<wsdl:part name="parameters" element="tds:GetNTP"/>
+	</wsdl:message>
+	<wsdl:message name="GetNTPResponse">
+		<wsdl:part name="parameters" element="tds:GetNTPResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetNTPRequest">
+		<wsdl:part name="parameters" element="tds:SetNTP"/>
+	</wsdl:message>
+	<wsdl:message name="SetNTPResponse">
+		<wsdl:part name="parameters" element="tds:SetNTPResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDynamicDNSRequest">
+		<wsdl:part name="parameters" element="tds:GetDynamicDNS"/>
+	</wsdl:message>
+	<wsdl:message name="GetDynamicDNSResponse">
+		<wsdl:part name="parameters" element="tds:GetDynamicDNSResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetDynamicDNSRequest">
+		<wsdl:part name="parameters" element="tds:SetDynamicDNS"/>
+	</wsdl:message>
+	<wsdl:message name="SetDynamicDNSResponse">
+		<wsdl:part name="parameters" element="tds:SetDynamicDNSResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetNetworkInterfacesRequest">
+		<wsdl:part name="parameters" element="tds:GetNetworkInterfaces"/>
+	</wsdl:message>
+	<wsdl:message name="GetNetworkInterfacesResponse">
+		<wsdl:part name="parameters" element="tds:GetNetworkInterfacesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetNetworkInterfacesRequest">
+		<wsdl:part name="parameters" element="tds:SetNetworkInterfaces"/>
+	</wsdl:message>
+	<wsdl:message name="SetNetworkInterfacesResponse">
+		<wsdl:part name="parameters" element="tds:SetNetworkInterfacesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetNetworkProtocolsRequest">
+		<wsdl:part name="parameters" element="tds:GetNetworkProtocols"/>
+	</wsdl:message>
+	<wsdl:message name="GetNetworkProtocolsResponse">
+		<wsdl:part name="parameters" element="tds:GetNetworkProtocolsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetNetworkProtocolsRequest">
+		<wsdl:part name="parameters" element="tds:SetNetworkProtocols"/>
+	</wsdl:message>
+	<wsdl:message name="SetNetworkProtocolsResponse">
+		<wsdl:part name="parameters" element="tds:SetNetworkProtocolsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetNetworkDefaultGatewayRequest">
+		<wsdl:part name="parameters" element="tds:GetNetworkDefaultGateway"/>
+	</wsdl:message>
+	<wsdl:message name="GetNetworkDefaultGatewayResponse">
+		<wsdl:part name="parameters" element="tds:GetNetworkDefaultGatewayResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetNetworkDefaultGatewayRequest">
+		<wsdl:part name="parameters" element="tds:SetNetworkDefaultGateway"/>
+	</wsdl:message>
+	<wsdl:message name="SetNetworkDefaultGatewayResponse">
+		<wsdl:part name="parameters" element="tds:SetNetworkDefaultGatewayResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetZeroConfigurationRequest">
+		<wsdl:part name="parameters" element="tds:GetZeroConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetZeroConfigurationResponse">
+		<wsdl:part name="parameters" element="tds:GetZeroConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetZeroConfigurationRequest">
+		<wsdl:part name="parameters" element="tds:SetZeroConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetZeroConfigurationResponse">
+		<wsdl:part name="parameters" element="tds:SetZeroConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetIPAddressFilterRequest">
+		<wsdl:part name="parameters" element="tds:GetIPAddressFilter"/>
+	</wsdl:message>
+	<wsdl:message name="GetIPAddressFilterResponse">
+		<wsdl:part name="parameters" element="tds:GetIPAddressFilterResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetIPAddressFilterRequest">
+		<wsdl:part name="parameters" element="tds:SetIPAddressFilter"/>
+	</wsdl:message>
+	<wsdl:message name="SetIPAddressFilterResponse">
+		<wsdl:part name="parameters" element="tds:SetIPAddressFilterResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddIPAddressFilterRequest">
+		<wsdl:part name="parameters" element="tds:AddIPAddressFilter"/>
+	</wsdl:message>
+	<wsdl:message name="AddIPAddressFilterResponse">
+		<wsdl:part name="parameters" element="tds:AddIPAddressFilterResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveIPAddressFilterRequest">
+		<wsdl:part name="parameters" element="tds:RemoveIPAddressFilter"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveIPAddressFilterResponse">
+		<wsdl:part name="parameters" element="tds:RemoveIPAddressFilterResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAccessPolicyRequest">
+		<wsdl:part name="parameters" element="tds:GetAccessPolicy"/>
+	</wsdl:message>
+	<wsdl:message name="GetAccessPolicyResponse">
+		<wsdl:part name="parameters" element="tds:GetAccessPolicyResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetAccessPolicyRequest">
+		<wsdl:part name="parameters" element="tds:SetAccessPolicy"/>
+	</wsdl:message>
+	<wsdl:message name="SetAccessPolicyResponse">
+		<wsdl:part name="parameters" element="tds:SetAccessPolicyResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreateCertificateRequest">
+		<wsdl:part name="parameters" element="tds:CreateCertificate"/>
+	</wsdl:message>
+	<wsdl:message name="CreateCertificateResponse">
+		<wsdl:part name="parameters" element="tds:CreateCertificateResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCertificatesRequest">
+		<wsdl:part name="parameters" element="tds:GetCertificates"/>
+	</wsdl:message>
+	<wsdl:message name="GetCertificatesResponse">
+		<wsdl:part name="parameters" element="tds:GetCertificatesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCertificatesStatusRequest">
+		<wsdl:part name="parameters" element="tds:GetCertificatesStatus"/>
+	</wsdl:message>
+	<wsdl:message name="GetCertificatesStatusResponse">
+		<wsdl:part name="parameters" element="tds:GetCertificatesStatusResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetCertificatesStatusRequest">
+		<wsdl:part name="parameters" element="tds:SetCertificatesStatus"/>
+	</wsdl:message>
+	<wsdl:message name="SetCertificatesStatusResponse">
+		<wsdl:part name="parameters" element="tds:SetCertificatesStatusResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteCertificatesRequest">
+		<wsdl:part name="parameters" element="tds:DeleteCertificates"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteCertificatesResponse">
+		<wsdl:part name="parameters" element="tds:DeleteCertificatesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetPkcs10RequestRequest">
+		<wsdl:part name="parameters" element="tds:GetPkcs10Request"/>
+	</wsdl:message>
+	<wsdl:message name="GetPkcs10RequestResponse">
+		<wsdl:part name="parameters" element="tds:GetPkcs10RequestResponse"/>
+	</wsdl:message>
+	<wsdl:message name="LoadCertificatesRequest">
+		<wsdl:part name="parameters" element="tds:LoadCertificates"/>
+	</wsdl:message>
+	<wsdl:message name="LoadCertificatesResponse">
+		<wsdl:part name="parameters" element="tds:LoadCertificatesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetClientCertificateModeRequest">
+		<wsdl:part name="parameters" element="tds:GetClientCertificateMode"/>
+	</wsdl:message>
+	<wsdl:message name="GetClientCertificateModeResponse">
+		<wsdl:part name="parameters" element="tds:GetClientCertificateModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetClientCertificateModeRequest">
+		<wsdl:part name="parameters" element="tds:SetClientCertificateMode"/>
+	</wsdl:message>
+	<wsdl:message name="SetClientCertificateModeResponse">
+		<wsdl:part name="parameters" element="tds:SetClientCertificateModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetRelayOutputsRequest">
+		<wsdl:part name="parameters" element="tds:GetRelayOutputs"/>
+	</wsdl:message>
+	<wsdl:message name="GetRelayOutputsResponse">
+		<wsdl:part name="parameters" element="tds:GetRelayOutputsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetRelayOutputSettingsRequest">
+		<wsdl:part name="parameters" element="tds:SetRelayOutputSettings"/>
+	</wsdl:message>
+	<wsdl:message name="SetRelayOutputSettingsResponse">
+		<wsdl:part name="parameters" element="tds:SetRelayOutputSettingsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetRelayOutputStateRequest">
+		<wsdl:part name="parameters" element="tds:SetRelayOutputState"/>
+	</wsdl:message>
+	<wsdl:message name="SetRelayOutputStateResponse">
+		<wsdl:part name="parameters" element="tds:SetRelayOutputStateResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SendAuxiliaryCommandRequest">
+		<wsdl:part name="parameters" element="tds:SendAuxiliaryCommand"/>
+	</wsdl:message>
+	<wsdl:message name="SendAuxiliaryCommandResponse">
+		<wsdl:part name="parameters" element="tds:SendAuxiliaryCommandResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCACertificatesRequest">
+		<wsdl:part name="parameters" element="tds:GetCACertificates"/>
+	</wsdl:message>
+	<wsdl:message name="GetCACertificatesResponse">
+		<wsdl:part name="parameters" element="tds:GetCACertificatesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="LoadCertificateWithPrivateKeyRequest">
+		<wsdl:part name="parameters" element="tds:LoadCertificateWithPrivateKey"/>
+	</wsdl:message>
+	<wsdl:message name="LoadCertificateWithPrivateKeyResponse">
+		<wsdl:part name="parameters" element="tds:LoadCertificateWithPrivateKeyResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCertificateInformationRequest">
+		<wsdl:part name="parameters" element="tds:GetCertificateInformation"/>
+	</wsdl:message>
+	<wsdl:message name="GetCertificateInformationResponse">
+		<wsdl:part name="parameters" element="tds:GetCertificateInformationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="LoadCACertificatesRequest">
+		<wsdl:part name="parameters" element="tds:LoadCACertificates"/>
+	</wsdl:message>
+	<wsdl:message name="LoadCACertificatesResponse">
+		<wsdl:part name="parameters" element="tds:LoadCACertificatesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreateDot1XConfigurationRequest">
+		<wsdl:part name="parameters" element="tds:CreateDot1XConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="CreateDot1XConfigurationResponse">
+		<wsdl:part name="parameters" element="tds:CreateDot1XConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetDot1XConfigurationRequest">
+		<wsdl:part name="parameters" element="tds:SetDot1XConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetDot1XConfigurationResponse">
+		<wsdl:part name="parameters" element="tds:SetDot1XConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot1XConfigurationRequest">
+		<wsdl:part name="parameters" element="tds:GetDot1XConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot1XConfigurationResponse">
+		<wsdl:part name="parameters" element="tds:GetDot1XConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot1XConfigurationsRequest">
+		<wsdl:part name="parameters" element="tds:GetDot1XConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot1XConfigurationsResponse">
+		<wsdl:part name="parameters" element="tds:GetDot1XConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteDot1XConfigurationRequest">
+		<wsdl:part name="parameters" element="tds:DeleteDot1XConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteDot1XConfigurationResponse">
+		<wsdl:part name="parameters" element="tds:DeleteDot1XConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot11CapabilitiesRequest">
+		<wsdl:part name="parameters" element="tds:GetDot11Capabilities"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot11CapabilitiesResponse">
+		<wsdl:part name="parameters" element="tds:GetDot11CapabilitiesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot11StatusRequest">
+		<wsdl:part name="parameters" element="tds:GetDot11Status"/>
+	</wsdl:message>
+	<wsdl:message name="GetDot11StatusResponse">
+		<wsdl:part name="parameters" element="tds:GetDot11StatusResponse"/>
+	</wsdl:message>
+	<wsdl:message name="ScanAvailableDot11NetworksRequest">
+		<wsdl:part name="parameters" element="tds:ScanAvailableDot11Networks"/>
+	</wsdl:message>
+	<wsdl:message name="ScanAvailableDot11NetworksResponse">
+		<wsdl:part name="parameters" element="tds:ScanAvailableDot11NetworksResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemUrisRequest">
+		<wsdl:part name="parameters" element="tds:GetSystemUris"/>
+	</wsdl:message>
+	<wsdl:message name="GetSystemUrisResponse">
+		<wsdl:part name="parameters" element="tds:GetSystemUrisResponse"/>
+	</wsdl:message>
+	<wsdl:message name="StartFirmwareUpgradeRequest">
+		<wsdl:part name="parameters" element="tds:StartFirmwareUpgrade"/>
+	</wsdl:message>
+	<wsdl:message name="StartFirmwareUpgradeResponse">
+		<wsdl:part name="parameters" element="tds:StartFirmwareUpgradeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="StartSystemRestoreRequest">
+		<wsdl:part name="parameters" element="tds:StartSystemRestore"/>
+	</wsdl:message>
+	<wsdl:message name="StartSystemRestoreResponse">
+		<wsdl:part name="parameters" element="tds:StartSystemRestoreResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="Device">
+		<wsdl:operation name="GetServices">
+			<wsdl:documentation>Returns information about services on the device.</wsdl:documentation>
+			<wsdl:input message="tds:GetServicesRequest"/>
+			<wsdl:output message="tds:GetServicesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetServiceCapabilities">
+			<wsdl:documentation>Returns the capabilities of the device service. The result is returned in a typed answer.</wsdl:documentation>
+			<wsdl:input message="tds:GetServiceCapabilitiesRequest"/>
+			<wsdl:output message="tds:GetServiceCapabilitiesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDeviceInformation">
+			<wsdl:documentation>This operation gets basic device information from the device.</wsdl:documentation>
+			<wsdl:input message="tds:GetDeviceInformationRequest"/>
+			<wsdl:output message="tds:GetDeviceInformationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetSystemDateAndTime">
+			<wsdl:documentation>This operation sets the device system date and time. The device shall support the
+				configuration of the daylight saving setting and of the manual system date and time (if
+				applicable) or indication of NTP time (if applicable) through the SetSystemDateAndTime
+				command. <br/>
+				If system time and date are set manually, the client shall include UTCDateTime in the request.<br/>
+				A TimeZone token which is not formed according to the rules of IEEE 1003.1 section 8.3 is considered as invalid timezone.<br/>
+				The DayLightSavings flag should be set to true to activate any DST settings of the TimeZone string. 
+				Clear the DayLightSavings flag if the DST portion of the TimeZone settings should be ignored.
+			</wsdl:documentation>
+			<wsdl:input message="tds:SetSystemDateAndTimeRequest"/>
+			<wsdl:output message="tds:SetSystemDateAndTimeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemDateAndTime">
+			<wsdl:documentation>This operation gets the device system date and time. The device shall support the return of
+				the daylight saving setting and of the manual system date and time (if applicable) or indication
+				of NTP time (if applicable) through the GetSystemDateAndTime command.<br/>
+				A device shall provide the UTCDateTime information.</wsdl:documentation>
+			<wsdl:input message="tds:GetSystemDateAndTimeRequest"/>
+			<wsdl:output message="tds:GetSystemDateAndTimeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetSystemFactoryDefault">
+			<wsdl:documentation>This operation reloads the parameters on the device to their factory default values.</wsdl:documentation>
+			<wsdl:input message="tds:SetSystemFactoryDefaultRequest"/>
+			<wsdl:output message="tds:SetSystemFactoryDefaultResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="UpgradeSystemFirmware">
+			<wsdl:documentation>This operation upgrades a device firmware version. After a successful upgrade the response
+				message is sent before the device reboots. The device should support firmware upgrade
+				through the UpgradeSystemFirmware command. The exact format of the firmware data is
+				outside the scope of this standard.</wsdl:documentation>
+			<wsdl:input message="tds:UpgradeSystemFirmwareRequest"/>
+			<wsdl:output message="tds:UpgradeSystemFirmwareResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SystemReboot">
+			<wsdl:documentation>This operation reboots the device.</wsdl:documentation>
+			<wsdl:input message="tds:SystemRebootRequest"/>
+			<wsdl:output message="tds:SystemRebootResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RestoreSystem">
+			<wsdl:documentation>This operation restores the system backup configuration files(s) previously retrieved from a
+				device. The device should support restore of backup configuration file(s) through the
+				RestoreSystem command. The exact format of the backup configuration file(s) is outside the
+				scope of this standard. If the command is supported, it shall accept backup files returned by
+				the GetSystemBackup command.</wsdl:documentation>
+			<wsdl:input message="tds:RestoreSystemRequest"/>
+			<wsdl:output message="tds:RestoreSystemResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemBackup">
+			<wsdl:documentation>This operation is retrieves system backup configuration file(s) from a device. The device
+				should support return of back up configuration file(s) through the GetSystemBackup command.
+				The backup is returned with reference to a name and mime-type together with binary data.
+				The exact format of the backup configuration files is outside the scope of this standard.</wsdl:documentation>
+			<wsdl:input message="tds:GetSystemBackupRequest"/>
+			<wsdl:output message="tds:GetSystemBackupResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemLog">
+			<wsdl:documentation>This operation gets a system log from the device. The exact format of the system logs is outside the scope of this standard.</wsdl:documentation>
+			<wsdl:input message="tds:GetSystemLogRequest"/>
+			<wsdl:output message="tds:GetSystemLogResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemSupportInformation">
+			<wsdl:documentation>This operation gets arbitary device diagnostics information from the device.</wsdl:documentation>
+			<wsdl:input message="tds:GetSystemSupportInformationRequest"/>
+			<wsdl:output message="tds:GetSystemSupportInformationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetScopes">
+			<wsdl:documentation>This operation requests the scope parameters of a device. The scope parameters are used in
+				the device discovery to match a probe message, see Section 7. The Scope parameters are of
+				two different types: <ul>
+					<li>Fixed</li>
+					<li>Configurable</li>
+				</ul>
+				Fixed scope parameters are permanent device characteristics and cannot be removed through the device management interface. 
+				The scope type is indicated in the scope list returned in the get scope parameters response. A device shall support 
+				retrieval of discovery scope parameters through the GetScopes command. As some scope parameters are mandatory, 
+				the device shall return a non-empty scope list in the response.</wsdl:documentation>
+			<wsdl:input message="tds:GetScopesRequest"/>
+			<wsdl:output message="tds:GetScopesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetScopes">
+			<wsdl:documentation>This operation sets the scope parameters of a device. The scope parameters are used in the
+				device discovery to match a probe message.
+				This operation replaces all existing configurable scope parameters (not fixed parameters). If
+				this shall be avoided, one should use the scope add command instead. The device shall
+				support configuration of discovery scope parameters through the SetScopes command.</wsdl:documentation>
+			<wsdl:input message="tds:SetScopesRequest"/>
+			<wsdl:output message="tds:SetScopesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddScopes">
+			<wsdl:documentation>This operation adds new configurable scope parameters to a device. The scope parameters
+				are used in the device discovery to match a probe message. The device shall
+				support addition of discovery scope parameters through the AddScopes command.</wsdl:documentation>
+			<wsdl:input message="tds:AddScopesRequest"/>
+			<wsdl:output message="tds:AddScopesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveScopes">
+			<wsdl:documentation>This operation deletes scope-configurable scope parameters from a device. The scope
+				parameters are used in the device discovery to match a probe message, see Section 7. The
+				device shall support deletion of discovery scope parameters through the RemoveScopes
+				command.
+				Table</wsdl:documentation>
+			<wsdl:input message="tds:RemoveScopesRequest"/>
+			<wsdl:output message="tds:RemoveScopesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDiscoveryMode">
+			<wsdl:documentation>This operation gets the discovery mode of a device. See Section 7.2 for the definition of the
+				different device discovery modes. The device shall support retrieval of the discovery mode
+				setting through the GetDiscoveryMode command.</wsdl:documentation>
+			<wsdl:input message="tds:GetDiscoveryModeRequest"/>
+			<wsdl:output message="tds:GetDiscoveryModeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetDiscoveryMode">
+			<wsdl:documentation>This operation sets the discovery mode operation of a device. See Section 7.2 for the
+				definition of the different device discovery modes. The device shall support configuration of
+				the discovery mode setting through the SetDiscoveryMode command.</wsdl:documentation>
+			<wsdl:input message="tds:SetDiscoveryModeRequest"/>
+			<wsdl:output message="tds:SetDiscoveryModeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetRemoteDiscoveryMode">
+			<wsdl:documentation>This operation gets the remote discovery mode of a device. See Section 7.4 for the definition
+				of remote discovery extensions. A device that supports remote discovery shall support
+				retrieval of the remote discovery mode setting through the GetRemoteDiscoveryMode
+				command.</wsdl:documentation>
+			<wsdl:input message="tds:GetRemoteDiscoveryModeRequest"/>
+			<wsdl:output message="tds:GetRemoteDiscoveryModeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetRemoteDiscoveryMode">
+			<wsdl:documentation>This operation sets the remote discovery mode of operation of a device. See Section 7.4 for
+				the definition of remote discovery remote extensions. A device that supports remote discovery
+				shall support configuration of the discovery mode setting through the
+				SetRemoteDiscoveryMode command.</wsdl:documentation>
+			<wsdl:input message="tds:SetRemoteDiscoveryModeRequest"/>
+			<wsdl:output message="tds:SetRemoteDiscoveryModeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDPAddresses">
+			<wsdl:documentation>This operation gets the remote DP address or addresses from a device. If the device supports
+				remote discovery, as specified in Section 7.4, the device shall support retrieval of the remote
+				DP address(es) through the GetDPAddresses command.</wsdl:documentation>
+			<wsdl:input message="tds:GetDPAddressesRequest"/>
+			<wsdl:output message="tds:GetDPAddressesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetDPAddresses">
+			<wsdl:documentation>This operation sets the remote DP address or addresses on a device. If the device supports
+				remote discovery, as specified in Section 7.4, the device shall support configuration of the
+				remote DP address(es) through the SetDPAddresses command.</wsdl:documentation>
+			<wsdl:input message="tds:SetDPAddressesRequest"/>
+			<wsdl:output message="tds:SetDPAddressesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetEndpointReference">
+			<wsdl:documentation>A client can ask for the device service endpoint reference address property that can be used
+				to derive the password equivalent for remote user operation. The device shall support the
+				GetEndpointReference command returning the address property of the device service
+				endpoint reference.</wsdl:documentation>
+			<wsdl:input message="tds:GetEndpointReferenceRequest"/>
+			<wsdl:output message="tds:GetEndpointReferenceResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetRemoteUser">
+			<wsdl:documentation>This operation returns the configured remote user (if any). A device supporting remote user
+				handling shall support this operation. The user is only valid for the WS-UserToken profile or
+				as a HTTP / RTSP user.<br/>
+				The algorithm to use for deriving the password is described in section 5.12.2.1 of the core specification.</wsdl:documentation>
+			<wsdl:input message="tds:GetRemoteUserRequest"/>
+			<wsdl:output message="tds:GetRemoteUserResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetRemoteUser">
+			<wsdl:documentation>This operation sets the remote user. A device supporting remote user handling shall support this
+				operation. The user is only valid for the WS-UserToken profile or as a HTTP / RTSP user.<br/>
+				The password that is set shall always be the original (not derived) password.<br/>
+				If UseDerivedPassword is set password derivation shall be done by the device when connecting to a
+				remote device.The algorithm to use for deriving the password is described in section 5.12.2.1 of the core specification.<br/>
+				To remove the remote user SetRemoteUser should be called without the RemoteUser parameter.</wsdl:documentation>
+			<wsdl:input message="tds:SetRemoteUserRequest"/>
+			<wsdl:output message="tds:SetRemoteUserResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetUsers">
+			<wsdl:documentation>This operation lists the registered users and corresponding credentials on a device. The
+				device shall support retrieval of registered device users and their credentials for the user
+				token through the GetUsers command.</wsdl:documentation>
+			<wsdl:input message="tds:GetUsersRequest"/>
+			<wsdl:output message="tds:GetUsersResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreateUsers">
+			<wsdl:documentation>This operation creates new device users and corresponding credentials on a device for authentication purposes. 
+				The device shall support creation of device users and their credentials through the CreateUsers
+				command. Either all users are created successfully or a fault message shall be returned
+				without creating any user.<br/>
+				ONVIF compliant devices are recommended to support password length of at least 28 bytes,
+				as clients may follow the password derivation mechanism which results in 'password
+				equivalent' of length 28 bytes, as described in section 3.1.2 of the ONVIF security white paper.</wsdl:documentation>
+			<wsdl:input message="tds:CreateUsersRequest"/>
+			<wsdl:output message="tds:CreateUsersResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteUsers">
+			<wsdl:documentation>This operation deletes users on a device. The device shall support deletion of device users and their credentials 
+				through the DeleteUsers command. A device may have one or more fixed users
+				that cannot be deleted to ensure access to the unit. Either all users are deleted successfully or a
+				fault message shall be returned and no users be deleted.</wsdl:documentation>
+			<wsdl:input message="tds:DeleteUsersRequest"/>
+			<wsdl:output message="tds:DeleteUsersResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetUser">
+			<wsdl:documentation>This operation updates the settings for one or several users on a device for authentication purposes.
+				The device shall support update of device users and their credentials through the SetUser command. 
+				Either all change requests are processed successfully or a fault message shall be returned and no change requests be processed.</wsdl:documentation>
+			<wsdl:input message="tds:SetUserRequest"/>
+			<wsdl:output message="tds:SetUserResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetWsdlUrl">
+			<wsdl:documentation>It is possible for an endpoint to request a URL that can be used to retrieve the complete
+				schema and WSDL definitions of a device. The command gives in return a URL entry point
+				where all the necessary product specific WSDL and schema definitions can be retrieved. The
+				device shall provide a URL for WSDL and schema download through the GetWsdlUrl command.</wsdl:documentation>
+			<wsdl:input message="tds:GetWsdlUrlRequest"/>
+			<wsdl:output message="tds:GetWsdlUrlResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCapabilities">
+			<wsdl:documentation>Any endpoint can ask for the capabilities of a device using the capability exchange request
+				response operation. The device shall indicate all its ONVIF compliant capabilities through the
+				GetCapabilities command.
+				The capability list includes references to the addresses (XAddr) of the service implementing
+				the interface operations in the category. Apart from the addresses, the
+				capabilities only reflect optional functions.</wsdl:documentation>
+			<wsdl:input message="tds:GetCapabilitiesRequest"/>
+			<wsdl:output message="tds:GetCapabilitiesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetHostname">
+			<wsdl:documentation>This operation is used by an endpoint to get the hostname from a device. The device shall
+				return its hostname configurations through the GetHostname command.</wsdl:documentation>
+			<wsdl:input message="tds:GetHostnameRequest"/>
+			<wsdl:output message="tds:GetHostnameResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetHostname">
+			<wsdl:documentation>This operation sets the hostname on a device. It shall be possible to set the device hostname
+				configurations through the SetHostname command.<br/>
+				A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, 
+				other string shall be considered as invalid strings. 
+			</wsdl:documentation>
+			<wsdl:input message="tds:SetHostnameRequest"/>
+			<wsdl:output message="tds:SetHostnameResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetHostnameFromDHCP">
+			<wsdl:documentation>This operation controls whether the hostname is set manually or retrieved via DHCP.</wsdl:documentation>
+			<wsdl:input message="tds:SetHostnameFromDHCPRequest"/>
+			<wsdl:output message="tds:SetHostnameFromDHCPResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDNS">
+			<wsdl:documentation>This operation gets the DNS settings from a device. The device shall return its DNS
+				configurations through the GetDNS command.</wsdl:documentation>
+			<wsdl:input message="tds:GetDNSRequest"/>
+			<wsdl:output message="tds:GetDNSResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetDNS">
+			<wsdl:documentation>This operation sets the DNS settings on a device. It shall be possible to set the device DNS
+				configurations through the SetDNS command.</wsdl:documentation>
+			<wsdl:input message="tds:SetDNSRequest"/>
+			<wsdl:output message="tds:SetDNSResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetNTP">
+			<wsdl:documentation>This operation gets the NTP settings from a device. If the device supports NTP, it shall be
+				possible to get the NTP server settings through the GetNTP command.</wsdl:documentation>
+			<wsdl:input message="tds:GetNTPRequest"/>
+			<wsdl:output message="tds:GetNTPResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetNTP">
+			<wsdl:documentation>This operation sets the NTP settings on a device. If the device supports NTP, it shall be
+				possible to set the NTP server settings through the SetNTP command.<br/>
+				A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, 
+				other string shall be considered as invalid strings. <br/>
+				Changes to the NTP server list will not affect the clock mode DateTimeType. Use SetSystemDateAndTime to activate NTP operation.
+			</wsdl:documentation>
+			<wsdl:input message="tds:SetNTPRequest"/>
+			<wsdl:output message="tds:SetNTPResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDynamicDNS">
+			<wsdl:documentation>This operation gets the dynamic DNS settings from a device. If the device supports dynamic
+				DNS as specified in [RFC 2136] and [RFC 4702], it shall be possible to get the type, name
+				and TTL through the GetDynamicDNS command.</wsdl:documentation>
+			<wsdl:input message="tds:GetDynamicDNSRequest"/>
+			<wsdl:output message="tds:GetDynamicDNSResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetDynamicDNS">
+			<wsdl:documentation>This operation sets the dynamic DNS settings on a device. If the device supports dynamic
+				DNS as specified in [RFC 2136] and [RFC 4702], it shall be possible to set the type, name
+				and TTL through the SetDynamicDNS command.</wsdl:documentation>
+			<wsdl:input message="tds:SetDynamicDNSRequest"/>
+			<wsdl:output message="tds:SetDynamicDNSResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetNetworkInterfaces">
+			<wsdl:documentation>This operation gets the network interface configuration from a device. The device shall
+				support return of network interface configuration settings as defined by the NetworkInterface
+				type through the GetNetworkInterfaces command.</wsdl:documentation>
+			<wsdl:input message="tds:GetNetworkInterfacesRequest"/>
+			<wsdl:output message="tds:GetNetworkInterfacesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetNetworkInterfaces">
+			<wsdl:documentation>This operation sets the network interface configuration on a device. The device shall support
+				network configuration of supported network interfaces through the SetNetworkInterfaces
+				command.<br/>
+				For interoperability with a client unaware of the IEEE 802.11 extension a device shall retain
+				its IEEE 802.11 configuration if the IEEE 802.11 configuration element isn’t present in the
+				request.</wsdl:documentation>
+			<wsdl:input message="tds:SetNetworkInterfacesRequest"/>
+			<wsdl:output message="tds:SetNetworkInterfacesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetNetworkProtocols">
+			<wsdl:documentation>This operation gets defined network protocols from a device. The device shall support the
+				GetNetworkProtocols command returning configured network protocols.</wsdl:documentation>
+			<wsdl:input message="tds:GetNetworkProtocolsRequest"/>
+			<wsdl:output message="tds:GetNetworkProtocolsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetNetworkProtocols">
+			<wsdl:documentation>This operation configures defined network protocols on a device. The device shall support
+				configuration of defined network protocols through the SetNetworkProtocols command.</wsdl:documentation>
+			<wsdl:input message="tds:SetNetworkProtocolsRequest"/>
+			<wsdl:output message="tds:SetNetworkProtocolsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetNetworkDefaultGateway">
+			<wsdl:documentation>This operation gets the default gateway settings from a device. The device shall support the
+				GetNetworkDefaultGateway command returning configured default gateway address(es).</wsdl:documentation>
+			<wsdl:input message="tds:GetNetworkDefaultGatewayRequest"/>
+			<wsdl:output message="tds:GetNetworkDefaultGatewayResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetNetworkDefaultGateway">
+			<wsdl:documentation>This operation sets the default gateway settings on a device. The device shall support
+				configuration of default gateway through the SetNetworkDefaultGateway command.</wsdl:documentation>
+			<wsdl:input message="tds:SetNetworkDefaultGatewayRequest"/>
+			<wsdl:output message="tds:SetNetworkDefaultGatewayResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetZeroConfiguration">
+			<wsdl:documentation>This operation gets the zero-configuration from a device. If the device supports dynamic IP
+				configuration according to [RFC3927], it shall support the return of IPv4 zero configuration
+				address and status through the GetZeroConfiguration command.<br/>
+			Devices supporting zero configuration on more than one interface shall use the extension to list the additional interface settings.</wsdl:documentation>
+			<wsdl:input message="tds:GetZeroConfigurationRequest"/>
+			<wsdl:output message="tds:GetZeroConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetZeroConfiguration">
+			<wsdl:documentation>This operation sets the zero-configuration. Use GetCapalities to get if zero-zero-configuration is supported or not.</wsdl:documentation>
+			<wsdl:input message="tds:SetZeroConfigurationRequest"/>
+			<wsdl:output message="tds:SetZeroConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetIPAddressFilter">
+			<wsdl:documentation>This operation gets the IP address filter settings from a device. If the device supports device
+				access control based on IP filtering rules (denied or accepted ranges of IP addresses), the
+				device shall support the GetIPAddressFilter command.</wsdl:documentation>
+			<wsdl:input message="tds:GetIPAddressFilterRequest"/>
+			<wsdl:output message="tds:GetIPAddressFilterResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetIPAddressFilter">
+			<wsdl:documentation>This operation sets the IP address filter settings on a device. If the device supports device
+				access control based on IP filtering rules (denied or accepted ranges of IP addresses), the
+				device shall support configuration of IP filtering rules through the SetIPAddressFilter
+				command.</wsdl:documentation>
+			<wsdl:input message="tds:SetIPAddressFilterRequest"/>
+			<wsdl:output message="tds:SetIPAddressFilterResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddIPAddressFilter">
+			<wsdl:documentation>This operation adds an IP filter address to a device. If the device supports device access
+				control based on IP filtering rules (denied or accepted ranges of IP addresses), the device
+				shall support adding of IP filtering addresses through the AddIPAddressFilter command.</wsdl:documentation>
+			<wsdl:input message="tds:AddIPAddressFilterRequest"/>
+			<wsdl:output message="tds:AddIPAddressFilterResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveIPAddressFilter">
+			<wsdl:documentation>This operation deletes an IP filter address from a device. If the device supports device access
+				control based on IP filtering rules (denied or accepted ranges of IP addresses), the device
+				shall support deletion of IP filtering addresses through the RemoveIPAddressFilter command.</wsdl:documentation>
+			<wsdl:input message="tds:RemoveIPAddressFilterRequest"/>
+			<wsdl:output message="tds:RemoveIPAddressFilterResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAccessPolicy">
+			<wsdl:documentation>Access to different services and sub-sets of services should be subject to access control. The
+				WS-Security framework gives the prerequisite for end-point authentication. Authorization
+				decisions can then be taken using an access security policy. This standard does not mandate
+				any particular policy description format or security policy but this is up to the device
+				manufacturer or system provider to choose policy and policy description format of choice.
+				However, an access policy (in arbitrary format) can be requested using this command. If the
+				device supports access policy settings based on WS-Security authentication, then the device
+				shall support this command.</wsdl:documentation>
+			<wsdl:input message="tds:GetAccessPolicyRequest"/>
+			<wsdl:output message="tds:GetAccessPolicyResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetAccessPolicy">
+			<wsdl:documentation>This command sets the device access security policy (for more details on the access security
+				policy see the Get command). If the device supports access policy settings
+				based on WS-Security authentication, then the device shall support this command.</wsdl:documentation>
+			<wsdl:input message="tds:SetAccessPolicyRequest"/>
+			<wsdl:output message="tds:SetAccessPolicyResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreateCertificate">
+			<wsdl:documentation>This operation generates a private/public key pair and also can create a self-signed device
+				certificate as a result of key pair generation. The certificate is created using a suitable
+				onboard key pair generation mechanism.<br/>
+				If a device supports onboard key pair generation, the device that supports TLS shall support
+				this certificate creation command. And also, if a device supports onboard key pair generation,
+				the device that support IEEE 802.1X shall support this command for the purpose of key pair
+				generation. Certificates and key pairs are identified using certificate IDs. These IDs are either
+				chosen by the certificate generation requester or by the device (in case that no ID value is
+				given).</wsdl:documentation>
+			<wsdl:input message="tds:CreateCertificateRequest"/>
+			<wsdl:output message="tds:CreateCertificateResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCertificates">
+			<wsdl:documentation>This operation gets all device server certificates (including self-signed) for the purpose of TLS
+				authentication and all device client certificates for the purpose of IEEE 802.1X authentication.
+				This command lists only the TLS server certificates and IEEE 802.1X client certificates for the
+				device (neither trusted CA certificates nor trusted root certificates). The certificates are
+				returned as binary data. A device that supports TLS shall support this command and the
+				certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
+				rules.</wsdl:documentation>
+			<wsdl:input message="tds:GetCertificatesRequest"/>
+			<wsdl:output message="tds:GetCertificatesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCertificatesStatus">
+			<wsdl:documentation>This operation is specific to TLS functionality. This operation gets the status
+				(enabled/disabled) of the device TLS server certificates. A device that supports TLS shall
+				support this command.</wsdl:documentation>
+			<wsdl:input message="tds:GetCertificatesStatusRequest"/>
+			<wsdl:output message="tds:GetCertificatesStatusResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetCertificatesStatus">
+			<wsdl:documentation>This operation is specific to TLS functionality. This operation sets the status (enable/disable)
+				of the device TLS server certificates. A device that supports TLS shall support this command.
+				Typically only one device server certificate is allowed to be enabled at a time.</wsdl:documentation>
+			<wsdl:input message="tds:SetCertificatesStatusRequest"/>
+			<wsdl:output message="tds:SetCertificatesStatusResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteCertificates">
+			<wsdl:documentation>This operation deletes a certificate or multiple certificates. The device MAY also delete a
+				private/public key pair which is coupled with the certificate to be deleted. The device that
+				support either TLS or IEEE 802.1X shall support the deletion of a certificate or multiple
+				certificates through this command. Either all certificates are deleted successfully or a fault
+				message shall be returned without deleting any certificate.</wsdl:documentation>
+			<wsdl:input message="tds:DeleteCertificatesRequest"/>
+			<wsdl:output message="tds:DeleteCertificatesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetPkcs10Request">
+			<wsdl:documentation>This operation requests a PKCS #10 certificate signature request from the device. The
+				returned information field shall be either formatted exactly as specified in [PKCS#10] or PEM
+				encoded [PKCS#10] format. In order for this command to work, the device must already have
+				a private/public key pair. This key pair should be referred by CertificateID as specified in the
+				input parameter description. This CertificateID refers to the key pair generated using
+				CreateCertificate command.<br/>
+				A device that support onboard key pair generation that supports either TLS or IEEE 802.1X
+				using client certificate shall support this command.</wsdl:documentation>
+			<wsdl:input message="tds:GetPkcs10RequestRequest"/>
+			<wsdl:output message="tds:GetPkcs10RequestResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="LoadCertificates">
+			<wsdl:documentation>TLS server certificate(s) or IEEE 802.1X client certificate(s) created using the PKCS#10
+				certificate request command can be loaded into the device using this command (see Section
+				8.4.13). The certificate ID in the request shall be present. The device may sort the received
+				certificate(s) based on the public key and subject information in the certificate(s).
+				The certificate ID in the request will be the ID value the client wish to have. The device is
+				supposed to scan the generated key pairs present in the device to identify which is the
+				correspondent key pair with the loaded certificate and then make the link between the
+				certificate and the key pair.<br/>
+				A device that supports onboard key pair generation that support either TLS or IEEE 802.1X
+				shall support this command.<br/>
+				The certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
+				rules.<br/>
+				This command is applicable to any device type, although the parameter name is called for
+				historical reasons NVTCertificate.</wsdl:documentation>
+			<wsdl:input message="tds:LoadCertificatesRequest"/>
+			<wsdl:output message="tds:LoadCertificatesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetClientCertificateMode">
+			<wsdl:documentation>This operation is specific to TLS functionality. This operation gets the status
+				(enabled/disabled) of the device TLS client authentication. A device that supports TLS shall
+				support this command.</wsdl:documentation>
+			<wsdl:input message="tds:GetClientCertificateModeRequest"/>
+			<wsdl:output message="tds:GetClientCertificateModeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetClientCertificateMode">
+			<wsdl:documentation>This operation is specific to TLS functionality. This operation sets the status
+				(enabled/disabled) of the device TLS client authentication. A device that supports TLS shall
+				support this command.</wsdl:documentation>
+			<wsdl:input message="tds:SetClientCertificateModeRequest"/>
+			<wsdl:output message="tds:SetClientCertificateModeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetRelayOutputs">
+			<wsdl:documentation>This operation gets a list of all available relay outputs and their settings.<br/>
+				This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
+			<wsdl:input message="tds:GetRelayOutputsRequest"/>
+			<wsdl:output message="tds:GetRelayOutputsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetRelayOutputSettings">
+			<wsdl:documentation>This operation sets the settings of a relay output.
+				<br/>This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
+			<wsdl:input message="tds:SetRelayOutputSettingsRequest"/>
+			<wsdl:output message="tds:SetRelayOutputSettingsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetRelayOutputState">
+			<wsdl:documentation>This operation sets the state of a relay output.
+				<br/>This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
+			<wsdl:input message="tds:SetRelayOutputStateRequest"/>
+			<wsdl:output message="tds:SetRelayOutputStateResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SendAuxiliaryCommand">
+			<wsdl:documentation>Manage auxiliary commands supported by a device, such as controlling an Infrared (IR) lamp, 
+				a heater or a wiper or a thermometer that is connected to the device.<br/>
+				The supported commands can be retrieved via the AuxiliaryCommands capability.<br/>
+				Although the name of the auxiliary commands can be freely defined, commands starting with the prefix tt: are 
+				reserved to define frequently used commands and these reserved commands shall all share the "tt:command|parameter" syntax.
+				<ul>
+					<li>tt:Wiper|On – Request to start the wiper.</li>
+					<li>tt:Wiper|Off – Request to stop the wiper.</li>
+					<li>tt:Washer|On – Request to start the washer.</li>
+					<li>tt:Washer|Off – Request to stop the washer.</li>
+					<li>tt:WashingProcedure|On – Request to start the washing procedure.</li>
+					<li>tt: WashingProcedure |Off – Request to stop the washing procedure.</li>
+					<li>tt:IRLamp|On – Request to turn ON an IR illuminator attached to the unit.</li>
+					<li>tt:IRLamp|Off – Request to turn OFF an IR illuminator attached to the unit.</li>
+					<li>tt:IRLamp|Auto – Request to configure an IR illuminator attached to the unit so that it automatically turns ON and OFF.</li>
+				</ul>
+				A device that indicates auxiliary service capability shall support this command.</wsdl:documentation>
+			<wsdl:input message="tds:SendAuxiliaryCommandRequest"/>
+			<wsdl:output message="tds:SendAuxiliaryCommandResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCACertificates">
+			<wsdl:documentation>CA certificates will be loaded into a device and be used for the sake of following two cases.
+				The one is for the purpose of TLS client authentication in TLS server function. The other one
+				is for the purpose of Authentication Server authentication in IEEE 802.1X function. This
+				operation gets all CA certificates loaded into a device. A device that supports either TLS client
+				authentication or IEEE 802.1X shall support this command and the returned certificates shall
+				be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding rules.</wsdl:documentation>
+			<wsdl:input message="tds:GetCACertificatesRequest"/>
+			<wsdl:output message="tds:GetCACertificatesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="LoadCertificateWithPrivateKey">
+			<wsdl:documentation>There might be some cases that a Certificate Authority or some other equivalent creates a
+				certificate without having PKCS#10 certificate signing request. In such cases, the certificate
+				will be bundled in conjunction with its private key. This command will be used for such use
+				case scenarios. The certificate ID in the request is optionally set to the ID value the client
+				wish to have. If the certificate ID is not specified in the request, device can choose the ID
+				accordingly.<br/>
+				This operation imports a private/public key pair into the device.
+				The certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
+				rules.<br/>
+				A device that does not support onboard key pair generation and support either TLS or IEEE
+				802.1X using client certificate shall support this command. A device that support onboard key
+				pair generation MAY support this command. The security policy of a device that supports this
+				operation should make sure that the private key is sufficiently protected.</wsdl:documentation>
+			<wsdl:input message="tds:LoadCertificateWithPrivateKeyRequest"/>
+			<wsdl:output message="tds:LoadCertificateWithPrivateKeyResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCertificateInformation">
+			<wsdl:documentation>This operation requests the information of a certificate specified by certificate ID. The device
+				should respond with its “Issuer DN”, “Subject DN”, “Key usage”, "Extended key usage”, “Key
+				Length”, “Version”, “Serial Number”, “Signature Algorithm” and “Validity” data as the
+				information of the certificate, as long as the device can retrieve such information from the
+				specified certificate.<br/>
+				A device that supports either TLS or IEEE 802.1X should support this command.</wsdl:documentation>
+			<wsdl:input message="tds:GetCertificateInformationRequest"/>
+			<wsdl:output message="tds:GetCertificateInformationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="LoadCACertificates">
+			<wsdl:documentation>This command is used when it is necessary to load trusted CA certificates or trusted root
+				certificates for the purpose of verification for its counterpart i.e. client certificate verification in
+				TLS function or server certificate verification in IEEE 802.1X function.<br/>
+				A device that support either TLS or IEEE 802.1X shall support this command. As for the
+				supported certificate format, either DER format or PEM format is possible to be used. But a
+				device that support this command shall support at least DER format as supported format type.
+				The device may sort the received certificate(s) based on the public key and subject
+				information in the certificate(s). Either all CA certificates are loaded successfully or a fault
+				message shall be returned without loading any CA certificate.</wsdl:documentation>
+			<wsdl:input message="tds:LoadCACertificatesRequest"/>
+			<wsdl:output message="tds:LoadCACertificatesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreateDot1XConfiguration">
+			<wsdl:documentation>This operation newly creates IEEE 802.1X configuration parameter set of the device. The
+				device shall support this command if it supports IEEE 802.1X. If the device receives this
+				request with already existing configuration token (Dot1XConfigurationToken) specification, the
+				device should respond with 'ter:ReferenceToken ' error to indicate there is some configuration
+				conflict.</wsdl:documentation>
+			<wsdl:input message="tds:CreateDot1XConfigurationRequest"/>
+			<wsdl:output message="tds:CreateDot1XConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetDot1XConfiguration">
+			<wsdl:documentation>While the CreateDot1XConfiguration command is trying to create a new configuration
+				parameter set, this operation modifies existing IEEE 802.1X configuration parameter set of
+				the device. A device that support IEEE 802.1X shall support this command.</wsdl:documentation>
+			<wsdl:input message="tds:SetDot1XConfigurationRequest"/>
+			<wsdl:output message="tds:SetDot1XConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot1XConfiguration">
+			<wsdl:documentation>This operation gets one IEEE 802.1X configuration parameter set from the device by
+				specifying the configuration token (Dot1XConfigurationToken).<br/>
+				A device that supports IEEE 802.1X shall support this command.
+				Regardless of whether the 802.1X method in the retrieved configuration has a password or
+				not, the device shall not include the Password element in the response.</wsdl:documentation>
+			<wsdl:input message="tds:GetDot1XConfigurationRequest"/>
+			<wsdl:output message="tds:GetDot1XConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot1XConfigurations">
+			<wsdl:documentation>This operation gets all the existing IEEE 802.1X configuration parameter sets from the device.
+				The device shall respond with all the IEEE 802.1X configurations so that the client can get to
+				know how many IEEE 802.1X configurations are existing and how they are configured.<br/>
+				A device that support IEEE 802.1X shall support this command.<br/>
+				Regardless of whether the 802.1X method in the retrieved configuration has a password or
+				not, the device shall not include the Password element in the response.</wsdl:documentation>
+			<wsdl:input message="tds:GetDot1XConfigurationsRequest"/>
+			<wsdl:output message="tds:GetDot1XConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteDot1XConfiguration">
+			<wsdl:documentation>This operation deletes an IEEE 802.1X configuration parameter set from the device. Which
+				configuration should be deleted is specified by the 'Dot1XConfigurationToken' in the request.
+				A device that support IEEE 802.1X shall support this command.</wsdl:documentation>
+			<wsdl:input message="tds:DeleteDot1XConfigurationRequest"/>
+			<wsdl:output message="tds:DeleteDot1XConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot11Capabilities">
+			<wsdl:documentation>This operation returns the IEEE802.11 capabilities. The device shall support
+				this operation.</wsdl:documentation>
+			<wsdl:input message="tds:GetDot11CapabilitiesRequest"/>
+			<wsdl:output message="tds:GetDot11CapabilitiesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot11Status">
+			<wsdl:documentation>This operation returns the status of a wireless network interface. The device shall support this
+				command.</wsdl:documentation>
+			<wsdl:input message="tds:GetDot11StatusRequest"/>
+			<wsdl:output message="tds:GetDot11StatusResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="ScanAvailableDot11Networks">
+			<wsdl:documentation>This operation returns a lists of the wireless networks in range of the device. A device should
+				support this operation.</wsdl:documentation>
+			<wsdl:input message="tds:ScanAvailableDot11NetworksRequest"/>
+			<wsdl:output message="tds:ScanAvailableDot11NetworksResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemUris">
+			<wsdl:documentation>This operation is used to retrieve URIs from which system information may be downloaded
+				using HTTP. URIs may be returned for the following system information:<br/>
+				System Logs. Multiple system logs may be returned, of different types. The exact format of
+				the system logs is outside the scope of this specification.<br/>
+				Support Information. This consists of arbitrary device diagnostics information from a device.
+				The exact format of the diagnostic information is outside the scope of this specification.<br/>
+				System Backup. The received file is a backup file that can be used to restore the current
+				device configuration at a later date. The exact format of the backup configuration file is
+				outside the scope of this specification.<br/>
+				If the device allows retrieval of system logs, support information or system backup data, it
+				should make them available via HTTP GET. If it does, it shall support the GetSystemUris
+				command.</wsdl:documentation>
+			<wsdl:input message="tds:GetSystemUrisRequest"/>
+			<wsdl:output message="tds:GetSystemUrisResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="StartFirmwareUpgrade">
+			<wsdl:documentation>This operation initiates a firmware upgrade using the HTTP POST mechanism. The response
+				to the command includes an HTTP URL to which the upgrade file may be uploaded. The
+				actual upgrade takes place as soon as the HTTP POST operation has completed. The device
+				should support firmware upgrade through the StartFirmwareUpgrade command. The exact
+				format of the firmware data is outside the scope of this specification.
+				Firmware upgrade over HTTP may be achieved using the following steps:<ol>
+					<li>Client calls StartFirmwareUpgrade.</li>
+					<li>Server responds with upload URI and optional delay value.</li>
+					<li>Client waits for delay duration if specified by server.</li>
+					<li>Client transmits the firmware image to the upload URI using HTTP POST.</li>
+					<li>Server reprograms itself using the uploaded image, then reboots.</li>
+				</ol>
+				If the firmware upgrade fails because the upgrade file was invalid, the HTTP POST response
+				shall be “415 Unsupported Media Type”. If the firmware upgrade fails due to an error at the
+				device, the HTTP POST response shall be “500 Internal Server Error”.<br/>
+				The value of the Content-Type header in the HTTP POST request shall be “application/octetstream”.</wsdl:documentation>
+			<wsdl:input message="tds:StartFirmwareUpgradeRequest"/>
+			<wsdl:output message="tds:StartFirmwareUpgradeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="StartSystemRestore">
+			<wsdl:documentation>This operation initiates a system restore from backed up configuration data using the HTTP
+				POST mechanism. The response to the command includes an HTTP URL to which the backup
+				file may be uploaded. The actual restore takes place as soon as the HTTP POST operation
+				has completed. Devices should support system restore through the StartSystemRestore
+				command. The exact format of the backup configuration data is outside the scope of this
+				specification.<br/>
+				System restore over HTTP may be achieved using the following steps:<ol>
+					<li>Client calls StartSystemRestore.</li>
+					<li>Server responds with upload URI.</li>
+					<li>Client transmits the configuration data to the upload URI using HTTP POST.</li>
+					<li>Server applies the uploaded configuration, then reboots if necessary.</li>
+				</ol>
+				If the system restore fails because the uploaded file was invalid, the HTTP POST response
+				shall be “415 Unsupported Media Type”. If the system restore fails due to an error at the
+				device, the HTTP POST response shall be “500 Internal Server Error”.<br/>
+				The value of the Content-Type header in the HTTP POST request shall be “application/octetstream”.</wsdl:documentation>
+			<wsdl:input message="tds:StartSystemRestoreRequest"/>
+			<wsdl:output message="tds:StartSystemRestoreResponse"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="DeviceBinding" type="tds:Device">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="GetServices">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetServices"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetServiceCapabilities">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetServiceCapabilities"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDeviceInformation">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDeviceInformation"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetSystemDateAndTime">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetSystemDateAndTime"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemDateAndTime">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemDateAndTime"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetSystemFactoryDefault">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetSystemFactoryDefault"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="UpgradeSystemFirmware">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/UpgradeSystemFirmware"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SystemReboot">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SystemReboot"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="RestoreSystem">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RestoreSystem"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemBackup">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemBackup"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemLog">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemLog"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemSupportInformation">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemSupportInformation"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetScopes">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetScopes"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetScopes">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetScopes"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="AddScopes">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/AddScopes"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveScopes">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RemoveScopes"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDiscoveryMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDiscoveryMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetDiscoveryMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDiscoveryMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetRemoteDiscoveryMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRemoteDiscoveryMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetRemoteDiscoveryMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRemoteDiscoveryMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDPAddresses">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDPAddresses"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetEndpointReference">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetEndpointReference"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetRemoteUser">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRemoteUser"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetRemoteUser">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRemoteUser"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetUsers">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetUsers"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreateUsers">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateUsers"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteUsers">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteUsers"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetUser">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetUser"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetWsdlUrl">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetWsdlUrl"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCapabilities">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCapabilities"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetDPAddresses">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDPAddresses"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetHostname">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetHostname"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetHostname">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetHostname"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetHostnameFromDHCP">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetHostnameFromDHCP"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDNS">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDNS"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetDNS">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDNS"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetNTP">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNTP"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetNTP">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNTP"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDynamicDNS">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDynamicDNS"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetDynamicDNS">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDynamicDNS"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetNetworkInterfaces">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkInterfaces"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetNetworkInterfaces">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkInterfaces"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetNetworkProtocols">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkProtocols"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetNetworkProtocols">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkProtocols"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetNetworkDefaultGateway">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkDefaultGateway"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetNetworkDefaultGateway">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkDefaultGateway"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetZeroConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetZeroConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetZeroConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetZeroConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetIPAddressFilter">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetIPAddressFilter"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetIPAddressFilter">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetIPAddressFilter"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="AddIPAddressFilter">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/AddIPAddressFilter"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveIPAddressFilter">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RemoveIPAddressFilter"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAccessPolicy">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetAccessPolicy"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetAccessPolicy">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetAccessPolicy"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreateCertificate">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateCertificate"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCertificates">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificates"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCertificatesStatus">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificatesStatus"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetCertificatesStatus">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetCertificatesStatus"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteCertificates">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteCertificates"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetPkcs10Request">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetPkcs10Request"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="LoadCertificates">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCertificates"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetClientCertificateMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetClientCertificateMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetClientCertificateMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetClientCertificateMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetRelayOutputs">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRelayOutputs"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetRelayOutputSettings">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRelayOutputSettings"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetRelayOutputState">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRelayOutputState"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SendAuxiliaryCommand">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SendAuxiliaryCommand"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCACertificates">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCACertificates"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="LoadCertificateWithPrivateKey">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCertificateWithPrivateKey"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCertificateInformation">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificateInformation"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="LoadCACertificates">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCACertificates"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreateDot1XConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateDot1XConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetDot1XConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDot1XConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot1XConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot1XConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot1XConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot1XConfigurations"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteDot1XConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteDot1XConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot11Capabilities">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot11Capabilities"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetDot11Status">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot11Status"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="ScanAvailableDot11Networks">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/ScanAvailableDot11Networks"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetSystemUris">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemUris"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="StartFirmwareUpgrade">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/StartFirmwareUpgrade"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="StartSystemRestore">
+			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/StartSystemRestore"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<!--===============================-->
+  <wsdl:service name="Device">
+    <wsdl:port name="DevicePort" binding="tds:DeviceBinding" >
+      <soap:address
+        location="http://www.examples.com/Device/" />
+    </wsdl:port>
+  </wsdl:service>
+	<!--===============================-->
+</wsdl:definitions>
diff --git a/onvif/wsdl/media.wsdl b/onvif/wsdl/media.wsdl
new file mode 100644
index 000000000..de3fdb30d
--- /dev/null
+++ b/onvif/wsdl/media.wsdl
@@ -0,0 +1,3688 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
+<!--
+Copyright (c) 2008-2012 by ONVIF: Open Network Video Interface Forum. All rights reserved.
+
+Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
+-->
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:trt="http://www.onvif.org/ver10/media/wsdl" targetNamespace="http://www.onvif.org/ver10/media/wsdl">
+	<wsdl:types>
+		<xs:schema targetNamespace="http://www.onvif.org/ver10/media/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.4.1">
+			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
+			<!--  Message Request/Responses elements  -->
+			<!--===============================-->
+			<xs:element name="GetServiceCapabilities">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetServiceCapabilitiesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Capabilities" type="trt:Capabilities">
+							<xs:annotation>
+								<xs:documentation>The capabilities for the media service is returned in the Capabilities element.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:complexType name="Capabilities">
+				<xs:sequence>
+					<xs:element name="ProfileCapabilities" type="trt:ProfileCapabilities">
+						<xs:annotation>
+							<xs:documentation>Media profile capabilities.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="StreamingCapabilities" type="trt:StreamingCapabilities">
+						<xs:annotation>
+							<xs:documentation>Streaming capabilities.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:attribute name="SnapshotUri" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates if GetSnapshotUri is supported.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="Rotation" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates whether or not Rotation feature is supported.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="VideoSourceMode" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates the support for changing video source mode.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="OSD" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates if OSD is supported.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<xs:element name="Capabilities" type="trt:Capabilities"/>
+			<!--===============================-->
+			<xs:complexType name="ProfileCapabilities">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:attribute name="MaximumNumberOfProfiles" type="xs:int">
+					<xs:annotation>
+						<xs:documentation>Maximum number of profiles supported.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:complexType name="StreamingCapabilities">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:attribute name="RTPMulticast" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for RTP multicast.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="RTP_TCP" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for RTP over TCP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="RTP_RTSP_TCP" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for RTP/RTSP/TCP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="NonAggregateControl" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for non aggregate RTSP control.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="NoRTSPStreaming" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation> Indicates the device does not support live media streaming via RTSP.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:element name="GetVideoSources">
+				<xs:complexType>
+					<xs:sequence>
+				   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoSourcesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="VideoSources" type="tt:VideoSource" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>List of existing Video Sources</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioSources">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioSourcesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="AudioSources" type="tt:AudioSource" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>List of existing Audio Sources</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioOutputs">
+				<xs:complexType>
+					<xs:sequence>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioOutputsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="AudioOutputs" type="tt:AudioOutput" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>List of existing Audio Outputs</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateProfile">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Name" type="tt:Name">
+							<xs:annotation>
+								<xs:documentation>friendly name of the profile to be created</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Token" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional token, specifying the unique identifier of the new profile. <br/>A device supports at least a token length of 12 characters and characters "A-Z" | "a-z" | "0-9" | "-.".</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateProfileResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Profile" type="tt:Profile">
+							<xs:annotation>
+								<xs:documentation>returns the new created profile</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetProfile">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>this command requests a specific profile</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetProfileResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Profile" type="tt:Profile">
+							<xs:annotation>
+								<xs:documentation>returns the requested media profile</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetProfiles">
+				<xs:complexType>
+					<xs:sequence>
+				
+      </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetProfilesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Profiles" type="tt:Profile" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>lists all profiles that exist in the media service </xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddVideoEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the VideoEncoderConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddVideoEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+				   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveVideoEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+VideoEncoderConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveVideoEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+    </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddVideoSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the VideoSourceConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddVideoSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveVideoSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+VideoSourceConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveVideoSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddAudioEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the AudioEncoderConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddAudioEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveAudioEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+AudioEncoderConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveAudioEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddAudioSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the AudioSourceConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddAudioSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveAudioSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+AudioSourceConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveAudioSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddPTZConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the PTZConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddPTZConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemovePTZConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+PTZConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemovePTZConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddVideoAnalyticsConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the VideoAnalyticsConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddVideoAnalyticsConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveVideoAnalyticsConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+VideoAnalyticsConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveVideoAnalyticsConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddMetadataConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the MetadataConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddMetadataConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveMetadataConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+MetadataConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveMetadataConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddAudioOutputConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the AudioOutputConfiguration to add</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddAudioOutputConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+                   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveAudioOutputConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a reference to the media profile from which the
+AudioOutputConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveAudioOutputConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+                    </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AddAudioDecoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>This element contains a reference to the profile where the configuration should be added.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>This element contains a reference to the AudioDecoderConfiguration to add.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AddAudioDecoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+                    </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemoveAudioDecoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>This element contains a  reference to the media profile from which the AudioDecoderConfiguration shall be removed.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemoveAudioDecoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+                    </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteProfile">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>This element contains a  reference to the profile that should be deleted.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteProfileResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<!--===============================-->
+			<!--===============================-->
+			<xs:element name="GetVideoEncoderConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+      </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoEncoderConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:VideoEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of video encoder configurations.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoSourceConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoSourceConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:VideoSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of video source configurations.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioEncoderConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioEncoderConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of audio encoder configurations.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioSourceConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+      </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioSourceConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of audio source configurations.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoAnalyticsConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+      </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoAnalyticsConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:VideoAnalyticsConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of VideoAnalytics configurations.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetMetadataConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+      </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetMetadataConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:MetadataConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of metadata configurations</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<!--===============================-->
+			<xs:element name="GetAudioOutputConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+				   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioOutputConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioOutputConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of audio output configurations</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioDecoderConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+				   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioDecoderConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioDecoderConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of audio decoder configurations</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested video source configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:VideoSourceConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested video source configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested video encoder configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:VideoEncoderConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested video encoder configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested audio source configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioSourceConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested audio source configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested audio encoder configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioEncoderConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested audio encoder configuration</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoAnalyticsConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested video analytics configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoAnalyticsConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:VideoAnalyticsConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested video analytics configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetMetadataConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested metadata configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetMetadataConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:MetadataConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested metadata configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<!--===============================-->
+			<xs:element name="GetAudioOutputConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested audio output configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioOutputConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioOutputConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested audio output configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioDecoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested audio decoder configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioDecoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioDecoderConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested audio decoder configuration</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleVideoEncoderConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleVideoEncoderConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:VideoEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of video encoder configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleVideoSourceConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleVideoSourceConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:VideoSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of video source configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleAudioEncoderConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleAudioEncoderConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of audio encoder configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleAudioSourceConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleAudioSourceConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of audio source configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleVideoAnalyticsConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleVideoAnalyticsConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:VideoAnalyticsConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of video analytics configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleMetadataConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleMetadataConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:MetadataConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of metadata configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<!--===============================-->
+			<xs:element name="GetCompatibleAudioOutputConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleAudioOutputConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioOutputConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of audio output configurations that are compatible with the specified media profile.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleAudioDecoderConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleAudioDecoderConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configurations" type="tt:AudioDecoderConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Contains a list of audio decoder configurations that are compatible with the specified media profile. </xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<!--===============================-->
+			<!--===============================-->
+			<!--===============================-->
+			<!--===============================-->
+			<!--===============================-->
+			<xs:element name="SetVideoEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:VideoEncoderConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified video encoder configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetVideoEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetVideoSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:VideoSourceConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified video source configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetVideoSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetAudioEncoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioEncoderConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified audio encoder configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetAudioEncoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetAudioSourceConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioSourceConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified audio source configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetAudioSourceConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetVideoAnalyticsConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:VideoAnalyticsConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified video analytics configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetVideoAnalyticsConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetMetadataConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:MetadataConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified metadata configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetMetadataConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<!--===============================-->
+			<xs:element name="SetAudioOutputConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioOutputConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified audio output configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetAudioOutputConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+				   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetAudioDecoderConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Configuration" type="tt:AudioDecoderConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified audio decoder configuration. The configuration shall exist in the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetAudioDecoderConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+				   </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoSourceConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional video source configurationToken that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoSourceConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:VideoSourceConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>This message contains the video source configuration options. If a video source configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetVideoEncoderConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional video encoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoEncoderConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:VideoEncoderConfigurationOptions"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioSourceConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional audio source configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioSourceConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:AudioSourceConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>This message contains the audio source configuration options. If a audio source configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioEncoderConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional audio encoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioEncoderConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:AudioEncoderConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>This message contains the audio encoder configuration options. If a audio encoder configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetMetadataConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional metadata configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetMetadataConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:MetadataConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>This message contains the metadata configuration options. If a metadata configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioOutputConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional audio output configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioOutputConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:AudioOutputConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>This message contains the audio output configuration options. If a audio output configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetAudioDecoderConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional audio decoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetAudioDecoderConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:AudioDecoderConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>This message contains the audio decoder configuration options. If a audio decoder configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetGuaranteedNumberOfVideoEncoderInstances">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the video source configuration</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetGuaranteedNumberOfVideoEncoderInstancesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="TotalNumber" type="xs:int">
+							<xs:annotation>
+								<xs:documentation>The minimum guaranteed total number of encoder instances (applications) per VideoSourceConfiguration. The device is able to deliver the TotalNumber of streams</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="JPEG" type="xs:int" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many Jpeg streams can be set up at the same time per VideoSource.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="H264" type="xs:int" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many H264 streams can be set up at the same time per VideoSource.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="MPEG4" type="xs:int" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many Mpeg4 streams can be set up at the same time per VideoSource.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetStreamUri">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="StreamSetup" type="tt:StreamSetup">
+							<xs:annotation>
+								<xs:documentation>Stream Setup that should be used with the uri</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>The ProfileToken element indicates the media profile to use and will define the configuration of the content of the stream.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetStreamUriResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="MediaUri" type="tt:MediaUri">
+							<xs:annotation>
+								<xs:documentation/>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="StartMulticastStreaming">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of the Profile that is used to define the multicast stream.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="StartMulticastStreamingResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="StopMulticastStreaming">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of the Profile that is used to define the multicast stream.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="StopMulticastStreamingResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetSynchronizationPoint">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a Profile reference for which a Synchronization Point is requested.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetSynchronizationPointResponse">
+				<xs:complexType>
+					<xs:sequence>
+          </xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetSnapshotUri">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>The ProfileToken element indicates the media profile to use and will define the source and dimensions of the snapshot.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSnapshotUriResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="MediaUri" type="tt:MediaUri">
+							<xs:annotation>
+								<xs:documentation/>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--================ Video Source Mode ===============-->
+			<xs:element name="GetVideoSourceModes">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="VideoSourceToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a video source reference for which a video source mode is requested.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetVideoSourceModesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="VideoSourceModes" type="trt:VideoSourceMode" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>Return the information for specified video source mode.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetVideoSourceMode">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="VideoSourceToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains a video source reference for which a video source mode is requested.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="VideoSourceModeToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Indicate video source mode.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetVideoSourceModeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Reboot" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>The response contains information about rebooting after returning response. When Reboot is set true, a device will reboot automatically after setting mode.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:simpleType name="EncodingTypes">
+				<xs:annotation>
+					<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
+				</xs:annotation>
+				<xs:list itemType="xs:string"/>
+			</xs:simpleType>
+			<!--===============================-->
+			<xs:complexType name="VideoSourceMode"> 
+				<xs:sequence>
+					<xs:element name="MaxFramerate" type="xs:float">
+						<xs:annotation>
+							<xs:documentation>Max frame rate in frames per second for this video source mode.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxResolution" type="tt:VideoResolution">
+						<xs:annotation>
+							<xs:documentation>Max horizontal and vertical resolution for this video source mode.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Encodings" type="trt:EncodingTypes">
+						<xs:annotation>
+							<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Reboot" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>After setting the mode if a device starts to reboot this value is true. If a device change the mode without rebooting this value is false. If true, configured parameters may not be guaranteed by the device after rebooting.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Description" type="tt:Description" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Informative description of this video source mode. This field should be described in English.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="trt:VideoSourceModeExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+					<xs:annotation>
+						<xs:documentation>Indicate token for video source mode.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="Enabled" type="xs:boolean"> 
+					<xs:annotation>
+						<xs:documentation>Indication of whether this mode is active. If active this value is true. In case of non-indication, it means as false. The value of true shall be had by only one video source mode.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<!--===============================-->
+			<xs:complexType name="VideoSourceModeExtension"> 
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+			</xs:complexType>
+
+			<!--===============================-->
+			<!--============OSD Schema Begin================-->
+			<xs:element name="GetOSDs">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="1">
+							<xs:annotation>
+								<xs:documentation>Token of the Video Source Configuration, which has OSDs associated with are requested. If token not exist, request all available OSDs.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetOSDsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSDs" type="tt:OSDConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>This element contains a list of requested OSDs.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetOSD">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSDToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>The GetOSD command fetches the OSD configuration if the OSD token is known.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetOSDResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSD" type="tt:OSDConfiguration">
+							<xs:annotation>
+								<xs:documentation>The requested OSD configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetOSD">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSD" type="tt:OSDConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contains the modified OSD configuration.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetOSDResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetOSDOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Video Source Configuration Token that specifies an existing video source configuration that the options shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetOSDOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSDOptions" type="tt:OSDConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation/>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreateOSD">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSD" type="tt:OSDConfiguration">
+							<xs:annotation>
+								<xs:documentation>Contain the initial OSD configuration for create.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreateOSDResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSDToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Returns Token of the newly created OSD</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="DeleteOSD">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OSDToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>This element contains a reference to the OSD configuration that should be deleted.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="DeleteOSDResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--============OSD Schema End================-->
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="GetServiceCapabilitiesRequest">
+		<wsdl:part name="parameter" element="trt:GetServiceCapabilities"/>
+	</wsdl:message>
+	<wsdl:message name="GetServiceCapabilitiesResponse">
+		<wsdl:part name="parameter" element="trt:GetServiceCapabilitiesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourcesRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoSources"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourcesResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoSourcesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourcesRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioSources"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourcesResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioSourcesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputs"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreateProfileRequest">
+		<wsdl:part name="parameters" element="trt:CreateProfile"/>
+	</wsdl:message>
+	<wsdl:message name="CreateProfileResponse">
+		<wsdl:part name="parameters" element="trt:CreateProfileResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetProfileRequest">
+		<wsdl:part name="parameters" element="trt:GetProfile"/>
+	</wsdl:message>
+	<wsdl:message name="GetProfileResponse">
+		<wsdl:part name="parameters" element="trt:GetProfileResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetProfilesRequest">
+		<wsdl:part name="parameters" element="trt:GetProfiles"/>
+	</wsdl:message>
+	<wsdl:message name="GetProfilesResponse">
+		<wsdl:part name="parameters" element="trt:GetProfilesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddVideoEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddVideoEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddVideoEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddVideoEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveVideoEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveVideoEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveVideoEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveVideoEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddVideoSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddVideoSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddVideoSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddVideoSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveVideoSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveVideoSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveVideoSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveVideoSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddAudioEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddAudioEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveAudioEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveAudioEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddAudioSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddAudioSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveAudioSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveAudioSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddPTZConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddPTZConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddPTZConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddPTZConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemovePTZConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemovePTZConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemovePTZConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemovePTZConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddVideoAnalyticsConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddVideoAnalyticsConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddVideoAnalyticsConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddVideoAnalyticsConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveVideoAnalyticsConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveVideoAnalyticsConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveVideoAnalyticsConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveVideoAnalyticsConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddMetadataConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddMetadataConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddMetadataConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddMetadataConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveMetadataConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveMetadataConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveMetadataConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveMetadataConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioOutputConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddAudioOutputConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioOutputConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddAudioOutputConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioOutputConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveAudioOutputConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioOutputConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveAudioOutputConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioDecoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:AddAudioDecoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="AddAudioDecoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:AddAudioDecoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioDecoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:RemoveAudioDecoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="RemoveAudioDecoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:RemoveAudioDecoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteProfileRequest">
+		<wsdl:part name="parameters" element="trt:DeleteProfile"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteProfileResponse">
+		<wsdl:part name="parameters" element="trt:DeleteProfileResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoEncoderConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoEncoderConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourceConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourceConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioEncoderConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioEncoderConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoAnalyticsConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoAnalyticsConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetMetadataConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetMetadataConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetMetadataConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioDecoderConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioDecoderConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoAnalyticsConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoAnalyticsConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetMetadataConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetMetadataConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetMetadataConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioDecoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioDecoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleVideoEncoderConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleVideoEncoderConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleVideoEncoderConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleVideoEncoderConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleVideoSourceConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleVideoSourceConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleVideoSourceConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleVideoSourceConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioEncoderConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioEncoderConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioEncoderConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioEncoderConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioSourceConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioSourceConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioSourceConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioSourceConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleVideoAnalyticsConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleVideoAnalyticsConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleVideoAnalyticsConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleVideoAnalyticsConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleMetadataConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleMetadataConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleMetadataConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleMetadataConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioOutputConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioOutputConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioOutputConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioOutputConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioDecoderConfigurationsRequest">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioDecoderConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleAudioDecoderConfigurationsResponse">
+		<wsdl:part name="parameters" element="trt:GetCompatibleAudioDecoderConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetVideoSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetVideoSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetVideoEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetVideoEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioSourceConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetAudioSourceConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioSourceConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetAudioSourceConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioEncoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetAudioEncoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioEncoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetAudioEncoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoAnalyticsConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetVideoAnalyticsConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoAnalyticsConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetVideoAnalyticsConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetMetadataConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetMetadataConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetMetadataConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetMetadataConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioOutputConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetAudioOutputConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioOutputConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetAudioOutputConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioDecoderConfigurationRequest">
+		<wsdl:part name="parameters" element="trt:SetAudioDecoderConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetAudioDecoderConfigurationResponse">
+		<wsdl:part name="parameters" element="trt:SetAudioDecoderConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoEncoderConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoEncoderConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourceConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioSourceConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioEncoderConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioEncoderConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetMetadataConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetMetadataConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioOutputConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioDecoderConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetAudioDecoderConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetGuaranteedNumberOfVideoEncoderInstancesRequest">
+		<wsdl:part name="parameters" element="trt:GetGuaranteedNumberOfVideoEncoderInstances"/>
+	</wsdl:message>
+	<wsdl:message name="GetGuaranteedNumberOfVideoEncoderInstancesResponse">
+		<wsdl:part name="parameters" element="trt:GetGuaranteedNumberOfVideoEncoderInstancesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetStreamUriRequest">
+		<wsdl:part name="parameters" element="trt:GetStreamUri"/>
+	</wsdl:message>
+	<wsdl:message name="GetStreamUriResponse">
+		<wsdl:part name="parameters" element="trt:GetStreamUriResponse"/>
+	</wsdl:message>
+	<wsdl:message name="StartMulticastStreamingRequest">
+		<wsdl:part name="parameters" element="trt:StartMulticastStreaming"/>
+	</wsdl:message>
+	<wsdl:message name="StartMulticastStreamingResponse">
+		<wsdl:part name="parameters" element="trt:StartMulticastStreamingResponse"/>
+	</wsdl:message>
+	<wsdl:message name="StopMulticastStreamingRequest">
+		<wsdl:part name="parameters" element="trt:StopMulticastStreaming"/>
+	</wsdl:message>
+	<wsdl:message name="StopMulticastStreamingResponse">
+		<wsdl:part name="parameters" element="trt:StopMulticastStreamingResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetSynchronizationPointRequest">
+		<wsdl:part name="parameters" element="trt:SetSynchronizationPoint"/>
+	</wsdl:message>
+	<wsdl:message name="SetSynchronizationPointResponse">
+		<wsdl:part name="parameters" element="trt:SetSynchronizationPointResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetSnapshotUriRequest">
+		<wsdl:part name="parameters" element="trt:GetSnapshotUri"/>
+	</wsdl:message>
+	<wsdl:message name="GetSnapshotUriResponse">
+		<wsdl:part name="parameters" element="trt:GetSnapshotUriResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceModesRequest">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceModes"/>
+	</wsdl:message>
+	<wsdl:message name="GetVideoSourceModesResponse">
+		<wsdl:part name="parameters" element="trt:GetVideoSourceModesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoSourceModeRequest">
+		<wsdl:part name="parameters" element="trt:SetVideoSourceMode"/>
+	</wsdl:message>
+	<wsdl:message name="SetVideoSourceModeResponse">
+		<wsdl:part name="parameters" element="trt:SetVideoSourceModeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetOSDsRequest">
+		<wsdl:part name="parameters" element="trt:GetOSDs"/>
+	</wsdl:message>
+	<wsdl:message name="GetOSDsResponse">
+		<wsdl:part name="parameters" element="trt:GetOSDsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetOSDRequest">
+		<wsdl:part name="parameters" element="trt:GetOSD"/>
+	</wsdl:message>
+	<wsdl:message name="GetOSDResponse">
+		<wsdl:part name="parameters" element="trt:GetOSDResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetOSDOptionsRequest">
+		<wsdl:part name="parameters" element="trt:GetOSDOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetOSDOptionsResponse">
+		<wsdl:part name="parameters" element="trt:GetOSDOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetOSDRequest">
+		<wsdl:part name="parameters" element="trt:SetOSD"/>
+	</wsdl:message>
+	<wsdl:message name="SetOSDResponse">
+		<wsdl:part name="parameters" element="trt:SetOSDResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreateOSDRequest">
+		<wsdl:part name="parameters" element="trt:CreateOSD"/>
+	</wsdl:message>
+	<wsdl:message name="CreateOSDResponse">
+		<wsdl:part name="parameters" element="trt:CreateOSDResponse"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteOSDRequest">
+		<wsdl:part name="parameters" element="trt:DeleteOSD"/>
+	</wsdl:message>
+	<wsdl:message name="DeleteOSDResponse">
+		<wsdl:part name="parameters" element="trt:DeleteOSDResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="Media">
+		<!--===============================-->
+		<!--===============================-->
+		<wsdl:operation name="GetServiceCapabilities">
+			<wsdl:documentation>Returns the capabilities of the media service. The result is returned in a typed answer.</wsdl:documentation>
+			<wsdl:input message="trt:GetServiceCapabilitiesRequest"/>
+			<wsdl:output message="trt:GetServiceCapabilitiesResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSources">
+			<wsdl:documentation>This command lists all available physical video inputs of the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoSourcesRequest"/>
+			<wsdl:output message="trt:GetVideoSourcesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSources">
+			<wsdl:documentation>This command lists all available physical audio inputs of the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioSourcesRequest"/>
+			<wsdl:output message="trt:GetAudioSourcesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputs">
+			<wsdl:documentation>This command lists all available physical audio outputs of the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioOutputsRequest"/>
+			<wsdl:output message="trt:GetAudioOutputsResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="CreateProfile">
+			<wsdl:documentation>This operation creates a new empty media profile. The media profile shall be created in the
+device and shall be persistent (remain after reboot). A created profile shall be deletable and a device shall set the “fixed” attribute to false in the
+returned Profile.</wsdl:documentation>
+			<wsdl:input message="trt:CreateProfileRequest"/>
+			<wsdl:output message="trt:CreateProfileResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetProfile">
+			<wsdl:documentation>If the profile token is already known, a profile can be fetched through the GetProfile command.</wsdl:documentation>
+			<wsdl:input message="trt:GetProfileRequest"/>
+			<wsdl:output message="trt:GetProfileResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetProfiles">
+			<wsdl:documentation>Any endpoint can ask for the existing media profiles of a device using the GetProfiles
+command. Pre-configured or dynamically configured profiles can be retrieved using this
+command. This command lists all configured profiles in a device. The client does not need to
+know the media profile in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetProfilesRequest"/>
+			<wsdl:output message="trt:GetProfilesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddVideoEncoderConfiguration">
+			<wsdl:documentation>This operation adds a VideoEncoderConfiguration to an existing media profile. If a
+configuration exists in the media profile, it will be replaced. The change shall be persistent. A device shall
+support adding a compatible VideoEncoderConfiguration to a Profile containing a VideoSourceConfiguration and shall
+support streaming video data of such a profile.
+			</wsdl:documentation>
+			<wsdl:input message="trt:AddVideoEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:AddVideoEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveVideoEncoderConfiguration">
+			<wsdl:documentation>This operation removes a VideoEncoderConfiguration from an existing media profile. If the
+media profile does not contain a VideoEncoderConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveVideoEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveVideoEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddVideoSourceConfiguration">
+			<wsdl:documentation>This operation adds a VideoSourceConfiguration to an existing media profile. If such a
+configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:AddVideoSourceConfigurationRequest"/>
+			<wsdl:output message="trt:AddVideoSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveVideoSourceConfiguration">
+			<wsdl:documentation>This operation removes a VideoSourceConfiguration from an existing media profile. If the
+media profile does not contain a VideoSourceConfiguration, the operation has no effect. The removal shall be persistent. Video source configurations should only be removed after removing a
+VideoEncoderConfiguration from the media profile.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveVideoSourceConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveVideoSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddAudioEncoderConfiguration">
+			<wsdl:documentation>This operation adds an AudioEncoderConfiguration to an existing media profile. If a 
+configuration exists in the media profile, it will be replaced. The change shall be persistent. A device shall
+support adding a compatible AudioEncoderConfiguration to a profile containing an AudioSourceConfiguration and shall
+support streaming audio data of such a profile.
+			</wsdl:documentation>
+			<wsdl:input message="trt:AddAudioEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:AddAudioEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveAudioEncoderConfiguration">
+			<wsdl:documentation>This operation removes an AudioEncoderConfiguration from an existing media profile. If the
+media profile does not contain an AudioEncoderConfiguration, the operation has no effect.
+The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveAudioEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveAudioEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddAudioSourceConfiguration">
+			<wsdl:documentation>This operation adds an AudioSourceConfiguration to an existing media profile. If a
+configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:AddAudioSourceConfigurationRequest"/>
+			<wsdl:output message="trt:AddAudioSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveAudioSourceConfiguration">
+			<wsdl:documentation>This operation removes an AudioSourceConfiguration from an existing media profile. If the
+media profile does not contain an AudioSourceConfiguration, the operation has no effect. The
+removal shall be persistent. Audio source configurations should only be removed after removing an
+AudioEncoderConfiguration from the media profile.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveAudioSourceConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveAudioSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddPTZConfiguration">
+			<wsdl:documentation>This operation adds a PTZConfiguration to an existing media profile. If a configuration exists
+in the media profile, it will be replaced. The change shall be persistent. Adding a PTZConfiguration to a media profile means that streams using that media profile can
+contain PTZ status (in the metadata), and that the media profile can be used for controlling
+PTZ movement.</wsdl:documentation>
+			<wsdl:input message="trt:AddPTZConfigurationRequest"/>
+			<wsdl:output message="trt:AddPTZConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemovePTZConfiguration">
+			<wsdl:documentation>This operation removes a PTZConfiguration from an existing media profile. If the media profile
+does not contain a PTZConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemovePTZConfigurationRequest"/>
+			<wsdl:output message="trt:RemovePTZConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddVideoAnalyticsConfiguration">
+			<wsdl:documentation>This operation adds a VideoAnalytics configuration to an existing media profile. If a
+configuration exists in the media profile, it will be replaced. The change shall be persistent. Adding a VideoAnalyticsConfiguration to a media profile means that streams using that media
+profile can contain video analytics data (in the metadata) as defined by the submitted configuration reference. A profile containing only a video analytics configuration but no video source configuration is incomplete. Therefore, a client should first add a video source configuration to a profile before adding a video analytics configuration. The device can deny adding of a video analytics
+configuration before a video source configuration.</wsdl:documentation>
+			<wsdl:input message="trt:AddVideoAnalyticsConfigurationRequest"/>
+			<wsdl:output message="trt:AddVideoAnalyticsConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveVideoAnalyticsConfiguration">
+			<wsdl:documentation>This operation removes a VideoAnalyticsConfiguration from an existing media profile. If the media profile does not contain a VideoAnalyticsConfiguration, the operation has no effect.
+The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveVideoAnalyticsConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveVideoAnalyticsConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddMetadataConfiguration">
+			<wsdl:documentation>This operation adds a Metadata configuration to an existing media profile. If a configuration exists in the media profile, it will be replaced. The change shall be persistent. Adding a MetadataConfiguration to a Profile means that streams using that profile contain metadata. Metadata can consist of events, PTZ status, and/or video analytics data.</wsdl:documentation>
+			<wsdl:input message="trt:AddMetadataConfigurationRequest"/>
+			<wsdl:output message="trt:AddMetadataConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveMetadataConfiguration">
+			<wsdl:documentation>This operation removes a MetadataConfiguration from an existing media profile. If the media profile does not contain a MetadataConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveMetadataConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveMetadataConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddAudioOutputConfiguration">
+			<wsdl:documentation>This operation adds an AudioOutputConfiguration to an existing media profile. If a configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:AddAudioOutputConfigurationRequest"/>
+			<wsdl:output message="trt:AddAudioOutputConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveAudioOutputConfiguration">
+			<wsdl:documentation>This operation removes an AudioOutputConfiguration from an existing media profile. If the media profile does not contain an AudioOutputConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveAudioOutputConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveAudioOutputConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AddAudioDecoderConfiguration">
+			<wsdl:documentation>This operation adds an AudioDecoderConfiguration to an existing media profile. If a configuration exists in the media profile, it shall be replaced. The change shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:AddAudioDecoderConfigurationRequest"/>
+			<wsdl:output message="trt:AddAudioDecoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemoveAudioDecoderConfiguration">
+			<wsdl:documentation>This operation removes an AudioDecoderConfiguration from an existing media profile. If the media profile does not contain an AudioDecoderConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
+			<wsdl:input message="trt:RemoveAudioDecoderConfigurationRequest"/>
+			<wsdl:output message="trt:RemoveAudioDecoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteProfile">
+			<wsdl:documentation>This operation deletes a profile. This change shall always be persistent. Deletion of a profile is only possible for non-fixed profiles</wsdl:documentation>
+			<wsdl:input message="trt:DeleteProfileRequest"/>
+			<wsdl:output message="trt:DeleteProfileResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSourceConfigurations">
+			<wsdl:documentation>This operation lists all existing video source configurations for a device. The client need not know anything about the video source configurations in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoSourceConfigurationsRequest"/>
+			<wsdl:output message="trt:GetVideoSourceConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoEncoderConfigurations">
+			<wsdl:documentation>This operation lists all existing video encoder configurations of a device. This command lists all configured video encoder configurations in a device. The client need not know anything apriori about the video encoder configurations in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoEncoderConfigurationsRequest"/>
+			<wsdl:output message="trt:GetVideoEncoderConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSourceConfigurations">
+			<wsdl:documentation>This operation lists all existing audio source configurations of a device. This command lists all audio source configurations in a device. The client need not know anything apriori about the audio source configurations in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioSourceConfigurationsRequest"/>
+			<wsdl:output message="trt:GetAudioSourceConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioEncoderConfigurations">
+			<wsdl:documentation>This operation lists all existing device audio encoder configurations. The client need not know anything apriori about the audio encoder configurations in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioEncoderConfigurationsRequest"/>
+			<wsdl:output message="trt:GetAudioEncoderConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoAnalyticsConfigurations">
+			<wsdl:documentation>This operation lists all video analytics configurations of a device. This command lists all configured video analytics in a device. The client need not know anything apriori about the video analytics in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoAnalyticsConfigurationsRequest"/>
+			<wsdl:output message="trt:GetVideoAnalyticsConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetMetadataConfigurations">
+			<wsdl:documentation>This operation lists all existing metadata configurations. The client need not know anything apriori about the metadata in order to use the command.</wsdl:documentation>
+			<wsdl:input message="trt:GetMetadataConfigurationsRequest"/>
+			<wsdl:output message="trt:GetMetadataConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputConfigurations">
+			<wsdl:documentation>This command lists all existing AudioOutputConfigurations of a device. The NVC need not know anything apriori about the audio configurations to use this command.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioOutputConfigurationsRequest"/>
+			<wsdl:output message="trt:GetAudioOutputConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioDecoderConfigurations">
+			<wsdl:documentation>This command lists all existing AudioDecoderConfigurations of a device. The NVC need not know anything apriori about the audio decoder configurations in order to
+use this command.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioDecoderConfigurationsRequest"/>
+			<wsdl:output message="trt:GetAudioDecoderConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoSourceConfiguration">
+			<wsdl:documentation>If the video source configuration token is already known, the video source configuration can be fetched through the GetVideoSourceConfiguration command.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoSourceConfigurationRequest"/>
+			<wsdl:output message="trt:GetVideoSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoEncoderConfiguration">
+			<wsdl:documentation>If the video encoder configuration token is already known, the encoder configuration can be fetched through the GetVideoEncoderConfiguration command.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:GetVideoEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSourceConfiguration">
+			<wsdl:documentation>The GetAudioSourceConfiguration command fetches the audio source configurations if the audio source configuration token is already known. An</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioSourceConfigurationRequest"/>
+			<wsdl:output message="trt:GetAudioSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioEncoderConfiguration">
+			<wsdl:documentation>The GetAudioEncoderConfiguration command fetches the encoder configuration if the audio encoder configuration token is known.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:GetAudioEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoAnalyticsConfiguration">
+			<wsdl:documentation>The GetVideoAnalyticsConfiguration command fetches the video analytics configuration if the video analytics token is known.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoAnalyticsConfigurationRequest"/>
+			<wsdl:output message="trt:GetVideoAnalyticsConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetMetadataConfiguration">
+			<wsdl:documentation>The GetMetadataConfiguration command fetches the metadata configuration if the metadata token is known.</wsdl:documentation>
+			<wsdl:input message="trt:GetMetadataConfigurationRequest"/>
+			<wsdl:output message="trt:GetMetadataConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputConfiguration">
+			<wsdl:documentation>If the audio output configuration token is already known, the output configuration can be fetched through the GetAudioOutputConfiguration command.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioOutputConfigurationRequest"/>
+			<wsdl:output message="trt:GetAudioOutputConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioDecoderConfiguration">
+			<wsdl:documentation>If the audio decoder configuration token is already known, the decoder configuration can be fetched through the GetAudioDecoderConfiguration command.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioDecoderConfigurationRequest"/>
+			<wsdl:output message="trt:GetAudioDecoderConfigurationResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetCompatibleVideoEncoderConfigurations">
+			<wsdl:documentation>This operation lists all the video encoder configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddVideoEncoderConfiguration command on the media profile. The result will vary depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleVideoEncoderConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleVideoEncoderConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleVideoSourceConfigurations">
+			<wsdl:documentation>This operation requests all the video source configurations of the device that are compatible
+with a certain media profile. Each of the returned configurations shall be a valid input
+parameter for the AddVideoSourceConfiguration command on the media profile. The result
+will vary depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleVideoSourceConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleVideoSourceConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioEncoderConfigurations">
+			<wsdl:documentation>This operation requests all audio encoder configurations of a device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioSourceConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleAudioEncoderConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleAudioEncoderConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioSourceConfigurations">
+			<wsdl:documentation>This operation requests all audio source configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioEncoderConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleAudioSourceConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleAudioSourceConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleVideoAnalyticsConfigurations">
+			<wsdl:documentation>This operation requests all video analytic configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddVideoAnalyticsConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleVideoAnalyticsConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleVideoAnalyticsConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleMetadataConfigurations">
+			<wsdl:documentation>This operation requests all the metadata configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddMetadataConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleMetadataConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleMetadataConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioOutputConfigurations">
+			<wsdl:documentation>This command lists all audio output configurations of a device that are compatible with a certain media profile. Each returned configuration shall be a valid input for the 
+AddAudioOutputConfiguration command.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleAudioOutputConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleAudioOutputConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioDecoderConfigurations">
+			<wsdl:documentation>This operation lists all the audio decoder configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioDecoderConfiguration command on the media profile.</wsdl:documentation>
+			<wsdl:input message="trt:GetCompatibleAudioDecoderConfigurationsRequest"/>
+			<wsdl:output message="trt:GetCompatibleAudioDecoderConfigurationsResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="SetVideoSourceConfiguration">
+			<wsdl:documentation>This operation modifies a video source configuration. The ForcePersistence flag indicates if the changes shall remain after reboot of the device. Running streams using this configuration may be immediately updated according to the new settings. The changes are not guaranteed to take effect unless the client requests a new stream URI and restarts any affected stream. NVC methods for changing a running stream are out of scope for this specification.</wsdl:documentation>
+			<wsdl:input message="trt:SetVideoSourceConfigurationRequest"/>
+			<wsdl:output message="trt:SetVideoSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetVideoEncoderConfiguration">
+			<wsdl:documentation>This operation modifies a video encoder configuration. The ForcePersistence flag indicates if the changes shall remain after reboot of the device. Changes in the Multicast settings shall always be persistent. Running streams using this configuration may be immediately updated according to the new settings. The changes are not guaranteed to take effect unless the client requests a new stream URI and restarts any affected stream. NVC methods for changing a running stream are out of scope for this specification. <br/>SessionTimeout is provided as a hint for keeping rtsp session by a device. If necessary the device may adapt parameter values for SessionTimeout elements without returning an error. For the time between keep alive calls the client shall adhere to the timeout value signaled via RTSP.</wsdl:documentation>
+			<wsdl:input message="trt:SetVideoEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:SetVideoEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioSourceConfiguration">
+			<wsdl:documentation>This operation modifies an audio source configuration. The ForcePersistence flag indicates if
+the changes shall remain after reboot of the device. Running streams using this configuration
+may be immediately updated according to the new settings. The changes are not guaranteed
+to take effect unless the client requests a new stream URI and restarts any affected stream
+NVC methods for changing a running stream are out of scope for this specification.</wsdl:documentation>
+			<wsdl:input message="trt:SetAudioSourceConfigurationRequest"/>
+			<wsdl:output message="trt:SetAudioSourceConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioEncoderConfiguration">
+			<wsdl:documentation>This operation modifies an audio encoder configuration. The ForcePersistence flag indicates if
+the changes shall remain after reboot of the device. Running streams using this configuration may be immediately updated
+according to the new settings. The changes are not guaranteed to take effect unless the client
+requests a new stream URI and restarts any affected streams. NVC methods for changing a
+running stream are out of scope for this specification.</wsdl:documentation>
+			<wsdl:input message="trt:SetAudioEncoderConfigurationRequest"/>
+			<wsdl:output message="trt:SetAudioEncoderConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetVideoAnalyticsConfiguration">
+			<wsdl:documentation>A video analytics configuration is modified using this command. The ForcePersistence flag
+indicates if the changes shall remain after reboot of the device or not. Running streams using
+this configuration shall be immediately updated according to the new settings. Otherwise
+inconsistencies can occur between the scene description processed by the rule engine and
+the notifications produced by analytics engine and rule engine which reference the very same
+video analytics configuration token.</wsdl:documentation>
+			<wsdl:input message="trt:SetVideoAnalyticsConfigurationRequest"/>
+			<wsdl:output message="trt:SetVideoAnalyticsConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetMetadataConfiguration">
+			<wsdl:documentation>This operation modifies a metadata configuration. The ForcePersistence flag indicates if the
+changes shall remain after reboot of the device. Changes in the Multicast settings shall
+always be persistent. Running streams using this configuration may be updated immediately
+according to the new settings. The changes are not guaranteed to take effect unless the client
+requests a new stream URI and restarts any affected streams. NVC methods for changing a
+running stream are out of scope for this specification.</wsdl:documentation>
+			<wsdl:input message="trt:SetMetadataConfigurationRequest"/>
+			<wsdl:output message="trt:SetMetadataConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioOutputConfiguration">
+			<wsdl:documentation>This operation modifies an audio output configuration. The ForcePersistence flag indicates if
+the changes shall remain after reboot of the device.</wsdl:documentation>
+			<wsdl:input message="trt:SetAudioOutputConfigurationRequest"/>
+			<wsdl:output message="trt:SetAudioOutputConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioDecoderConfiguration">
+			<wsdl:documentation>This operation modifies an audio decoder configuration. The ForcePersistence flag indicates if
+the changes shall remain after reboot of the device.</wsdl:documentation>
+			<wsdl:input message="trt:SetAudioDecoderConfigurationRequest"/>
+			<wsdl:output message="trt:SetAudioDecoderConfigurationResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSourceConfigurationOptions">
+			<wsdl:documentation>This operation returns the available options  (supported values and ranges for video source configuration parameters) when the video source parameters are
+reconfigured If a video source configuration is specified, the options shall concern that
+particular configuration. If a media profile is specified, the options shall be compatible with
+that media profile.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoSourceConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetVideoSourceConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoEncoderConfigurationOptions">
+			<wsdl:documentation>This operation returns the available options (supported values and ranges for video encoder 
+				configuration parameters) when the video encoder parameters are reconfigured. <br/>
+				For JPEG, MPEG4 and H264 extension elements have been defined that provide additional information. A device must provide the 
+				XxxOption information for all encodings supported and should additionally provide the corresponding XxxOption2 information.<br/>
+				This response contains the available video encoder configuration options. If a video encoder configuration is specified, 
+				the options shall concern that particular configuration. If a media profile is specified, the options shall be 
+				compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.
+			</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoEncoderConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetVideoEncoderConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSourceConfigurationOptions">
+			<wsdl:documentation>This operation returns the available options (supported values and ranges for audio source configuration parameters) when the audio source parameters are
+reconfigured. If an audio source configuration is specified, the options shall concern that
+particular configuration. If a media profile is specified, the options shall be compatible with
+that media profile.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioSourceConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetAudioSourceConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioEncoderConfigurationOptions">
+			<wsdl:documentation>This operation returns the available options  (supported values and ranges for audio encoder configuration parameters) when the audio encoder parameters are
+reconfigured.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioEncoderConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetAudioEncoderConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetMetadataConfigurationOptions">
+			<wsdl:documentation>This operation returns the available options (supported values and ranges for metadata configuration parameters) for changing the metadata configuration.</wsdl:documentation>
+			<wsdl:input message="trt:GetMetadataConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetMetadataConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputConfigurationOptions">
+			<wsdl:documentation>This operation returns the available options (supported values and ranges for audio output configuration parameters) for configuring an audio output.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioOutputConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetAudioOutputConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioDecoderConfigurationOptions">
+			<wsdl:documentation>This command list the audio decoding capabilities for a given profile and configuration of a
+device.</wsdl:documentation>
+			<wsdl:input message="trt:GetAudioDecoderConfigurationOptionsRequest"/>
+			<wsdl:output message="trt:GetAudioDecoderConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetGuaranteedNumberOfVideoEncoderInstances">
+			<wsdl:documentation>The GetGuaranteedNumberOfVideoEncoderInstances command can be used to request the
+minimum number of guaranteed video encoder instances (applications) per Video Source
+Configuration.</wsdl:documentation>
+			<wsdl:input message="trt:GetGuaranteedNumberOfVideoEncoderInstancesRequest"/>
+			<wsdl:output message="trt:GetGuaranteedNumberOfVideoEncoderInstancesResponse"/>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetStreamUri">
+			<wsdl:documentation>This operation requests a URI that can be used to initiate a live media stream using RTSP as
+the control protocol. The returned URI shall remain valid indefinitely even if the profile is
+changed. The ValidUntilConnect, ValidUntilReboot and Timeout Parameter shall be set
+accordingly (ValidUntilConnect=false, ValidUntilReboot=false, timeout=PT0S). <br/>
+				The correct syntax for the StreamSetup element for these media stream setups defined in 5.1.1 of the streaming specification are as follows:
+				<ol>
+					<li>RTP unicast over UDP: StreamType = "RTP_unicast", TransportProtocol = "UDP"</li>
+					<li>RTP over RTSP over HTTP over TCP: StreamType = "RTP_unicast", TransportProtocol = "HTTP"</li>
+					<li>RTP over RTSP over TCP: StreamType = "RTP_unicast", TransportProtocol = "RTSP"</li>
+				</ol>
+				<br/>
+If a multicast stream is requested the VideoEncoderConfiguration, AudioEncoderConfiguration and MetadataConfiguration element inside the corresponding 
+media profile must be configured with valid multicast settings.<br/>
+For full compatibility with other ONVIF services a device should not generate Uris longer than
+128 octets.</wsdl:documentation>
+			<wsdl:input message="trt:GetStreamUriRequest"/>
+			<wsdl:output message="trt:GetStreamUriResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="StartMulticastStreaming">
+			<wsdl:documentation>This command starts multicast streaming using a specified media profile of a device.
+Streaming continues until StopMulticastStreaming is called for the same Profile. The
+streaming shall continue after a reboot of the device until a StopMulticastStreaming request is
+received. The multicast address, port and TTL are configured in the
+VideoEncoderConfiguration, AudioEncoderConfiguration and MetadataConfiguration
+respectively.</wsdl:documentation>
+			<wsdl:input message="trt:StartMulticastStreamingRequest"/>
+			<wsdl:output message="trt:StartMulticastStreamingResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="StopMulticastStreaming">
+			<wsdl:documentation>This command stop multicast streaming using a specified media profile of a device</wsdl:documentation>
+			<wsdl:input message="trt:StopMulticastStreamingRequest"/>
+			<wsdl:output message="trt:StopMulticastStreamingResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetSynchronizationPoint">
+			<wsdl:documentation>Synchronization points allow clients to decode and correctly use all data after the
+synchronization point.
+For example, if a video stream is configured with a large I-frame distance and a client loses a
+single packet, the client does not display video until the next I-frame is transmitted. In such
+cases, the client can request a Synchronization Point which enforces the device to add an I-Frame as soon as possible. Clients can request Synchronization Points for profiles. The device
+shall add synchronization points for all streams associated with this profile.
+Similarly, a synchronization point is used to get an update on full PTZ or event status through
+the metadata stream.
+If a video stream is associated with the profile, an I-frame shall be added to this video stream.
+If a PTZ metadata stream is associated to the profile,
+the PTZ position shall be repeated within the metadata stream.</wsdl:documentation>
+			<wsdl:input message="trt:SetSynchronizationPointRequest"/>
+			<wsdl:output message="trt:SetSynchronizationPointResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetSnapshotUri">
+			<wsdl:documentation>A client uses the GetSnapshotUri command to obtain a JPEG snapshot from the
+device. The returned URI shall remain valid indefinitely even if the profile is changed. The
+ValidUntilConnect, ValidUntilReboot and Timeout Parameter shall be set accordingly
+(ValidUntilConnect=false, ValidUntilReboot=false, timeout=PT0S). The URI can be used for
+acquiring a JPEG image through a HTTP GET operation. The image encoding will always be
+JPEG regardless of the encoding setting in the media profile. The Jpeg settings
+(like resolution or quality) may be taken from the profile if suitable. The provided
+image will be updated automatically and independent from calls to GetSnapshotUri.</wsdl:documentation>
+			<wsdl:input message="trt:GetSnapshotUriRequest"/>
+			<wsdl:output message="trt:GetSnapshotUriResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoSourceModes">
+			<wsdl:documentation>A device returns the information for current video source mode and settable video source modes of specified video source. A device that indicates a capability of  VideoSourceModes shall support this command.</wsdl:documentation>
+			<wsdl:input message="trt:GetVideoSourceModesRequest"/>
+			<wsdl:output message="trt:GetVideoSourceModesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetVideoSourceMode">
+			<wsdl:documentation>SetVideoSourceMode changes the media profile structure relating to video source for the specified video source mode. A device that indicates a capability of VideoSourceModes shall support this command. The behavior after changing the mode is not defined in this specification.</wsdl:documentation>
+			<wsdl:input message="trt:SetVideoSourceModeRequest"/>
+			<wsdl:output message="trt:SetVideoSourceModeResponse"/>
+		</wsdl:operation>
+		<!--==============OSD Operation Begin=================-->
+		<wsdl:operation name="GetOSDs">
+			<wsdl:documentation>Get the OSDs.</wsdl:documentation>
+			<wsdl:input message="trt:GetOSDsRequest"/>
+			<wsdl:output message="trt:GetOSDsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetOSD">
+			<wsdl:documentation>Get the OSD.</wsdl:documentation>
+			<wsdl:input message="trt:GetOSDRequest"/>
+			<wsdl:output message="trt:GetOSDResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetOSDOptions">
+			<wsdl:documentation>Get the OSD Options.</wsdl:documentation>
+			<wsdl:input message="trt:GetOSDOptionsRequest"/>
+			<wsdl:output message="trt:GetOSDOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetOSD">
+			<wsdl:documentation>Set the OSD</wsdl:documentation>
+			<wsdl:input message="trt:SetOSDRequest"/>
+			<wsdl:output message="trt:SetOSDResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreateOSD">
+			<wsdl:documentation>Create the OSD.</wsdl:documentation>
+			<wsdl:input message="trt:CreateOSDRequest"/>
+			<wsdl:output message="trt:CreateOSDResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteOSD">
+			<wsdl:documentation>Delete the OSD.</wsdl:documentation>
+			<wsdl:input message="trt:DeleteOSDRequest"/>
+			<wsdl:output message="trt:DeleteOSDResponse"/>
+		</wsdl:operation>
+		<!--==============OSD Operation End=================-->
+	</wsdl:portType>
+	<wsdl:binding name="MediaBinding" type="trt:Media">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<!--===============================-->
+		<!--===============================-->
+		<wsdl:operation name="GetServiceCapabilities">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetServiceCapabilities"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSources">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetVideoSources/"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<!--===============================-->
+		<wsdl:operation name="GetAudioSources">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSources"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetAudioOutputs">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputs"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="CreateProfile">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/CreateProfile"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetProfile">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetProfile/"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetProfiles">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetProfiles"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddVideoEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddVideoSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddAudioEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddAudioSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddPTZConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddPTZConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddVideoAnalyticsConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoAnalyticsConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddMetadataConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddMetadataConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddAudioOutputConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioOutputConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="AddAudioDecoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioDecoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveVideoEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveVideoSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveAudioEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveAudioSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemovePTZConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemovePTZConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveVideoAnalyticsConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoAnalyticsConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveMetadataConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveMetadataConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveAudioOutputConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioOutputConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="RemoveAudioDecoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioDecoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="DeleteProfile">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/DeleteProfile"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<!--===============================-->
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSourceConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoEncoderConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSourceConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetAudioSourceConfigurations/"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioEncoderConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoAnalyticsConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetMetadataConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioDecoderConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoAnalyticsConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetMetadataConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioDecoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetCompatibleVideoEncoderConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoEncoderConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleVideoSourceConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoSourceConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioEncoderConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioEncoderConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioSourceConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioSourceConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleVideoAnalyticsConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoAnalyticsConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleMetadataConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleMetadataConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioOutputConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioOutputConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleAudioDecoderConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioDecoderConfigurations"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="SetVideoSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetVideoEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioSourceConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioSourceConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioEncoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioEncoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetVideoAnalyticsConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoAnalyticsConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetMetadataConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetMetadataConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioOutputConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioOutputConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetAudioDecoderConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioDecoderConfiguration"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSourceConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetVideoSourceConfigurationOptions/"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetVideoEncoderConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioSourceConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioEncoderConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetMetadataConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioOutputConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetAudioDecoderConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetGuaranteedNumberOfVideoEncoderInstances">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetGuaranteedNumberOfVideoEncoderInstances"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<!--===============================-->
+		<!--===============================-->
+		<wsdl:operation name="GetStreamUri">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetStreamUri"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="StartMulticastStreaming">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/StartMulticastStreaming"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="StopMulticastStreaming">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/StopMulticastStreaming"/>
+			<wsdl:input>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="SetSynchronizationPoint">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetSynchronizationPoint"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetSnapshotUri">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetSnapshotUri"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="GetVideoSourceModes">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceModes"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<wsdl:operation name="SetVideoSourceMode">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoSourceMode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--===============================-->
+		<!--==============OSD Operation Begin=================-->
+		<wsdl:operation name="GetOSDs">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSDs"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetOSD">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSD"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetOSDOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSDOptions"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetOSD">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetOSD"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreateOSD">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/CreateOSD"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="DeleteOSD">
+			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/DeleteOSD"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<!--==============OSD Operation End=================-->
+	</wsdl:binding>
+  <wsdl:service name="Media">
+    <wsdl:port name="MediaPort" binding="trt:MediaBinding" >
+      <soap:address
+        location="http://www.examples.com/Media/" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/onvif/wsdl/onvif-local.xsd b/onvif/wsdl/onvif-local.xsd
new file mode 100644
index 000000000..17f722d6e
--- /dev/null
+++ b/onvif/wsdl/onvif-local.xsd
@@ -0,0 +1,8578 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<?xml-stylesheet type="text/xsl" href="onvif-schema-viewer.xsl"?>-->
+<!--
+Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
+
+Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
+-->
+<xs:schema xmlns:tt="http://www.onvif.org/ver10/schema" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns:xmime="http://www.w3.org/2005/05/xmlmime" 
+           xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" 
+           xmlns:xop="http://www.w3.org/2004/08/xop/include" 
+           xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
+           targetNamespace="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="2.4.2">
+	<xs:import namespace="http://www.w3.org/2005/05/xmlmime" schemaLocation="http://www.w3.org/2005/05/xmlmime"/>
+	<xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/" schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
+<!--
+	<xs:import namespace="http://docs.oasis-open.org/wsn/b-2" schemaLocation="file:b-2.xsd"/>
+-->
+	<xs:import namespace="http://www.w3.org/2004/08/xop/include" schemaLocation="http://www.w3.org/2004/08/xop/include"/>
+	<!--===============================-->
+	<!--         Generic Types         -->
+	<!--===============================-->
+	<xs:complexType name="DeviceEntity">
+		<xs:annotation>
+			<xs:documentation>Base class for physical entities like inputs and outputs.</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+			<xs:annotation>
+				<xs:documentation>Unique identifier referencing the physical entity.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ReferenceToken">
+		<xs:annotation>
+			<xs:documentation>Unique identifier for a physical or logical resource.
+			Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class.
+			Length up to 64 characters.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="64"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Name">
+		<xs:annotation>
+			<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="64"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="IntRectangle">
+		<xs:annotation>
+			<xs:documentation>Rectangle defined by lower left corner position and size. Units are pixel.</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="x" type="xs:int" use="required"/>
+		<xs:attribute name="y" type="xs:int" use="required"/>
+		<xs:attribute name="width" type="xs:int" use="required"/>
+		<xs:attribute name="height" type="xs:int" use="required"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IntRectangleRange">
+		<xs:annotation>
+			<xs:documentation>Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="XRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of X-axis.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="YRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of Y-axis.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WidthRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of width.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HeightRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of height.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IntRange">
+		<xs:annotation>
+			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Min" type="xs:int"/>
+			<xs:element name="Max" type="xs:int"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FloatRange">
+		<xs:annotation>
+			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Min" type="xs:float"/>
+			<xs:element name="Max" type="xs:float"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DurationRange">
+		<xs:annotation>
+			<xs:documentation>Range of duration greater equal Min duration and less equal Max duration.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Min" type="xs:duration"/>
+			<xs:element name="Max" type="xs:duration"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IntList">
+		<xs:annotation>
+			<xs:documentation>List of values.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Items" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IntAttrList">
+		<xs:list itemType="xs:int"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="FloatAttrList">
+		<xs:list itemType="xs:float"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="StringAttrList">
+		<xs:list itemType="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="FloatList">
+		<xs:sequence>
+			<xs:element name="Items" type="xs:float" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnyHolder">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--      End, Generic Types       -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Media Related Types      -->
+	<!--===============================-->
+	<xs:complexType name="VideoSource">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical video input.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Framerate" type="xs:float">
+						<xs:annotation>
+							<xs:documentation>Frame rate in frames per second.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Resolution" type="tt:VideoResolution">
+						<xs:annotation>
+							<xs:documentation>Horizontal and vertical resolution</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Imaging" type="tt:ImagingSettings" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional configuration of the image sensor.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:VideoSourceExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Imaging" type="tt:ImagingSettings20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the image sensor. To be used if imaging service 2.00 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioSource">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical audio input.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Channels" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>number of available audio channels. (1: mono, 2: stereo) </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Profile">
+		<xs:annotation>
+			<xs:documentation>
+			A media profile consists of a set of media configurations. Media profiles are used by a client
+			to configure properties of a media stream from an NVT.<br/>
+			An NVT shall provide at least one media profile at boot. An NVT should provide “ready to use”
+			profiles for the most common media configurations that the device offers.<br/>
+			A profile consists of a set of interconnected configuration entities. Configurations are provided
+			by the NVT and can be either static or created dynamically by the NVT. For example, the
+			dynamic configurations can be created by the NVT depending on current available encoding
+			resources.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name">
+				<xs:annotation>
+					<xs:documentation>User readable name of the profile.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Video input.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio input.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Video encoder.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio encoder.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the video analytics module and rule engine.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the pan tilt zoom unit.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the metadata stream.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ProfileExtension" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Extensions defined in ONVIF 2.0</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+			<xs:annotation>
+				<xs:documentation>Unique identifier of the profile.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="fixed" type="xs:boolean">
+			<xs:annotation>
+				<xs:documentation>A value of true signals that the profile cannot be deleted. Default is false.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ProfileExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio output.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio decoder.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ProfileExtension2" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ProfileExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration"/>
+	<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration"/>
+	<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration"/>
+	<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration"/>
+	<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
+	<xs:element name="PTZConfiguration" type="tt:PTZConfiguration"/>
+	<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration"/>
+	<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration"/>
+	<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration"/>
+	<!--===============================-->
+	<xs:complexType name="ConfigurationEntity">
+		<xs:annotation>
+			<xs:documentation>Base type defining the common properties of a configuration.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name">
+				<xs:annotation>
+					<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UseCount" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Number of internal references currently using this configuration. <br/>This parameter is read-only and cannot be changed by a set request. <br/>For example the value increases if the configuration is added to a media profile or attached to a PaneConfiguration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+			<xs:annotation>
+				<xs:documentation>Token that uniquely refernces this configuration. Length up to 64 characters.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   VideoSourceConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="SourceToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Reference to the physical input.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Bounds" type="tt:IntRectangle">
+						<xs:annotation>
+							<xs:documentation>Rectangle specifying the Video capturing area. The capturing area shall not be larger than the whole Video source area.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationExtension">
+		<xs:sequence>
+			<xs:element name="Rotate" type="tt:Rotate" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure rotation of captured image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Rotate">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:RotateMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable Rotation feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Degree" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to configure how much degree of clockwise rotation of image  for On mode. Omitting this parameter for On mode means 180 degree rotation.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RotateExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RotateExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RotateMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="AUTO"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="BoundsRange" type="tt:IntRectangleRange">
+				<xs:annotation>
+					<xs:documentation>Supported range for the capturing area.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoSourceTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of physical inputs.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Rotate" type="tt:RotateOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Options of parameters for Rotation feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationOptionsExtension2">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RotateOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:RotateMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options of Rotate mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DegreeList" type="tt:IntList" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>List of supported degree value for rotation.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RotateOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RotateOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   VideoEncoderConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="Encoding" type="tt:VideoEncoding">
+						<xs:annotation>
+							<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Resolution" type="tt:VideoResolution">
+						<xs:annotation>
+							<xs:documentation>Configured video resolution</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Quality" type="xs:float">
+						<xs:annotation>
+							<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RateControl" type="tt:VideoRateControl" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MPEG4" type="tt:Mpeg4Configuration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure Mpeg4 related parameters.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="H264" type="tt:H264Configuration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure H.264 related parameters.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration">
+						<xs:annotation>
+							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SessionTimeout" type="xs:duration">
+						<xs:annotation>
+							<xs:documentation>The rtsp session timeout for the related video stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="VideoEncoding">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="JPEG"/>
+			<xs:enumeration value="MPEG4"/>
+			<xs:enumeration value="H264"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Mpeg4Profile">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="SP"/>
+			<xs:enumeration value="ASP"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="H264Profile">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Baseline"/>
+			<xs:enumeration value="Main"/>
+			<xs:enumeration value="Extended"/>
+			<xs:enumeration value="High"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="VideoResolution">
+		<xs:sequence>
+			<xs:element name="Width" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Number of the columns of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Height" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Number of the lines of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoRateControl">
+		<xs:sequence>
+			<xs:element name="FrameRateLimit" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Maximum output framerate in fps. If an EncodingInterval is provided the resulting encoded framerate will be reduced by the given factor.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingInterval" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Interval at which images are encoded and transmitted. (A value of 1 means that every frame is encoded, a value of 2 means that every 2nd frame is encoded ...)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BitrateLimit" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>the maximum output bitrate in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4Configuration">
+		<xs:sequence>
+			<xs:element name="GovLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Determines the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mpeg4Profile" type="tt:Mpeg4Profile">
+				<xs:annotation>
+					<xs:documentation>the Mpeg4 profile, either simple profile (SP) or advanced simple profile (ASP)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264Configuration">
+		<xs:sequence>
+			<xs:element name="GovLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Group of Video frames length. Determines typically the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264Profile" type="tt:H264Profile">
+				<xs:annotation>
+					<xs:documentation>the H.264 profile, either baseline, main, extended or high</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="QualityRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of the quality values. A high value means higher quality.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="JPEG" type="tt:JpegOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional JPEG encoder settings ranges (See also Extension element).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MPEG4" type="tt:Mpeg4Options" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional MPEG-4 encoder settings ranges (See also Extension element).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264" type="tt:H264Options" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional H.264 encoder settings ranges (See also Extension element).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="JPEG" type="tt:JpegOptions2" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional JPEG encoder settings ranges.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MPEG4" type="tt:Mpeg4Options2" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional MPEG-4 encoder settings ranges.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264" type="tt:H264Options2" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional H.264 encoder settings ranges.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderOptionsExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="JpegOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported image sizes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FrameRateRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="JpegOptions2">
+		<xs:complexContent>
+			<xs:extension base="tt:JpegOptions">
+				<xs:sequence>
+					<xs:element name="BitrateRange" type="tt:IntRange">
+						<xs:annotation>
+							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4Options">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported image sizes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GovLengthRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FrameRateRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mpeg4ProfilesSupported" type="tt:Mpeg4Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported MPEG-4 profiles.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4Options2">
+		<xs:complexContent>
+			<xs:extension base="tt:Mpeg4Options">
+				<xs:sequence>
+					<xs:element name="BitrateRange" type="tt:IntRange">
+						<xs:annotation>
+							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264Options">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported image sizes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GovLengthRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FrameRateRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264ProfilesSupported" type="tt:H264Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported H.264 profiles.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264Options2">
+		<xs:complexContent>
+			<xs:extension base="tt:H264Options">
+				<xs:sequence>
+					<xs:element name="BitrateRange" type="tt:IntRange">
+						<xs:annotation>
+							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--    AudioSourceConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="AudioSourceConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="SourceToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the Audio Source the configuration applies to</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioSourceConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="InputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Tokens of the audio source the configuration can be used for.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:AudioSourceOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioSourceOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   AudioEncoderConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="AudioEncoderConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="Encoding" type="tt:AudioEncoding">
+						<xs:annotation>
+							<xs:documentation>Audio codec used for encoding the audio input (either G.711, G.726 or AAC)</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Bitrate" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>The output bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SampleRate" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>The output sample rate in kHz.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration">
+						<xs:annotation>
+							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SessionTimeout" type="xs:duration">
+						<xs:annotation>
+							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="AudioEncoding">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="G711"/>
+			<xs:enumeration value="G726"/>
+			<xs:enumeration value="AAC"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="AudioEncoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="Options" type="tt:AudioEncoderConfigurationOption" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>list of supported AudioEncoderConfigurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioEncoderConfigurationOption">
+		<xs:sequence>
+			<xs:element name="Encoding" type="tt:AudioEncoding">
+				<xs:annotation>
+					<xs:documentation>The enoding used for audio data (either G.711, G.726 or AAC)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BitrateList" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps for the specified Encoding</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateList" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported Sample Rates in kHz for the specified Encoding</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--  VideoAnalyticsConfiguration  -->
+	<!--===============================-->
+	<xs:complexType name="VideoAnalyticsConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration"/>
+					<xs:element name="RuleEngineConfiguration" type="tt:RuleEngineConfiguration"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--    MetadataConfiguration      -->
+	<!--===============================-->
+	<xs:complexType name="MetadataConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="PTZStatus" type="tt:PTZFilter" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>optional element to configure which PTZ related data is to include in the metadata stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+<!--
+					<xs:element name="Events" type="tt:EventSubscription" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure the streaming of events. A client might be interested in receiving all, 
+								none or some of the events produced by the device:<ul>
+									<li>To get all events: Include the Events element but do not include a filter.</li>
+									<li>To get no events: Do not include the Events element.</li>
+									<li>To get only some events: Include the Events element and include a filter in the element.</li>
+								</ul>
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+-->
+					<xs:element name="Analytics" type="xs:boolean" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Defines whether the streamed metadata will include metadata from the analytics engines (video, cell motion, audio etc.)</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration">
+						<xs:annotation>
+							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SessionTimeout" type="xs:duration">
+						<xs:annotation>
+							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration" minOccurs="0"/>
+					<xs:element name="Extension" type="tt:MetadataConfigurationExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZFilter">
+		<xs:sequence>
+			<xs:element name="Status" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the metadata stream shall contain the PTZ status (IDLE, MOVING or UNKNOWN)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Position" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the metadata stream shall contain the PTZ position</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventSubscription">
+		<xs:annotation>
+			<xs:documentation>Subcription handling in the same way as base notification subscription.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+<!--
+			<xs:element name="Filter" type="wsnt:FilterType" minOccurs="0"/>
+-->
+			<xs:element name="Filter" type="xs:anyType" minOccurs="0"/>
+			<xs:element name="SubscriptionPolicy" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="PTZStatusFilterOptions" type="tt:PTZStatusFilterOptions"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStatusFilterOptions">
+		<xs:sequence>
+			<xs:element name="PanTiltStatusSupported" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream pan or tilt status information.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomStatusSupported" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream zoom status inforamtion.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="PanTiltPositionSupported" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream the pan or tilt position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomPositionSupported" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream zoom position information.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZStatusFilterOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStatusFilterOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoOutput            -->
+	<!--===============================-->
+	<xs:complexType name="VideoOutput">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical video outputs.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Layout" type="tt:Layout"/>
+					<xs:element name="Resolution" type="tt:VideoResolution" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Resolution of the display in Pixel.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RefreshRate" type="xs:float" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Refresh rate of the display in Hertz.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AspectRatio" type="xs:float" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Aspect ratio of the display as physical extent of width divided by height.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:VideoOutputExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoOutputExtension">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoOutputConfiguration            -->
+	<!--===============================-->
+	<xs:complexType name="VideoOutputConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="OutputToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the Video Output the configuration applies to</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoOutputConfigurationOptions            -->
+	<!--===============================-->
+	<xs:complexType name="VideoOutputConfigurationOptions">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoDecoderConfigurationOptions            -->
+	<!--===============================-->
+	<xs:complexType name="VideoDecoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="JpegDecOptions" type="tt:JpegDecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode Jpeg streams this element describes the supported codecs and configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264DecOptions" type="tt:H264DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode H.264 streams this element describes the supported codecs and configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mpeg4DecOptions" type="tt:Mpeg4DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode Mpeg4 streams this element describes the supported codecs and configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoDecoderConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264DecOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported H.264 Video Resolutions</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedH264Profiles" type="tt:H264Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported H264 Profiles (either baseline, main, extended or high) </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported H.264 bitrate range in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedFrameRate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported H.264 framerate range in fps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="JpegDecOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported Jpeg Video Resolutions</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Jpeg bitrate range in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedFrameRate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Jpeg framerate range in fps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4DecOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported Mpeg4 Video Resolutions</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedMpeg4Profiles" type="tt:Mpeg4Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported Mpeg4 Profiles (either SP or ASP) </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Mpeg4 bitrate range in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedFrameRate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Mpeg4 framerate range in fps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoDecoderConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioOutputs            -->
+	<!--===============================-->
+	<xs:complexType name="AudioOutput">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical audio outputs.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioOutputConfiguration            -->
+	<!--===============================-->
+	<xs:complexType name="AudioOutputConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="OutputToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the phsycial Audio output.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SendPrimacy" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+						An audio channel MAY support different types of audio transmission. While for full duplex
+						operation no special handling is required, in half duplex operation the transmission direction
+						needs to be switched.
+						The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
+						direction is currently active. An NVC can switch between different modes by setting the
+						AudioOutputConfiguration.<br/>
+						The following modes for the Send-Primacy are defined:<ul>
+									<li>www.onvif.org/ver20/HalfDuplex/Server
+						The server is allowed to send audio data to the client. The client shall not send
+						audio data via the backchannel to the NVT in this mode.</li>
+									<li>www.onvif.org/ver20/HalfDuplex/Client
+						The client is allowed to send audio data via the backchannel to the server. The
+						NVT shall not send audio data to the client in this mode.</li>
+									<li>www.onvif.org/ver20/HalfDuplex/Auto
+							It is up to the device how to deal with sending and receiving audio data.</li>
+								</ul>
+						Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OutputLevel" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>Volume setting of the output. The applicable range is defined via the option AudioOutputOptions.OutputLevelRange.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioOutputConfigurationOptions            -->
+	<!--===============================-->
+	<xs:complexType name="AudioOutputConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="OutputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Tokens of the physical Audio outputs (typically one).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SendPrimacyOptions" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				An <b>audio</b> channel MAY support different types of audio transmission. While for full duplex
+				operation no special handling is required, in half duplex operation the transmission direction
+				needs to be switched.
+				The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
+				direction is currently active. An NVC can switch between different modes by setting the
+				AudioOutputConfiguration.<br/>
+				The following modes for the Send-Primacy are defined:<ul>
+							<li>www.onvif.org/ver20/HalfDuplex/Server
+						The server is allowed to send audio data to the client. The client shall not send
+						audio data via the backchannel to the NVT in this mode.</li>
+							<li>www.onvif.org/ver20/HalfDuplex/Client
+						The client is allowed to send audio data via the backchannel to the server. The
+						NVT shall not send audio data to the client in this mode.</li>
+							<li>www.onvif.org/ver20/HalfDuplex/Auto
+						It is up to the device how to deal with sending and receiving audio data.</li>
+						</ul>
+				Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="OutputLevelRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Minimum and maximum level range supported for this Output.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioDecoderConfiguration           -->
+	<!--===============================-->
+	<xs:complexType name="AudioDecoderConfiguration">
+		<xs:annotation>
+			<xs:documentation>The Audio Decoder Configuration does not contain any that parameter to configure the
+decoding .A decoder shall decode every data it receives (according to its capabilities).</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioDecoderConfigurationOptions           -->
+	<!--===============================-->
+	<xs:complexType name="AudioDecoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="AACDecOptions" type="tt:AACDecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode AAC encoded audio this section describes the supported configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="G711DecOptions" type="tt:G711DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode G711 encoded audio this section describes the supported configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="G726DecOptions" type="tt:G726DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode G726 encoded audio this section describes the supported configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:AudioDecoderConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="G711DecOptions">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateRange" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AACDecOptions">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateRange" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="G726DecOptions">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateRange" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioDecoderConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          Streaming            -->
+	<!--===============================-->
+	<xs:complexType name="MulticastConfiguration">
+		<xs:sequence>
+			<xs:element name="Address" type="tt:IPAddress">
+				<xs:annotation>
+					<xs:documentation>The multicast address (if this address is set to 0 no multicast streaming is enaled)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Port" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The RTP mutlicast destination port. A device may support RTCP. In this case the port value shall be even to allow the corresponding RTCP stream to be mapped to the next higher (odd) destination port number as defined in the RTSP specification.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TTL" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>In case of IPv6 the TTL value is assumed as the hop limit. Note that for IPV6 and administratively scoped IPv4 multicast the primary use for hop limit / TTL is to prevent packets from (endlessly) circulating and not limiting scope. In these cases the address contains the scope.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Read only property signalling that streaming is persistant. Use the methods StartMulticastStreaming and StopMulticastStreaming to switch its state.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="StreamSetup">
+		<xs:sequence>
+			<xs:element name="Stream" type="tt:StreamType">
+				<xs:annotation>
+					<xs:documentation>Defines if a multicast or unicast stream is requested</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Transport" type="tt:Transport"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="StreamType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="RTP-Unicast"/>
+			<xs:enumeration value="RTP-Multicast"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Transport">
+		<xs:sequence>
+			<xs:element name="Protocol" type="tt:TransportProtocol">
+				<xs:annotation>
+					<xs:documentation>Defines the network protocol for streaming, either UDP=RTP/UDP, RTSP=RTP/RTSP/TCP or HTTP=RTP/RTSP/HTTP/TCP </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+<!--
+			<xs:element name="Tunnel" type="tt:Transport" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to describe further tunnel options. This element is normally not needed </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+-->
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="TransportProtocol">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="UDP"/>
+			<xs:enumeration value="TCP"/>
+			<xs:enumeration value="RTSP"/>
+			<xs:enumeration value="HTTP"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="MediaUri">
+		<xs:sequence>
+			<xs:element name="Uri" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Stable Uri to be used for requesting the media stream</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="InvalidAfterConnect" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if the Uri is only valid until the connection is established. The value shall be set to "false".</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="InvalidAfterReboot" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if the Uri is invalid after a reboot of the device. The value shall be set to "false".</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Timeout" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>Duration how long the Uri is valid. This parameter shall be set to PT0S to indicate that this stream URI is indefinitely valid even if the profile changes</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, Media Related Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--    Discovery Related Types    -->
+	<!--===============================-->
+	<xs:simpleType name="ScopeDefinition">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Fixed"/>
+			<xs:enumeration value="Configurable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Scope">
+		<xs:sequence>
+			<xs:element name="ScopeDef" type="tt:ScopeDefinition">
+				<xs:annotation>
+					<xs:documentation>Indicates if the scope is fixed or configurable.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ScopeItem" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Scope item URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="DiscoveryMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Discoverable"/>
+			<xs:enumeration value="NonDiscoverable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<!-- End, Discovery Related Types  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--     Network Related Types     -->
+	<!--===============================-->
+	<xs:complexType name="NetworkInterface">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Enabled" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Info" type="tt:NetworkInterfaceInfo" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Network interface information</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Link" type="tt:NetworkInterfaceLink" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Link configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IPv4" type="tt:IPv4NetworkInterface" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>IPv4 network interface configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IPv6" type="tt:IPv6NetworkInterface" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>IPv6 network interface configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:NetworkInterfaceExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="InterfaceType" type="tt:IANA-IfTypes"/>
+			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Extension point prepared for future 802.3 configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:NetworkInterfaceExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="NetworkInterfaceConfigPriority">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="31"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot3Configuration">
+		<xs:sequence>
+			<!-- Placeholder for 802.3 configuration -->
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceLink">
+		<xs:sequence>
+			<xs:element name="AdminSettings" type="tt:NetworkInterfaceConnectionSetting">
+				<xs:annotation>
+					<xs:documentation>Configured link settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="OperSettings" type="tt:NetworkInterfaceConnectionSetting">
+				<xs:annotation>
+					<xs:documentation>Current active link settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="InterfaceType" type="tt:IANA-IfTypes">
+				<xs:annotation>
+					<xs:documentation>Integer indicating interface type, for example: 6 is ethernet.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceConnectionSetting">
+		<xs:sequence>
+			<xs:element name="AutoNegotiation" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Auto negotiation on/off.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Speed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Duplex" type="tt:Duplex">
+				<xs:annotation>
+					<xs:documentation>Duplex type, Half or Full.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Duplex">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Full"/>
+			<xs:enumeration value="Half"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IANA-IfTypes">
+		<xs:restriction base="xs:int">
+			<xs:annotation>
+				<xs:documentation>
+				For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceInfo">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Network interface name, for example eth0.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HwAddress" type="tt:HwAddress">
+				<xs:annotation>
+					<xs:documentation>Network interface MAC address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MTU" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Maximum transmission unit.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6NetworkInterface">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Config" type="tt:IPv6Configuration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv4NetworkInterface">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Config" type="tt:IPv4Configuration">
+				<xs:annotation>
+					<xs:documentation>IPv4 configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv4Configuration">
+		<xs:sequence>
+			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LinkLocal" type="tt:PrefixedIPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Link local address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FromDHCP" type="tt:PrefixedIPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 address configured by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6Configuration">
+		<xs:sequence>
+			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration">
+				<xs:annotation>
+					<xs:documentation>DHCP configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually entered IPv6 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LinkLocal" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of link local IPv6 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FromDHCP" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of IPv6 addresses configured by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FromRA" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of IPv6 addresses configured by using router advertisment.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IPv6ConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6ConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IPv6DHCPConfiguration">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Auto"/>
+			<xs:enumeration value="Stateful"/>
+			<xs:enumeration value="Stateless"/>
+			<xs:enumeration value="Off"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkProtocol">
+		<xs:sequence>
+			<xs:element name="Name" type="tt:NetworkProtocolType">
+				<xs:annotation>
+					<xs:documentation>Network protocol type string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if the protocol is enabled or not.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Port" type="xs:int" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>The port that is used by the protocol.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkProtocolExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkProtocolExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="NetworkProtocolType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="HTTP"/>
+			<xs:enumeration value="HTTPS"/>
+			<xs:enumeration value="RTSP"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="NetworkHostType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="IPv4"/>
+			<xs:enumeration value="IPv6"/>
+			<xs:enumeration value="DNS"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkHost">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:NetworkHostType">
+				<xs:annotation>
+					<xs:documentation>Network host type: IPv4, IPv6 or DNS.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DNSname" type="tt:DNSName" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>DNS name.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkHostExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkHostExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPAddress">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:IPType">
+				<xs:annotation>
+					<xs:documentation>Indicates if the address is an IPv4 or IPv6 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 address</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PrefixedIPv4Address">
+		<xs:sequence>
+			<xs:element name="Address" type="tt:IPv4Address">
+				<xs:annotation>
+					<xs:documentation>IPv4 address</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PrefixLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Prefix/submask length</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IPv4Address">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="PrefixedIPv6Address">
+		<xs:sequence>
+			<xs:element name="Address" type="tt:IPv6Address">
+				<xs:annotation>
+					<xs:documentation>IPv6 address</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PrefixLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Prefix/submask length</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IPv6Address">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="HwAddress">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IPType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="IPv4"/>
+			<xs:enumeration value="IPv6"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="DNSName">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="HostnameInformation">
+		<xs:sequence>
+			<xs:element name="FromDHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the hostname is obtained from DHCP or not.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Name" type="xs:token" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates the hostname.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:HostnameInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="HostnameInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DNSInformation">
+		<xs:sequence>
+			<xs:element name="FromDHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not DNS information is retrieved from DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Search domain.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DNSFromDHCP" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of DNS addresses received from DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually entered DNS addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:DNSInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DNSInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NTPInformation">
+		<xs:sequence>
+			<xs:element name="FromDHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if NTP information is to be retrieved by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NTPFromDHCP" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of NTP addresses retrieved by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually entered NTP addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NTPInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NTPInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Domain">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IPAddressFilterType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Allow"/>
+			<xs:enumeration value="Deny"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="DynamicDNSInformation">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:DynamicDNSType">
+				<xs:annotation>
+					<xs:documentation>Dynamic DNS type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Name" type="tt:DNSName" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>DNS name.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TTL" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Time to live.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:DynamicDNSInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DynamicDNSInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="DynamicDNSType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="NoUpdate"/>
+			<xs:enumeration value="ClientUpdates"/>
+			<xs:enumeration value="ServerUpdates"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceSetConfiguration">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Link" type="tt:NetworkInterfaceConnectionSetting" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Link configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MTU" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Maximum transmission unit.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv4" type="tt:IPv4NetworkInterfaceSetConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 network interface configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6" type="tt:IPv6NetworkInterfaceSetConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 network interface configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceSetConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6NetworkInterfaceSetConfiguration">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually added IPv6 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>DHCP configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv4NetworkInterfaceSetConfiguration">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkGateway">
+		<xs:sequence>
+			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>IPv4 address string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>IPv6 address string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkZeroConfiguration">
+		<xs:sequence>
+			<xs:element name="InterfaceToken" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Unique identifier of network interface.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the zero-configuration is enabled or not.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Addresses" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>The zero-configuration IPv4 address(es)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkZeroConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+<!--
+			<xs:element name="Additional" type="tt:NetworkZeroConfiguration" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Optional array holding the configuration for the second and possibly further interfaces.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+-->
+			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkZeroConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPAddressFilter">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:IPAddressFilterType"/>
+			<xs:element name="IPv4Address" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="IPv6Address" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:IPAddressFilterExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPAddressFilterExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11Configuration">
+		<xs:sequence>
+			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
+			<xs:element name="Mode" type="tt:Dot11StationMode"/>
+			<xs:element name="Alias" type="tt:Name"/>
+			<xs:element name="Priority" type="tt:NetworkInterfaceConfigPriority"/>
+			<xs:element name="Security" type="tt:Dot11SecurityConfiguration"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11SSIDType">
+		<xs:restriction base="xs:hexBinary">
+			<xs:minLength value="1"/>
+			<xs:maxLength value="32"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11StationMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Ad-hoc"/>
+			<xs:enumeration value="Infrastructure"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11SecurityConfiguration">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:Dot11SecurityMode"/>
+			<xs:element name="Algorithm" type="tt:Dot11Cipher" minOccurs="0"/>
+			<xs:element name="PSK" type="tt:Dot11PSKSet" minOccurs="0"/>
+			<xs:element name="Dot1X" type="tt:ReferenceToken" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:Dot11SecurityConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11SecurityConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11SecurityMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="WEP"/>
+			<xs:enumeration value="PSK"/>
+			<xs:enumeration value="Dot1X"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11Cipher">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="CCMP"/>
+			<xs:enumeration value="TKIP"/>
+			<xs:enumeration value="Any"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11PSK">
+		<xs:restriction base="xs:hexBinary">
+			<xs:length value="32"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11PSKPassphrase">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[ -~]{8,63}"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11PSKSet">
+		<xs:sequence>
+			<xs:element name="Key" type="tt:Dot11PSK" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					According to IEEE802.11-2007 H.4.1 the RSNA PSK consists of 256 bits, or 64 octets when represented in hex<br/>
+					Either Key or Passphrase shall be given, if both are supplied Key shall be used by the device and Passphrase ignored.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Passphrase" type="tt:Dot11PSKPassphrase" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					According to IEEE802.11-2007 H.4.1 a pass-phrase is a sequence of between 8 and 63 ASCII-encoded characters and
+					each character in the pass-phrase must have an encoding in the range of 32 to 126 (decimal),inclusive.<br/>
+					If only Passpharse is supplied the Key shall be derived using the algorithm described in IEEE802.11-2007 section H.4
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:Dot11PSKSetExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11PSKSetExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceSetConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11Capabilities">
+		<xs:sequence>
+			<xs:element name="TKIP" type="xs:boolean"/>
+			<xs:element name="ScanAvailableNetworks" type="xs:boolean"/>
+			<xs:element name="MultipleConfiguration" type="xs:boolean"/>
+			<xs:element name="AdHocStationMode" type="xs:boolean"/>
+			<xs:element name="WEP" type="xs:boolean"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11SignalStrength">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="Very Bad"/>
+			<xs:enumeration value="Bad"/>
+			<xs:enumeration value="Good"/>
+			<xs:enumeration value="Very Good"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11Status">
+		<xs:sequence>
+			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
+			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
+			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0"/>
+			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0"/>
+			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
+			<xs:element name="ActiveConfigAlias" type="tt:ReferenceToken"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11AuthAndMangementSuite">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="Dot1X"/>
+			<xs:enumeration value="PSK"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11AvailableNetworks">
+		<xs:sequence>
+			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
+			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
+			<xs:element name="AuthAndMangementSuite" type="tt:Dot11AuthAndMangementSuite" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>See IEEE802.11 7.3.2.25.2 for details.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:Dot11AvailableNetworksExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11AvailableNetworksExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--===============================-->
+	<!--  End, network Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Capabilities Related Types  -->
+	<!--===============================-->
+	<xs:simpleType name="CapabilityCategory">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="All"/>
+			<xs:enumeration value="Analytics"/>
+			<xs:enumeration value="Device"/>
+			<xs:enumeration value="Events"/>
+			<xs:enumeration value="Imaging"/>
+			<xs:enumeration value="Media"/>
+			<xs:enumeration value="PTZ"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Capabilities">
+		<xs:sequence>
+			<xs:element name="Analytics" type="tt:AnalyticsCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Analytics capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Device" type="tt:DeviceCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Device capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Events" type="tt:EventCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Event capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Imaging" type="tt:ImagingCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Imaging capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Media" type="tt:MediaCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Media capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZ" type="tt:PTZCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>PTZ capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:CapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="DeviceIO" type="tt:DeviceIOCapabilities" minOccurs="0"/>
+			<xs:element name="Display" type="tt:DisplayCapabilities" minOccurs="0"/>
+			<xs:element name="Recording" type="tt:RecordingCapabilities" minOccurs="0"/>
+			<xs:element name="Search" type="tt:SearchCapabilities" minOccurs="0"/>
+			<xs:element name="Replay" type="tt:ReplayCapabilities" minOccurs="0"/>
+			<xs:element name="Receiver" type="tt:ReceiverCapabilities" minOccurs="0"/>
+			<xs:element name="AnalyticsDevice" type="tt:AnalyticsDeviceCapabilities" minOccurs="0"/>
+			<xs:element name="Extensions" type="tt:CapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Analytics service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RuleSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not rules are supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AnalyticsModuleSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not modules are supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DeviceCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Device service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Network" type="tt:NetworkCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Network capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="System" type="tt:SystemCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>System capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IO" type="tt:IOCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>I/O capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Security" type="tt:SecurityCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Security capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:DeviceCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DeviceCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Event service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WSSubscriptionPolicySupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Subscription policy is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WSPullPointSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Pull Point is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WSPausableSubscriptionManagerInterfaceSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Pausable Subscription Manager Interface is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IOCapabilities">
+		<xs:sequence>
+			<xs:element name="InputConnectors" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Number of input connectors.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RelayOutputs" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Number of relay outputs.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IOCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IOCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Auxiliary" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:IOCapabilitiesExtension2"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IOCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MediaCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Media service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StreamingCapabilities" type="tt:RealTimeStreamingCapabilities">
+				<xs:annotation>
+					<xs:documentation>Streaming capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:MediaCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MediaCapabilitiesExtension">
+		<xs:sequence>
+			<xs:element name="ProfileCapabilities" type="tt:ProfileCapabilities"/>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RealTimeStreamingCapabilities">
+		<xs:sequence>
+			<xs:element name="RTPMulticast" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not RTP multicast is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_TCP" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not RTP over TCP is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_RTSP_TCP" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not RTP/RTSP/TCP is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RealTimeStreamingCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RealTimeStreamingCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ProfileCapabilities">
+		<xs:sequence>
+			<xs:element name="MaximumNumberOfProfiles" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Maximum number of profiles.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkCapabilities">
+		<xs:sequence>
+			<xs:element name="IPFilter" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IP filtering is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZeroConfiguration" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not zeroconf is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPVersion6" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv6 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DynDNS" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not  is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Dot11Configuration" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SecurityCapabilities">
+		<xs:sequence>
+			<xs:element name="TLS1.1" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not TLS 1.1 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TLS1.2" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not TLS 1.2 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="OnboardKeyGeneration" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not onboard key generation is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AccessPolicyConfig" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not access policy configuration is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="X.509Token" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security X.509 token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SAMLToken" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security SAML token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="KerberosToken" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security Kerberos token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RELToken" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security REL token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SecurityCapabilitiesExtension">
+		<xs:sequence>
+			<xs:element name="TLS1.0" type="xs:boolean"/>
+			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SecurityCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:element name="Dot1X" type="xs:boolean"/>
+			<xs:element name="SupportedEAPMethod" type="xs:int" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RemoteUserHandling" type="xs:boolean"/>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemCapabilities">
+		<xs:sequence>
+			<xs:element name="DiscoveryResolve" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Discovery resolve requests are supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DiscoveryBye" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Discovery Bye is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RemoteDiscovery" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not remote discovery is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SystemBackup" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not system backup is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SystemLogging" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not system logging is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FirmwareUpgrade" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not firmware upgrade is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedVersions" type="tt:OnvifVersion" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Indicates supported ONVIF version(s).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="HttpFirmwareUpgrade" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="HttpSystemBackup" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="HttpSystemLogging" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="HttpSupportInformation" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OnvifVersion">
+		<xs:sequence>
+			<xs:element name="Major" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Major version number.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Minor" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Two digit minor version number (e.g. X.0.1 maps to "01" and X.2.1 maps to "21" where X stands for Major version number).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Imaging service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>PTZ service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DeviceIOCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="VideoSources" type="xs:int"/>
+			<xs:element name="VideoOutputs" type="xs:int"/>
+			<xs:element name="AudioSources" type="xs:int"/>
+			<xs:element name="AudioOutputs" type="xs:int"/>
+			<xs:element name="RelayOutputs" type="xs:int"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DisplayCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="FixedLayout" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indication that the SetLayout command supports only predefined layouts.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="ReceiverSource" type="xs:boolean"/>
+			<xs:element name="MediaProfileSource" type="xs:boolean"/>
+			<xs:element name="DynamicRecordings" type="xs:boolean"/>
+			<xs:element name="DynamicTracks" type="xs:boolean"/>
+			<xs:element name="MaxStringLength" type="xs:int"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SearchCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="MetadataSearch" type="xs:boolean"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReplayCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>The address of the replay service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReceiverCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>The address of the receiver service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_Multicast" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the device can receive RTP multicast streams.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_TCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the device can receive RTP/TCP streams</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_RTSP_TCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the device can receive RTP/RTSP/TCP streams.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedReceivers" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The maximum number of receivers supported by the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaximumRTSPURILength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The maximum allowed length for RTSP URIs.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="RuleSupport" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Obsolete property.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:AnalyticsDeviceExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--===============================-->
+	<!--End, Capabilities Related Types-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--    System Related Types       -->
+	<!--===============================-->
+	<xs:simpleType name="SystemLogType">
+		<xs:annotation>
+			<xs:documentation>Enumeration describing the available system log modes.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="System">
+				<xs:annotation>
+					<xs:documentation>Indicates that a system log is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Access">
+				<xs:annotation>
+					<xs:documentation>Indicates that a access log is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="SystemLog">
+		<xs:sequence>
+			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The log information as attachment data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="String" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The log information as character data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportInformation">
+		<xs:sequence>
+			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The support information as attachment data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="String" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The support information as character data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BinaryData">
+		<xs:sequence>
+			<xs:element name="Data" type="xs:base64Binary" nillable="false">
+				<xs:annotation>
+					<xs:documentation>base64 encoded binary data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute ref="xmime:contentType" use="optional"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AttachmentData">
+		<xs:sequence>
+			<xs:element ref="xop:Include"/>
+		</xs:sequence>
+		<xs:attribute ref="xmime:contentType" use="optional"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BackupFile">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string"/>
+			<xs:element name="Data" type="tt:AttachmentData"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemLogUriList">
+		<xs:sequence>
+			<xs:element name="SystemLog" type="tt:SystemLogUri" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemLogUri">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:SystemLogType"/>
+			<xs:element name="Uri" type="xs:anyURI"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="FactoryDefaultType">
+		<xs:annotation>
+			<xs:documentation>Enumeration describing the available factory default modes.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Hard">
+				<xs:annotation>
+					<xs:documentation>Indicates that a hard factory default is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Soft">
+				<xs:annotation>
+					<xs:documentation>Indicates that a soft factory default is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="SetDateTimeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Manual">
+				<xs:annotation>
+					<xs:documentation>Indicates that the date and time are set manually.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="NTP">
+				<xs:annotation>
+					<xs:documentation>Indicates that the date and time are set through NTP</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="SystemDateTime">
+		<xs:annotation>
+			<xs:documentation>General date time inforamtion returned by the GetSystemDateTime method.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="DateTimeType" type="tt:SetDateTimeType">
+				<xs:annotation>
+					<xs:documentation>Indicates if the time is set manully or through NTP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DaylightSavings" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Informative indicator whether daylight savings is currently on/off.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Timezone information in Posix format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Current system date and time in UTC format. This field is mandatory since version 2.0.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LocalDateTime" type="tt:DateTime" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Date and time in local format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SystemDateTimeExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemDateTimeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DateTime">
+		<xs:sequence>
+			<xs:element name="Time" type="tt:Time"/>
+			<xs:element name="Date" type="tt:Date"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Date">
+		<xs:sequence>
+			<xs:element name="Year" type="xs:int"/>
+			<xs:element name="Month" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 1 to 12.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Day" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 1 to 31.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Time">
+		<xs:sequence>
+			<xs:element name="Hour" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 0 to 23.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Minute" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 0 to 59.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Second" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 0 to 61 (typically 59).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TimeZone">
+		<xs:annotation>
+			<xs:documentation>
+				The TZ format is specified by POSIX, please refer to POSIX 1003.1 section 8.3<br/>
+				Example: Europe, Paris TZ=CET-1CEST,M3.5.0/2,M10.5.0/3<br/>
+				CET = designation for standard time when daylight saving is not in force<br/>
+				-1 = offset in hours = negative so 1 hour east of Greenwich meridian<br/>
+				CEST = designation when daylight saving is in force ("Central European Summer Time")<br/>
+				, = no offset number between code and comma, so default to one hour ahead for daylight saving<br/>
+				M3.5.0 = when daylight saving starts = the last Sunday in March (the "5th" week means the last in the month)<br/>
+				/2, = the local time when the switch occurs = 2 a.m. in this case<br/>
+				M10.5.0 = when daylight saving ends = the last Sunday in October.<br/>
+				/3, = the local time when the switch occurs = 3 a.m. in this case<br/>
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="TZ" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>Posix timezone string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, System Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   RemoteUser Handling Types    -->
+	<!--===============================-->
+	<xs:complexType name="RemoteUser">
+		<xs:sequence>
+			<xs:element name="Username" type="xs:string"/>
+			<xs:element name="Password" type="xs:string" minOccurs="0"/>
+			<xs:element name="UseDerivedPassword" type="xs:boolean"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, RemoteUser Handling Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   UserToken Handling Types    -->
+	<!--===============================-->
+	<xs:simpleType name="UserLevel">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Administrator"/>
+			<xs:enumeration value="Operator"/>
+			<xs:enumeration value="User"/>
+			<xs:enumeration value="Anonymous"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="User">
+		<xs:sequence>
+			<xs:element name="Username" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Username string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Password" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Password string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UserLevel" type="tt:UserLevel">
+				<xs:annotation>
+					<xs:documentation>User level string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:UserExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="UserExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!-- End, UserToken Handling Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Security Management Types   -->
+	<!--===============================-->
+	<xs:complexType name="CertificateGenerationParameters">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
+			<xs:element name="Subject" type="xs:string" minOccurs="0"/>
+			<xs:element name="ValidNotBefore" type="xs:token" minOccurs="0"/>
+			<xs:element name="ValidNotAfter" type="xs:token" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:CertificateGenerationParametersExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateGenerationParametersExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Certificate">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>Certificate id.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Certificate" type="tt:BinaryData">
+				<xs:annotation>
+					<xs:documentation>base64 encoded DER representation of certificate.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateStatus">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>Certificate id.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Status" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not a certificate is used in a HTTPS configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateWithPrivateKey">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
+			<xs:element name="Certificate" type="tt:BinaryData"/>
+			<xs:element name="PrivateKey" type="tt:BinaryData"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateInformation">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token"/>
+			<xs:element name="IssuerDN" type="xs:string" minOccurs="0"/>
+			<xs:element name="SubjectDN" type="xs:string" minOccurs="0"/>
+			<xs:element name="KeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
+			<xs:element name="ExtendedKeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
+			<xs:element name="KeyLength" type="xs:int" minOccurs="0"/>
+			<xs:element name="Version" type="xs:string" minOccurs="0"/>
+			<xs:element name="SerialNum" type="xs:string" minOccurs="0"/>
+			<xs:element name="SignatureAlgorithm" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Validity Range is from "NotBefore" to "NotAfter"; the corresponding DateTimeRange is from "From" to "Until"</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Validity" type="tt:DateTimeRange" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:CertificateInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateUsage">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="Critical" type="xs:boolean" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--End, Security management Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Start Dot1X related Types   -->
+	<!--===============================-->
+	<xs:complexType name="Dot1XConfiguration">
+		<xs:sequence>
+			<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken"/>
+			<xs:element name="Identity" type="xs:string"/>
+			<xs:element name="AnonymousID" type="xs:string" minOccurs="0"/>
+			<xs:element name="EAPMethod" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>
+				EAP Method type as defined in <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.
+			</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CACertificateID" type="xs:token" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="EAPMethodConfiguration" type="tt:EAPMethodConfiguration" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:Dot1XConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot1XConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EAPMethodConfiguration">
+		<xs:sequence>
+			<xs:element name="TLSConfiguration" type="tt:TLSConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Confgiuration information for TLS Method.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Password" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Password for those EAP Methods that require a password. The password shall never be returned on a get method.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:EapMethodExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EapMethodExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TLSConfiguration">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GenericEapPwdConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--End, Dot1X related Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Start IO management Types   -->
+	<!--===============================-->
+	<xs:simpleType name="RelayLogicalState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="active"/>
+			<xs:enumeration value="inactive"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="RelayIdleState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="closed"/>
+			<xs:enumeration value="open"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RelayOutputSettings">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:RelayMode">
+				<xs:annotation>
+					<xs:documentation>
+					'Bistable' or 'Monostable'
+					<ul>
+							<li>Bistable – After setting the state, the relay remains in this state.</li>
+							<li>Monostable – After setting the state, the relay returns to its idle state after the specified time.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DelayTime" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>Time after which the relay returns to its idle state if it is in monostable mode. If the Mode field is set to bistable mode the value of the parameter can be ignored.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IdleState" type="tt:RelayIdleState">
+				<xs:annotation>
+					<xs:documentation>
+			'open' or 'closed'
+			<ul>
+							<li>'open' means that the relay is open when the relay state is set to 'inactive' through the trigger command and closed when the state is set to 'active' through the same command.</li>
+							<li>'closed' means that the relay is closed when the relay state is set to 'inactive' through the trigger command and open when the state is set to 'active' through the same command.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RelayMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Monostable"/>
+			<xs:enumeration value="Bistable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RelayOutput">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Properties" type="tt:RelayOutputSettings"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DigitalInput">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, IO management Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--    Start PTZ Related Types    -->
+	<!--===============================-->
+	<xs:complexType name="PTZNode">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Name" type="tt:Name" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                A unique identifier that is used to reference PTZ Nodes.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SupportedPTZSpaces" type="tt:PTZSpaces">
+						<xs:annotation>
+							<xs:documentation>
+                A list of Coordinate Systems available for the PTZ Node. For each Coordinate System, the PTZ Node MUST specify its allowed range.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaximumNumberOfPresets" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>
+                All preset operations MUST be available for this PTZ Node if one preset is supported.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="HomeSupported" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>
+                A boolean operator specifying the availability of a home position. If set to true, the Home Position Operations MUST be available for this PTZ Node.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>
+                A list of supported Auxiliary commands. If the list is not empty, the Auxiliary Operations MUST be available for this PTZ Node.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:PTZNodeExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:attribute name="FixedHomePosition" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>
+      				Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command.
+      			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZNodeExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="SupportedPresetTour" type="tt:PTZPresetTourSupported" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            Detail of supported Preset Tour feature.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZNodeExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZNodeExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSupported">
+		<xs:sequence>
+			<xs:element name="MaximumNumberOfPresetTours" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Indicates number of preset tours that can be created. Required preset tour operations shall be available for this PTZ Node if one or more preset tour is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZPresetTourOperation" type="tt:PTZPresetTourOperation" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Indicates which preset tour operations are available for this PTZ Node.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourSupportedExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSupportedExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="NodeToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>
+                A mandatory reference to the PTZ Node that the PTZ Configuration belongs to.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultAbsolutePantTiltPositionSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports absolute Pan/Tilt movements, it shall specify one Absolute Pan/Tilt Position Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultAbsoluteZoomPositionSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports absolute zoom movements, it shall specify one Absolute Zoom Position Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultRelativePanTiltTranslationSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports relative Pan/Tilt movements, it shall specify one RelativePan/Tilt Translation Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultRelativeZoomTranslationSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports relative zoom movements, it shall specify one Relative Zoom Translation Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultContinuousPanTiltVelocitySpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports continuous Pan/Tilt movements, it shall specify one Continuous Pan/Tilt Velocity Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultContinuousZoomVelocitySpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports continuous zoom movements, it shall specify one Continuous Zoom Velocity Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultPTZSpeed" type="tt:PTZSpeed" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports absolute or relative PTZ movements, it shall specify corresponding default Pan/Tilt and Zoom speeds.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultPTZTimeout" type="xs:duration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports continuous movements, it shall specify a default timeout, after which the movement stops.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="PanTiltLimits" type="tt:PanTiltLimits" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                The Pan/Tilt limits element should be present for a PTZ Node that supports an absolute Pan/Tilt. If the element is present it signals the support for configurable Pan/Tilt limits. If limits are enabled, the Pan/Tilt movements shall always stay within the specified range. The Pan/Tilt limits are disabled by setting the limits to –INF or +INF.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZoomLimits" type="tt:ZoomLimits" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                The Zoom limits element should be present for a PTZ Node that supports absolute zoom. If the element is present it signals the supports for configurable Zoom limits. If limits are enabled the zoom movements shall always stay within the specified range. The Zoom limits are disabled by settings the limits to -INF and +INF.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:PTZConfigurationExtension" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="PTControlDirection" type="tt:PTControlDirection" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure PT Control Direction related features.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirection">
+		<xs:sequence>
+			<xs:element name="EFlip" type="tt:EFlip" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure related parameters for E-Flip.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Reverse" type="tt:Reverse" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure related parameters for reversing of PT Control Direction.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTControlDirectionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirectionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EFlip">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:EFlipMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable E-Flip feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Reverse">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ReverseMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable Reverse feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="EFlipMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="ReverseMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="Spaces" type="tt:PTZSpaces">
+				<xs:annotation>
+					<xs:documentation>
+            A list of supported coordinate systems including their range limitations.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZTimeout" type="tt:DurationRange">
+				<xs:annotation>
+					<xs:documentation>
+            A timeout Range within which Timeouts are accepted by the PTZ Node.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="PTControlDirection" type="tt:PTControlDirectionOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported options for PT Direction Control.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZConfigurationOptions2" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationOptions2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirectionOptions">
+		<xs:sequence>
+			<xs:element name="EFlip" type="tt:EFlipOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported options for EFlip feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Reverse" type="tt:ReverseOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported options for Reverse feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTControlDirectionOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirectionOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EFlipOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:EFlipMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Options of EFlip mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:EFlipOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EFlipOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReverseOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ReverseMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Options of Reverse mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ReverseOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReverseOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PanTiltLimits">
+		<xs:sequence>
+			<xs:element name="Range" type="tt:Space2DDescription">
+				<xs:annotation>
+					<xs:documentation>
+            A range of pan tilt limits.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ZoomLimits">
+		<xs:sequence>
+			<xs:element name="Range" type="tt:Space1DDescription">
+				<xs:annotation>
+					<xs:documentation>
+            A range of zoom limit
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZSpaces">
+		<xs:sequence>
+			<xs:element name="AbsolutePanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Pan/Tilt Position space is provided by every PTZ node that supports absolute Pan/Tilt, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as the full range of the PTZ unit normalized to the range -1 to 1 resulting in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AbsoluteZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Zoom Position Space is provided by every PTZ node that supports absolute Zoom, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as the full range of the Zoom normalized to the range 0 (wide) to 1 (tele). 
+			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RelativePanTiltTranslationSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Pan/Tilt translation space is provided by every PTZ node that supports relative Pan/Tilt, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as the full positive and negative translation range of the PTZ unit normalized to the range -1 to 1, 
+			where positive translation would mean clockwise rotation or movement in right/up direction resulting in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RelativeZoomTranslationSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Zoom Translation Space is provided by every PTZ node that supports relative Zoom, since it does not relate to a specific physical range. 
+			Instead, the corresponding absolute range should be defined as the full positive and negative translation range of the Zoom normalized to the range -1 to1, 
+			where a positive translation maps to a movement in TELE direction. The translation is signed to indicate direction (negative is to wide, positive is to tele). 
+			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension. This results in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ContinuousPanTiltVelocitySpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The generic Pan/Tilt velocity space shall be provided by every PTZ node, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as a range of the PTZ unit’s speed normalized to the range -1 to 1, where a positive velocity would map to clockwise 
+			rotation or movement in the right/up direction. A signed speed can be independently specified for the pan and tilt component resulting in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ContinuousZoomVelocitySpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The generic zoom velocity space specifies a zoom factor velocity without knowing the underlying physical model. The range should be normalized from -1 to 1, 
+			where a positive velocity would map to TELE direction. A generic zoom velocity space description resembles the following.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PanTiltSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The speed space specifies the speed for a Pan/Tilt movement when moving to an absolute position or to a relative translation. 
+			In contrast to the velocity spaces, speed spaces do not contain any directional information. The speed of a combined Pan/Tilt 
+			movement is represented by a single non-negative scalar value.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The speed space specifies the speed for a Zoom movement when moving to an absolute position or to a relative translation. 
+			In contrast to the velocity spaces, speed spaces do not contain any directional information. 
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZSpacesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZSpacesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Space2DDescription">
+		<xs:sequence>
+			<xs:element name="URI" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>
+            A URI of coordinate systems.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="XRange" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+            A range of x-axis.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="YRange" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+            A range of y-axis.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Space1DDescription">
+		<xs:sequence>
+			<xs:element name="URI" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>
+            A URI of coordinate systems.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="XRange" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+            A range of x-axis.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Vector2D">
+		<xs:attribute name="x" type="xs:float" use="required"/>
+		<xs:attribute name="y" type="xs:float" use="required"/>
+		<xs:attribute name="space" type="xs:anyURI" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+  				Pan/tilt coordinate space selector. The following options are defined:<ul>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
+					</ul>
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Vector1D">
+		<xs:attribute name="x" type="xs:float" use="required"/>
+		<xs:attribute name="space" type="xs:anyURI" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+  				Pan/tilt coordinate space selector. The following options are defined:<ul style="">
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
+					</ul>
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZVector">
+		<xs:sequence>
+			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Pan and tilt position. The x component corresponds to pan and the y component to tilt.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A zoom position.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZSpeed">
+		<xs:sequence>
+			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Pan and tilt speed. The x component corresponds to pan and the y component to tilt. If omitted in a request, the current (if any) PanTilt movement should not be affected. </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A zoom speed. If omitted in a request, the current (if any) Zoom movement should not be affected.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStatus">
+		<xs:sequence>
+			<xs:element name="Position" type="tt:PTZVector" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            Specifies the absolute position of the PTZ unit together with the Space references. The default absolute spaces of the corresponding PTZ configuration MUST be referenced within the Position element.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MoveStatus" type="tt:PTZMoveStatus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            Indicates if the Pan/Tilt/Zoom device unit is currently moving, idle or in an unknown state.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            States a current PTZ error.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UtcTime" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>
+            Specifies the UTC time when this status was generated.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPreset">
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A list of preset position name.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZPosition" type="tt:PTZVector" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A list of preset position.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken">
+			<xs:annotation>
+				<xs:documentation>
+        </xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZMoveStatus">
+		<xs:sequence>
+			<xs:element name="PanTilt" type="tt:MoveStatus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Zoom" type="tt:MoveStatus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="AuxiliaryData">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="128"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="MoveStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="IDLE"/>
+			<xs:enumeration value="MOVING"/>
+			<xs:enumeration value="UNKNOWN"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PTZPresetTourState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Idle"/>
+			<xs:enumeration value="Touring"/>
+			<xs:enumeration value="Paused"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PTZPresetTourDirection">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Forward"/>
+			<xs:enumeration value="Backward"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PTZPresetTourOperation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Start"/>
+			<xs:enumeration value="Stop"/>
+			<xs:enumeration value="Pause"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="PresetTour">
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Readable name of the preset tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Status" type="tt:PTZPresetTourStatus">
+				<xs:annotation>
+					<xs:documentation>Read only parameters to indicate the status of the preset tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Auto Start flag of the preset tour. True allows the preset tour to be activated always.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingCondition">
+				<xs:annotation>
+					<xs:documentation>Parameters to specify the detail behavior of the preset tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TourSpot" type="tt:PTZPresetTourSpot" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of detail of touring spots including preset positions.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken">
+			<xs:annotation>
+				<xs:documentation>Unique identifier of this preset tour.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSpot">
+		<xs:sequence>
+			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetail">
+				<xs:annotation>
+					<xs:documentation>Detail definition of preset position of the tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify Pan/Tilt and Zoom speed on moving toward this tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StayTime" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify time duration of staying on this tour sport.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourSpotExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSpotExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourPresetDetail">
+		<xs:sequence>
+			<xs:choice>
+				<xs:element name="PresetToken" type="tt:ReferenceToken">
+					<xs:annotation>
+						<xs:documentation>Option to specify the preset position with Preset Token defined in advance.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="Home" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Option to specify the preset position with the home position of this PTZ Node. "False" to this parameter shall be treated as an invalid argument.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="PTZPosition" type="tt:PTZVector">
+					<xs:annotation>
+						<xs:documentation>Option to specify the preset position with vector of PTZ node directly.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="TypeExtension" type="tt:PTZPresetTourTypeExtension"/>
+			</xs:choice>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourTypeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStatus">
+		<xs:sequence>
+			<xs:element name="State" type="tt:PTZPresetTourState">
+				<xs:annotation>
+					<xs:documentation>Indicates state of this preset tour by Idle/Touring/Paused.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CurrentTourSpot" type="tt:PTZPresetTourSpot" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates a tour spot currently staying.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourStatusExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStatusExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingCondition">
+		<xs:sequence>
+			<xs:element name="RecurringTime" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify how many times the preset tour is recurred.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecurringDuration" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify how long time duration the preset tour is recurred.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to choose which direction the preset tour goes. Forward shall be chosen in case it is omitted.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingConditionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourOptions">
+		<xs:sequence>
+			<xs:element name="AutoStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not the AutoStart is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingConditionOptions">
+				<xs:annotation>
+					<xs:documentation>Supported options for Preset Tour Starting Condition.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TourSpot" type="tt:PTZPresetTourSpotOptions">
+				<xs:annotation>
+					<xs:documentation>Supported options for Preset Tour Spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSpotOptions">
+		<xs:sequence>
+			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetailOptions">
+				<xs:annotation>
+					<xs:documentation>Supported options for detail definition of preset position of the tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StayTime" type="tt:DurationRange">
+				<xs:annotation>
+					<xs:documentation>Supported range of stay time for a tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourPresetDetailOptions">
+		<xs:sequence>
+			<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of available Preset Tokens for tour spots.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Home" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>An option to indicate Home postion for tour spots.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Pan and Tilt for tour spots.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Zoom for a tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourPresetDetailOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourPresetDetailOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingConditionOptions">
+		<xs:sequence>
+			<xs:element name="RecurringTime" type="tt:IntRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Recurring Time.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecurringDuration" type="tt:DurationRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Recurring Duration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options for Direction of Preset Tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingConditionOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--     End, PTZ Related Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Imaging Related Types    -->
+	<!--===============================-->
+	<xs:complexType name="ImagingStatus">
+		<xs:sequence>
+			<xs:element name="FocusStatus" type="tt:FocusStatus"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusStatus">
+		<xs:sequence>
+			<xs:element name="Position" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus position.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MoveStatus" type="tt:MoveStatus">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus MoveStatus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>
+				Error status of focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusConfiguration">
+		<xs:sequence>
+			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode"/>
+			<xs:element name="DefaultSpeed" type="xs:float"/>
+			<xs:element name="NearLimit" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FarLimit" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus far limit (unit: meter).
+If set to 0.0, infinity will be used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="AutoFocusMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="MANUAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettings">
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Brightness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Contrast" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Exposure" type="tt:Exposure" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Exposure mode of the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Focus" type="tt:FocusConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Focus configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Sharpness of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>WDR settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalance" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>White balance settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Exposure">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode">
+				<xs:annotation>
+					<xs:documentation>
+					Exposure Mode
+					<ul>
+							<li>Auto – Enabled the exposure algorithm on the NVT.</li>
+							<li>Manual – Disabled exposure algorithm on the NVT.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="tt:ExposurePriority">
+				<xs:annotation>
+					<xs:documentation>
+				The exposure priority mode (low noise/framerate).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Window" type="tt:Rectangle">
+				<xs:annotation>
+					<xs:documentation>
+				Rectangular exposure mask.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinExposureTime" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxExposureTime" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinIris" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxIris" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ExposureTime" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed exposure time used by the image sensor (&#956;s).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Gain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed gain used by the image sensor (dB).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Iris" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="WideDynamicMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRange">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode">
+				<xs:annotation>
+					<xs:documentation>
+				White dynamic range (on/off)
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Optional level parameter (unitless)
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="BacklightCompensationMode">
+		<xs:annotation>
+			<xs:documentation>Enumeration describing the available backlight compenstation modes.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation is disabled.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="ON">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensation">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:BacklightCompensationMode">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ExposurePriority">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="LowNoise"/>
+			<xs:enumeration value="FrameRate"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions">
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions"/>
+			<xs:element name="Brightness" type="tt:FloatRange"/>
+			<xs:element name="ColorSaturation" type="tt:FloatRange"/>
+			<xs:element name="Contrast" type="tt:FloatRange"/>
+			<xs:element name="Exposure" type="tt:ExposureOptions"/>
+			<xs:element name="Focus" type="tt:FocusOptions"/>
+			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" maxOccurs="unbounded"/>
+			<xs:element name="Sharpness" type="tt:FloatRange"/>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions"/>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRangeOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
+			<xs:element name="Level" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensationOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
+			<xs:element name="Level" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusOptions">
+		<xs:sequence>
+			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="DefaultSpeed" type="tt:FloatRange"/>
+			<xs:element name="NearLimit" type="tt:FloatRange"/>
+			<xs:element name="FarLimit" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ExposureOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded"/>
+			<xs:element name="Priority" type="tt:ExposurePriority" maxOccurs="unbounded"/>
+			<xs:element name="MinExposureTime" type="tt:FloatRange"/>
+			<xs:element name="MaxExposureTime" type="tt:FloatRange"/>
+			<xs:element name="MinGain" type="tt:FloatRange"/>
+			<xs:element name="MaxGain" type="tt:FloatRange"/>
+			<xs:element name="MinIris" type="tt:FloatRange"/>
+			<xs:element name="MaxIris" type="tt:FloatRange"/>
+			<xs:element name="ExposureTime" type="tt:FloatRange"/>
+			<xs:element name="Gain" type="tt:FloatRange"/>
+			<xs:element name="Iris" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalanceOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded"/>
+			<xs:element name="YrGain" type="tt:FloatRange"/>
+			<xs:element name="YbGain" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusMove">
+		<xs:sequence>
+			<xs:element name="Absolute" type="tt:AbsoluteFocus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Parameters for the absolute focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Relative" type="tt:RelativeFocus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Parameters for the relative focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Continuous" type="tt:ContinuousFocus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Parameter for the continuous focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AbsoluteFocus">
+		<xs:sequence>
+			<xs:element name="Position" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Position parameter for the absolute focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Speed parameter for the absolute focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RelativeFocus">
+		<xs:sequence>
+			<xs:element name="Distance" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Distance parameter for the relative focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Speed parameter for the relative focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ContinuousFocus">
+		<xs:sequence>
+			<xs:element name="Speed" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Speed parameter for the Continuous focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MoveOptions">
+		<xs:sequence>
+			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0"/>
+			<xs:element name="Relative" type="tt:RelativeFocusOptions" minOccurs="0"/>
+			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AbsoluteFocusOptions">
+		<xs:sequence>
+			<xs:element name="Position" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the position.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RelativeFocusOptions">
+		<xs:sequence>
+			<xs:element name="Distance" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the distance.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ContinuousFocusOptions">
+		<xs:sequence>
+			<xs:element name="Speed" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ExposureMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="MANUAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Enabled">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ENABLED"/>
+			<xs:enumeration value="DISABLED"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="WhiteBalanceMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="MANUAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IrCutFilterMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="AUTO"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalance">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode">
+				<xs:annotation>
+					<xs:documentation>Auto whitebalancing mode (auto/manual).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CrGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Rgain (unitless).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CbGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Bgain (unitless).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--  End, Imaging Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Imaging Version 2.0 Related Types    -->
+	<!--===============================-->
+	<xs:complexType name="ImagingStatus20">
+		<xs:sequence>
+			<xs:element name="FocusStatus20" type="tt:FocusStatus20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingStatus20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingStatus20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusStatus20">
+		<xs:sequence>
+			<xs:element name="Position" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus position.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MoveStatus" type="tt:MoveStatus">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus MoveStatus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Error status of focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:FocusStatus20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusStatus20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettings20">
+		<xs:annotation>
+			<xs:documentation>Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Brightness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Contrast" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Exposure" type="tt:Exposure20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Exposure mode of the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Focus" type="tt:FocusConfiguration20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Focus configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Sharpness of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>WDR settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalance20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>White balance settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension20" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension20">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ImageStabilization" type="tt:ImageStabilization" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure Image Stabilization feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension202" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension202">
+		<xs:sequence>
+			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustment" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>An optional parameter applied to only auto mode to adjust timing of toggling Ir cut filter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension203" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension203">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilization">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ImageStabilizationMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable Image Stabilization feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImageStabilizationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilizationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ImageStabilizationMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustment">
+		<xs:sequence>
+			<xs:element name="BoundaryType" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Specifies which boundaries to automatically toggle Ir cut filter following parameters are applied to. Its options shall be chosen from tt:IrCutFilterAutoBoundaryType.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BoundaryOffset" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Adjusts boundary exposure level for toggling Ir cut filter to on/off specified with unitless normalized value from +1.0 to -1.0. Zero is default and -1.0 is the darkest adjustment (Unitless).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ResponseTime" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Delay time of toggling Ir cut filter to on/off after crossing of the boundary exposure levels.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax" />
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustmentExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IrCutFilterAutoBoundaryType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Common" />
+			<xs:enumeration value="ToOn" />
+			<xs:enumeration value="ToOff" />
+			<xs:enumeration value="Extended" />
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRange20">
+		<xs:annotation>
+			<xs:documentation>Type describing whether WDR mode is enabled or disabled (on/off).</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode">
+				<xs:annotation>
+					<xs:documentation>Wide dynamic range mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensation20">
+		<xs:annotation>
+			<xs:documentation>Type describing whether BLC mode is enabled or disabled (on/off).</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:BacklightCompensationMode">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Exposure20">
+		<xs:annotation>
+			<xs:documentation>Type describing the exposure settings.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode">
+				<xs:annotation>
+					<xs:documentation>
+				Exposure Mode
+				<ul>
+							<li>Auto – Enabled the exposure algorithm on the device.</li>
+							<li>Manual – Disabled exposure algorithm on the device.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The exposure priority mode (low noise/framerate).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Window" type="tt:Rectangle" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Rectangular exposure mask.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinExposureTime" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxExposureTime" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinIris" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxIris" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ExposureTime" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed exposure time used by the image sensor (&#956;s).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Gain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed gain used by the image sensor (dB).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Iris" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20">
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Backlight Compensation.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Brightness" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Brightness.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ColorSaturation" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Color Saturation.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Contrast" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Contrast.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Exposure" type="tt:ExposureOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Exposure.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Focus" type="tt:FocusOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of IrCutFilterModes.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sharpness" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Sharpness.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of WideDynamicRange.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of WhiteBalance.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingOptions20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20Extension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ImageStabilization" type="tt:ImageStabilizationOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Options of parameters for Image Stabilization feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingOptions20Extension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20Extension2">
+		<xs:sequence>
+			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustmentOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Options of parameters for adjustment of Ir cut filter auto mode.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingOptions20Extension3" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20Extension3">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilizationOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ImageStabilizationMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options of Image Stabilization mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Valid range of the Image Stabilization.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImageStabilizationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilizationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustmentOptions">
+		<xs:sequence>
+			<xs:element name="BoundaryType" type="xs:string" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options of boundary types for adjustment of Ir cut filter auto mode. The opptions shall be chosen from tt:IrCutFilterAutoBoundaryType. </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BoundaryOffset" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not boundary offset for toggling Ir cut filter is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ResponseTimeRange" type="tt:DurationRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of delay time for toggling Ir cut filter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentOptionsExtension" minOccurs="0" />
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax" />
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustmentOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRangeOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
+			<xs:element name="Level" type="tt:FloatRange" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensationOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:BacklightCompensationMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				'ON' or 'OFF'
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Level range of BacklightCompensation.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ExposureOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				Exposure Mode
+				<ul>
+							<li>Auto – Enabled the exposure algorithm on the device.</li>
+							<li>Manual – Disabled exposure algorithm on the device.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				The exposure priority mode (low noise/framerate).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinExposureTime" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Minimum ExposureTime.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxExposureTime" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Maximum ExposureTime.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinGain" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Minimum Gain.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxGain" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Maximum Gain.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinIris" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Minimum Iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxIris" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Maximum Iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ExposureTime" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the ExposureTime.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Gain" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Gain.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Iris" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MoveOptions20">
+		<xs:sequence>
+			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges for the absolute control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Relative" type="tt:RelativeFocusOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges for the relative control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges for the continuous control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RelativeFocusOptions20">
+		<xs:sequence>
+			<xs:element name="Distance" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the distance.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalance20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode">
+				<xs:annotation>
+					<xs:documentation>
+				'AUTO' or 'MANUAL'
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CrGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Rgain (unitless).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CbGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Bgain (unitless).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:WhiteBalance20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalance20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusConfiguration20">
+		<xs:sequence>
+			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode">
+				<xs:annotation>
+					<xs:documentation>
+			Mode of auto fucus.
+			<ul>
+							<li>AUTO</li>
+							<li>MANUAL</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DefaultSpeed" type="xs:float" minOccurs="0"/>
+			<xs:element name="NearLimit" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FarLimit" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus far limit (unit: meter).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:FocusConfiguration20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusConfiguration20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalanceOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				Mode of WhiteBalance.
+				<ul>
+							<li>AUTO</li>
+							<li>MANUAL</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="YrGain" type="tt:FloatRange" minOccurs="0"/>
+			<xs:element name="YbGain" type="tt:FloatRange" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:WhiteBalanceOptions20Extension" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalanceOptions20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusOptions20">
+		<xs:sequence>
+			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+					Mode of Auto Focus.
+					<ul>
+							<li>AUTO</li>
+							<li>MANUAL</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DefaultSpeed" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					Valid range of DefaultSpeed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NearLimit" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					Valid range of NearLimit.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FarLimit" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					Valid range of FarLimit.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:FocusOptions20Extension" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusOptions20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--===============================-->
+	<!--  End, Imaging Version 2.0 Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--  Event and Analytics Types    -->
+	<!--===============================-->
+	<xs:simpleType name="TopicNamespaceLocation">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PropertyOperation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Initialized"/>
+			<xs:enumeration value="Deleted"/>
+			<xs:enumeration value="Changed"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:element name="Message">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Source" type="tt:ItemList" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>Token value pairs that triggered this message. Typically only one item is present.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="Key" type="tt:ItemList" minOccurs="0"/>
+				<xs:element name="Data" type="tt:ItemList" minOccurs="0"/>
+				<xs:element name="Extension" type="tt:MessageExtension" minOccurs="0"/>
+			</xs:sequence>
+			<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
+			<xs:attribute name="PropertyOperation" type="tt:PropertyOperation"/>
+			<xs:anyAttribute processContents="lax"/>
+		</xs:complexType>
+	</xs:element>
+	<!--===============================-->
+	<xs:complexType name="MessageExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemList">
+		<xs:annotation>
+			<xs:documentation>
+			List of parameters according to the corresponding ItemListDescription.
+			Each item in the list shall have a unique name.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SimpleItem" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Value name pair as defined by the corresponding description.</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+					<xs:attribute name="Value" type="xs:anySimpleType" use="required">
+						<xs:annotation>
+							<xs:documentation>Item value. The type is defined in the corresponding description.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ElementItem" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Complex value structure.</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any">
+							<xs:annotation>
+								<xs:documentation>XML tree contiaing the element value as defined in the corresponding description.</xs:documentation>
+							</xs:annotation>
+						</xs:any>
+					</xs:sequence>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ItemListExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemListExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--       Message Description     -->
+	<!--===============================-->
+	<xs:complexType name="MessageDescription">
+		<xs:sequence>
+			<xs:element name="Source" type="tt:ItemListDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Set of tokens producing this message. The list may only contain SimpleItemDescription items.
+					The set of tokens identify the component within the WS-Endpoint, which is responsible for the producing the message.<br/>
+					For analytics events the token set shall include the VideoSourceConfigurationToken, the VideoAnalyticsConfigurationToken
+					and the name of the analytics module or rule.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Key" type="tt:ItemListDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Describes optional message payload parameters that may be used as key. E.g. object IDs of tracked objects are conveyed as key.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Data" type="tt:ItemListDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Describes the payload of the message.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:MessageDescriptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="IsProperty" type="xs:boolean">
+			<xs:annotation>
+				<xs:documentation>Must be set to true when the described Message relates to a property. An alternative term of "property" is a "state" in contrast to a pure event, which contains relevant information for only a single point in time.<br/>Default is false.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MessageDescriptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemListDescription">
+		<xs:annotation>
+			<xs:documentation>
+			Describes a list of items. Each item in the list shall have a unique name.
+			The list is designed as linear structure without optional or unbounded elements.
+			Use ElementItems only when complex structures are inevitable.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SimpleItemDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Description of a simple item. The type must be of cathegory simpleType (xs:string, xs:integer, xs:float, ...).</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+					<xs:attribute name="Type" type="xs:QName" use="required"/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ElementItemDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            Description of a complex type. The Type must reference a defined type.
+          </xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+					<xs:attribute name="Type" type="xs:QName" use="required">
+						<xs:annotation>
+							<xs:documentation>The type of the item. The Type must reference a defined type.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ItemListDescriptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemListDescriptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Vector">
+		<xs:attribute name="x" type="xs:float"/>
+		<xs:attribute name="y" type="xs:float"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Rectangle">
+		<xs:attribute name="bottom" type="xs:float"/>
+		<xs:attribute name="top" type="xs:float"/>
+		<xs:attribute name="right" type="xs:float"/>
+		<xs:attribute name="left" type="xs:float"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Polygon">
+		<xs:sequence>
+			<xs:element name="Point" type="tt:Vector" minOccurs="3" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Polygon" type="tt:Polygon"/>
+	<!--===============================-->
+	<xs:complexType name="Polyline">
+		<xs:sequence>
+			<xs:element name="Point" type="tt:Vector" minOccurs="2" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Polyline" type="tt:Polyline"/>
+	<!--===============================-->
+	<xs:simpleType name="Direction">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Left"/>
+			<xs:enumeration value="Right"/>
+			<xs:enumeration value="Any"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Color">
+		<xs:attribute name="X" type="xs:float" use="required"/>
+		<xs:attribute name="Y" type="xs:float" use="required"/>
+		<xs:attribute name="Z" type="xs:float" use="required"/>
+		<xs:attribute name="Colorspace" type="xs:anyURI"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorCovariance">
+		<xs:attribute name="XX" type="xs:float" use="required"/>
+		<xs:attribute name="YY" type="xs:float" use="required"/>
+		<xs:attribute name="ZZ" type="xs:float" use="required"/>
+		<xs:attribute name="XY" type="xs:float"/>
+		<xs:attribute name="XZ" type="xs:float"/>
+		<xs:attribute name="YZ" type="xs:float"/>
+		<xs:attribute name="Colorspace" type="xs:anyURI"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--       Scene Description       -->
+	<!--===============================-->
+	<xs:complexType name="Appearance">
+		<xs:sequence>
+			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
+			<xs:element name="Shape" type="tt:ShapeDescriptor" minOccurs="0"/>
+			<xs:element name="Color" type="tt:ColorDescriptor" minOccurs="0"/>
+			<xs:element name="Class" type="tt:ClassDescriptor" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:AppearanceExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AppearanceExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ShapeDescriptor">
+		<xs:sequence>
+			<xs:element name="BoundingBox" type="tt:Rectangle"/>
+			<xs:element name="CenterOfGravity" type="tt:Vector"/>
+			<xs:element name="Polygon" type="tt:Polygon" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:ShapeDescriptorExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ShapeDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorDescriptor">
+		<xs:sequence>
+			<xs:element name="ColorCluster" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Color" type="tt:Color"/>
+						<xs:element name="Weight" type="xs:float" minOccurs="0"/>
+						<xs:element name="Covariance" type="tt:ColorCovariance" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ColorDescriptorExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ClassType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Animal"/>
+			<xs:enumeration value="Face"/>
+			<xs:enumeration value="Human"/>
+			<xs:enumeration value="Vehical"/>
+			<xs:enumeration value="Other"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ClassDescriptor">
+		<xs:sequence>
+			<xs:element name="ClassCandidate" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Type" type="tt:ClassType"/>
+						<xs:element name="Likelihood" type="xs:float"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ClassDescriptorExtension" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ClassDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="OtherTypes" type="tt:OtherType" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:ClassDescriptorExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ClassDescriptorExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OtherType">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Object Class Type</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Likelihood" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>A likelihood/probability that the corresponding object belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Object">
+		<xs:complexContent>
+			<xs:extension base="tt:ObjectId">
+				<xs:sequence>
+					<xs:element name="Appearance" type="tt:Appearance" minOccurs="0"/>
+					<xs:element name="Behaviour" type="tt:Behaviour" minOccurs="0"/>
+					<xs:element name="Extension" type="tt:ObjectExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Transformation">
+		<xs:sequence>
+			<xs:element name="Translate" type="tt:Vector" minOccurs="0"/>
+			<xs:element name="Scale" type="tt:Vector" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:TransformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TransformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Frame">
+		<xs:sequence>
+			<xs:element name="PTZStatus" type="tt:PTZStatus" minOccurs="0"/>
+			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
+			<xs:element name="Object" type="tt:Object" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ObjectTree" type="tt:ObjectTree" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:FrameExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FrameExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="MotionInCells" type="tt:MotionInCells" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:FrameExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FrameExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Merge">
+		<xs:sequence>
+			<xs:element name="from" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
+			<xs:element name="to" type="tt:ObjectId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Split">
+		<xs:sequence>
+			<xs:element name="from" type="tt:ObjectId"/>
+			<xs:element name="to" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Rename">
+		<xs:sequence>
+			<xs:element name="from" type="tt:ObjectId"/>
+			<xs:element name="to" type="tt:ObjectId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectId">
+		<xs:attribute name="ObjectId" type="xs:integer"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Behaviour">
+		<xs:sequence>
+			<xs:element name="Removed" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Idle" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:BehaviourExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BehaviourExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectTree">
+		<xs:sequence>
+			<xs:element name="Rename" type="tt:Rename" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Split" type="tt:Split" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Merge" type="tt:Merge" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Delete" type="tt:ObjectId" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:ObjectTreeExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectTreeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MotionInCells">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Columns" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Rows" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Cells" type="xs:base64Binary" use="required">
+			<xs:annotation>
+				<xs:documentation>A “1” denotes a cell where motion is detected and a “0” an empty cell. The first cell is in the upper left corner. Then the cell order goes first from left to right and then from up to down.  If the number of cells is not a multiple of 8 the last byte is filled with zeros. The information is run length encoded according to Packbit coding in ISO 12369 (TIFF, Revision 6.0).</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--    Analytics Configuration    -->
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineConfiguration">
+		<xs:sequence>
+			<xs:element name="AnalyticsModule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:AnalyticsEngineConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RuleEngineConfiguration">
+		<xs:sequence>
+			<xs:element name="Rule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:RuleEngineConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RuleEngineConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Config">
+		<xs:sequence>
+			<xs:element name="Parameters" type="tt:ItemList">
+				<xs:annotation>
+					<xs:documentation>List of configuration parameters as defined in the correspding description.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="Name" type="xs:string" use="required">
+			<xs:annotation>
+				<xs:documentation>Name of the configuration.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Type" type="xs:QName" use="required">
+			<xs:annotation>
+				<xs:documentation>Type of the configuration represented by a unique QName. The Type characterizes a ConfigDescription defining the Parameters.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ConfigDescription">
+		<xs:sequence>
+			<xs:element name="Parameters" type="tt:ItemListDescription">
+				<xs:annotation>
+					<xs:documentation>
+						List describing the configuration parameters. The names of the parameters must be unique. If possible SimpleItems
+						should be used to transport the information to ease parsing of dynamically defined messages by a client
+						application.
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Messages" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+						The analytics modules and rule engine produce Events, which must be listed within the Analytics Module Description. In order to do so
+						the structure of the Message is defined and consists of three groups: Source, Key, and Data. It is recommended to use SimpleItemDescriptions wherever applicable.
+						The name of all Items must be unique within all Items contained in any group of this Message.
+						Depending on the component multiple parameters or none may be needed to identify the component uniquely.
+					</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="tt:MessageDescription">
+							<xs:sequence>
+								<xs:element name="ParentTopic" type="xs:string">
+									<xs:annotation>
+										<xs:documentation>
+											The ParentTopic labels the message (e.g. "nn:RuleEngine/LineCrossing"). The real message can extend the ParentTopic
+											by for example the name of the instaniated rule (e.g. "nn:RuleEngine/LineCrossing/corssMyFirstLine").
+											Even without knowing the complete topic name, the subscriber will be able to distiguish the
+											messages produced by different rule instances of the same type via the Source fields of the message.
+											There the name of the rule instance, which produced the message, must be listed.
+										</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ConfigDescriptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="Name" type="xs:QName" use="required">
+			<xs:annotation>
+				<xs:documentation>XML Type of the Configuration (e.g. "tt::LineDetector"). </xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ConfigDescriptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedRules">
+		<xs:sequence>
+			<xs:element name="RuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Lists the location of all schemas that are referenced in the rules.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of rules supported by the Video Analytics configuration..</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SupportedRulesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedRulesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedAnalyticsModules">
+		<xs:sequence>
+			<xs:element name="AnalyticsModuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>It optionally contains a list of URLs that provide the location of schema files.
+        These schema files describe the types and elements used in the analytics module descriptions.
+        If the analytics module descriptions reference types or elements of the ONVIF schema file,
+        the ONVIF schema file MUST be explicitly listed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AnalyticsModuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:SupportedAnalyticsModulesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedAnalyticsModulesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolygonConfiguration">
+		<xs:sequence>
+			<xs:element name="Polygon" type="tt:Polygon">
+				<xs:annotation>
+					<xs:documentation>Contains Polygon configuration for rule parameters</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolylineArray">
+		<xs:sequence>
+			<xs:element name="Segment" type="tt:Polyline" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Contains array of Polyline</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PolylineArrayExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolylineArrayExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolylineArrayConfiguration">
+		<xs:sequence>
+			<xs:element name="PolylineArray" type="tt:PolylineArray">
+				<xs:annotation>
+					<xs:documentation>Contains PolylineArray configuration data</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MotionExpression">
+		<xs:sequence>
+			<xs:element name="Expression" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Motion Expression data structure contains motion expression which is based on Scene Descriptor schema with XPATH syntax. The Type argument could allow introduction of different dialects </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Type" type="xs:string"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MotionExpressionConfiguration">
+		<xs:sequence>
+			<xs:element name="MotionExpression" type="tt:MotionExpression">
+				<xs:annotation>
+					<xs:documentation>Contains Rule MotionExpression configuration</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CellLayout">
+		<xs:sequence>
+			<xs:element name="Transformation" type="tt:Transformation">
+				<xs:annotation>
+					<xs:documentation>Mapping of the cell grid to the Video frame. The cell grid is starting from the upper left corner and x dimension is going from left to right and the y dimension from up to down.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Columns" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Rows" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--End, Event and Analytics Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Metadata Streaming Types    -->
+	<!--===============================-->
+	<xs:complexType name="MetadataStream">
+		<xs:sequence>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:element name="VideoAnalytics" type="tt:VideoAnalyticsStream"/>
+				<xs:element name="PTZ" type="tt:PTZStream"/>
+<!--
+				<xs:element name="Event" type="tt:EventStream"/>
+-->
+				<xs:element name="Event" type="xs:anyType"/>
+				<xs:element name="Extension" type="tt:MetadataStreamExtension"/>
+			</xs:choice>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="AudioAnalyticsStream" type="tt:AudioAnalyticsStream" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:MetadataStreamExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataStreamExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioAnalyticsStream">
+		<xs:sequence>
+			<xs:element name="AudioDescriptor" type="tt:AudioDescriptor" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:AudioAnalyticsStreamExtension" minOccurs="0" />
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioDescriptor">
+		<xs:sequence>
+		<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="UtcTime" type="xs:dateTime" use="required">
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioAnalyticsStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:element name="MetadataStream" type="tt:MetadataStream"/>
+	<!--===============================-->
+	<xs:complexType name="VideoAnalyticsStream">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="Frame" type="tt:Frame"/>
+			<xs:element name="Extension" type="tt:VideoAnalyticsStreamExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoAnalyticsStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStream">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="PTZStatus" type="tt:PTZStatus"/>
+			<xs:element name="Extension" type="tt:PTZStreamExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+<!--
+	<xs:complexType name="EventStream">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element ref="wsnt:NotificationMessage"/>
+			<xs:element name="Extension" type="tt:EventStreamExtension"/>
+		</xs:choice>
+	</xs:complexType>
+-->
+	<!--===============================-->
+	<xs:complexType name="EventStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!-- End, Metadata Streaming Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Display Related Types  -->
+	<!--===============================-->
+	<xs:complexType name="PaneConfiguration">
+		<xs:annotation>
+			<xs:documentation>Configuration of the streaming and coding settings of a Video window.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="PaneName" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional name of the pane configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioOutputToken" type="tt:ReferenceToken" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device has audio outputs, this element contains a pointer to the audio output that is associated with the pane. A client
+can retrieve the available audio outputs of a device using the GetAudioOutputs command of the DeviceIO service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioSourceToken" type="tt:ReferenceToken" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device has audio sources, this element contains a pointer to the audio source that is associated with this pane.
+The audio connection from a decoder device to the NVT is established using the backchannel mechanism. A client can retrieve the available audio sources of a device using the GetAudioSources command of the
+DeviceIO service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The configuration of the audio encoder including codec, bitrate
+and sample rate. </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ReceiverToken" type="tt:ReferenceToken" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>A pointer to a Receiver that has the necessary information to receive
+				data from a Transmitter. This Receiver can be connected and the network video decoder displays the received data on the specified outputs. A client can retrieve the available Receivers using the
+				GetReceivers command of the Receiver Service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Token" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>A unique identifier in the display device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PaneLayout">
+		<xs:annotation>
+			<xs:documentation>A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Pane" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Reference to the configuration of the streaming and coding parameters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Area" type="tt:Rectangle">
+				<xs:annotation>
+					<xs:documentation>Describes the location and size of the area on the monitor. The area coordinate values are espressed in normalized units [-1.0, 1.0].</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Layout">
+		<xs:annotation>
+			<xs:documentation>A layout describes a set of Video windows that are displayed simultaniously on a display. </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="PaneLayout" type="tt:PaneLayout" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of panes assembling the display layout.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:LayoutExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="LayoutExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CodingCapabilities">
+		<xs:annotation>
+			<xs:documentation>This type contains the Audio and Video coding capabilities of a display service.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="AudioEncodingCapabilities" type="tt:AudioEncoderConfigurationOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device supports audio encoding this section describes the supported codecs and their configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioDecodingCapabilities" type="tt:AudioDecoderConfigurationOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device supports audio decoding this section describes the supported codecs and their settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoDecodingCapabilities" type="tt:VideoDecoderConfigurationOptions">
+				<xs:annotation>
+					<xs:documentation>This section describes the supported video codesc and their configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="LayoutOptions">
+		<xs:annotation>
+			<xs:documentation>The options supported for a display layout.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="PaneLayoutOptions" type="tt:PaneLayoutOptions" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Lists the possible Pane Layouts of the Video Output</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:LayoutOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="LayoutOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PaneLayoutOptions">
+		<xs:annotation>
+			<xs:documentation>Description of a pane layout describing a complete display layout.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Area" type="tt:Rectangle" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of areas assembling a layout. Coordinate values are in the range [-1.0, 1.0].</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PaneOptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PaneOptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--      End, Display Related Types  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Receiver Types              -->
+	<!--===============================-->
+	<xs:complexType name="Receiver">
+		<xs:annotation>
+			<xs:documentation>
+			Description of a receiver, including its token and configuration.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Token" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Unique identifier of the receiver.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Configuration" type="tt:ReceiverConfiguration">
+				<xs:annotation>
+					<xs:documentation>Describes the configuration of the receiver.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReceiverConfiguration">
+		<xs:annotation>
+			<xs:documentation>
+			Describes the configuration of a receiver.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ReceiverMode">
+				<xs:annotation>
+					<xs:documentation>The following connection modes are defined:</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MediaUri" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Details of the URI to which the receiver should connect.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StreamSetup" type="tt:StreamSetup">
+				<xs:annotation>
+					<xs:documentation>Stream connection parameters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ReceiverMode">
+		<xs:annotation>
+			<xs:documentation>
+			Specifies a receiver connection mode.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AutoConnect">
+				<xs:annotation>
+					<xs:documentation>The receiver connects on demand, as required by consumers of the media streams.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="AlwaysConnect">
+				<xs:annotation>
+					<xs:documentation>The receiver attempts to maintain a persistent connection to the configured endpoint.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="NeverConnect">
+				<xs:annotation>
+					<xs:documentation>The receiver does not attempt to connect.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="ReceiverState">
+		<xs:annotation>
+			<xs:documentation>
+			Specifies the current connection state of the receiver.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="NotConnected">
+				<xs:annotation>
+					<xs:documentation>The receiver is not connected.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Connecting">
+				<xs:annotation>
+					<xs:documentation>The receiver is attempting to connect.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Connected">
+				<xs:annotation>
+					<xs:documentation>The receiver is connected.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ReceiverStateInformation">
+		<xs:annotation>
+			<xs:documentation>
+			Contains information about a receiver's current state.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="State" type="tt:ReceiverState">
+				<xs:annotation>
+					<xs:documentation>The connection state of the receiver may have one of the following states: </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoCreated" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not the receiver was created automatically.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, Receiver Types         					  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--         Storage Types         -->
+	<!--===============================-->
+	<xs:simpleType name="ReceiverReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="SourceReference">
+		<xs:sequence>
+			<xs:element name="Token" type="tt:ReferenceToken"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Type" type="xs:anyURI" use="optional" default="http://www.onvif.org/ver10/schema/Receiver"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="TrackReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Description">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="DateTimeRange">
+		<xs:sequence>
+			<xs:element name="From" type="xs:dateTime"/>
+			<xs:element name="Until" type="xs:dateTime"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingSummary">
+		<xs:sequence>
+			<xs:element name="DataFrom" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The earliest point in time where there is recorded data on the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DataUntil" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The most recent point in time where there is recorded data on the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NumberRecordings" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The device contains this many recordings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SearchScope">
+		<xs:annotation>
+			<xs:documentation>A structure for defining a limited scope when searching in recorded data.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="IncludedSources" type="tt:SourceReference" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of sources that are included in the scope. If this list is included, only data from one of these sources shall be searched.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IncludedRecordings" type="tt:RecordingReference" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of recordings that are included in the scope. If this list is included, only data from one of these recordings shall be searched.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecordingInformationFilter" type="tt:XPathExpression" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>An xpath expression used to specify what recordings to search. Only those recordings with an RecordingInformation structure that matches the filter shall be searched.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SearchScopeExtension" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Extension point</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SearchScopeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+<!--
+	<xs:complexType name="EventFilter">
+		<xs:complexContent>
+			<xs:extension base="wsnt:FilterType">
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+-->
+	<!--===============================-->
+	<xs:complexType name="PTZPositionFilter">
+		<xs:sequence>
+			<xs:element name="MinPosition" type="tt:PTZVector">
+				<xs:annotation>
+					<xs:documentation>The lower boundary of the PTZ volume to look for.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxPosition" type="tt:PTZVector">
+				<xs:annotation>
+					<xs:documentation>The upper boundary of the PTZ volume to look for.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EnterOrExit" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>If true, search for when entering the specified PTZ volume.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataFilter">
+		<xs:sequence>
+			<xs:element name="MetadataStreamFilter" type="tt:XPathExpression"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="XPathExpression">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="FindRecordingResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecordingInformation" type="tt:RecordingInformation" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A RecordingInformation structure for each found recording matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindEventResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Result" type="tt:FindEventResult" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A FindEventResult structure for each found event matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindEventResult">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>The recording where this event was found. Empty string if no recording is associated with this event.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the track where this event was found. Empty string if no track is associated with this event.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Time" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The time when the event occured.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+<!--
+			<xs:element name="Event" type="wsnt:NotificationMessageHolderType">
+-->
+			<xs:element name="Event" type="xs:anyType">
+				<xs:annotation>
+					<xs:documentation>The description of the event.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StartStateEvent" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>If true, indicates that the event is a virtual event generated for this particular search session to give the state of a property at the start time of the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindPTZPositionResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Result" type="tt:FindPTZPositionResult" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A FindPTZPositionResult structure for each found PTZ position matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindPTZPositionResult">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the recording containing the PTZ position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the metadata track containing the PTZ position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Time" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The time when the PTZ position was valid.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Position" type="tt:PTZVector">
+				<xs:annotation>
+					<xs:documentation>The PTZ position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindMetadataResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Result" type="tt:FindMetadataResult" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A FindMetadataResult structure for each found set of Metadata matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindMetadataResult">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the recording containing the metadata.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the metadata track containing the matching metadata.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Time" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The point in time when the matching metadata occurs in the metadata track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="SearchState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Queued">
+				<xs:annotation>
+					<xs:documentation>The search is queued and not yet started.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Searching">
+				<xs:annotation>
+					<xs:documentation>The search is underway and not yet completed.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Completed">
+				<xs:annotation>
+					<xs:documentation>The search has been completed and no new results will be found.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>The state of the search is unknown. (This is not a valid response from GetSearchState.)</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="JobToken">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingInformation">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference"/>
+			<xs:element name="Source" type="tt:RecordingSourceInformation">
+				<xs:annotation>
+					<xs:documentation>
+					Information about the source of the recording. This gives a description of where the data in the recording comes from. Since a single
+					recording is intended to record related material, there is just one source. It is indicates the physical location or the
+					major data source for the recording. Currently the recordingconfiguration cannot describe each individual data source.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EarliestRecording" type="xs:dateTime" minOccurs="0"/>
+			<xs:element name="LatestRecording" type="xs:dateTime" minOccurs="0"/>
+			<xs:element name="Content" type="tt:Description"/>
+			<xs:element name="Track" type="tt:TrackInformation" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecordingStatus" type="tt:RecordingStatus"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingSourceInformation">
+		<xs:annotation>
+			<xs:documentation>
+				A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SourceId" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>
+				Identifier for the source chosen by the client that creates the structure.
+				This identifier is opaque to the device. Clients may use any type of URI for this field. A device shall support at least 128 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Name" type="tt:Name">
+				<xs:annotation>
+					<xs:documentation>Informative user readable name of the source, e.g. "Camera23". A device shall support at least 20 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Location" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the physical location of the source, e.g. the coordinates on a map.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Description" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the source.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Address" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>URI provided by the service supplying data to be recorded. A device shall support at least 128 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Initiated"/>
+			<xs:enumeration value="Recording"/>
+			<xs:enumeration value="Stopped"/>
+			<xs:enumeration value="Removing"/>
+			<xs:enumeration value="Removed"/>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="TrackInformation">
+		<xs:sequence>
+			<xs:element name="TrackToken" type="tt:TrackReference"/>
+			<xs:element name="TrackType" type="tt:TrackType">
+				<xs:annotation>
+					<xs:documentation>Type of the track: "Video", "Audio" or "Metadata".
+					The track shall only be able to hold data of that type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Description" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the contents of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DataFrom" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The start date and time of the oldest recorded data in the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DataTo" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The stop date and time of the newest recorded data in the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="TrackType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Video"/>
+			<xs:enumeration value="Audio"/>
+			<xs:enumeration value="Metadata"/>
+			<xs:enumeration value="Extended">
+				<xs:annotation>
+					<xs:documentation>Placeholder for future extension.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="MediaAttributes">
+		<xs:annotation>
+			<xs:documentation>A set of media attributes valid for a recording at a point in time or for a time interval.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the recording that has these attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackAttributes" type="tt:TrackAttributes" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A set of attributes for each track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="From" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The attributes are valid from this point in time in the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Until" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The attributes are valid until this point in time in the recording. Can be equal to 'From' to indicate that the attributes are only known to be valid for this particular point in time.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TrackAttributes">
+		<xs:sequence>
+			<xs:element name="TrackInformation" type="tt:TrackInformation">
+				<xs:annotation>
+					<xs:documentation>The basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoAttributes" type="tt:VideoAttributes" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the track is a video track, exactly one of this structure shall be present and contain the video attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioAttributes" type="tt:AudioAttributes" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the track is an audio track, exactly one of this structure shall be present and contain the audio attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MetadataAttributes" type="tt:MetadataAttributes" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the track is an metadata track, exactly one of this structure shall be present and contain the metadata attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:TrackAttributesExtension" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation/>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TrackAttributesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoAttributes">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Average bitrate in kbps.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Width" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The width of the video in pixels.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Height" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The height of the video in pixels.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Encoding" type="tt:VideoEncoding">
+				<xs:annotation>
+					<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Framerate" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Average framerate in frames per second.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioAttributes">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The bitrate in kbps.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Encoding" type="tt:AudioEncoding">
+				<xs:annotation>
+					<xs:documentation>Audio codec used for encoding the audio (either G.711, G.726 or AAC)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Samplerate" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The sample rate in kHz.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataAttributes">
+		<xs:sequence>
+			<xs:element name="CanContainPTZ" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates that there can be PTZ data in the metadata track in the specified time interval.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CanContainAnalytics" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates that there can be analytics data in the metadata track in the specified time interval.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CanContainNotifications" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates that there can be notifications in the metadata track in the specified time interval.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="PtzSpaces" type="tt:StringAttrList">
+			<xs:annotation>
+				<xs:documentation>List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. </xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         RecordingService Types         		  -->
+	<!--===============================-->
+	<!--===============================-->
+	<xs:simpleType name="RecordingJobReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingConfiguration">
+		<xs:sequence>
+			<xs:element name="Source" type="tt:RecordingSourceInformation">
+				<xs:annotation>
+					<xs:documentation>Information about the source of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Content" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the source.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaximumRetentionTime" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>Sspecifies the maximum time that data in any track within the
+				recording shall be stored. The device shall delete any data older than the maximum retention
+				time. Such data shall not be accessible anymore. If the MaximumRetentionPeriod is set to 0,
+				the device shall not limit the retention time of stored data, except by resource constraints.
+				Whatever the value of MaximumRetentionTime, the device may automatically delete
+				recordings to free up storage space for new recordings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TrackConfiguration">
+		<xs:sequence>
+			<xs:element name="TrackType" type="tt:TrackType">
+				<xs:annotation>
+					<xs:documentation>Type of the track. It shall be equal to the strings “Video”,
+				“Audio” or “Metadata”. The track shall only be able to hold data of that type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Description" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetRecordingsResponseItem">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>Token of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Configuration" type="tt:RecordingConfiguration">
+				<xs:annotation>
+					<xs:documentation>Configuration of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tracks" type="tt:GetTracksResponseList">
+				<xs:annotation>
+					<xs:documentation>List of tracks.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetTracksResponseList">
+		<xs:sequence>
+			<xs:element name="Track" type="tt:GetTracksResponseItem" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Configuration of a track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetTracksResponseItem">
+		<xs:sequence>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>Token of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Configuration" type="tt:TrackConfiguration">
+				<xs:annotation>
+					<xs:documentation>Configuration of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobConfiguration">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>Identifies the recording to which this job shall store the received data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mode" type="tt:RecordingJobMode">
+				<xs:annotation>
+					<xs:documentation>The mode of the job. If it is idle, nothing shall happen. If it is active, the device shall try
+				to obtain data from the receivers. A client shall use GetRecordingJobState to determine if data transfer is really taking place.<br/>
+				The only valid values for Mode shall be “Idle” and “Active”.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>This shall be a non-negative number. If there are multiple recording jobs that store data to
+				the same track, the device will only store the data for the recording job with the highest
+				priority. The priority is specified per recording job, but the device shall determine the priority
+				of each track individually. If there are two recording jobs with the same priority, the device
+				shall record the data corresponding to the recording job that was activated the latest.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Source" type="tt:RecordingJobSource" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Source of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RecordingJobConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingJobMode">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobSource">
+		<xs:sequence>
+			<xs:element name="SourceToken" type="tt:SourceReference" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>This field shall be a reference to the source of the data. The type of the source
+				is determined by the attribute Type in the SourceToken structure. If Type is
+				http://www.onvif.org/ver10/schema/Receiver, the token is a ReceiverReference. In this case
+				the device shall receive the data over the network. If Type is
+				http://www.onvif.org/ver10/schema/Profile, the token identifies a media profile, instructing the
+				device to obtain data from a profile that exists on the local device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoCreateReceiver" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If this field is TRUE, and if the SourceToken is omitted, the device
+				shall create a receiver object (through the receiver service) and assign the
+				ReceiverReference to the SourceToken field. When retrieving the RecordingJobConfiguration
+				from the device, the AutoCreateReceiver field shall never be present.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tracks" type="tt:RecordingJobTrack" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of tracks associated with the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RecordingJobSourceExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobSourceExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobTrack">
+		<xs:sequence>
+			<xs:element name="SourceTag" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>If the received RTSP stream contains multiple tracks of the same type, the
+						SourceTag differentiates between those Tracks. This field can be ignored in case of recording a local source.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Destination" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>The destination is the tracktoken of the track to which the device shall store the
+				received data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateInformation">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>Identification of the recording that the recording job records to.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:RecordingJobState">
+				<xs:annotation>
+					<xs:documentation>Holds the aggregated state over the whole RecordingJobInformation structure.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sources" type="tt:RecordingJobStateSource" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RecordingJobStateInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingJobState">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateSource">
+		<xs:sequence>
+			<xs:element name="SourceToken" type="tt:SourceReference">
+				<xs:annotation>
+					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:RecordingJobState">
+				<xs:annotation>
+					<xs:documentation>Holds the aggregated state over all substructures of RecordingJobStateSource.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tracks" type="tt:RecordingJobStateTracks">
+				<xs:annotation>
+					<xs:documentation>List of track items.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateTracks">
+		<xs:sequence>
+			<xs:element name="Track" type="tt:RecordingJobStateTrack" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateTrack">
+		<xs:sequence>
+			<xs:element name="SourceTag" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Identifies the track of the data source that provides the data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Destination" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>Indicates the destination track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optionally holds an implementation defined string value that describes the error.
+				The string should be in the English language.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:RecordingJobState">
+				<xs:annotation>
+					<xs:documentation>Provides the job state of the track. The valid
+				values of state shall be “Idle”, “Active” and “Error”. If state equals “Error”, the Error field may be filled in with an implementation defined value.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetRecordingJobsResponseItem">
+		<xs:sequence>
+			<xs:element name="JobToken" type="tt:RecordingJobReference"/>
+			<xs:element name="JobConfiguration" type="tt:RecordingJobConfiguration"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         End, RecordingService Types         		  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--         Replay Types         		  -->
+	<!--===============================-->
+	<xs:complexType name="ReplayConfiguration">
+		<xs:annotation>
+			<xs:documentation>
+      Configuration parameters for the replay service.
+    </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SessionTimeout" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>The RTSP session timeout.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         End, Replay Types         		  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--         Analytics Device Types         -->
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngine">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsDeviceEngineConfiguration"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceEngineConfiguration">
+		<xs:sequence>
+			<xs:element name="EngineConfiguration" type="tt:EngineConfiguration" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:AnalyticsDeviceEngineConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceEngineConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EngineConfiguration">
+		<xs:sequence>
+			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
+			<xs:element name="AnalyticsEngineInputInfo" type="tt:AnalyticsEngineInputInfo"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineInputInfo">
+		<xs:sequence>
+			<xs:element name="InputInfo" type="tt:Config" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:AnalyticsEngineInputInfoExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineInputInfoExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineInput">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="SourceIdentification" type="tt:SourceIdentification"/>
+					<xs:element name="VideoInput" type="tt:VideoEncoderConfiguration"/>
+					<xs:element name="MetadataInput" type="tt:MetadataInput"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SourceIdentification">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string"/>
+			<xs:element name="Token" type="tt:ReferenceToken" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:SourceIdentificationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SourceIdentificationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataInput">
+		<xs:sequence>
+			<xs:element name="MetadataConfig" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:MetadataInputExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataInputExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineControl">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="EngineToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the analytics engine (AnalyticsEngine) being controlled.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="EngineConfigToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the analytics engine configuration (VideoAnalyticsConfiguration) in effect.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="InputToken" type="tt:ReferenceToken" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>Tokens of the input (AnalyticsEngineInput) configuration applied.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ReceiverToken" type="tt:ReferenceToken" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>Tokens of the receiver providing media input data. The order of ReceiverToken shall exactly match the order of InputToken.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0"/>
+					<xs:element name="Subscription" type="tt:Config"/>
+					<xs:element name="Mode" type="tt:ModeOfOperation"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ModeOfOperation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Idle"/>
+			<xs:enumeration value="Active"/>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsStateInformation">
+		<xs:sequence>
+			<xs:element name="AnalyticsEngineControlToken" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Token of the control object whose status is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:AnalyticsState"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsState">
+		<xs:sequence>
+			<xs:element name="Error" type="xs:string" minOccurs="0"/>
+			<xs:element name="State" type="xs:string"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         End, Analytics Device Types         -->
+	<!--===============================-->
+	<!--=========================================-->
+	<!--  Action event payload Types   -->
+	<!--=========================================-->
+	<!--===============================-->
+	<xs:complexType name="ActionEngineEventPayload">
+		<xs:annotation>
+			<xs:documentation>Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="RequestInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>Request Message</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ResponseInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>Response Message</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Fault" type="soapenv:Fault" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>Fault Message</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ActionEngineEventPayloadExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ActionEngineEventPayloadExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--=========================================-->
+	<!--  End, Action event payload Types   -->
+	<!--=========================================-->
+        <!--=========================================-->
+	<!--  Begin, Audio event types               -->
+	<!--=========================================-->
+	<xs:simpleType name="AudioClassType">
+		<xs:annotation>
+		<xs:documentation>
+		  AudioClassType acceptable values are;
+		   gun_shot, scream, glass_breaking, tire_screech   
+		</xs:documentation>
+		</xs:annotation>
+	<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:complexType name="AudioClassCandidate">
+	<xs:sequence>
+		<xs:element name="Type" type="tt:AudioClassType">
+			<xs:annotation>
+			<xs:documentation>Indicates audio class label</xs:documentation>
+			</xs:annotation>
+		</xs:element> 
+ 		<xs:element name="Likelihood" type="xs:float">
+			<xs:annotation>
+			<xs:documentation>A likelihood/probability that the corresponding audio event belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
+			</xs:annotation>
+		</xs:element>  
+		<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+	</xs:sequence>
+	<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+
+	<xs:complexType name="AudioClassDescriptor">
+	<xs:sequence>
+		<xs:element name="ClassCandidate" type="tt:AudioClassCandidate" minOccurs="0" maxOccurs="unbounded">
+			<xs:annotation>
+			<xs:documentation>Array of audio class label and class probability</xs:documentation>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="Extension" type="tt:AudioClassDescriptorExtension" minOccurs="0"/>
+	</xs:sequence>
+	<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<xs:complexType name="AudioClassDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--=========================================-->
+	<!--  End, Audio event types                 -->
+	<!--=========================================-->	
+	<!--==================================-->
+	<!--  Begin, OSD Device Types         -->
+	<!--==================================-->
+	<xs:complexType name="OSDReference">
+		<xs:simpleContent>
+			<xs:extension base="tt:ReferenceToken">
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="OSDType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Text"/>
+			<xs:enumeration value="Image"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="OSDPosConfiguration">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>For OSD position type, following are the pre-defined: <ul><li>UpperLeft</li>
+						<li>UpperRight</li>
+						<li>LowerLeft</li>
+						<li>LowerRight</li>
+						<li>Custom</li></ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Pos" type="tt:Vector" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:OSDPosConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDPosConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDColor">
+		<xs:annotation>
+			<xs:documentation>The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Color" type="tt:Color"/>
+		</xs:sequence>
+		<xs:attribute name="Transparent" type="xs:int" use="optional"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextConfiguration">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>
+						The following OSD Text Type are defined:<ul>
+							<li>Plain - The Plain type means the OSD is shown as a text string which defined in the "PlainText" item.</li>
+							<li>Date - The Date type means the OSD is shown as a date, format of which should be present in the "DateFormat" item.</li>
+							<li>Time - The Time type means the OSD is shown as a time, format of which should be present in the "TimeFormat" item.</li>
+							<li>DateAndTime - The DateAndTime type means the OSD is shown as date and time, format of which should be present in the "DateFormat" and the "TimeFormat" item.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DateFormat" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+						List of supported OSD date formats. This element shall be present when the value of Type field has Date or DateAndTime. The following DateFormat are defined:<ul>
+							<li>M/d/yyyy - e.g. 3/6/2013</li>
+							<li>MM/dd/yyyy - e.g. 03/06/2013</li>
+							<li>dd/MM/yyyy - e.g. 06/03/2013</li>
+							<li>yyyy/MM/dd - e.g. 2013/03/06</li>
+							<li>yyyy-MM-dd - e.g. 2013-06-03</li>
+							<li>dddd, MMMM dd, yyyy - e.g. Wednesday, March 06, 2013</li>
+							<li>MMMM dd, yyyy - e.g. March 06, 2013</li>
+							<li>dd MMMM, yyyy - e.g. 06 March, 2013</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TimeFormat" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+						List of supported OSD time formats. This element shall be present when the value of Type field has Time or DateAndTime. The following TimeFormat are defined:<ul>
+							<li>h:mm:ss tt - e.g. 2:14:21 PM</li>
+							<li>hh:mm:ss tt - e.g. 02:14:21 PM</li>
+							<li>H:mm:ss - e.g. 14:14:21</li>
+							<li>HH:mm:ss - e.g. 14:14:21</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontSize" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Font size of the text in pt.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontColor" type="tt:OSDColor" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Font color of the text.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BackgroundColor" type="tt:OSDColor" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Background color of the text.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PlainText" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The content of text to be displayed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDTextConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgConfiguration">
+		<xs:sequence>
+			<xs:element name="ImgPath" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>The URI of the image which to be displayed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDImgConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorspaceRange">
+		<xs:sequence>
+			<xs:element name="X" type="tt:FloatRange"/>
+			<xs:element name="Y" type="tt:FloatRange"/>
+			<xs:element name="Z" type="tt:FloatRange"/>
+			<xs:element name="Colorspace" type="xs:anyURI"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorOptions">
+		<xs:annotation>
+			<xs:documentation>Describe the option of the color supported. Either list each color or define the range of color value. The following values are acceptable for Colourspace attribute.<ul><li>http://www.onvif.org/ver10/colorspace/YCbCr - YCbCr colourspace</li>
+				<li>http://www.onvif.org/ver10/colorspace/CIELUV - CIE LUV</li>
+				<li>http://www.onvif.org/ver10/colorspace/CIELAB - CIE 1976 (L*a*b*)</li>
+				<li>http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace</li></ul>
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:choice>
+				<xs:element name="ColorList" type="tt:Color" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>List the supported color.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ColorspaceRange" type="tt:ColorspaceRange" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>Define the rang of color supported.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:choice>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDColorOptions">
+		<xs:annotation>
+			<xs:documentation>Describe the option of the color and its transparency.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Color" type="tt:ColorOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional list of supported colors.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Transparent" type="tt:IntRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Range of the transparent level. Larger means more tranparent.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDColorOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDColorOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextOptions">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported OSD text type. When a device indicates the supported number relating to Text type in MaximumNumberOfOSDs, the type shall be presented.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontSizeRange" type="tt:IntRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Range of the font size value.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DateFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported date format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TimeFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported time format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontColor" type="tt:OSDColorOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>List of supported font color.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BackgroundColor" type="tt:OSDColorOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>List of supported background color.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDTextOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgOptions">
+		<xs:sequence>
+			<xs:element name="ImagePath" type="xs:anyURI" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of avaiable uris of image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDImgOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="VideoSourceConfigurationToken" type="tt:OSDReference">
+						<xs:annotation>
+							<xs:documentation>Reference to the video source configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Type" type="tt:OSDType">
+						<xs:annotation>
+							<xs:documentation>Type of OSD.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Position" type="tt:OSDPosConfiguration">
+						<xs:annotation>
+							<xs:documentation>Position configuration of OSD.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TextString" type="tt:OSDTextConfiguration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Text configuration of OSD. It shall be present when the value of Type field is Text.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Image" type="tt:OSDImgConfiguration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Image configuration of OSD. It shall be present when the value of Type field is Image</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:OSDConfigurationExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MaximumNumberOfOSDs">
+		<xs:attribute name="Total" type="xs:int" use="required"/>
+		<xs:attribute name="Image" type="xs:int"/>
+		<xs:attribute name="PlainText" type="xs:int"/>
+		<xs:attribute name="Date" type="xs:int"/>
+		<xs:attribute name="Time" type="xs:int"/>
+		<xs:attribute name="DateAndTime" type="xs:int"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="MaximumNumberOfOSDs" type="tt:MaximumNumberOfOSDs">
+				<xs:annotation>
+					<xs:documentation>The maximum number of OSD configurations supported for the specificate video source configuration. If a device limits the number of instances by OSDType, it should indicate the supported number via the related attribute.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Type" type="tt:OSDType" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List supported type of OSD configuration. When a device indicates the supported number for each types in MaximumNumberOfOSDs, related type shall be presented. A device shall return Option element relating to listed type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PositionOption" type="xs:string" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List available OSD position type. Following are the pre-defined:<ul><li>UpperLeft</li>
+						<li>UpperRight</li>
+						<li>LowerLeft</li>
+						<li>LowerRight</li>
+						<li>Custom</li></ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TextOption" type="tt:OSDTextOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Option of the OSD text configuration. This element shall be returned if the device is signaling the support for Text.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ImageOption" type="tt:OSDImgOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Option of the OSD image configuration. This element shall be returned if the device is signaling the support for Image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--=========================================-->
+	<!--  End, OSD Device Types                  -->
+	<!--=========================================-->
+</xs:schema>
diff --git a/onvif/wsdl/onvif.xsd b/onvif/wsdl/onvif.xsd
new file mode 100644
index 000000000..252204e2f
--- /dev/null
+++ b/onvif/wsdl/onvif.xsd
@@ -0,0 +1,8559 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<?xml-stylesheet type="text/xsl" href="onvif-schema-viewer.xsl"?>-->
+<!--
+Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
+
+Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
+-->
+<xs:schema xmlns:tt="http://www.onvif.org/ver10/schema" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns:xmime="http://www.w3.org/2005/05/xmlmime" 
+           xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" 
+           xmlns:xop="http://www.w3.org/2004/08/xop/include" 
+           xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
+           targetNamespace="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="2.4.2">
+	<xs:import namespace="http://www.w3.org/2005/05/xmlmime" schemaLocation="http://www.w3.org/2005/05/xmlmime"/>
+	<xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/" schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
+<!--
+	<xs:import namespace="http://docs.oasis-open.org/wsn/b-2" schemaLocation="file:b-2.xsd"/>
+-->
+	<xs:import namespace="http://www.w3.org/2004/08/xop/include" schemaLocation="http://www.w3.org/2004/08/xop/include"/>
+	<!--===============================-->
+	<!--         Generic Types         -->
+	<!--===============================-->
+	<xs:complexType name="DeviceEntity">
+		<xs:annotation>
+			<xs:documentation>Base class for physical entities like inputs and outputs.</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+			<xs:annotation>
+				<xs:documentation>Unique identifier referencing the physical entity.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ReferenceToken">
+		<xs:annotation>
+			<xs:documentation>Unique identifier for a physical or logical resource.
+			Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class.
+			Length up to 64 characters.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="64"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Name">
+		<xs:annotation>
+			<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="64"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="IntRectangle">
+		<xs:annotation>
+			<xs:documentation>Rectangle defined by lower left corner position and size. Units are pixel.</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="x" type="xs:int" use="required"/>
+		<xs:attribute name="y" type="xs:int" use="required"/>
+		<xs:attribute name="width" type="xs:int" use="required"/>
+		<xs:attribute name="height" type="xs:int" use="required"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IntRectangleRange">
+		<xs:annotation>
+			<xs:documentation>Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="XRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of X-axis.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="YRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of Y-axis.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WidthRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of width.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HeightRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of height.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IntRange">
+		<xs:annotation>
+			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Min" type="xs:int"/>
+			<xs:element name="Max" type="xs:int"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FloatRange">
+		<xs:annotation>
+			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Min" type="xs:float"/>
+			<xs:element name="Max" type="xs:float"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DurationRange">
+		<xs:annotation>
+			<xs:documentation>Range of duration greater equal Min duration and less equal Max duration.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Min" type="xs:duration"/>
+			<xs:element name="Max" type="xs:duration"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IntList">
+		<xs:annotation>
+			<xs:documentation>List of values.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Items" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IntAttrList">
+		<xs:list itemType="xs:int"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="FloatAttrList">
+		<xs:list itemType="xs:float"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="StringAttrList">
+		<xs:list itemType="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="FloatList">
+		<xs:sequence>
+			<xs:element name="Items" type="xs:float" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnyHolder">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--      End, Generic Types       -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Media Related Types      -->
+	<!--===============================-->
+	<xs:complexType name="VideoSource">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical video input.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Framerate" type="xs:float">
+						<xs:annotation>
+							<xs:documentation>Frame rate in frames per second.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Resolution" type="tt:VideoResolution">
+						<xs:annotation>
+							<xs:documentation>Horizontal and vertical resolution</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Imaging" type="tt:ImagingSettings" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional configuration of the image sensor.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:VideoSourceExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Imaging" type="tt:ImagingSettings20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the image sensor. To be used if imaging service 2.00 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioSource">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical audio input.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Channels" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>number of available audio channels. (1: mono, 2: stereo) </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Profile">
+		<xs:annotation>
+			<xs:documentation>
+			A media profile consists of a set of media configurations. Media profiles are used by a client
+			to configure properties of a media stream from an NVT.<br/>
+			An NVT shall provide at least one media profile at boot. An NVT should provide “ready to use”
+			profiles for the most common media configurations that the device offers.<br/>
+			A profile consists of a set of interconnected configuration entities. Configurations are provided
+			by the NVT and can be either static or created dynamically by the NVT. For example, the
+			dynamic configurations can be created by the NVT depending on current available encoding
+			resources.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name">
+				<xs:annotation>
+					<xs:documentation>User readable name of the profile.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Video input.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio input.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Video encoder.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio encoder.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the video analytics module and rule engine.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the pan tilt zoom unit.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the metadata stream.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ProfileExtension" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Extensions defined in ONVIF 2.0</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+			<xs:annotation>
+				<xs:documentation>Unique identifier of the profile.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="fixed" type="xs:boolean">
+			<xs:annotation>
+				<xs:documentation>A value of true signals that the profile cannot be deleted. Default is false.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ProfileExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio output.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional configuration of the Audio decoder.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ProfileExtension2" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ProfileExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration"/>
+	<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration"/>
+	<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration"/>
+	<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration"/>
+	<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
+	<xs:element name="PTZConfiguration" type="tt:PTZConfiguration"/>
+	<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration"/>
+	<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration"/>
+	<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration"/>
+	<!--===============================-->
+	<xs:complexType name="ConfigurationEntity">
+		<xs:annotation>
+			<xs:documentation>Base type defining the common properties of a configuration.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name">
+				<xs:annotation>
+					<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UseCount" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Number of internal references currently using this configuration. <br/>This parameter is read-only and cannot be changed by a set request. <br/>For example the value increases if the configuration is added to a media profile or attached to a PaneConfiguration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
+			<xs:annotation>
+				<xs:documentation>Token that uniquely refernces this configuration. Length up to 64 characters.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   VideoSourceConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="SourceToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Reference to the physical input.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Bounds" type="tt:IntRectangle">
+						<xs:annotation>
+							<xs:documentation>Rectangle specifying the Video capturing area. The capturing area shall not be larger than the whole Video source area.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationExtension">
+		<xs:sequence>
+			<xs:element name="Rotate" type="tt:Rotate" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure rotation of captured image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Rotate">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:RotateMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable Rotation feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Degree" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to configure how much degree of clockwise rotation of image  for On mode. Omitting this parameter for On mode means 180 degree rotation.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RotateExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RotateExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RotateMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="AUTO"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="BoundsRange" type="tt:IntRectangleRange">
+				<xs:annotation>
+					<xs:documentation>Supported range for the capturing area.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoSourceTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of physical inputs.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Rotate" type="tt:RotateOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Options of parameters for Rotation feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoSourceConfigurationOptionsExtension2">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RotateOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:RotateMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options of Rotate mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DegreeList" type="tt:IntList" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>List of supported degree value for rotation.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RotateOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RotateOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   VideoEncoderConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="Encoding" type="tt:VideoEncoding">
+						<xs:annotation>
+							<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Resolution" type="tt:VideoResolution">
+						<xs:annotation>
+							<xs:documentation>Configured video resolution</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Quality" type="xs:float">
+						<xs:annotation>
+							<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RateControl" type="tt:VideoRateControl" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MPEG4" type="tt:Mpeg4Configuration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure Mpeg4 related parameters.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="H264" type="tt:H264Configuration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure H.264 related parameters.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration">
+						<xs:annotation>
+							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SessionTimeout" type="xs:duration">
+						<xs:annotation>
+							<xs:documentation>The rtsp session timeout for the related video stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="VideoEncoding">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="JPEG"/>
+			<xs:enumeration value="MPEG4"/>
+			<xs:enumeration value="H264"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Mpeg4Profile">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="SP"/>
+			<xs:enumeration value="ASP"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="H264Profile">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Baseline"/>
+			<xs:enumeration value="Main"/>
+			<xs:enumeration value="Extended"/>
+			<xs:enumeration value="High"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="VideoResolution">
+		<xs:sequence>
+			<xs:element name="Width" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Number of the columns of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Height" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Number of the lines of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoRateControl">
+		<xs:sequence>
+			<xs:element name="FrameRateLimit" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Maximum output framerate in fps. If an EncodingInterval is provided the resulting encoded framerate will be reduced by the given factor.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingInterval" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Interval at which images are encoded and transmitted. (A value of 1 means that every frame is encoded, a value of 2 means that every 2nd frame is encoded ...)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BitrateLimit" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>the maximum output bitrate in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4Configuration">
+		<xs:sequence>
+			<xs:element name="GovLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Determines the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mpeg4Profile" type="tt:Mpeg4Profile">
+				<xs:annotation>
+					<xs:documentation>the Mpeg4 profile, either simple profile (SP) or advanced simple profile (ASP)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264Configuration">
+		<xs:sequence>
+			<xs:element name="GovLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Group of Video frames length. Determines typically the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264Profile" type="tt:H264Profile">
+				<xs:annotation>
+					<xs:documentation>the H.264 profile, either baseline, main, extended or high</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="QualityRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Range of the quality values. A high value means higher quality.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="JPEG" type="tt:JpegOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional JPEG encoder settings ranges (See also Extension element).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MPEG4" type="tt:Mpeg4Options" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional MPEG-4 encoder settings ranges (See also Extension element).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264" type="tt:H264Options" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional H.264 encoder settings ranges (See also Extension element).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="JPEG" type="tt:JpegOptions2" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional JPEG encoder settings ranges.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MPEG4" type="tt:Mpeg4Options2" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional MPEG-4 encoder settings ranges.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264" type="tt:H264Options2" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional H.264 encoder settings ranges.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoEncoderOptionsExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="JpegOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported image sizes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FrameRateRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="JpegOptions2">
+		<xs:complexContent>
+			<xs:extension base="tt:JpegOptions">
+				<xs:sequence>
+					<xs:element name="BitrateRange" type="tt:IntRange">
+						<xs:annotation>
+							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4Options">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported image sizes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GovLengthRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FrameRateRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mpeg4ProfilesSupported" type="tt:Mpeg4Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported MPEG-4 profiles.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4Options2">
+		<xs:complexContent>
+			<xs:extension base="tt:Mpeg4Options">
+				<xs:sequence>
+					<xs:element name="BitrateRange" type="tt:IntRange">
+						<xs:annotation>
+							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264Options">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported image sizes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GovLengthRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FrameRateRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264ProfilesSupported" type="tt:H264Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported H.264 profiles.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264Options2">
+		<xs:complexContent>
+			<xs:extension base="tt:H264Options">
+				<xs:sequence>
+					<xs:element name="BitrateRange" type="tt:IntRange">
+						<xs:annotation>
+							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--    AudioSourceConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="AudioSourceConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="SourceToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the Audio Source the configuration applies to</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioSourceConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="InputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Tokens of the audio source the configuration can be used for.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:AudioSourceOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioSourceOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   AudioEncoderConfiguration   -->
+	<!--===============================-->
+	<xs:complexType name="AudioEncoderConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="Encoding" type="tt:AudioEncoding">
+						<xs:annotation>
+							<xs:documentation>Audio codec used for encoding the audio input (either G.711, G.726 or AAC)</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Bitrate" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>The output bitrate in kbps.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SampleRate" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>The output sample rate in kHz.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration">
+						<xs:annotation>
+							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SessionTimeout" type="xs:duration">
+						<xs:annotation>
+							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="AudioEncoding">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="G711"/>
+			<xs:enumeration value="G726"/>
+			<xs:enumeration value="AAC"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="AudioEncoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="Options" type="tt:AudioEncoderConfigurationOption" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>list of supported AudioEncoderConfigurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioEncoderConfigurationOption">
+		<xs:sequence>
+			<xs:element name="Encoding" type="tt:AudioEncoding">
+				<xs:annotation>
+					<xs:documentation>The enoding used for audio data (either G.711, G.726 or AAC)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BitrateList" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps for the specified Encoding</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateList" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported Sample Rates in kHz for the specified Encoding</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--  VideoAnalyticsConfiguration  -->
+	<!--===============================-->
+	<xs:complexType name="VideoAnalyticsConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration"/>
+					<xs:element name="RuleEngineConfiguration" type="tt:RuleEngineConfiguration"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--    MetadataConfiguration      -->
+	<!--===============================-->
+	<xs:complexType name="MetadataConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="PTZStatus" type="tt:PTZFilter" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>optional element to configure which PTZ related data is to include in the metadata stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Events" type="tt:EventSubscription" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Optional element to configure the streaming of events. A client might be interested in receiving all, 
+								none or some of the events produced by the device:<ul>
+									<li>To get all events: Include the Events element but do not include a filter.</li>
+									<li>To get no events: Do not include the Events element.</li>
+									<li>To get only some events: Include the Events element and include a filter in the element.</li>
+								</ul>
+							</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Analytics" type="xs:boolean" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Defines whether the streamed metadata will include metadata from the analytics engines (video, cell motion, audio etc.)</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration">
+						<xs:annotation>
+							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SessionTimeout" type="xs:duration">
+						<xs:annotation>
+							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration" minOccurs="0"/>
+					<xs:element name="Extension" type="tt:MetadataConfigurationExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZFilter">
+		<xs:sequence>
+			<xs:element name="Status" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the metadata stream shall contain the PTZ status (IDLE, MOVING or UNKNOWN)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Position" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the metadata stream shall contain the PTZ position</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventSubscription">
+		<xs:annotation>
+			<xs:documentation>Subcription handling in the same way as base notification subscription.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Filter" type="wsnt:FilterType" minOccurs="0"/>
+			<xs:element name="SubscriptionPolicy" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="PTZStatusFilterOptions" type="tt:PTZStatusFilterOptions"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStatusFilterOptions">
+		<xs:sequence>
+			<xs:element name="PanTiltStatusSupported" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream pan or tilt status information.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomStatusSupported" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream zoom status inforamtion.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="PanTiltPositionSupported" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream the pan or tilt position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomPositionSupported" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>True if the device is able to stream zoom position information.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZStatusFilterOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStatusFilterOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoOutput            -->
+	<!--===============================-->
+	<xs:complexType name="VideoOutput">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical video outputs.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Layout" type="tt:Layout"/>
+					<xs:element name="Resolution" type="tt:VideoResolution" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Resolution of the display in Pixel.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RefreshRate" type="xs:float" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Refresh rate of the display in Hertz.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AspectRatio" type="xs:float" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Aspect ratio of the display as physical extent of width divided by height.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:VideoOutputExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoOutputExtension">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoOutputConfiguration            -->
+	<!--===============================-->
+	<xs:complexType name="VideoOutputConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="OutputToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the Video Output the configuration applies to</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoOutputConfigurationOptions            -->
+	<!--===============================-->
+	<xs:complexType name="VideoOutputConfigurationOptions">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          VideoDecoderConfigurationOptions            -->
+	<!--===============================-->
+	<xs:complexType name="VideoDecoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="JpegDecOptions" type="tt:JpegDecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode Jpeg streams this element describes the supported codecs and configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="H264DecOptions" type="tt:H264DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode H.264 streams this element describes the supported codecs and configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mpeg4DecOptions" type="tt:Mpeg4DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode Mpeg4 streams this element describes the supported codecs and configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:VideoDecoderConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="H264DecOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported H.264 Video Resolutions</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedH264Profiles" type="tt:H264Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported H264 Profiles (either baseline, main, extended or high) </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported H.264 bitrate range in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedFrameRate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported H.264 framerate range in fps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="JpegDecOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported Jpeg Video Resolutions</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Jpeg bitrate range in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedFrameRate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Jpeg framerate range in fps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Mpeg4DecOptions">
+		<xs:sequence>
+			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported Mpeg4 Video Resolutions</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedMpeg4Profiles" type="tt:Mpeg4Profile" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported Mpeg4 Profiles (either SP or ASP) </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Mpeg4 bitrate range in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedFrameRate" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Supported Mpeg4 framerate range in fps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoDecoderConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioOutputs            -->
+	<!--===============================-->
+	<xs:complexType name="AudioOutput">
+		<xs:annotation>
+			<xs:documentation>Representation of a physical audio outputs.</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioOutputConfiguration            -->
+	<!--===============================-->
+	<xs:complexType name="AudioOutputConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="OutputToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the phsycial Audio output.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SendPrimacy" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+						An audio channel MAY support different types of audio transmission. While for full duplex
+						operation no special handling is required, in half duplex operation the transmission direction
+						needs to be switched.
+						The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
+						direction is currently active. An NVC can switch between different modes by setting the
+						AudioOutputConfiguration.<br/>
+						The following modes for the Send-Primacy are defined:<ul>
+									<li>www.onvif.org/ver20/HalfDuplex/Server
+						The server is allowed to send audio data to the client. The client shall not send
+						audio data via the backchannel to the NVT in this mode.</li>
+									<li>www.onvif.org/ver20/HalfDuplex/Client
+						The client is allowed to send audio data via the backchannel to the server. The
+						NVT shall not send audio data to the client in this mode.</li>
+									<li>www.onvif.org/ver20/HalfDuplex/Auto
+							It is up to the device how to deal with sending and receiving audio data.</li>
+								</ul>
+						Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OutputLevel" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>Volume setting of the output. The applicable range is defined via the option AudioOutputOptions.OutputLevelRange.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioOutputConfigurationOptions            -->
+	<!--===============================-->
+	<xs:complexType name="AudioOutputConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="OutputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Tokens of the physical Audio outputs (typically one).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SendPrimacyOptions" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				An <b>audio</b> channel MAY support different types of audio transmission. While for full duplex
+				operation no special handling is required, in half duplex operation the transmission direction
+				needs to be switched.
+				The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
+				direction is currently active. An NVC can switch between different modes by setting the
+				AudioOutputConfiguration.<br/>
+				The following modes for the Send-Primacy are defined:<ul>
+							<li>www.onvif.org/ver20/HalfDuplex/Server
+						The server is allowed to send audio data to the client. The client shall not send
+						audio data via the backchannel to the NVT in this mode.</li>
+							<li>www.onvif.org/ver20/HalfDuplex/Client
+						The client is allowed to send audio data via the backchannel to the server. The
+						NVT shall not send audio data to the client in this mode.</li>
+							<li>www.onvif.org/ver20/HalfDuplex/Auto
+						It is up to the device how to deal with sending and receiving audio data.</li>
+						</ul>
+				Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="OutputLevelRange" type="tt:IntRange">
+				<xs:annotation>
+					<xs:documentation>Minimum and maximum level range supported for this Output.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioDecoderConfiguration           -->
+	<!--===============================-->
+	<xs:complexType name="AudioDecoderConfiguration">
+		<xs:annotation>
+			<xs:documentation>The Audio Decoder Configuration does not contain any that parameter to configure the
+decoding .A decoder shall decode every data it receives (according to its capabilities).</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          AudioDecoderConfigurationOptions           -->
+	<!--===============================-->
+	<xs:complexType name="AudioDecoderConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="AACDecOptions" type="tt:AACDecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode AAC encoded audio this section describes the supported configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="G711DecOptions" type="tt:G711DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode G711 encoded audio this section describes the supported configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="G726DecOptions" type="tt:G726DecOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device is able to decode G726 encoded audio this section describes the supported configurations</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:AudioDecoderConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="G711DecOptions">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateRange" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AACDecOptions">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateRange" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="G726DecOptions">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SampleRateRange" type="tt:IntList">
+				<xs:annotation>
+					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioDecoderConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--          Streaming            -->
+	<!--===============================-->
+	<xs:complexType name="MulticastConfiguration">
+		<xs:sequence>
+			<xs:element name="Address" type="tt:IPAddress">
+				<xs:annotation>
+					<xs:documentation>The multicast address (if this address is set to 0 no multicast streaming is enaled)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Port" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The RTP mutlicast destination port. A device may support RTCP. In this case the port value shall be even to allow the corresponding RTCP stream to be mapped to the next higher (odd) destination port number as defined in the RTSP specification.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TTL" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>In case of IPv6 the TTL value is assumed as the hop limit. Note that for IPV6 and administratively scoped IPv4 multicast the primary use for hop limit / TTL is to prevent packets from (endlessly) circulating and not limiting scope. In these cases the address contains the scope.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Read only property signalling that streaming is persistant. Use the methods StartMulticastStreaming and StopMulticastStreaming to switch its state.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="StreamSetup">
+		<xs:sequence>
+			<xs:element name="Stream" type="tt:StreamType">
+				<xs:annotation>
+					<xs:documentation>Defines if a multicast or unicast stream is requested</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Transport" type="tt:Transport"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="StreamType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="RTP-Unicast"/>
+			<xs:enumeration value="RTP-Multicast"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Transport">
+		<xs:sequence>
+			<xs:element name="Protocol" type="tt:TransportProtocol">
+				<xs:annotation>
+					<xs:documentation>Defines the network protocol for streaming, either UDP=RTP/UDP, RTSP=RTP/RTSP/TCP or HTTP=RTP/RTSP/HTTP/TCP </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tunnel" type="tt:Transport" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to describe further tunnel options. This element is normally not needed </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="TransportProtocol">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="UDP"/>
+			<xs:enumeration value="TCP"/>
+			<xs:enumeration value="RTSP"/>
+			<xs:enumeration value="HTTP"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="MediaUri">
+		<xs:sequence>
+			<xs:element name="Uri" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Stable Uri to be used for requesting the media stream</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="InvalidAfterConnect" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if the Uri is only valid until the connection is established. The value shall be set to "false".</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="InvalidAfterReboot" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if the Uri is invalid after a reboot of the device. The value shall be set to "false".</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Timeout" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>Duration how long the Uri is valid. This parameter shall be set to PT0S to indicate that this stream URI is indefinitely valid even if the profile changes</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, Media Related Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--    Discovery Related Types    -->
+	<!--===============================-->
+	<xs:simpleType name="ScopeDefinition">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Fixed"/>
+			<xs:enumeration value="Configurable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Scope">
+		<xs:sequence>
+			<xs:element name="ScopeDef" type="tt:ScopeDefinition">
+				<xs:annotation>
+					<xs:documentation>Indicates if the scope is fixed or configurable.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ScopeItem" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Scope item URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="DiscoveryMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Discoverable"/>
+			<xs:enumeration value="NonDiscoverable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<!-- End, Discovery Related Types  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--     Network Related Types     -->
+	<!--===============================-->
+	<xs:complexType name="NetworkInterface">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Enabled" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Info" type="tt:NetworkInterfaceInfo" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Network interface information</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Link" type="tt:NetworkInterfaceLink" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Link configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IPv4" type="tt:IPv4NetworkInterface" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>IPv4 network interface configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IPv6" type="tt:IPv6NetworkInterface" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>IPv6 network interface configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:NetworkInterfaceExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="InterfaceType" type="tt:IANA-IfTypes"/>
+			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Extension point prepared for future 802.3 configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:NetworkInterfaceExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="NetworkInterfaceConfigPriority">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="31"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot3Configuration">
+		<xs:sequence>
+			<!-- Placeholder for 802.3 configuration -->
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceLink">
+		<xs:sequence>
+			<xs:element name="AdminSettings" type="tt:NetworkInterfaceConnectionSetting">
+				<xs:annotation>
+					<xs:documentation>Configured link settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="OperSettings" type="tt:NetworkInterfaceConnectionSetting">
+				<xs:annotation>
+					<xs:documentation>Current active link settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="InterfaceType" type="tt:IANA-IfTypes">
+				<xs:annotation>
+					<xs:documentation>Integer indicating interface type, for example: 6 is ethernet.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceConnectionSetting">
+		<xs:sequence>
+			<xs:element name="AutoNegotiation" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Auto negotiation on/off.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Speed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Duplex" type="tt:Duplex">
+				<xs:annotation>
+					<xs:documentation>Duplex type, Half or Full.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Duplex">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Full"/>
+			<xs:enumeration value="Half"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IANA-IfTypes">
+		<xs:restriction base="xs:int">
+			<xs:annotation>
+				<xs:documentation>
+				For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceInfo">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Network interface name, for example eth0.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HwAddress" type="tt:HwAddress">
+				<xs:annotation>
+					<xs:documentation>Network interface MAC address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MTU" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Maximum transmission unit.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6NetworkInterface">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Config" type="tt:IPv6Configuration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv4NetworkInterface">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Config" type="tt:IPv4Configuration">
+				<xs:annotation>
+					<xs:documentation>IPv4 configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv4Configuration">
+		<xs:sequence>
+			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LinkLocal" type="tt:PrefixedIPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Link local address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FromDHCP" type="tt:PrefixedIPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 address configured by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6Configuration">
+		<xs:sequence>
+			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration">
+				<xs:annotation>
+					<xs:documentation>DHCP configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually entered IPv6 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LinkLocal" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of link local IPv6 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FromDHCP" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of IPv6 addresses configured by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FromRA" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of IPv6 addresses configured by using router advertisment.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IPv6ConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6ConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IPv6DHCPConfiguration">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Auto"/>
+			<xs:enumeration value="Stateful"/>
+			<xs:enumeration value="Stateless"/>
+			<xs:enumeration value="Off"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkProtocol">
+		<xs:sequence>
+			<xs:element name="Name" type="tt:NetworkProtocolType">
+				<xs:annotation>
+					<xs:documentation>Network protocol type string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if the protocol is enabled or not.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Port" type="xs:int" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>The port that is used by the protocol.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkProtocolExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkProtocolExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="NetworkProtocolType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="HTTP"/>
+			<xs:enumeration value="HTTPS"/>
+			<xs:enumeration value="RTSP"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="NetworkHostType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="IPv4"/>
+			<xs:enumeration value="IPv6"/>
+			<xs:enumeration value="DNS"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkHost">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:NetworkHostType">
+				<xs:annotation>
+					<xs:documentation>Network host type: IPv4, IPv6 or DNS.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DNSname" type="tt:DNSName" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>DNS name.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkHostExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkHostExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPAddress">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:IPType">
+				<xs:annotation>
+					<xs:documentation>Indicates if the address is an IPv4 or IPv6 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 address.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 address</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PrefixedIPv4Address">
+		<xs:sequence>
+			<xs:element name="Address" type="tt:IPv4Address">
+				<xs:annotation>
+					<xs:documentation>IPv4 address</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PrefixLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Prefix/submask length</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IPv4Address">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="PrefixedIPv6Address">
+		<xs:sequence>
+			<xs:element name="Address" type="tt:IPv6Address">
+				<xs:annotation>
+					<xs:documentation>IPv6 address</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PrefixLength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Prefix/submask length</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IPv6Address">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="HwAddress">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IPType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="IPv4"/>
+			<xs:enumeration value="IPv6"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="DNSName">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="HostnameInformation">
+		<xs:sequence>
+			<xs:element name="FromDHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the hostname is obtained from DHCP or not.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Name" type="xs:token" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates the hostname.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:HostnameInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="HostnameInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DNSInformation">
+		<xs:sequence>
+			<xs:element name="FromDHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not DNS information is retrieved from DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Search domain.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DNSFromDHCP" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of DNS addresses received from DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually entered DNS addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:DNSInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DNSInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NTPInformation">
+		<xs:sequence>
+			<xs:element name="FromDHCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates if NTP information is to be retrieved by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NTPFromDHCP" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of NTP addresses retrieved by using DHCP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually entered NTP addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NTPInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NTPInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Domain">
+		<xs:restriction base="xs:token"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IPAddressFilterType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Allow"/>
+			<xs:enumeration value="Deny"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="DynamicDNSInformation">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:DynamicDNSType">
+				<xs:annotation>
+					<xs:documentation>Dynamic DNS type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Name" type="tt:DNSName" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>DNS name.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TTL" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Time to live.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:DynamicDNSInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DynamicDNSInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="DynamicDNSType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="NoUpdate"/>
+			<xs:enumeration value="ClientUpdates"/>
+			<xs:enumeration value="ServerUpdates"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceSetConfiguration">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Link" type="tt:NetworkInterfaceConnectionSetting" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Link configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MTU" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Maximum transmission unit.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv4" type="tt:IPv4NetworkInterfaceSetConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv4 network interface configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6" type="tt:IPv6NetworkInterfaceSetConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>IPv6 network interface configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceSetConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv6NetworkInterfaceSetConfiguration">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually added IPv6 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>DHCP configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPv4NetworkInterfaceSetConfiguration">
+		<xs:sequence>
+			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DHCP" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkGateway">
+		<xs:sequence>
+			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>IPv4 address string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>IPv6 address string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkZeroConfiguration">
+		<xs:sequence>
+			<xs:element name="InterfaceToken" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Unique identifier of network interface.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Enabled" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the zero-configuration is enabled or not.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Addresses" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>The zero-configuration IPv4 address(es)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkZeroConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Additional" type="tt:NetworkZeroConfiguration" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Optional array holding the configuration for the second and possibly further interfaces.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkZeroConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPAddressFilter">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:IPAddressFilterType"/>
+			<xs:element name="IPv4Address" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="IPv6Address" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:IPAddressFilterExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IPAddressFilterExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11Configuration">
+		<xs:sequence>
+			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
+			<xs:element name="Mode" type="tt:Dot11StationMode"/>
+			<xs:element name="Alias" type="tt:Name"/>
+			<xs:element name="Priority" type="tt:NetworkInterfaceConfigPriority"/>
+			<xs:element name="Security" type="tt:Dot11SecurityConfiguration"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11SSIDType">
+		<xs:restriction base="xs:hexBinary">
+			<xs:minLength value="1"/>
+			<xs:maxLength value="32"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11StationMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Ad-hoc"/>
+			<xs:enumeration value="Infrastructure"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11SecurityConfiguration">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:Dot11SecurityMode"/>
+			<xs:element name="Algorithm" type="tt:Dot11Cipher" minOccurs="0"/>
+			<xs:element name="PSK" type="tt:Dot11PSKSet" minOccurs="0"/>
+			<xs:element name="Dot1X" type="tt:ReferenceToken" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:Dot11SecurityConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11SecurityConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11SecurityMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="WEP"/>
+			<xs:enumeration value="PSK"/>
+			<xs:enumeration value="Dot1X"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11Cipher">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="CCMP"/>
+			<xs:enumeration value="TKIP"/>
+			<xs:enumeration value="Any"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11PSK">
+		<xs:restriction base="xs:hexBinary">
+			<xs:length value="32"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11PSKPassphrase">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[ -~]{8,63}"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11PSKSet">
+		<xs:sequence>
+			<xs:element name="Key" type="tt:Dot11PSK" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					According to IEEE802.11-2007 H.4.1 the RSNA PSK consists of 256 bits, or 64 octets when represented in hex<br/>
+					Either Key or Passphrase shall be given, if both are supplied Key shall be used by the device and Passphrase ignored.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Passphrase" type="tt:Dot11PSKPassphrase" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					According to IEEE802.11-2007 H.4.1 a pass-phrase is a sequence of between 8 and 63 ASCII-encoded characters and
+					each character in the pass-phrase must have an encoding in the range of 32 to 126 (decimal),inclusive.<br/>
+					If only Passpharse is supplied the Key shall be derived using the algorithm described in IEEE802.11-2007 section H.4
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:Dot11PSKSetExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11PSKSetExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkInterfaceSetConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11Capabilities">
+		<xs:sequence>
+			<xs:element name="TKIP" type="xs:boolean"/>
+			<xs:element name="ScanAvailableNetworks" type="xs:boolean"/>
+			<xs:element name="MultipleConfiguration" type="xs:boolean"/>
+			<xs:element name="AdHocStationMode" type="xs:boolean"/>
+			<xs:element name="WEP" type="xs:boolean"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11SignalStrength">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="Very Bad"/>
+			<xs:enumeration value="Bad"/>
+			<xs:enumeration value="Good"/>
+			<xs:enumeration value="Very Good"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11Status">
+		<xs:sequence>
+			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
+			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
+			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0"/>
+			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0"/>
+			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
+			<xs:element name="ActiveConfigAlias" type="tt:ReferenceToken"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="Dot11AuthAndMangementSuite">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="Dot1X"/>
+			<xs:enumeration value="PSK"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Dot11AvailableNetworks">
+		<xs:sequence>
+			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
+			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
+			<xs:element name="AuthAndMangementSuite" type="tt:Dot11AuthAndMangementSuite" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>See IEEE802.11 7.3.2.25.2 for details.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:Dot11AvailableNetworksExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot11AvailableNetworksExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--===============================-->
+	<!--  End, network Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Capabilities Related Types  -->
+	<!--===============================-->
+	<xs:simpleType name="CapabilityCategory">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="All"/>
+			<xs:enumeration value="Analytics"/>
+			<xs:enumeration value="Device"/>
+			<xs:enumeration value="Events"/>
+			<xs:enumeration value="Imaging"/>
+			<xs:enumeration value="Media"/>
+			<xs:enumeration value="PTZ"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Capabilities">
+		<xs:sequence>
+			<xs:element name="Analytics" type="tt:AnalyticsCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Analytics capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Device" type="tt:DeviceCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Device capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Events" type="tt:EventCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Event capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Imaging" type="tt:ImagingCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Imaging capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Media" type="tt:MediaCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Media capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZ" type="tt:PTZCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>PTZ capabilities</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:CapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="DeviceIO" type="tt:DeviceIOCapabilities" minOccurs="0"/>
+			<xs:element name="Display" type="tt:DisplayCapabilities" minOccurs="0"/>
+			<xs:element name="Recording" type="tt:RecordingCapabilities" minOccurs="0"/>
+			<xs:element name="Search" type="tt:SearchCapabilities" minOccurs="0"/>
+			<xs:element name="Replay" type="tt:ReplayCapabilities" minOccurs="0"/>
+			<xs:element name="Receiver" type="tt:ReceiverCapabilities" minOccurs="0"/>
+			<xs:element name="AnalyticsDevice" type="tt:AnalyticsDeviceCapabilities" minOccurs="0"/>
+			<xs:element name="Extensions" type="tt:CapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Analytics service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RuleSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not rules are supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AnalyticsModuleSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not modules are supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DeviceCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Device service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Network" type="tt:NetworkCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Network capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="System" type="tt:SystemCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>System capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IO" type="tt:IOCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>I/O capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Security" type="tt:SecurityCapabilities" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Security capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:DeviceCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DeviceCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Event service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WSSubscriptionPolicySupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Subscription policy is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WSPullPointSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Pull Point is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WSPausableSubscriptionManagerInterfaceSupport" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Pausable Subscription Manager Interface is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IOCapabilities">
+		<xs:sequence>
+			<xs:element name="InputConnectors" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Number of input connectors.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RelayOutputs" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Number of relay outputs.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IOCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IOCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Auxiliary" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:IOCapabilitiesExtension2"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IOCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MediaCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Media service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StreamingCapabilities" type="tt:RealTimeStreamingCapabilities">
+				<xs:annotation>
+					<xs:documentation>Streaming capabilities.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:MediaCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MediaCapabilitiesExtension">
+		<xs:sequence>
+			<xs:element name="ProfileCapabilities" type="tt:ProfileCapabilities"/>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RealTimeStreamingCapabilities">
+		<xs:sequence>
+			<xs:element name="RTPMulticast" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not RTP multicast is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_TCP" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not RTP over TCP is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_RTSP_TCP" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not RTP/RTSP/TCP is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RealTimeStreamingCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RealTimeStreamingCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ProfileCapabilities">
+		<xs:sequence>
+			<xs:element name="MaximumNumberOfProfiles" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Maximum number of profiles.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkCapabilities">
+		<xs:sequence>
+			<xs:element name="IPFilter" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IP filtering is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZeroConfiguration" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not zeroconf is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IPVersion6" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not IPv6 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DynDNS" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not  is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Dot11Configuration" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="NetworkCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SecurityCapabilities">
+		<xs:sequence>
+			<xs:element name="TLS1.1" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not TLS 1.1 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TLS1.2" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not TLS 1.2 is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="OnboardKeyGeneration" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not onboard key generation is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AccessPolicyConfig" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not access policy configuration is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="X.509Token" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security X.509 token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SAMLToken" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security SAML token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="KerberosToken" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security Kerberos token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RELToken" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Security REL token is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SecurityCapabilitiesExtension">
+		<xs:sequence>
+			<xs:element name="TLS1.0" type="xs:boolean"/>
+			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SecurityCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:element name="Dot1X" type="xs:boolean"/>
+			<xs:element name="SupportedEAPMethod" type="xs:int" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RemoteUserHandling" type="xs:boolean"/>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemCapabilities">
+		<xs:sequence>
+			<xs:element name="DiscoveryResolve" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS Discovery resolve requests are supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DiscoveryBye" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not WS-Discovery Bye is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RemoteDiscovery" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not remote discovery is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SystemBackup" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not system backup is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SystemLogging" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not system logging is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FirmwareUpgrade" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not firmware upgrade is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedVersions" type="tt:OnvifVersion" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Indicates supported ONVIF version(s).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemCapabilitiesExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="HttpFirmwareUpgrade" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="HttpSystemBackup" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="HttpSystemLogging" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="HttpSupportInformation" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemCapabilitiesExtension2">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OnvifVersion">
+		<xs:sequence>
+			<xs:element name="Major" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Major version number.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Minor" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Two digit minor version number (e.g. X.0.1 maps to "01" and X.2.1 maps to "21" where X stands for Major version number).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Imaging service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>PTZ service URI.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DeviceIOCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="VideoSources" type="xs:int"/>
+			<xs:element name="VideoOutputs" type="xs:int"/>
+			<xs:element name="AudioSources" type="xs:int"/>
+			<xs:element name="AudioOutputs" type="xs:int"/>
+			<xs:element name="RelayOutputs" type="xs:int"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DisplayCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="FixedLayout" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indication that the SetLayout command supports only predefined layouts.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="ReceiverSource" type="xs:boolean"/>
+			<xs:element name="MediaProfileSource" type="xs:boolean"/>
+			<xs:element name="DynamicRecordings" type="xs:boolean"/>
+			<xs:element name="DynamicTracks" type="xs:boolean"/>
+			<xs:element name="MaxStringLength" type="xs:int"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SearchCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="MetadataSearch" type="xs:boolean"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReplayCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>The address of the replay service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReceiverCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>The address of the receiver service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_Multicast" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the device can receive RTP multicast streams.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_TCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the device can receive RTP/TCP streams</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RTP_RTSP_TCP" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether the device can receive RTP/RTSP/TCP streams.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SupportedReceivers" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The maximum number of receivers supported by the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaximumRTSPURILength" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The maximum allowed length for RTSP URIs.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceCapabilities">
+		<xs:sequence>
+			<xs:element name="XAddr" type="xs:anyURI"/>
+			<xs:element name="RuleSupport" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Obsolete property.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:AnalyticsDeviceExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--===============================-->
+	<!--End, Capabilities Related Types-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--    System Related Types       -->
+	<!--===============================-->
+	<xs:simpleType name="SystemLogType">
+		<xs:annotation>
+			<xs:documentation>Enumeration describing the available system log modes.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="System">
+				<xs:annotation>
+					<xs:documentation>Indicates that a system log is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Access">
+				<xs:annotation>
+					<xs:documentation>Indicates that a access log is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="SystemLog">
+		<xs:sequence>
+			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The log information as attachment data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="String" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The log information as character data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportInformation">
+		<xs:sequence>
+			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The support information as attachment data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="String" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The support information as character data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BinaryData">
+		<xs:sequence>
+			<xs:element name="Data" type="xs:base64Binary" nillable="false">
+				<xs:annotation>
+					<xs:documentation>base64 encoded binary data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute ref="xmime:contentType" use="optional"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AttachmentData">
+		<xs:sequence>
+			<xs:element ref="xop:Include"/>
+		</xs:sequence>
+		<xs:attribute ref="xmime:contentType" use="optional"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BackupFile">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string"/>
+			<xs:element name="Data" type="tt:AttachmentData"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemLogUriList">
+		<xs:sequence>
+			<xs:element name="SystemLog" type="tt:SystemLogUri" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemLogUri">
+		<xs:sequence>
+			<xs:element name="Type" type="tt:SystemLogType"/>
+			<xs:element name="Uri" type="xs:anyURI"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="FactoryDefaultType">
+		<xs:annotation>
+			<xs:documentation>Enumeration describing the available factory default modes.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Hard">
+				<xs:annotation>
+					<xs:documentation>Indicates that a hard factory default is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Soft">
+				<xs:annotation>
+					<xs:documentation>Indicates that a soft factory default is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="SetDateTimeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Manual">
+				<xs:annotation>
+					<xs:documentation>Indicates that the date and time are set manually.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="NTP">
+				<xs:annotation>
+					<xs:documentation>Indicates that the date and time are set through NTP</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="SystemDateTime">
+		<xs:annotation>
+			<xs:documentation>General date time inforamtion returned by the GetSystemDateTime method.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="DateTimeType" type="tt:SetDateTimeType">
+				<xs:annotation>
+					<xs:documentation>Indicates if the time is set manully or through NTP.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DaylightSavings" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Informative indicator whether daylight savings is currently on/off.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Timezone information in Posix format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Current system date and time in UTC format. This field is mandatory since version 2.0.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LocalDateTime" type="tt:DateTime" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Date and time in local format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SystemDateTimeExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SystemDateTimeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DateTime">
+		<xs:sequence>
+			<xs:element name="Time" type="tt:Time"/>
+			<xs:element name="Date" type="tt:Date"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Date">
+		<xs:sequence>
+			<xs:element name="Year" type="xs:int"/>
+			<xs:element name="Month" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 1 to 12.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Day" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 1 to 31.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Time">
+		<xs:sequence>
+			<xs:element name="Hour" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 0 to 23.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Minute" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 0 to 59.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Second" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Range is 0 to 61 (typically 59).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TimeZone">
+		<xs:annotation>
+			<xs:documentation>
+				The TZ format is specified by POSIX, please refer to POSIX 1003.1 section 8.3<br/>
+				Example: Europe, Paris TZ=CET-1CEST,M3.5.0/2,M10.5.0/3<br/>
+				CET = designation for standard time when daylight saving is not in force<br/>
+				-1 = offset in hours = negative so 1 hour east of Greenwich meridian<br/>
+				CEST = designation when daylight saving is in force ("Central European Summer Time")<br/>
+				, = no offset number between code and comma, so default to one hour ahead for daylight saving<br/>
+				M3.5.0 = when daylight saving starts = the last Sunday in March (the "5th" week means the last in the month)<br/>
+				/2, = the local time when the switch occurs = 2 a.m. in this case<br/>
+				M10.5.0 = when daylight saving ends = the last Sunday in October.<br/>
+				/3, = the local time when the switch occurs = 3 a.m. in this case<br/>
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="TZ" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>Posix timezone string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, System Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   RemoteUser Handling Types    -->
+	<!--===============================-->
+	<xs:complexType name="RemoteUser">
+		<xs:sequence>
+			<xs:element name="Username" type="xs:string"/>
+			<xs:element name="Password" type="xs:string" minOccurs="0"/>
+			<xs:element name="UseDerivedPassword" type="xs:boolean"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, RemoteUser Handling Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   UserToken Handling Types    -->
+	<!--===============================-->
+	<xs:simpleType name="UserLevel">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Administrator"/>
+			<xs:enumeration value="Operator"/>
+			<xs:enumeration value="User"/>
+			<xs:enumeration value="Anonymous"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="User">
+		<xs:sequence>
+			<xs:element name="Username" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Username string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Password" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Password string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UserLevel" type="tt:UserLevel">
+				<xs:annotation>
+					<xs:documentation>User level string.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:UserExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="UserExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!-- End, UserToken Handling Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Security Management Types   -->
+	<!--===============================-->
+	<xs:complexType name="CertificateGenerationParameters">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
+			<xs:element name="Subject" type="xs:string" minOccurs="0"/>
+			<xs:element name="ValidNotBefore" type="xs:token" minOccurs="0"/>
+			<xs:element name="ValidNotAfter" type="xs:token" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:CertificateGenerationParametersExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateGenerationParametersExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Certificate">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>Certificate id.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Certificate" type="tt:BinaryData">
+				<xs:annotation>
+					<xs:documentation>base64 encoded DER representation of certificate.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateStatus">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>Certificate id.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Status" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not a certificate is used in a HTTPS configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateWithPrivateKey">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
+			<xs:element name="Certificate" type="tt:BinaryData"/>
+			<xs:element name="PrivateKey" type="tt:BinaryData"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateInformation">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token"/>
+			<xs:element name="IssuerDN" type="xs:string" minOccurs="0"/>
+			<xs:element name="SubjectDN" type="xs:string" minOccurs="0"/>
+			<xs:element name="KeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
+			<xs:element name="ExtendedKeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
+			<xs:element name="KeyLength" type="xs:int" minOccurs="0"/>
+			<xs:element name="Version" type="xs:string" minOccurs="0"/>
+			<xs:element name="SerialNum" type="xs:string" minOccurs="0"/>
+			<xs:element name="SignatureAlgorithm" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Validity Range is from "NotBefore" to "NotAfter"; the corresponding DateTimeRange is from "From" to "Until"</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Validity" type="tt:DateTimeRange" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:CertificateInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateUsage">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="Critical" type="xs:boolean" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CertificateInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--End, Security management Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Start Dot1X related Types   -->
+	<!--===============================-->
+	<xs:complexType name="Dot1XConfiguration">
+		<xs:sequence>
+			<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken"/>
+			<xs:element name="Identity" type="xs:string"/>
+			<xs:element name="AnonymousID" type="xs:string" minOccurs="0"/>
+			<xs:element name="EAPMethod" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>
+				EAP Method type as defined in <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.
+			</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CACertificateID" type="xs:token" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="EAPMethodConfiguration" type="tt:EAPMethodConfiguration" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:Dot1XConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Dot1XConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EAPMethodConfiguration">
+		<xs:sequence>
+			<xs:element name="TLSConfiguration" type="tt:TLSConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Confgiuration information for TLS Method.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Password" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Password for those EAP Methods that require a password. The password shall never be returned on a get method.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:EapMethodExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EapMethodExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TLSConfiguration">
+		<xs:sequence>
+			<xs:element name="CertificateID" type="xs:token"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GenericEapPwdConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--End, Dot1X related Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Start IO management Types   -->
+	<!--===============================-->
+	<xs:simpleType name="RelayLogicalState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="active"/>
+			<xs:enumeration value="inactive"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="RelayIdleState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="closed"/>
+			<xs:enumeration value="open"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RelayOutputSettings">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:RelayMode">
+				<xs:annotation>
+					<xs:documentation>
+					'Bistable' or 'Monostable'
+					<ul>
+							<li>Bistable – After setting the state, the relay remains in this state.</li>
+							<li>Monostable – After setting the state, the relay returns to its idle state after the specified time.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DelayTime" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>Time after which the relay returns to its idle state if it is in monostable mode. If the Mode field is set to bistable mode the value of the parameter can be ignored.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IdleState" type="tt:RelayIdleState">
+				<xs:annotation>
+					<xs:documentation>
+			'open' or 'closed'
+			<ul>
+							<li>'open' means that the relay is open when the relay state is set to 'inactive' through the trigger command and closed when the state is set to 'active' through the same command.</li>
+							<li>'closed' means that the relay is closed when the relay state is set to 'inactive' through the trigger command and open when the state is set to 'active' through the same command.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RelayMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Monostable"/>
+			<xs:enumeration value="Bistable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RelayOutput">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Properties" type="tt:RelayOutputSettings"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="DigitalInput">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, IO management Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--    Start PTZ Related Types    -->
+	<!--===============================-->
+	<xs:complexType name="PTZNode">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="Name" type="tt:Name" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                A unique identifier that is used to reference PTZ Nodes.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SupportedPTZSpaces" type="tt:PTZSpaces">
+						<xs:annotation>
+							<xs:documentation>
+                A list of Coordinate Systems available for the PTZ Node. For each Coordinate System, the PTZ Node MUST specify its allowed range.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaximumNumberOfPresets" type="xs:int">
+						<xs:annotation>
+							<xs:documentation>
+                All preset operations MUST be available for this PTZ Node if one preset is supported.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="HomeSupported" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>
+                A boolean operator specifying the availability of a home position. If set to true, the Home Position Operations MUST be available for this PTZ Node.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>
+                A list of supported Auxiliary commands. If the list is not empty, the Auxiliary Operations MUST be available for this PTZ Node.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:PTZNodeExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:attribute name="FixedHomePosition" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>
+      				Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command.
+      			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZNodeExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="SupportedPresetTour" type="tt:PTZPresetTourSupported" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            Detail of supported Preset Tour feature.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZNodeExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZNodeExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSupported">
+		<xs:sequence>
+			<xs:element name="MaximumNumberOfPresetTours" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>Indicates number of preset tours that can be created. Required preset tour operations shall be available for this PTZ Node if one or more preset tour is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZPresetTourOperation" type="tt:PTZPresetTourOperation" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Indicates which preset tour operations are available for this PTZ Node.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourSupportedExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSupportedExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="NodeToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>
+                A mandatory reference to the PTZ Node that the PTZ Configuration belongs to.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultAbsolutePantTiltPositionSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports absolute Pan/Tilt movements, it shall specify one Absolute Pan/Tilt Position Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultAbsoluteZoomPositionSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports absolute zoom movements, it shall specify one Absolute Zoom Position Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultRelativePanTiltTranslationSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports relative Pan/Tilt movements, it shall specify one RelativePan/Tilt Translation Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultRelativeZoomTranslationSpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports relative zoom movements, it shall specify one Relative Zoom Translation Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultContinuousPanTiltVelocitySpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports continuous Pan/Tilt movements, it shall specify one Continuous Pan/Tilt Velocity Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultContinuousZoomVelocitySpace" type="xs:anyURI" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports continuous zoom movements, it shall specify one Continuous Zoom Velocity Space as default.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultPTZSpeed" type="tt:PTZSpeed" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports absolute or relative PTZ movements, it shall specify corresponding default Pan/Tilt and Zoom speeds.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DefaultPTZTimeout" type="xs:duration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                If the PTZ Node supports continuous movements, it shall specify a default timeout, after which the movement stops.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="PanTiltLimits" type="tt:PanTiltLimits" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                The Pan/Tilt limits element should be present for a PTZ Node that supports an absolute Pan/Tilt. If the element is present it signals the support for configurable Pan/Tilt limits. If limits are enabled, the Pan/Tilt movements shall always stay within the specified range. The Pan/Tilt limits are disabled by setting the limits to –INF or +INF.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZoomLimits" type="tt:ZoomLimits" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+                The Zoom limits element should be present for a PTZ Node that supports absolute zoom. If the element is present it signals the supports for configurable Zoom limits. If limits are enabled the zoom movements shall always stay within the specified range. The Zoom limits are disabled by settings the limits to -INF and +INF.
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:PTZConfigurationExtension" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>
+              </xs:documentation>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="PTControlDirection" type="tt:PTControlDirection" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure PT Control Direction related features.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZConfigurationExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirection">
+		<xs:sequence>
+			<xs:element name="EFlip" type="tt:EFlip" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure related parameters for E-Flip.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Reverse" type="tt:Reverse" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure related parameters for reversing of PT Control Direction.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTControlDirectionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirectionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EFlip">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:EFlipMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable E-Flip feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Reverse">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ReverseMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable Reverse feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="EFlipMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="ReverseMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="Spaces" type="tt:PTZSpaces">
+				<xs:annotation>
+					<xs:documentation>
+            A list of supported coordinate systems including their range limitations.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZTimeout" type="tt:DurationRange">
+				<xs:annotation>
+					<xs:documentation>
+            A timeout Range within which Timeouts are accepted by the PTZ Node.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="PTControlDirection" type="tt:PTControlDirectionOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported options for PT Direction Control.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZConfigurationOptions2" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZConfigurationOptions2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirectionOptions">
+		<xs:sequence>
+			<xs:element name="EFlip" type="tt:EFlipOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported options for EFlip feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Reverse" type="tt:ReverseOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported options for Reverse feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTControlDirectionOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTControlDirectionOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EFlipOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:EFlipMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Options of EFlip mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:EFlipOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EFlipOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReverseOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ReverseMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Options of Reverse mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ReverseOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReverseOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PanTiltLimits">
+		<xs:sequence>
+			<xs:element name="Range" type="tt:Space2DDescription">
+				<xs:annotation>
+					<xs:documentation>
+            A range of pan tilt limits.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ZoomLimits">
+		<xs:sequence>
+			<xs:element name="Range" type="tt:Space1DDescription">
+				<xs:annotation>
+					<xs:documentation>
+            A range of zoom limit
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZSpaces">
+		<xs:sequence>
+			<xs:element name="AbsolutePanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Pan/Tilt Position space is provided by every PTZ node that supports absolute Pan/Tilt, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as the full range of the PTZ unit normalized to the range -1 to 1 resulting in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AbsoluteZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Zoom Position Space is provided by every PTZ node that supports absolute Zoom, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as the full range of the Zoom normalized to the range 0 (wide) to 1 (tele). 
+			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RelativePanTiltTranslationSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Pan/Tilt translation space is provided by every PTZ node that supports relative Pan/Tilt, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as the full positive and negative translation range of the PTZ unit normalized to the range -1 to 1, 
+			where positive translation would mean clockwise rotation or movement in right/up direction resulting in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RelativeZoomTranslationSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The Generic Zoom Translation Space is provided by every PTZ node that supports relative Zoom, since it does not relate to a specific physical range. 
+			Instead, the corresponding absolute range should be defined as the full positive and negative translation range of the Zoom normalized to the range -1 to1, 
+			where a positive translation maps to a movement in TELE direction. The translation is signed to indicate direction (negative is to wide, positive is to tele). 
+			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension. This results in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ContinuousPanTiltVelocitySpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The generic Pan/Tilt velocity space shall be provided by every PTZ node, since it does not relate to a specific physical range. 
+			Instead, the range should be defined as a range of the PTZ unit’s speed normalized to the range -1 to 1, where a positive velocity would map to clockwise 
+			rotation or movement in the right/up direction. A signed speed can be independently specified for the pan and tilt component resulting in the following space description.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ContinuousZoomVelocitySpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The generic zoom velocity space specifies a zoom factor velocity without knowing the underlying physical model. The range should be normalized from -1 to 1, 
+			where a positive velocity would map to TELE direction. A generic zoom velocity space description resembles the following.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PanTiltSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The speed space specifies the speed for a Pan/Tilt movement when moving to an absolute position or to a relative translation. 
+			In contrast to the velocity spaces, speed spaces do not contain any directional information. The speed of a combined Pan/Tilt 
+			movement is represented by a single non-negative scalar value.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            The speed space specifies the speed for a Zoom movement when moving to an absolute position or to a relative translation. 
+			In contrast to the velocity spaces, speed spaces do not contain any directional information. 
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZSpacesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZSpacesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Space2DDescription">
+		<xs:sequence>
+			<xs:element name="URI" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>
+            A URI of coordinate systems.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="XRange" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+            A range of x-axis.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="YRange" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+            A range of y-axis.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Space1DDescription">
+		<xs:sequence>
+			<xs:element name="URI" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>
+            A URI of coordinate systems.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="XRange" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+            A range of x-axis.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Vector2D">
+		<xs:attribute name="x" type="xs:float" use="required"/>
+		<xs:attribute name="y" type="xs:float" use="required"/>
+		<xs:attribute name="space" type="xs:anyURI" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+  				Pan/tilt coordinate space selector. The following options are defined:<ul>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
+					</ul>
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Vector1D">
+		<xs:attribute name="x" type="xs:float" use="required"/>
+		<xs:attribute name="space" type="xs:anyURI" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+  				Pan/tilt coordinate space selector. The following options are defined:<ul style="">
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
+						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
+					</ul>
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZVector">
+		<xs:sequence>
+			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Pan and tilt position. The x component corresponds to pan and the y component to tilt.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A zoom position.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZSpeed">
+		<xs:sequence>
+			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Pan and tilt speed. The x component corresponds to pan and the y component to tilt. If omitted in a request, the current (if any) PanTilt movement should not be affected. </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A zoom speed. If omitted in a request, the current (if any) Zoom movement should not be affected.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStatus">
+		<xs:sequence>
+			<xs:element name="Position" type="tt:PTZVector" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            Specifies the absolute position of the PTZ unit together with the Space references. The default absolute spaces of the corresponding PTZ configuration MUST be referenced within the Position element.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MoveStatus" type="tt:PTZMoveStatus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            Indicates if the Pan/Tilt/Zoom device unit is currently moving, idle or in an unknown state.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            States a current PTZ error.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="UtcTime" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>
+            Specifies the UTC time when this status was generated.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPreset">
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A list of preset position name.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PTZPosition" type="tt:PTZVector" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+            A list of preset position.
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken">
+			<xs:annotation>
+				<xs:documentation>
+        </xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZMoveStatus">
+		<xs:sequence>
+			<xs:element name="PanTilt" type="tt:MoveStatus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Zoom" type="tt:MoveStatus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+          </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="AuxiliaryData">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="128"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="MoveStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="IDLE"/>
+			<xs:enumeration value="MOVING"/>
+			<xs:enumeration value="UNKNOWN"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PTZPresetTourState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Idle"/>
+			<xs:enumeration value="Touring"/>
+			<xs:enumeration value="Paused"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PTZPresetTourDirection">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Forward"/>
+			<xs:enumeration value="Backward"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PTZPresetTourOperation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Start"/>
+			<xs:enumeration value="Stop"/>
+			<xs:enumeration value="Pause"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="PresetTour">
+		<xs:sequence>
+			<xs:element name="Name" type="tt:Name" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Readable name of the preset tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Status" type="tt:PTZPresetTourStatus">
+				<xs:annotation>
+					<xs:documentation>Read only parameters to indicate the status of the preset tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Auto Start flag of the preset tour. True allows the preset tour to be activated always.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingCondition">
+				<xs:annotation>
+					<xs:documentation>Parameters to specify the detail behavior of the preset tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TourSpot" type="tt:PTZPresetTourSpot" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of detail of touring spots including preset positions.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="token" type="tt:ReferenceToken">
+			<xs:annotation>
+				<xs:documentation>Unique identifier of this preset tour.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSpot">
+		<xs:sequence>
+			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetail">
+				<xs:annotation>
+					<xs:documentation>Detail definition of preset position of the tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify Pan/Tilt and Zoom speed on moving toward this tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StayTime" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify time duration of staying on this tour sport.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourSpotExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSpotExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourPresetDetail">
+		<xs:sequence>
+			<xs:choice>
+				<xs:element name="PresetToken" type="tt:ReferenceToken">
+					<xs:annotation>
+						<xs:documentation>Option to specify the preset position with Preset Token defined in advance.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="Home" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Option to specify the preset position with the home position of this PTZ Node. "False" to this parameter shall be treated as an invalid argument.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="PTZPosition" type="tt:PTZVector">
+					<xs:annotation>
+						<xs:documentation>Option to specify the preset position with vector of PTZ node directly.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="TypeExtension" type="tt:PTZPresetTourTypeExtension"/>
+			</xs:choice>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourTypeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStatus">
+		<xs:sequence>
+			<xs:element name="State" type="tt:PTZPresetTourState">
+				<xs:annotation>
+					<xs:documentation>Indicates state of this preset tour by Idle/Touring/Paused.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CurrentTourSpot" type="tt:PTZPresetTourSpot" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates a tour spot currently staying.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourStatusExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStatusExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingCondition">
+		<xs:sequence>
+			<xs:element name="RecurringTime" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify how many times the preset tour is recurred.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecurringDuration" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to specify how long time duration the preset tour is recurred.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional parameter to choose which direction the preset tour goes. Forward shall be chosen in case it is omitted.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingConditionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourOptions">
+		<xs:sequence>
+			<xs:element name="AutoStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not the AutoStart is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingConditionOptions">
+				<xs:annotation>
+					<xs:documentation>Supported options for Preset Tour Starting Condition.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TourSpot" type="tt:PTZPresetTourSpotOptions">
+				<xs:annotation>
+					<xs:documentation>Supported options for Preset Tour Spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourSpotOptions">
+		<xs:sequence>
+			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetailOptions">
+				<xs:annotation>
+					<xs:documentation>Supported options for detail definition of preset position of the tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StayTime" type="tt:DurationRange">
+				<xs:annotation>
+					<xs:documentation>Supported range of stay time for a tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourPresetDetailOptions">
+		<xs:sequence>
+			<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of available Preset Tokens for tour spots.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Home" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>An option to indicate Home postion for tour spots.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Pan and Tilt for tour spots.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Zoom for a tour spot.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourPresetDetailOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourPresetDetailOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingConditionOptions">
+		<xs:sequence>
+			<xs:element name="RecurringTime" type="tt:IntRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Recurring Time.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecurringDuration" type="tt:DurationRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of Recurring Duration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options for Direction of Preset Tour.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPresetTourStartingConditionOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--     End, PTZ Related Types    -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Imaging Related Types    -->
+	<!--===============================-->
+	<xs:complexType name="ImagingStatus">
+		<xs:sequence>
+			<xs:element name="FocusStatus" type="tt:FocusStatus"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusStatus">
+		<xs:sequence>
+			<xs:element name="Position" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus position.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MoveStatus" type="tt:MoveStatus">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus MoveStatus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>
+				Error status of focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusConfiguration">
+		<xs:sequence>
+			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode"/>
+			<xs:element name="DefaultSpeed" type="xs:float"/>
+			<xs:element name="NearLimit" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FarLimit" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus far limit (unit: meter).
+If set to 0.0, infinity will be used.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="AutoFocusMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="MANUAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettings">
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Brightness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Contrast" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Exposure" type="tt:Exposure" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Exposure mode of the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Focus" type="tt:FocusConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Focus configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Sharpness of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>WDR settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalance" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>White balance settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Exposure">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode">
+				<xs:annotation>
+					<xs:documentation>
+					Exposure Mode
+					<ul>
+							<li>Auto – Enabled the exposure algorithm on the NVT.</li>
+							<li>Manual – Disabled exposure algorithm on the NVT.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="tt:ExposurePriority">
+				<xs:annotation>
+					<xs:documentation>
+				The exposure priority mode (low noise/framerate).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Window" type="tt:Rectangle">
+				<xs:annotation>
+					<xs:documentation>
+				Rectangular exposure mask.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinExposureTime" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxExposureTime" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinIris" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxIris" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ExposureTime" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed exposure time used by the image sensor (&#956;s).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Gain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed gain used by the image sensor (dB).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Iris" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="WideDynamicMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRange">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode">
+				<xs:annotation>
+					<xs:documentation>
+				White dynamic range (on/off)
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Optional level parameter (unitless)
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="BacklightCompensationMode">
+		<xs:annotation>
+			<xs:documentation>Enumeration describing the available backlight compenstation modes.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation is disabled.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="ON">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation is enabled.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensation">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:BacklightCompensationMode">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ExposurePriority">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="LowNoise"/>
+			<xs:enumeration value="FrameRate"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions">
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions"/>
+			<xs:element name="Brightness" type="tt:FloatRange"/>
+			<xs:element name="ColorSaturation" type="tt:FloatRange"/>
+			<xs:element name="Contrast" type="tt:FloatRange"/>
+			<xs:element name="Exposure" type="tt:ExposureOptions"/>
+			<xs:element name="Focus" type="tt:FocusOptions"/>
+			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" maxOccurs="unbounded"/>
+			<xs:element name="Sharpness" type="tt:FloatRange"/>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions"/>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRangeOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
+			<xs:element name="Level" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensationOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
+			<xs:element name="Level" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusOptions">
+		<xs:sequence>
+			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="DefaultSpeed" type="tt:FloatRange"/>
+			<xs:element name="NearLimit" type="tt:FloatRange"/>
+			<xs:element name="FarLimit" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ExposureOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded"/>
+			<xs:element name="Priority" type="tt:ExposurePriority" maxOccurs="unbounded"/>
+			<xs:element name="MinExposureTime" type="tt:FloatRange"/>
+			<xs:element name="MaxExposureTime" type="tt:FloatRange"/>
+			<xs:element name="MinGain" type="tt:FloatRange"/>
+			<xs:element name="MaxGain" type="tt:FloatRange"/>
+			<xs:element name="MinIris" type="tt:FloatRange"/>
+			<xs:element name="MaxIris" type="tt:FloatRange"/>
+			<xs:element name="ExposureTime" type="tt:FloatRange"/>
+			<xs:element name="Gain" type="tt:FloatRange"/>
+			<xs:element name="Iris" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalanceOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded"/>
+			<xs:element name="YrGain" type="tt:FloatRange"/>
+			<xs:element name="YbGain" type="tt:FloatRange"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusMove">
+		<xs:sequence>
+			<xs:element name="Absolute" type="tt:AbsoluteFocus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Parameters for the absolute focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Relative" type="tt:RelativeFocus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Parameters for the relative focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Continuous" type="tt:ContinuousFocus" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Parameter for the continuous focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AbsoluteFocus">
+		<xs:sequence>
+			<xs:element name="Position" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Position parameter for the absolute focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Speed parameter for the absolute focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RelativeFocus">
+		<xs:sequence>
+			<xs:element name="Distance" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Distance parameter for the relative focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Speed parameter for the relative focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ContinuousFocus">
+		<xs:sequence>
+			<xs:element name="Speed" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Speed parameter for the Continuous focus control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MoveOptions">
+		<xs:sequence>
+			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0"/>
+			<xs:element name="Relative" type="tt:RelativeFocusOptions" minOccurs="0"/>
+			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AbsoluteFocusOptions">
+		<xs:sequence>
+			<xs:element name="Position" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the position.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RelativeFocusOptions">
+		<xs:sequence>
+			<xs:element name="Distance" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the distance.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ContinuousFocusOptions">
+		<xs:sequence>
+			<xs:element name="Speed" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ExposureMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="MANUAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Enabled">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ENABLED"/>
+			<xs:enumeration value="DISABLED"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="WhiteBalanceMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="MANUAL"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="IrCutFilterMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="AUTO"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalance">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode">
+				<xs:annotation>
+					<xs:documentation>Auto whitebalancing mode (auto/manual).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CrGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Rgain (unitless).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CbGain" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Bgain (unitless).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--  End, Imaging Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Imaging Version 2.0 Related Types    -->
+	<!--===============================-->
+	<xs:complexType name="ImagingStatus20">
+		<xs:sequence>
+			<xs:element name="FocusStatus20" type="tt:FocusStatus20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingStatus20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingStatus20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusStatus20">
+		<xs:sequence>
+			<xs:element name="Position" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus position.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MoveStatus" type="tt:MoveStatus">
+				<xs:annotation>
+					<xs:documentation>
+				Status of focus MoveStatus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Error status of focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:FocusStatus20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusStatus20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettings20">
+		<xs:annotation>
+			<xs:documentation>Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Brightness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Contrast" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Exposure" type="tt:Exposure20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Exposure mode of the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Focus" type="tt:FocusConfiguration20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Focus configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Sharpness of the Video image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>WDR settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalance20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>White balance settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension20" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension20">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ImageStabilization" type="tt:ImageStabilization" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional element to configure Image Stabilization feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension202" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension202">
+		<xs:sequence>
+			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustment" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>An optional parameter applied to only auto mode to adjust timing of toggling Ir cut filter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingSettingsExtension203" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingSettingsExtension203">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilization">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ImageStabilizationMode">
+				<xs:annotation>
+					<xs:documentation>Parameter to enable/disable Image Stabilization feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImageStabilizationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilizationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ImageStabilizationMode">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="OFF"/>
+			<xs:enumeration value="ON"/>
+			<xs:enumeration value="AUTO"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustment">
+		<xs:sequence>
+			<xs:element name="BoundaryType" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Specifies which boundaries to automatically toggle Ir cut filter following parameters are applied to. Its options shall be chosen from tt:IrCutFilterAutoBoundaryType.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BoundaryOffset" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Adjusts boundary exposure level for toggling Ir cut filter to on/off specified with unitless normalized value from +1.0 to -1.0. Zero is default and -1.0 is the darkest adjustment (Unitless).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ResponseTime" type="xs:duration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Delay time of toggling Ir cut filter to on/off after crossing of the boundary exposure levels.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax" />
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustmentExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="IrCutFilterAutoBoundaryType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Common" />
+			<xs:enumeration value="ToOn" />
+			<xs:enumeration value="ToOff" />
+			<xs:enumeration value="Extended" />
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRange20">
+		<xs:annotation>
+			<xs:documentation>Type describing whether WDR mode is enabled or disabled (on/off).</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode">
+				<xs:annotation>
+					<xs:documentation>Wide dynamic range mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensation20">
+		<xs:annotation>
+			<xs:documentation>Type describing whether BLC mode is enabled or disabled (on/off).</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:BacklightCompensationMode">
+				<xs:annotation>
+					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Exposure20">
+		<xs:annotation>
+			<xs:documentation>Type describing the exposure settings.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode">
+				<xs:annotation>
+					<xs:documentation>
+				Exposure Mode
+				<ul>
+							<li>Auto – Enabled the exposure algorithm on the device.</li>
+							<li>Manual – Disabled exposure algorithm on the device.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The exposure priority mode (low noise/framerate).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Window" type="tt:Rectangle" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Rectangular exposure mask.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinExposureTime" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxExposureTime" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of exposure time range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinIris" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Minimum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxIris" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Maximum value of the iris range allowed to be used by the algorithm.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ExposureTime" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed exposure time used by the image sensor (&#956;s).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Gain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed gain used by the image sensor (dB).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Iris" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20">
+		<xs:sequence>
+			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Backlight Compensation.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Brightness" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Brightness.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ColorSaturation" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Color Saturation.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Contrast" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Contrast.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Exposure" type="tt:ExposureOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Exposure.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Focus" type="tt:FocusOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Focus.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of IrCutFilterModes.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sharpness" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of Sharpness.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of WideDynamicRange.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of WhiteBalance.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingOptions20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20Extension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ImageStabilization" type="tt:ImageStabilizationOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Options of parameters for Image Stabilization feature.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingOptions20Extension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20Extension2">
+		<xs:sequence>
+			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustmentOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Options of parameters for adjustment of Ir cut filter auto mode.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImagingOptions20Extension3" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImagingOptions20Extension3">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilizationOptions">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ImageStabilizationMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options of Image Stabilization mode parameter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Valid range of the Image Stabilization.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ImageStabilizationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ImageStabilizationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustmentOptions">
+		<xs:sequence>
+			<xs:element name="BoundaryType" type="xs:string" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Supported options of boundary types for adjustment of Ir cut filter auto mode. The opptions shall be chosen from tt:IrCutFilterAutoBoundaryType. </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BoundaryOffset" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not boundary offset for toggling Ir cut filter is supported.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ResponseTimeRange" type="tt:DurationRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Supported range of delay time for toggling Ir cut filter.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentOptionsExtension" minOccurs="0" />
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax" />
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="IrCutFilterAutoAdjustmentOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WideDynamicRangeOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
+			<xs:element name="Level" type="tt:FloatRange" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BacklightCompensationOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:BacklightCompensationMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				'ON' or 'OFF'
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Level range of BacklightCompensation.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ExposureOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				Exposure Mode
+				<ul>
+							<li>Auto – Enabled the exposure algorithm on the device.</li>
+							<li>Manual – Disabled exposure algorithm on the device.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				The exposure priority mode (low noise/framerate).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinExposureTime" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Minimum ExposureTime.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxExposureTime" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Maximum ExposureTime.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinGain" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Minimum Gain.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxGain" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Maximum Gain.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MinIris" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Minimum Iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxIris" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Maximum Iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ExposureTime" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the ExposureTime.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Gain" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Gain.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Iris" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid range of the Iris.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MoveOptions20">
+		<xs:sequence>
+			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges for the absolute control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Relative" type="tt:RelativeFocusOptions20" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges for the relative control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges for the continuous control.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RelativeFocusOptions20">
+		<xs:sequence>
+			<xs:element name="Distance" type="tt:FloatRange">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the distance.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Valid ranges of the speed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalance20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode">
+				<xs:annotation>
+					<xs:documentation>
+				'AUTO' or 'MANUAL'
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CrGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Rgain (unitless).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CbGain" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+				Bgain (unitless).
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:WhiteBalance20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalance20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusConfiguration20">
+		<xs:sequence>
+			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode">
+				<xs:annotation>
+					<xs:documentation>
+			Mode of auto fucus.
+			<ul>
+							<li>AUTO</li>
+							<li>MANUAL</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DefaultSpeed" type="xs:float" minOccurs="0"/>
+			<xs:element name="NearLimit" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FarLimit" type="xs:float" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Parameter to set autofocus far limit (unit: meter).</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:FocusConfiguration20Extension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusConfiguration20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalanceOptions20">
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+				Mode of WhiteBalance.
+				<ul>
+							<li>AUTO</li>
+							<li>MANUAL</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="YrGain" type="tt:FloatRange" minOccurs="0"/>
+			<xs:element name="YbGain" type="tt:FloatRange" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:WhiteBalanceOptions20Extension" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="WhiteBalanceOptions20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusOptions20">
+		<xs:sequence>
+			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+					Mode of Auto Focus.
+					<ul>
+							<li>AUTO</li>
+							<li>MANUAL</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DefaultSpeed" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					Valid range of DefaultSpeed.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NearLimit" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					Valid range of NearLimit.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FarLimit" type="tt:FloatRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+					Valid range of FarLimit.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:FocusOptions20Extension" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FocusOptions20Extension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--===============================-->
+	<!--  End, Imaging Version 2.0 Related Types   -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--  Event and Analytics Types    -->
+	<!--===============================-->
+	<xs:simpleType name="TopicNamespaceLocation">
+		<xs:restriction base="xs:anyURI"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="PropertyOperation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Initialized"/>
+			<xs:enumeration value="Deleted"/>
+			<xs:enumeration value="Changed"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:element name="Message">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Source" type="tt:ItemList" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>Token value pairs that triggered this message. Typically only one item is present.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="Key" type="tt:ItemList" minOccurs="0"/>
+				<xs:element name="Data" type="tt:ItemList" minOccurs="0"/>
+				<xs:element name="Extension" type="tt:MessageExtension" minOccurs="0"/>
+			</xs:sequence>
+			<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
+			<xs:attribute name="PropertyOperation" type="tt:PropertyOperation"/>
+			<xs:anyAttribute processContents="lax"/>
+		</xs:complexType>
+	</xs:element>
+	<!--===============================-->
+	<xs:complexType name="MessageExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemList">
+		<xs:annotation>
+			<xs:documentation>
+			List of parameters according to the corresponding ItemListDescription.
+			Each item in the list shall have a unique name.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SimpleItem" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Value name pair as defined by the corresponding description.</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+					<xs:attribute name="Value" type="xs:anySimpleType" use="required">
+						<xs:annotation>
+							<xs:documentation>Item value. The type is defined in the corresponding description.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ElementItem" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Complex value structure.</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##any">
+							<xs:annotation>
+								<xs:documentation>XML tree contiaing the element value as defined in the corresponding description.</xs:documentation>
+							</xs:annotation>
+						</xs:any>
+					</xs:sequence>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ItemListExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemListExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--       Message Description     -->
+	<!--===============================-->
+	<xs:complexType name="MessageDescription">
+		<xs:sequence>
+			<xs:element name="Source" type="tt:ItemListDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Set of tokens producing this message. The list may only contain SimpleItemDescription items.
+					The set of tokens identify the component within the WS-Endpoint, which is responsible for the producing the message.<br/>
+					For analytics events the token set shall include the VideoSourceConfigurationToken, the VideoAnalyticsConfigurationToken
+					and the name of the analytics module or rule.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Key" type="tt:ItemListDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Describes optional message payload parameters that may be used as key. E.g. object IDs of tracked objects are conveyed as key.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Data" type="tt:ItemListDescription" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Describes the payload of the message.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:MessageDescriptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="IsProperty" type="xs:boolean">
+			<xs:annotation>
+				<xs:documentation>Must be set to true when the described Message relates to a property. An alternative term of "property" is a "state" in contrast to a pure event, which contains relevant information for only a single point in time.<br/>Default is false.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MessageDescriptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemListDescription">
+		<xs:annotation>
+			<xs:documentation>
+			Describes a list of items. Each item in the list shall have a unique name.
+			The list is designed as linear structure without optional or unbounded elements.
+			Use ElementItems only when complex structures are inevitable.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SimpleItemDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Description of a simple item. The type must be of cathegory simpleType (xs:string, xs:integer, xs:float, ...).</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+					<xs:attribute name="Type" type="xs:QName" use="required"/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ElementItemDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+            Description of a complex type. The Type must reference a defined type.
+          </xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:attribute name="Name" type="xs:string" use="required">
+						<xs:annotation>
+							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+					<xs:attribute name="Type" type="xs:QName" use="required">
+						<xs:annotation>
+							<xs:documentation>The type of the item. The Type must reference a defined type.</xs:documentation>
+						</xs:annotation>
+					</xs:attribute>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ItemListDescriptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ItemListDescriptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Vector">
+		<xs:attribute name="x" type="xs:float"/>
+		<xs:attribute name="y" type="xs:float"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Rectangle">
+		<xs:attribute name="bottom" type="xs:float"/>
+		<xs:attribute name="top" type="xs:float"/>
+		<xs:attribute name="right" type="xs:float"/>
+		<xs:attribute name="left" type="xs:float"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Polygon">
+		<xs:sequence>
+			<xs:element name="Point" type="tt:Vector" minOccurs="3" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Polygon" type="tt:Polygon"/>
+	<!--===============================-->
+	<xs:complexType name="Polyline">
+		<xs:sequence>
+			<xs:element name="Point" type="tt:Vector" minOccurs="2" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Polyline" type="tt:Polyline"/>
+	<!--===============================-->
+	<xs:simpleType name="Direction">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Left"/>
+			<xs:enumeration value="Right"/>
+			<xs:enumeration value="Any"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="Color">
+		<xs:attribute name="X" type="xs:float" use="required"/>
+		<xs:attribute name="Y" type="xs:float" use="required"/>
+		<xs:attribute name="Z" type="xs:float" use="required"/>
+		<xs:attribute name="Colorspace" type="xs:anyURI"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorCovariance">
+		<xs:attribute name="XX" type="xs:float" use="required"/>
+		<xs:attribute name="YY" type="xs:float" use="required"/>
+		<xs:attribute name="ZZ" type="xs:float" use="required"/>
+		<xs:attribute name="XY" type="xs:float"/>
+		<xs:attribute name="XZ" type="xs:float"/>
+		<xs:attribute name="YZ" type="xs:float"/>
+		<xs:attribute name="Colorspace" type="xs:anyURI"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--       Scene Description       -->
+	<!--===============================-->
+	<xs:complexType name="Appearance">
+		<xs:sequence>
+			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
+			<xs:element name="Shape" type="tt:ShapeDescriptor" minOccurs="0"/>
+			<xs:element name="Color" type="tt:ColorDescriptor" minOccurs="0"/>
+			<xs:element name="Class" type="tt:ClassDescriptor" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:AppearanceExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AppearanceExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ShapeDescriptor">
+		<xs:sequence>
+			<xs:element name="BoundingBox" type="tt:Rectangle"/>
+			<xs:element name="CenterOfGravity" type="tt:Vector"/>
+			<xs:element name="Polygon" type="tt:Polygon" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:ShapeDescriptorExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ShapeDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorDescriptor">
+		<xs:sequence>
+			<xs:element name="ColorCluster" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Color" type="tt:Color"/>
+						<xs:element name="Weight" type="xs:float" minOccurs="0"/>
+						<xs:element name="Covariance" type="tt:ColorCovariance" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ColorDescriptorExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ClassType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Animal"/>
+			<xs:enumeration value="Face"/>
+			<xs:enumeration value="Human"/>
+			<xs:enumeration value="Vehical"/>
+			<xs:enumeration value="Other"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ClassDescriptor">
+		<xs:sequence>
+			<xs:element name="ClassCandidate" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Type" type="tt:ClassType"/>
+						<xs:element name="Likelihood" type="xs:float"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ClassDescriptorExtension" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ClassDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="OtherTypes" type="tt:OtherType" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:ClassDescriptorExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ClassDescriptorExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OtherType">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Object Class Type</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Likelihood" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>A likelihood/probability that the corresponding object belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Object">
+		<xs:complexContent>
+			<xs:extension base="tt:ObjectId">
+				<xs:sequence>
+					<xs:element name="Appearance" type="tt:Appearance" minOccurs="0"/>
+					<xs:element name="Behaviour" type="tt:Behaviour" minOccurs="0"/>
+					<xs:element name="Extension" type="tt:ObjectExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Transformation">
+		<xs:sequence>
+			<xs:element name="Translate" type="tt:Vector" minOccurs="0"/>
+			<xs:element name="Scale" type="tt:Vector" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:TransformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TransformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Frame">
+		<xs:sequence>
+			<xs:element name="PTZStatus" type="tt:PTZStatus" minOccurs="0"/>
+			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
+			<xs:element name="Object" type="tt:Object" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ObjectTree" type="tt:ObjectTree" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:FrameExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FrameExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="MotionInCells" type="tt:MotionInCells" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:FrameExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FrameExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Merge">
+		<xs:sequence>
+			<xs:element name="from" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
+			<xs:element name="to" type="tt:ObjectId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Split">
+		<xs:sequence>
+			<xs:element name="from" type="tt:ObjectId"/>
+			<xs:element name="to" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Rename">
+		<xs:sequence>
+			<xs:element name="from" type="tt:ObjectId"/>
+			<xs:element name="to" type="tt:ObjectId"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectId">
+		<xs:attribute name="ObjectId" type="xs:integer"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Behaviour">
+		<xs:sequence>
+			<xs:element name="Removed" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Idle" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:BehaviourExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="BehaviourExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectTree">
+		<xs:sequence>
+			<xs:element name="Rename" type="tt:Rename" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Split" type="tt:Split" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Merge" type="tt:Merge" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Delete" type="tt:ObjectId" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:ObjectTreeExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ObjectTreeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MotionInCells">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Columns" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Rows" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Cells" type="xs:base64Binary" use="required">
+			<xs:annotation>
+				<xs:documentation>A “1” denotes a cell where motion is detected and a “0” an empty cell. The first cell is in the upper left corner. Then the cell order goes first from left to right and then from up to down.  If the number of cells is not a multiple of 8 the last byte is filled with zeros. The information is run length encoded according to Packbit coding in ISO 12369 (TIFF, Revision 6.0).</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--    Analytics Configuration    -->
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineConfiguration">
+		<xs:sequence>
+			<xs:element name="AnalyticsModule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:AnalyticsEngineConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RuleEngineConfiguration">
+		<xs:sequence>
+			<xs:element name="Rule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:RuleEngineConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RuleEngineConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Config">
+		<xs:sequence>
+			<xs:element name="Parameters" type="tt:ItemList">
+				<xs:annotation>
+					<xs:documentation>List of configuration parameters as defined in the correspding description.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="Name" type="xs:string" use="required">
+			<xs:annotation>
+				<xs:documentation>Name of the configuration.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Type" type="xs:QName" use="required">
+			<xs:annotation>
+				<xs:documentation>Type of the configuration represented by a unique QName. The Type characterizes a ConfigDescription defining the Parameters.</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ConfigDescription">
+		<xs:sequence>
+			<xs:element name="Parameters" type="tt:ItemListDescription">
+				<xs:annotation>
+					<xs:documentation>
+						List describing the configuration parameters. The names of the parameters must be unique. If possible SimpleItems
+						should be used to transport the information to ease parsing of dynamically defined messages by a client
+						application.
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Messages" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+						The analytics modules and rule engine produce Events, which must be listed within the Analytics Module Description. In order to do so
+						the structure of the Message is defined and consists of three groups: Source, Key, and Data. It is recommended to use SimpleItemDescriptions wherever applicable.
+						The name of all Items must be unique within all Items contained in any group of this Message.
+						Depending on the component multiple parameters or none may be needed to identify the component uniquely.
+					</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="tt:MessageDescription">
+							<xs:sequence>
+								<xs:element name="ParentTopic" type="xs:string">
+									<xs:annotation>
+										<xs:documentation>
+											The ParentTopic labels the message (e.g. "nn:RuleEngine/LineCrossing"). The real message can extend the ParentTopic
+											by for example the name of the instaniated rule (e.g. "nn:RuleEngine/LineCrossing/corssMyFirstLine").
+											Even without knowing the complete topic name, the subscriber will be able to distiguish the
+											messages produced by different rule instances of the same type via the Source fields of the message.
+											There the name of the rule instance, which produced the message, must be listed.
+										</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ConfigDescriptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="Name" type="xs:QName" use="required">
+			<xs:annotation>
+				<xs:documentation>XML Type of the Configuration (e.g. "tt::LineDetector"). </xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ConfigDescriptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedRules">
+		<xs:sequence>
+			<xs:element name="RuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Lists the location of all schemas that are referenced in the rules.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of rules supported by the Video Analytics configuration..</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SupportedRulesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedRulesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedAnalyticsModules">
+		<xs:sequence>
+			<xs:element name="AnalyticsModuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>It optionally contains a list of URLs that provide the location of schema files.
+        These schema files describe the types and elements used in the analytics module descriptions.
+        If the analytics module descriptions reference types or elements of the ONVIF schema file,
+        the ONVIF schema file MUST be explicitly listed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AnalyticsModuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:SupportedAnalyticsModulesExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SupportedAnalyticsModulesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolygonConfiguration">
+		<xs:sequence>
+			<xs:element name="Polygon" type="tt:Polygon">
+				<xs:annotation>
+					<xs:documentation>Contains Polygon configuration for rule parameters</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolylineArray">
+		<xs:sequence>
+			<xs:element name="Segment" type="tt:Polyline" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Contains array of Polyline</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PolylineArrayExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolylineArrayExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PolylineArrayConfiguration">
+		<xs:sequence>
+			<xs:element name="PolylineArray" type="tt:PolylineArray">
+				<xs:annotation>
+					<xs:documentation>Contains PolylineArray configuration data</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MotionExpression">
+		<xs:sequence>
+			<xs:element name="Expression" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Motion Expression data structure contains motion expression which is based on Scene Descriptor schema with XPATH syntax. The Type argument could allow introduction of different dialects </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Type" type="xs:string"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MotionExpressionConfiguration">
+		<xs:sequence>
+			<xs:element name="MotionExpression" type="tt:MotionExpression">
+				<xs:annotation>
+					<xs:documentation>Contains Rule MotionExpression configuration</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CellLayout">
+		<xs:sequence>
+			<xs:element name="Transformation" type="tt:Transformation">
+				<xs:annotation>
+					<xs:documentation>Mapping of the cell grid to the Video frame. The cell grid is starting from the upper left corner and x dimension is going from left to right and the y dimension from up to down.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Columns" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="Rows" type="xs:integer" use="required">
+			<xs:annotation>
+				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--End, Event and Analytics Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Metadata Streaming Types    -->
+	<!--===============================-->
+	<xs:complexType name="MetadataStream">
+		<xs:sequence>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:element name="VideoAnalytics" type="tt:VideoAnalyticsStream"/>
+				<xs:element name="PTZ" type="tt:PTZStream"/>
+				<xs:element name="Event" type="tt:EventStream"/>
+				<xs:element name="Extension" type="tt:MetadataStreamExtension"/>
+			</xs:choice>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="AudioAnalyticsStream" type="tt:AudioAnalyticsStream" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:MetadataStreamExtension2" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataStreamExtension2">
+		<xs:sequence>
+			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioAnalyticsStream">
+		<xs:sequence>
+			<xs:element name="AudioDescriptor" type="tt:AudioDescriptor" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:AudioAnalyticsStreamExtension" minOccurs="0" />
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioDescriptor">
+		<xs:sequence>
+		<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="UtcTime" type="xs:dateTime" use="required">
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioAnalyticsStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:element name="MetadataStream" type="tt:MetadataStream"/>
+	<!--===============================-->
+	<xs:complexType name="VideoAnalyticsStream">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="Frame" type="tt:Frame"/>
+			<xs:element name="Extension" type="tt:VideoAnalyticsStreamExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoAnalyticsStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStream">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="PTZStatus" type="tt:PTZStatus"/>
+			<xs:element name="Extension" type="tt:PTZStreamExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventStream">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element ref="wsnt:NotificationMessage"/>
+			<xs:element name="Extension" type="tt:EventStreamExtension"/>
+		</xs:choice>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventStreamExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!-- End, Metadata Streaming Types -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--      Display Related Types  -->
+	<!--===============================-->
+	<xs:complexType name="PaneConfiguration">
+		<xs:annotation>
+			<xs:documentation>Configuration of the streaming and coding settings of a Video window.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="PaneName" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional name of the pane configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioOutputToken" type="tt:ReferenceToken" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device has audio outputs, this element contains a pointer to the audio output that is associated with the pane. A client
+can retrieve the available audio outputs of a device using the GetAudioOutputs command of the DeviceIO service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioSourceToken" type="tt:ReferenceToken" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device has audio sources, this element contains a pointer to the audio source that is associated with this pane.
+The audio connection from a decoder device to the NVT is established using the backchannel mechanism. A client can retrieve the available audio sources of a device using the GetAudioSources command of the
+DeviceIO service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The configuration of the audio encoder including codec, bitrate
+and sample rate. </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ReceiverToken" type="tt:ReferenceToken" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>A pointer to a Receiver that has the necessary information to receive
+				data from a Transmitter. This Receiver can be connected and the network video decoder displays the received data on the specified outputs. A client can retrieve the available Receivers using the
+				GetReceivers command of the Receiver Service.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Token" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>A unique identifier in the display device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PaneLayout">
+		<xs:annotation>
+			<xs:documentation>A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Pane" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Reference to the configuration of the streaming and coding parameters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Area" type="tt:Rectangle">
+				<xs:annotation>
+					<xs:documentation>Describes the location and size of the area on the monitor. The area coordinate values are espressed in normalized units [-1.0, 1.0].</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="Layout">
+		<xs:annotation>
+			<xs:documentation>A layout describes a set of Video windows that are displayed simultaniously on a display. </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="PaneLayout" type="tt:PaneLayout" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of panes assembling the display layout.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:LayoutExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="LayoutExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="CodingCapabilities">
+		<xs:annotation>
+			<xs:documentation>This type contains the Audio and Video coding capabilities of a display service.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="AudioEncodingCapabilities" type="tt:AudioEncoderConfigurationOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device supports audio encoding this section describes the supported codecs and their configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioDecodingCapabilities" type="tt:AudioDecoderConfigurationOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the device supports audio decoding this section describes the supported codecs and their settings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoDecodingCapabilities" type="tt:VideoDecoderConfigurationOptions">
+				<xs:annotation>
+					<xs:documentation>This section describes the supported video codesc and their configuration.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="LayoutOptions">
+		<xs:annotation>
+			<xs:documentation>The options supported for a display layout.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="PaneLayoutOptions" type="tt:PaneLayoutOptions" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Lists the possible Pane Layouts of the Video Output</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:LayoutOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="LayoutOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PaneLayoutOptions">
+		<xs:annotation>
+			<xs:documentation>Description of a pane layout describing a complete display layout.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Area" type="tt:Rectangle" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of areas assembling a layout. Coordinate values are in the range [-1.0, 1.0].</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:PaneOptionExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PaneOptionExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<!--      End, Display Related Types  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--   Receiver Types              -->
+	<!--===============================-->
+	<xs:complexType name="Receiver">
+		<xs:annotation>
+			<xs:documentation>
+			Description of a receiver, including its token and configuration.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Token" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Unique identifier of the receiver.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Configuration" type="tt:ReceiverConfiguration">
+				<xs:annotation>
+					<xs:documentation>Describes the configuration of the receiver.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ReceiverConfiguration">
+		<xs:annotation>
+			<xs:documentation>
+			Describes the configuration of a receiver.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Mode" type="tt:ReceiverMode">
+				<xs:annotation>
+					<xs:documentation>The following connection modes are defined:</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MediaUri" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>Details of the URI to which the receiver should connect.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StreamSetup" type="tt:StreamSetup">
+				<xs:annotation>
+					<xs:documentation>Stream connection parameters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ReceiverMode">
+		<xs:annotation>
+			<xs:documentation>
+			Specifies a receiver connection mode.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="AutoConnect">
+				<xs:annotation>
+					<xs:documentation>The receiver connects on demand, as required by consumers of the media streams.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="AlwaysConnect">
+				<xs:annotation>
+					<xs:documentation>The receiver attempts to maintain a persistent connection to the configured endpoint.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="NeverConnect">
+				<xs:annotation>
+					<xs:documentation>The receiver does not attempt to connect.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="ReceiverState">
+		<xs:annotation>
+			<xs:documentation>
+			Specifies the current connection state of the receiver.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="NotConnected">
+				<xs:annotation>
+					<xs:documentation>The receiver is not connected.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Connecting">
+				<xs:annotation>
+					<xs:documentation>The receiver is attempting to connect.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Connected">
+				<xs:annotation>
+					<xs:documentation>The receiver is connected.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="ReceiverStateInformation">
+		<xs:annotation>
+			<xs:documentation>
+			Contains information about a receiver's current state.
+		</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="State" type="tt:ReceiverState">
+				<xs:annotation>
+					<xs:documentation>The connection state of the receiver may have one of the following states: </xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoCreated" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates whether or not the receiver was created automatically.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--   End, Receiver Types         					  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--         Storage Types         -->
+	<!--===============================-->
+	<xs:simpleType name="ReceiverReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="SourceReference">
+		<xs:sequence>
+			<xs:element name="Token" type="tt:ReferenceToken"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="Type" type="xs:anyURI" use="optional" default="http://www.onvif.org/ver10/schema/Receiver"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="TrackReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="Description">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="DateTimeRange">
+		<xs:sequence>
+			<xs:element name="From" type="xs:dateTime"/>
+			<xs:element name="Until" type="xs:dateTime"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingSummary">
+		<xs:sequence>
+			<xs:element name="DataFrom" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The earliest point in time where there is recorded data on the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DataUntil" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The most recent point in time where there is recorded data on the device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="NumberRecordings" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The device contains this many recordings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SearchScope">
+		<xs:annotation>
+			<xs:documentation>A structure for defining a limited scope when searching in recorded data.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="IncludedSources" type="tt:SourceReference" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of sources that are included in the scope. If this list is included, only data from one of these sources shall be searched.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="IncludedRecordings" type="tt:RecordingReference" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A list of recordings that are included in the scope. If this list is included, only data from one of these recordings shall be searched.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecordingInformationFilter" type="tt:XPathExpression" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>An xpath expression used to specify what recordings to search. Only those recordings with an RecordingInformation structure that matches the filter shall be searched.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:SearchScopeExtension" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Extension point</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SearchScopeExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EventFilter">
+		<xs:complexContent>
+			<xs:extension base="wsnt:FilterType">
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="PTZPositionFilter">
+		<xs:sequence>
+			<xs:element name="MinPosition" type="tt:PTZVector">
+				<xs:annotation>
+					<xs:documentation>The lower boundary of the PTZ volume to look for.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxPosition" type="tt:PTZVector">
+				<xs:annotation>
+					<xs:documentation>The upper boundary of the PTZ volume to look for.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EnterOrExit" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>If true, search for when entering the specified PTZ volume.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataFilter">
+		<xs:sequence>
+			<xs:element name="MetadataStreamFilter" type="tt:XPathExpression"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="XPathExpression">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="FindRecordingResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecordingInformation" type="tt:RecordingInformation" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A RecordingInformation structure for each found recording matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindEventResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Result" type="tt:FindEventResult" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A FindEventResult structure for each found event matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindEventResult">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>The recording where this event was found. Empty string if no recording is associated with this event.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the track where this event was found. Empty string if no track is associated with this event.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Time" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The time when the event occured.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Event" type="wsnt:NotificationMessageHolderType">
+				<xs:annotation>
+					<xs:documentation>The description of the event.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="StartStateEvent" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>If true, indicates that the event is a virtual event generated for this particular search session to give the state of a property at the start time of the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindPTZPositionResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Result" type="tt:FindPTZPositionResult" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A FindPTZPositionResult structure for each found PTZ position matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindPTZPositionResult">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the recording containing the PTZ position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the metadata track containing the PTZ position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Time" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The time when the PTZ position was valid.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Position" type="tt:PTZVector">
+				<xs:annotation>
+					<xs:documentation>The PTZ position.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindMetadataResultList">
+		<xs:sequence>
+			<xs:element name="SearchState" type="tt:SearchState">
+				<xs:annotation>
+					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Result" type="tt:FindMetadataResult" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A FindMetadataResult structure for each found set of Metadata matching the search.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="FindMetadataResult">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the recording containing the metadata.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the metadata track containing the matching metadata.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Time" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The point in time when the matching metadata occurs in the metadata track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="SearchState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Queued">
+				<xs:annotation>
+					<xs:documentation>The search is queued and not yet started.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Searching">
+				<xs:annotation>
+					<xs:documentation>The search is underway and not yet completed.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Completed">
+				<xs:annotation>
+					<xs:documentation>The search has been completed and no new results will be found.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>The state of the search is unknown. (This is not a valid response from GetSearchState.)</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:simpleType name="JobToken">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingInformation">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference"/>
+			<xs:element name="Source" type="tt:RecordingSourceInformation">
+				<xs:annotation>
+					<xs:documentation>
+					Information about the source of the recording. This gives a description of where the data in the recording comes from. Since a single
+					recording is intended to record related material, there is just one source. It is indicates the physical location or the
+					major data source for the recording. Currently the recordingconfiguration cannot describe each individual data source.
+				</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EarliestRecording" type="xs:dateTime" minOccurs="0"/>
+			<xs:element name="LatestRecording" type="xs:dateTime" minOccurs="0"/>
+			<xs:element name="Content" type="tt:Description"/>
+			<xs:element name="Track" type="tt:TrackInformation" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RecordingStatus" type="tt:RecordingStatus"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingSourceInformation">
+		<xs:annotation>
+			<xs:documentation>
+				A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SourceId" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>
+				Identifier for the source chosen by the client that creates the structure.
+				This identifier is opaque to the device. Clients may use any type of URI for this field. A device shall support at least 128 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Name" type="tt:Name">
+				<xs:annotation>
+					<xs:documentation>Informative user readable name of the source, e.g. "Camera23". A device shall support at least 20 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Location" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the physical location of the source, e.g. the coordinates on a map.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Description" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the source.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Address" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>URI provided by the service supplying data to be recorded. A device shall support at least 128 characters.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingStatus">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Initiated"/>
+			<xs:enumeration value="Recording"/>
+			<xs:enumeration value="Stopped"/>
+			<xs:enumeration value="Removing"/>
+			<xs:enumeration value="Removed"/>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="TrackInformation">
+		<xs:sequence>
+			<xs:element name="TrackToken" type="tt:TrackReference"/>
+			<xs:element name="TrackType" type="tt:TrackType">
+				<xs:annotation>
+					<xs:documentation>Type of the track: "Video", "Audio" or "Metadata".
+					The track shall only be able to hold data of that type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Description" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the contents of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DataFrom" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The start date and time of the oldest recorded data in the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DataTo" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The stop date and time of the newest recorded data in the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="TrackType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Video"/>
+			<xs:enumeration value="Audio"/>
+			<xs:enumeration value="Metadata"/>
+			<xs:enumeration value="Extended">
+				<xs:annotation>
+					<xs:documentation>Placeholder for future extension.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="MediaAttributes">
+		<xs:annotation>
+			<xs:documentation>A set of media attributes valid for a recording at a point in time or for a time interval.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>A reference to the recording that has these attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TrackAttributes" type="tt:TrackAttributes" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>A set of attributes for each track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="From" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The attributes are valid from this point in time in the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Until" type="xs:dateTime">
+				<xs:annotation>
+					<xs:documentation>The attributes are valid until this point in time in the recording. Can be equal to 'From' to indicate that the attributes are only known to be valid for this particular point in time.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TrackAttributes">
+		<xs:sequence>
+			<xs:element name="TrackInformation" type="tt:TrackInformation">
+				<xs:annotation>
+					<xs:documentation>The basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VideoAttributes" type="tt:VideoAttributes" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the track is a video track, exactly one of this structure shall be present and contain the video attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AudioAttributes" type="tt:AudioAttributes" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the track is an audio track, exactly one of this structure shall be present and contain the audio attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MetadataAttributes" type="tt:MetadataAttributes" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If the track is an metadata track, exactly one of this structure shall be present and contain the metadata attributes.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:TrackAttributesExtension" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation/>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TrackAttributesExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="VideoAttributes">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Average bitrate in kbps.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Width" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The width of the video in pixels.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Height" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The height of the video in pixels.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Encoding" type="tt:VideoEncoding">
+				<xs:annotation>
+					<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Framerate" type="xs:float">
+				<xs:annotation>
+					<xs:documentation>Average framerate in frames per second.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AudioAttributes">
+		<xs:sequence>
+			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The bitrate in kbps.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Encoding" type="tt:AudioEncoding">
+				<xs:annotation>
+					<xs:documentation>Audio codec used for encoding the audio (either G.711, G.726 or AAC)</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Samplerate" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>The sample rate in kHz.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataAttributes">
+		<xs:sequence>
+			<xs:element name="CanContainPTZ" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates that there can be PTZ data in the metadata track in the specified time interval.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CanContainAnalytics" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates that there can be analytics data in the metadata track in the specified time interval.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CanContainNotifications" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>Indicates that there can be notifications in the metadata track in the specified time interval.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute name="PtzSpaces" type="tt:StringAttrList">
+			<xs:annotation>
+				<xs:documentation>List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. </xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         RecordingService Types         		  -->
+	<!--===============================-->
+	<!--===============================-->
+	<xs:simpleType name="RecordingJobReference">
+		<xs:restriction base="tt:ReferenceToken"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingConfiguration">
+		<xs:sequence>
+			<xs:element name="Source" type="tt:RecordingSourceInformation">
+				<xs:annotation>
+					<xs:documentation>Information about the source of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Content" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the source.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaximumRetentionTime" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>Sspecifies the maximum time that data in any track within the
+				recording shall be stored. The device shall delete any data older than the maximum retention
+				time. Such data shall not be accessible anymore. If the MaximumRetentionPeriod is set to 0,
+				the device shall not limit the retention time of stored data, except by resource constraints.
+				Whatever the value of MaximumRetentionTime, the device may automatically delete
+				recordings to free up storage space for new recordings.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="TrackConfiguration">
+		<xs:sequence>
+			<xs:element name="TrackType" type="tt:TrackType">
+				<xs:annotation>
+					<xs:documentation>Type of the track. It shall be equal to the strings “Video”,
+				“Audio” or “Metadata”. The track shall only be able to hold data of that type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Description" type="tt:Description">
+				<xs:annotation>
+					<xs:documentation>Informative description of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetRecordingsResponseItem">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>Token of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Configuration" type="tt:RecordingConfiguration">
+				<xs:annotation>
+					<xs:documentation>Configuration of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tracks" type="tt:GetTracksResponseList">
+				<xs:annotation>
+					<xs:documentation>List of tracks.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetTracksResponseList">
+		<xs:sequence>
+			<xs:element name="Track" type="tt:GetTracksResponseItem" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Configuration of a track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetTracksResponseItem">
+		<xs:sequence>
+			<xs:element name="TrackToken" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>Token of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Configuration" type="tt:TrackConfiguration">
+				<xs:annotation>
+					<xs:documentation>Configuration of the track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobConfiguration">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>Identifies the recording to which this job shall store the received data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Mode" type="tt:RecordingJobMode">
+				<xs:annotation>
+					<xs:documentation>The mode of the job. If it is idle, nothing shall happen. If it is active, the device shall try
+				to obtain data from the receivers. A client shall use GetRecordingJobState to determine if data transfer is really taking place.<br/>
+				The only valid values for Mode shall be “Idle” and “Active”.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Priority" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>This shall be a non-negative number. If there are multiple recording jobs that store data to
+				the same track, the device will only store the data for the recording job with the highest
+				priority. The priority is specified per recording job, but the device shall determine the priority
+				of each track individually. If there are two recording jobs with the same priority, the device
+				shall record the data corresponding to the recording job that was activated the latest.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Source" type="tt:RecordingJobSource" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Source of the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RecordingJobConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingJobMode">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobSource">
+		<xs:sequence>
+			<xs:element name="SourceToken" type="tt:SourceReference" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>This field shall be a reference to the source of the data. The type of the source
+				is determined by the attribute Type in the SourceToken structure. If Type is
+				http://www.onvif.org/ver10/schema/Receiver, the token is a ReceiverReference. In this case
+				the device shall receive the data over the network. If Type is
+				http://www.onvif.org/ver10/schema/Profile, the token identifies a media profile, instructing the
+				device to obtain data from a profile that exists on the local device.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AutoCreateReceiver" type="xs:boolean" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>If this field is TRUE, and if the SourceToken is omitted, the device
+				shall create a receiver object (through the receiver service) and assign the
+				ReceiverReference to the SourceToken field. When retrieving the RecordingJobConfiguration
+				from the device, the AutoCreateReceiver field shall never be present.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tracks" type="tt:RecordingJobTrack" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of tracks associated with the recording.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RecordingJobSourceExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobSourceExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobTrack">
+		<xs:sequence>
+			<xs:element name="SourceTag" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>If the received RTSP stream contains multiple tracks of the same type, the
+						SourceTag differentiates between those Tracks. This field can be ignored in case of recording a local source.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Destination" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>The destination is the tracktoken of the track to which the device shall store the
+				received data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateInformation">
+		<xs:sequence>
+			<xs:element name="RecordingToken" type="tt:RecordingReference">
+				<xs:annotation>
+					<xs:documentation>Identification of the recording that the recording job records to.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:RecordingJobState">
+				<xs:annotation>
+					<xs:documentation>Holds the aggregated state over the whole RecordingJobInformation structure.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Sources" type="tt:RecordingJobStateSource" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:RecordingJobStateInformationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateInformationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="RecordingJobState">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateSource">
+		<xs:sequence>
+			<xs:element name="SourceToken" type="tt:SourceReference">
+				<xs:annotation>
+					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:RecordingJobState">
+				<xs:annotation>
+					<xs:documentation>Holds the aggregated state over all substructures of RecordingJobStateSource.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Tracks" type="tt:RecordingJobStateTracks">
+				<xs:annotation>
+					<xs:documentation>List of track items.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateTracks">
+		<xs:sequence>
+			<xs:element name="Track" type="tt:RecordingJobStateTrack" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="RecordingJobStateTrack">
+		<xs:sequence>
+			<xs:element name="SourceTag" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>Identifies the track of the data source that provides the data.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Destination" type="tt:TrackReference">
+				<xs:annotation>
+					<xs:documentation>Indicates the destination track.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Error" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optionally holds an implementation defined string value that describes the error.
+				The string should be in the English language.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:RecordingJobState">
+				<xs:annotation>
+					<xs:documentation>Provides the job state of the track. The valid
+				values of state shall be “Idle”, “Active” and “Error”. If state equals “Error”, the Error field may be filled in with an implementation defined value.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="GetRecordingJobsResponseItem">
+		<xs:sequence>
+			<xs:element name="JobToken" type="tt:RecordingJobReference"/>
+			<xs:element name="JobConfiguration" type="tt:RecordingJobConfiguration"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         End, RecordingService Types         		  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--         Replay Types         		  -->
+	<!--===============================-->
+	<xs:complexType name="ReplayConfiguration">
+		<xs:annotation>
+			<xs:documentation>
+      Configuration parameters for the replay service.
+    </xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="SessionTimeout" type="xs:duration">
+				<xs:annotation>
+					<xs:documentation>The RTSP session timeout.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         End, Replay Types         		  -->
+	<!--===============================-->
+	<!--===============================-->
+	<!--===============================-->
+	<!--         Analytics Device Types         -->
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngine">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsDeviceEngineConfiguration"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceEngineConfiguration">
+		<xs:sequence>
+			<xs:element name="EngineConfiguration" type="tt:EngineConfiguration" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:AnalyticsDeviceEngineConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsDeviceEngineConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="EngineConfiguration">
+		<xs:sequence>
+			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
+			<xs:element name="AnalyticsEngineInputInfo" type="tt:AnalyticsEngineInputInfo"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineInputInfo">
+		<xs:sequence>
+			<xs:element name="InputInfo" type="tt:Config" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:AnalyticsEngineInputInfoExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineInputInfoExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineInput">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="SourceIdentification" type="tt:SourceIdentification"/>
+					<xs:element name="VideoInput" type="tt:VideoEncoderConfiguration"/>
+					<xs:element name="MetadataInput" type="tt:MetadataInput"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SourceIdentification">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string"/>
+			<xs:element name="Token" type="tt:ReferenceToken" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:SourceIdentificationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="SourceIdentificationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataInput">
+		<xs:sequence>
+			<xs:element name="MetadataConfig" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Extension" type="tt:MetadataInputExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MetadataInputExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsEngineControl">
+		<xs:complexContent>
+			<xs:extension base="tt:ConfigurationEntity">
+				<xs:sequence>
+					<xs:element name="EngineToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the analytics engine (AnalyticsEngine) being controlled.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="EngineConfigToken" type="tt:ReferenceToken">
+						<xs:annotation>
+							<xs:documentation>Token of the analytics engine configuration (VideoAnalyticsConfiguration) in effect.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="InputToken" type="tt:ReferenceToken" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>Tokens of the input (AnalyticsEngineInput) configuration applied.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ReceiverToken" type="tt:ReferenceToken" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>Tokens of the receiver providing media input data. The order of ReceiverToken shall exactly match the order of InputToken.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0"/>
+					<xs:element name="Subscription" type="tt:Config"/>
+					<xs:element name="Mode" type="tt:ModeOfOperation"/>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="ModeOfOperation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Idle"/>
+			<xs:enumeration value="Active"/>
+			<xs:enumeration value="Unknown">
+				<xs:annotation>
+					<xs:documentation>This case should never happen.</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsStateInformation">
+		<xs:sequence>
+			<xs:element name="AnalyticsEngineControlToken" type="tt:ReferenceToken">
+				<xs:annotation>
+					<xs:documentation>Token of the control object whose status is requested.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="State" type="tt:AnalyticsState"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="AnalyticsState">
+		<xs:sequence>
+			<xs:element name="Error" type="xs:string" minOccurs="0"/>
+			<xs:element name="State" type="xs:string"/>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<!--         End, Analytics Device Types         -->
+	<!--===============================-->
+	<!--=========================================-->
+	<!--  Action event payload Types   -->
+	<!--=========================================-->
+	<!--===============================-->
+	<xs:complexType name="ActionEngineEventPayload">
+		<xs:annotation>
+			<xs:documentation>Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="RequestInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>Request Message</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ResponseInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>Response Message</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Fault" type="soapenv:Fault" minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>Fault Message</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:ActionEngineEventPayloadExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ActionEngineEventPayloadExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--=========================================-->
+	<!--  End, Action event payload Types   -->
+	<!--=========================================-->
+        <!--=========================================-->
+	<!--  Begin, Audio event types               -->
+	<!--=========================================-->
+	<xs:simpleType name="AudioClassType">
+		<xs:annotation>
+		<xs:documentation>
+		  AudioClassType acceptable values are;
+		   gun_shot, scream, glass_breaking, tire_screech   
+		</xs:documentation>
+		</xs:annotation>
+	<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<xs:complexType name="AudioClassCandidate">
+	<xs:sequence>
+		<xs:element name="Type" type="tt:AudioClassType">
+			<xs:annotation>
+			<xs:documentation>Indicates audio class label</xs:documentation>
+			</xs:annotation>
+		</xs:element> 
+ 		<xs:element name="Likelihood" type="xs:float">
+			<xs:annotation>
+			<xs:documentation>A likelihood/probability that the corresponding audio event belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
+			</xs:annotation>
+		</xs:element>  
+		<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+	</xs:sequence>
+	<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+
+	<xs:complexType name="AudioClassDescriptor">
+	<xs:sequence>
+		<xs:element name="ClassCandidate" type="tt:AudioClassCandidate" minOccurs="0" maxOccurs="unbounded">
+			<xs:annotation>
+			<xs:documentation>Array of audio class label and class probability</xs:documentation>
+			</xs:annotation>
+		</xs:element>
+		<xs:element name="Extension" type="tt:AudioClassDescriptorExtension" minOccurs="0"/>
+	</xs:sequence>
+	<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<xs:complexType name="AudioClassDescriptorExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--=========================================-->
+	<!--  End, Audio event types                 -->
+	<!--=========================================-->	
+	<!--==================================-->
+	<!--  Begin, OSD Device Types         -->
+	<!--==================================-->
+	<xs:complexType name="OSDReference">
+		<xs:simpleContent>
+			<xs:extension base="tt:ReferenceToken">
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:simpleType name="OSDType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Text"/>
+			<xs:enumeration value="Image"/>
+			<xs:enumeration value="Extended"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!--===============================-->
+	<xs:complexType name="OSDPosConfiguration">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>For OSD position type, following are the pre-defined: <ul><li>UpperLeft</li>
+						<li>UpperRight</li>
+						<li>LowerLeft</li>
+						<li>LowerRight</li>
+						<li>Custom</li></ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Pos" type="tt:Vector" minOccurs="0"/>
+			<xs:element name="Extension" type="tt:OSDPosConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDPosConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDColor">
+		<xs:annotation>
+			<xs:documentation>The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Color" type="tt:Color"/>
+		</xs:sequence>
+		<xs:attribute name="Transparent" type="xs:int" use="optional"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextConfiguration">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>
+						The following OSD Text Type are defined:<ul>
+							<li>Plain - The Plain type means the OSD is shown as a text string which defined in the "PlainText" item.</li>
+							<li>Date - The Date type means the OSD is shown as a date, format of which should be present in the "DateFormat" item.</li>
+							<li>Time - The Time type means the OSD is shown as a time, format of which should be present in the "TimeFormat" item.</li>
+							<li>DateAndTime - The DateAndTime type means the OSD is shown as date and time, format of which should be present in the "DateFormat" and the "TimeFormat" item.</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DateFormat" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+						List of supported OSD date formats. This element shall be present when the value of Type field has Date or DateAndTime. The following DateFormat are defined:<ul>
+							<li>M/d/yyyy - e.g. 3/6/2013</li>
+							<li>MM/dd/yyyy - e.g. 03/06/2013</li>
+							<li>dd/MM/yyyy - e.g. 06/03/2013</li>
+							<li>yyyy/MM/dd - e.g. 2013/03/06</li>
+							<li>yyyy-MM-dd - e.g. 2013-06-03</li>
+							<li>dddd, MMMM dd, yyyy - e.g. Wednesday, March 06, 2013</li>
+							<li>MMMM dd, yyyy - e.g. March 06, 2013</li>
+							<li>dd MMMM, yyyy - e.g. 06 March, 2013</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TimeFormat" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>
+						List of supported OSD time formats. This element shall be present when the value of Type field has Time or DateAndTime. The following TimeFormat are defined:<ul>
+							<li>h:mm:ss tt - e.g. 2:14:21 PM</li>
+							<li>hh:mm:ss tt - e.g. 02:14:21 PM</li>
+							<li>H:mm:ss - e.g. 14:14:21</li>
+							<li>HH:mm:ss - e.g. 14:14:21</li>
+						</ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontSize" type="xs:int" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Font size of the text in pt.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontColor" type="tt:OSDColor" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Font color of the text.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BackgroundColor" type="tt:OSDColor" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Background color of the text.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PlainText" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The content of text to be displayed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDTextConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgConfiguration">
+		<xs:sequence>
+			<xs:element name="ImgPath" type="xs:anyURI">
+				<xs:annotation>
+					<xs:documentation>The URI of the image which to be displayed.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDImgConfigurationExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorspaceRange">
+		<xs:sequence>
+			<xs:element name="X" type="tt:FloatRange"/>
+			<xs:element name="Y" type="tt:FloatRange"/>
+			<xs:element name="Z" type="tt:FloatRange"/>
+			<xs:element name="Colorspace" type="xs:anyURI"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="ColorOptions">
+		<xs:annotation>
+			<xs:documentation>Describe the option of the color supported. Either list each color or define the range of color value. The following values are acceptable for Colourspace attribute.<ul><li>http://www.onvif.org/ver10/colorspace/YCbCr - YCbCr colourspace</li>
+				<li>http://www.onvif.org/ver10/colorspace/CIELUV - CIE LUV</li>
+				<li>http://www.onvif.org/ver10/colorspace/CIELAB - CIE 1976 (L*a*b*)</li>
+				<li>http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace</li></ul>
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:choice>
+				<xs:element name="ColorList" type="tt:Color" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>List the supported color.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ColorspaceRange" type="tt:ColorspaceRange" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:documentation>Define the rang of color supported.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:choice>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDColorOptions">
+		<xs:annotation>
+			<xs:documentation>Describe the option of the color and its transparency.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="Color" type="tt:ColorOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Optional list of supported colors.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Transparent" type="tt:IntRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Range of the transparent level. Larger means more tranparent.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDColorOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDColorOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextOptions">
+		<xs:sequence>
+			<xs:element name="Type" type="xs:string" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported OSD text type. When a device indicates the supported number relating to Text type in MaximumNumberOfOSDs, the type shall be presented.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontSizeRange" type="tt:IntRange" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Range of the font size value.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DateFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported date format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TimeFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of supported time format.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FontColor" type="tt:OSDColorOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>List of supported font color.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BackgroundColor" type="tt:OSDColorOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>List of supported background color.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDTextOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDTextOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgOptions">
+		<xs:sequence>
+			<xs:element name="ImagePath" type="xs:anyURI" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List of avaiable uris of image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDImgOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDImgOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfiguration">
+		<xs:complexContent>
+			<xs:extension base="tt:DeviceEntity">
+				<xs:sequence>
+					<xs:element name="VideoSourceConfigurationToken" type="tt:OSDReference">
+						<xs:annotation>
+							<xs:documentation>Reference to the video source configuration.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Type" type="tt:OSDType">
+						<xs:annotation>
+							<xs:documentation>Type of OSD.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Position" type="tt:OSDPosConfiguration">
+						<xs:annotation>
+							<xs:documentation>Position configuration of OSD.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TextString" type="tt:OSDTextConfiguration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Text configuration of OSD. It shall be present when the value of Type field is Text.</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Image" type="tt:OSDImgConfiguration" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>Image configuration of OSD. It shall be present when the value of Type field is Image</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Extension" type="tt:OSDConfigurationExtension" minOccurs="0"/>
+				</xs:sequence>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfigurationExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="MaximumNumberOfOSDs">
+		<xs:attribute name="Total" type="xs:int" use="required"/>
+		<xs:attribute name="Image" type="xs:int"/>
+		<xs:attribute name="PlainText" type="xs:int"/>
+		<xs:attribute name="Date" type="xs:int"/>
+		<xs:attribute name="Time" type="xs:int"/>
+		<xs:attribute name="DateAndTime" type="xs:int"/>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfigurationOptions">
+		<xs:sequence>
+			<xs:element name="MaximumNumberOfOSDs" type="tt:MaximumNumberOfOSDs">
+				<xs:annotation>
+					<xs:documentation>The maximum number of OSD configurations supported for the specificate video source configuration. If a device limits the number of instances by OSDType, it should indicate the supported number via the related attribute.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Type" type="tt:OSDType" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List supported type of OSD configuration. When a device indicates the supported number for each types in MaximumNumberOfOSDs, related type shall be presented. A device shall return Option element relating to listed type.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PositionOption" type="xs:string" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>List available OSD position type. Following are the pre-defined:<ul><li>UpperLeft</li>
+						<li>UpperRight</li>
+						<li>LowerLeft</li>
+						<li>LowerRight</li>
+						<li>Custom</li></ul>
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TextOption" type="tt:OSDTextOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Option of the OSD text configuration. This element shall be returned if the device is signaling the support for Text.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ImageOption" type="tt:OSDImgOptions" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>Option of the OSD image configuration. This element shall be returned if the device is signaling the support for Image.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Extension" type="tt:OSDConfigurationOptionsExtension" minOccurs="0"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--===============================-->
+	<xs:complexType name="OSDConfigurationOptionsExtension">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute processContents="lax"/>
+	</xs:complexType>
+	<!--=========================================-->
+	<!--  End, OSD Device Types                  -->
+	<!--=========================================-->
+</xs:schema>
diff --git a/onvif/wsdl/ptz.wsdl b/onvif/wsdl/ptz.wsdl
new file mode 100644
index 000000000..e977619be
--- /dev/null
+++ b/onvif/wsdl/ptz.wsdl
@@ -0,0 +1,1300 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
+<!--
+Copyright (c) 2008-2012 by ONVIF: Open Network Video Interface Forum. All rights reserved.
+
+Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
+-->
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tptz="http://www.onvif.org/ver20/ptz/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="PTZService" targetNamespace="http://www.onvif.org/ver20/ptz/wsdl">
+	<wsdl:types>
+		<xs:schema targetNamespace="http://www.onvif.org/ver20/ptz/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tptz="http://www.onvif.org/ver20/ptz/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.4">
+			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
+			<!--  Message Request/Responses elements  -->
+			<!--===============================-->
+			<xs:element name="GetServiceCapabilities">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetServiceCapabilitiesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Capabilities" type="tptz:Capabilities">
+							<xs:annotation>
+								<xs:documentation>The capabilities for the PTZ service is returned in the Capabilities element.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:complexType name="Capabilities">
+				<xs:sequence>
+					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:attribute name="EFlip" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates whether or not EFlip is supported.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="Reverse" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates whether or not reversing of PT control direction is supported.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="GetCompatibleConfigurations" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>Indicates support for the GetCompatibleConfigurations command.</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:anyAttribute processContents="lax"/>
+			</xs:complexType>
+			<xs:element name="Capabilities" type="tptz:Capabilities"/>
+			<!--===============================-->
+			<xs:element name="GetNodes">
+				<xs:complexType/>
+			</xs:element>
+			<xs:element name="GetNodesResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZNode" type="tt:PTZNode" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>A list of the existing PTZ Nodes on the device.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetNode">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="NodeToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested PTZNode.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetNodeResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZNode" type="tt:PTZNode">
+							<xs:annotation>
+								<xs:documentation>A requested PTZNode.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetConfigurations">
+				<xs:complexType/>
+			</xs:element>
+			<xs:element name="GetConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>A list of all existing PTZConfigurations on the device.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of the requested PTZConfiguration.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration">
+							<xs:annotation>
+								<xs:documentation>A requested PTZConfiguration.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetConfiguration">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration">
+							<xs:annotation>
+								<xs:documentation>
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="ForcePersistence" type="xs:boolean">
+							<xs:annotation>
+								<xs:documentation>Flag that makes configuration persistent. Example: User wants the configuration to exist after reboot.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetConfigurationResponse">
+				<xs:complexType>
+					<xs:sequence minOccurs="0"/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetConfigurationOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Token of an existing configuration that the options are intended for.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetConfigurationOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZConfigurationOptions" type="tt:PTZConfigurationOptions">
+							<xs:annotation>
+								<xs:documentation>The requested PTZ configuration options.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SendAuxiliaryCommand">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the operation should take place.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="AuxiliaryData" type="tt:AuxiliaryData">
+							<xs:annotation>
+								<xs:documentation>The Auxiliary request data.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SendAuxiliaryCommandResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="AuxiliaryResponse" type="tt:AuxiliaryData">
+							<xs:annotation>
+								<xs:documentation>The response contains the auxiliary response.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetPresets">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the operation should take place.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetPresetsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Preset" type="tt:PTZPreset" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>A list of presets which are available for the requested MediaProfile.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetPreset">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the operation should take place.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="PresetName" type="xs:string" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>A requested preset name.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>A requested preset token.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetPresetResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PresetToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A token to the Preset which has been set.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemovePreset">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the operation should take place.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="PresetToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A requested preset token.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemovePresetResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GotoPreset">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the operation should take place.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="PresetToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A requested preset token.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>A requested speed.The speed parameter can only be specified when Speed Spaces are available for the PTZ Node.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GotoPresetResponse">
+				<xs:complexType/>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetStatus">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the PTZStatus should be requested.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetStatusResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZStatus" type="tt:PTZStatus">
+							<xs:annotation>
+								<xs:documentation>The PTZStatus for the requested MediaProfile.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GotoHomePosition">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the operation should take place.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>A requested speed.The speed parameter can only be specified when Speed Spaces are available for the PTZ Node.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GotoHomePositionResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="SetHomePosition">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile where the home position should be set.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="SetHomePositionResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="ContinuousMove">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Velocity" type="tt:PTZSpeed">
+							<xs:annotation>
+								<xs:documentation>A Velocity vector specifying the velocity of pan, tilt and zoom.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Timeout" type="xs:duration" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>An optional Timeout parameter.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ContinuousMoveResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RelativeMove">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Translation" type="tt:PTZVector">
+							<xs:annotation>
+								<xs:documentation>A positional Translation relative to the current position
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>An optional Speed parameter.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RelativeMoveResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="AbsoluteMove">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Position" type="tt:PTZVector">
+							<xs:annotation>
+								<xs:documentation>A Position vector specifying the absolute target position.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>An optional Speed.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AbsoluteMoveResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="Stop">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>A reference to the MediaProfile that indicate what should be stopped.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="PanTilt" type="xs:boolean" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Set true when we want to stop ongoing pan and tilt movements.If PanTilt arguments are not present, this command stops these movements.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Zoom" type="xs:boolean" minOccurs="0">
+							<xs:annotation>
+								<xs:documentation>Set true when we want to stop ongoing zoom movement.If Zoom arguments are not present, this command stops ongoing zoom movement.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="StopResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetPresetTours">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetPresetToursResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PresetTour" type="tt:PresetTour" minOccurs="0" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetPresetTour">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetPresetTourResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PresetTour" type="tt:PresetTour"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetPresetTourOptions">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+						<xs:element name="PresetTourToken" type="tt:ReferenceToken" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetPresetTourOptionsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Options" type="tt:PTZPresetTourOptions"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="CreatePresetTour">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CreatePresetTourResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="ModifyPresetTour">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+						<xs:element name="PresetTour" type="tt:PresetTour"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ModifyPresetTourResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="OperatePresetTour">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
+						<xs:element name="Operation" type="tt:PTZPresetTourOperation"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="OperatePresetTourResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="RemovePresetTour">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
+						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RemovePresetTourResponse">
+				<xs:complexType>
+					<xs:sequence/>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+			<xs:element name="GetCompatibleConfigurations">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="ProfileToken" type="tt:ReferenceToken">
+							<xs:annotation>
+								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetCompatibleConfigurationsResponse">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>A list of all existing PTZConfigurations on the NVT that is suitable to be added to the addressed media profile.
+								</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<!--===============================-->
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="GetServiceCapabilitiesRequest">
+		<wsdl:part name="parameters" element="tptz:GetServiceCapabilities"/>
+	</wsdl:message>
+	<wsdl:message name="GetServiceCapabilitiesResponse">
+		<wsdl:part name="parameters" element="tptz:GetServiceCapabilitiesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetNodesRequest">
+		<wsdl:part name="parameters" element="tptz:GetNodes"/>
+	</wsdl:message>
+	<wsdl:message name="GetNodesResponse">
+		<wsdl:part name="parameters" element="tptz:GetNodesResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetNodeRequest">
+		<wsdl:part name="parameters" element="tptz:GetNode"/>
+	</wsdl:message>
+	<wsdl:message name="GetNodeResponse">
+		<wsdl:part name="parameters" element="tptz:GetNodeResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetConfigurationsRequest">
+		<wsdl:part name="parameters" element="tptz:GetConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetConfigurationsResponse">
+		<wsdl:part name="parameters" element="tptz:GetConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetConfigurationRequest">
+		<wsdl:part name="parameters" element="tptz:GetConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="GetConfigurationResponse">
+		<wsdl:part name="parameters" element="tptz:GetConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetConfigurationRequest">
+		<wsdl:part name="parameters" element="tptz:SetConfiguration"/>
+	</wsdl:message>
+	<wsdl:message name="SetConfigurationResponse">
+		<wsdl:part name="parameters" element="tptz:SetConfigurationResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetConfigurationOptionsRequest">
+		<wsdl:part name="parameters" element="tptz:GetConfigurationOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetConfigurationOptionsResponse">
+		<wsdl:part name="parameters" element="tptz:GetConfigurationOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetsRequest">
+		<wsdl:part name="parameters" element="tptz:GetPresets"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetsResponse">
+		<wsdl:part name="parameters" element="tptz:GetPresetsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetPresetRequest">
+		<wsdl:part name="parameters" element="tptz:SetPreset"/>
+	</wsdl:message>
+	<wsdl:message name="SetPresetResponse">
+		<wsdl:part name="parameters" element="tptz:SetPresetResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemovePresetRequest">
+		<wsdl:part name="parameters" element="tptz:RemovePreset"/>
+	</wsdl:message>
+	<wsdl:message name="RemovePresetResponse">
+		<wsdl:part name="parameters" element="tptz:RemovePresetResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GotoPresetRequest">
+		<wsdl:part name="parameters" element="tptz:GotoPreset"/>
+	</wsdl:message>
+	<wsdl:message name="GotoPresetResponse">
+		<wsdl:part name="parameters" element="tptz:GotoPresetResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetStatusRequest">
+		<wsdl:part name="parameters" element="tptz:GetStatus"/>
+	</wsdl:message>
+	<wsdl:message name="GetStatusResponse">
+		<wsdl:part name="parameters" element="tptz:GetStatusResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SendAuxiliaryCommandRequest">
+		<wsdl:part name="parameters" element="tptz:SendAuxiliaryCommand"/>
+	</wsdl:message>
+	<wsdl:message name="SendAuxiliaryCommandResponse">
+		<wsdl:part name="parameters" element="tptz:SendAuxiliaryCommandResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GotoHomePositionRequest">
+		<wsdl:part name="parameters" element="tptz:GotoHomePosition"/>
+	</wsdl:message>
+	<wsdl:message name="GotoHomePositionResponse">
+		<wsdl:part name="parameters" element="tptz:GotoHomePositionResponse"/>
+	</wsdl:message>
+	<wsdl:message name="SetHomePositionRequest">
+		<wsdl:part name="parameters" element="tptz:SetHomePosition"/>
+	</wsdl:message>
+	<wsdl:message name="SetHomePositionResponse">
+		<wsdl:part name="parameters" element="tptz:SetHomePositionResponse"/>
+	</wsdl:message>
+	<wsdl:message name="ContinuousMoveRequest">
+		<wsdl:part name="parameters" element="tptz:ContinuousMove"/>
+	</wsdl:message>
+	<wsdl:message name="ContinuousMoveResponse">
+		<wsdl:part name="parameters" element="tptz:ContinuousMoveResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RelativeMoveRequest">
+		<wsdl:part name="parameters" element="tptz:RelativeMove"/>
+	</wsdl:message>
+	<wsdl:message name="RelativeMoveResponse">
+		<wsdl:part name="parameters" element="tptz:RelativeMoveResponse"/>
+	</wsdl:message>
+	<wsdl:message name="AbsoluteMoveRequest">
+		<wsdl:part name="parameters" element="tptz:AbsoluteMove"/>
+	</wsdl:message>
+	<wsdl:message name="AbsoluteMoveResponse">
+		<wsdl:part name="parameters" element="tptz:AbsoluteMoveResponse"/>
+	</wsdl:message>
+	<wsdl:message name="StopRequest">
+		<wsdl:part name="parameters" element="tptz:Stop"/>
+	</wsdl:message>
+	<wsdl:message name="StopResponse">
+		<wsdl:part name="parameters" element="tptz:StopResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetToursRequest">
+		<wsdl:part name="parameters" element="tptz:GetPresetTours"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetToursResponse">
+		<wsdl:part name="parameters" element="tptz:GetPresetToursResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetTourRequest">
+		<wsdl:part name="parameters" element="tptz:GetPresetTour"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetTourResponse">
+		<wsdl:part name="parameters" element="tptz:GetPresetTourResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetTourOptionsRequest">
+		<wsdl:part name="parameters" element="tptz:GetPresetTourOptions"/>
+	</wsdl:message>
+	<wsdl:message name="GetPresetTourOptionsResponse">
+		<wsdl:part name="parameters" element="tptz:GetPresetTourOptionsResponse"/>
+	</wsdl:message>
+	<wsdl:message name="CreatePresetTourRequest">
+		<wsdl:part name="parameters" element="tptz:CreatePresetTour"/>
+	</wsdl:message>
+	<wsdl:message name="CreatePresetTourResponse">
+		<wsdl:part name="parameters" element="tptz:CreatePresetTourResponse"/>
+	</wsdl:message>
+	<wsdl:message name="ModifyPresetTourRequest">
+		<wsdl:part name="parameters" element="tptz:ModifyPresetTour"/>
+	</wsdl:message>
+	<wsdl:message name="ModifyPresetTourResponse">
+		<wsdl:part name="parameters" element="tptz:ModifyPresetTourResponse"/>
+	</wsdl:message>
+	<wsdl:message name="OperatePresetTourRequest">
+		<wsdl:part name="parameters" element="tptz:OperatePresetTour"/>
+	</wsdl:message>
+	<wsdl:message name="OperatePresetTourResponse">
+		<wsdl:part name="parameters" element="tptz:OperatePresetTourResponse"/>
+	</wsdl:message>
+	<wsdl:message name="RemovePresetTourRequest">
+		<wsdl:part name="parameters" element="tptz:RemovePresetTour"/>
+	</wsdl:message>
+	<wsdl:message name="RemovePresetTourResponse">
+		<wsdl:part name="parameters" element="tptz:RemovePresetTourResponse"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleConfigurationsRequest">
+		<wsdl:part name="parameters" element="tptz:GetCompatibleConfigurations"/>
+	</wsdl:message>
+	<wsdl:message name="GetCompatibleConfigurationsResponse">
+		<wsdl:part name="parameters" element="tptz:GetCompatibleConfigurationsResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="PTZ">
+		<wsdl:operation name="GetServiceCapabilities">
+			<wsdl:documentation>Returns the capabilities of the PTZ service. The result is returned in a typed answer.</wsdl:documentation>
+			<wsdl:input message="tptz:GetServiceCapabilitiesRequest"/>
+			<wsdl:output message="tptz:GetServiceCapabilitiesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetNodes">
+			<wsdl:documentation>
+				Get the descriptions of the available PTZ Nodes.
+				<br/>
+				A PTZ-capable device may have multiple PTZ Nodes. The PTZ Nodes may represent
+				mechanical PTZ drivers, uploaded PTZ drivers or digital PTZ drivers. PTZ Nodes are the
+				lowest level entities in the PTZ control API and reflect the supported PTZ capabilities. The
+				PTZ Node is referenced either by its name or by its reference token. 
+      		</wsdl:documentation>
+			<wsdl:input message="tptz:GetNodesRequest"/>
+			<wsdl:output message="tptz:GetNodesResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetNode">
+			<wsdl:documentation>Get a specific PTZ Node identified by a reference
+        token or a name.
+	  </wsdl:documentation>
+			<wsdl:input message="tptz:GetNodeRequest"/>
+			<wsdl:output message="tptz:GetNodeResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetConfiguration">
+			<wsdl:documentation>Get a specific PTZonfiguration from the device, identified by its reference token or name.
+				<br/>
+				The default Position/Translation/Velocity Spaces are introduced to allow NVCs sending move
+				requests without the need to specify a certain coordinate system. The default Speeds are
+				introduced to control the speed of move requests (absolute, relative, preset), where no
+				explicit speed has been set.<br/>
+				The allowed pan and tilt range for Pan/Tilt Limits is defined by a two-dimensional space range
+				that is mapped to a specific Absolute Pan/Tilt Position Space. At least one Pan/Tilt Position
+				Space is required by the PTZNode to support Pan/Tilt limits. The limits apply to all supported
+				absolute, relative and continuous Pan/Tilt movements. The limits shall be checked within the
+				coordinate system for which the limits have been specified. That means that even if
+				movements are specified in a different coordinate system, the requested movements shall be
+				transformed to the coordinate system of the limits where the limits can be checked. When a
+				relative or continuous movements is specified, which would leave the specified limits, the PTZ
+				unit has to move along the specified limits. The Zoom Limits have to be interpreted
+				accordingly.
+			</wsdl:documentation>
+			<wsdl:input message="tptz:GetConfigurationRequest"/>
+			<wsdl:output message="tptz:GetConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetConfigurations">
+			<wsdl:documentation>
+		        Get all the existing PTZConfigurations from the device.
+				<br/>
+				The default Position/Translation/Velocity Spaces are introduced to allow NVCs sending move
+				requests without the need to specify a certain coordinate system. The default Speeds are
+				introduced to control the speed of move requests (absolute, relative, preset), where no
+				explicit speed has been set.<br/>
+				The allowed pan and tilt range for Pan/Tilt Limits is defined by a two-dimensional space range
+				that is mapped to a specific Absolute Pan/Tilt Position Space. At least one Pan/Tilt Position
+				Space is required by the PTZNode to support Pan/Tilt limits. The limits apply to all supported
+				absolute, relative and continuous Pan/Tilt movements. The limits shall be checked within the
+				coordinate system for which the limits have been specified. That means that even if
+				movements are specified in a different coordinate system, the requested movements shall be
+				transformed to the coordinate system of the limits where the limits can be checked. When a
+				relative or continuous movements is specified, which would leave the specified limits, the PTZ
+				unit has to move along the specified limits. The Zoom Limits have to be interpreted
+				accordingly.
+			</wsdl:documentation>
+			<wsdl:input message="tptz:GetConfigurationsRequest"/>
+			<wsdl:output message="tptz:GetConfigurationsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetConfiguration">
+			<wsdl:documentation>
+        Set/update a existing PTZConfiguration on the device.
+      </wsdl:documentation>
+			<wsdl:input message="tptz:SetConfigurationRequest"/>
+			<wsdl:output message="tptz:SetConfigurationResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetConfigurationOptions">
+			<wsdl:documentation>
+				List supported coordinate systems including their range limitations. Therefore, the options
+				MAY differ depending on whether the PTZ Configuration is assigned to a Profile containing a
+				Video Source Configuration. In that case, the options may additionally contain coordinate
+				systems referring to the image coordinate system described by the Video Source
+				Configuration. If the PTZ Node supports continuous movements, it shall return a Timeout Range within
+				which Timeouts are accepted by the PTZ Node.				
+			</wsdl:documentation>
+			<wsdl:input message="tptz:GetConfigurationOptionsRequest"/>
+			<wsdl:output message="tptz:GetConfigurationOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SendAuxiliaryCommand">
+			<wsdl:documentation>
+        Operation to send auxiliary commands to the PTZ device
+        mapped by the PTZNode in the selected profile. The
+        operation is supported
+        if the AuxiliarySupported element of the PTZNode is true
+      </wsdl:documentation>
+			<wsdl:input message="tptz:SendAuxiliaryCommandRequest"/>
+			<wsdl:output message="tptz:SendAuxiliaryCommandResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresets">
+			<wsdl:documentation>
+        Operation to request all PTZ presets for the PTZNode
+        in the selected profile. The operation is supported if there is support
+        for at least on PTZ preset by the PTZNode.</wsdl:documentation>
+			<wsdl:input message="tptz:GetPresetsRequest"/>
+			<wsdl:output message="tptz:GetPresetsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetPreset">
+			<wsdl:documentation>
+				The SetPreset command saves the current device position parameters so that the device can
+				move to the saved preset position through the GotoPreset operation.
+				In order to create a new preset, the SetPresetRequest contains no PresetToken. If creation is
+				successful, the Response contains the PresetToken which uniquely identifies the Preset. An
+				existing Preset can be overwritten by specifying the PresetToken of the corresponding Preset.
+				In both cases (overwriting or creation) an optional PresetName can be specified. The
+				operation fails if the PTZ device is moving during the SetPreset operation.
+				The device MAY internally save additional states such as imaging properties in the PTZ
+				Preset which then should be recalled in the GotoPreset operation.      </wsdl:documentation>
+			<wsdl:input message="tptz:SetPresetRequest"/>
+			<wsdl:output message="tptz:SetPresetResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemovePreset">
+			<wsdl:documentation>
+        Operation to remove a PTZ preset for the Node in
+        the
+        selected profile. The operation is supported if the
+        PresetPosition
+        capability exists for teh Node in the
+        selected profile.
+      </wsdl:documentation>
+			<wsdl:input message="tptz:RemovePresetRequest"/>
+			<wsdl:output message="tptz:RemovePresetResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GotoPreset">
+			<wsdl:documentation>
+        Operation to go to a saved preset position for the
+        PTZNode in the selected profile. The operation is supported if there is
+        support for at least on PTZ preset by the PTZNode.</wsdl:documentation>
+			<wsdl:input message="tptz:GotoPresetRequest"/>
+			<wsdl:output message="tptz:GotoPresetResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GotoHomePosition">
+			<wsdl:documentation>
+        Operation to move the PTZ device to it's &quot;home&quot; position. The operation is supported if the HomeSupported element in the PTZNode is true.</wsdl:documentation>
+			<wsdl:input message="tptz:GotoHomePositionRequest"/>
+			<wsdl:output message="tptz:GotoHomePositionResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="SetHomePosition">
+			<wsdl:documentation>Operation to save current position as the home position.
+				The SetHomePosition command returns with a failure if the “home” position is fixed and
+				cannot be overwritten. If the SetHomePosition is successful, it is possible to recall the
+				Home Position with the GotoHomePosition command.</wsdl:documentation>
+			<wsdl:input message="tptz:SetHomePositionRequest"/>
+			<wsdl:output message="tptz:SetHomePositionResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="ContinuousMove">
+			<wsdl:documentation>Operation for continuous Pan/Tilt and Zoom movements. The operation is supported if the PTZNode supports at least one continuous Pan/Tilt or Zoom space. If the space argument is omitted, the default space set by the PTZConfiguration will be used.</wsdl:documentation>
+			<wsdl:input message="tptz:ContinuousMoveRequest"/>
+			<wsdl:output message="tptz:ContinuousMoveResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RelativeMove">
+			<wsdl:documentation>Operation for Relative Pan/Tilt and Zoom Move. The operation is supported if the PTZNode supports at least one relative Pan/Tilt or Zoom space.<br/> 
+				The speed argument is optional. If an x/y speed value is given it is up to the device to either use 
+				the x value as absolute resoluting speed vector or to map x and y to the component speed. 
+				If the speed argument is omitted, the default speed set by the PTZConfiguration will be used.
+			</wsdl:documentation>
+			<wsdl:input message="tptz:RelativeMoveRequest"/>
+			<wsdl:output message="tptz:RelativeMoveResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetStatus">
+			<wsdl:documentation>
+				Operation to request PTZ status for the Node in the
+				selected profile.</wsdl:documentation>
+			<wsdl:input message="tptz:GetStatusRequest"/>
+			<wsdl:output message="tptz:GetStatusResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="AbsoluteMove">
+			<wsdl:documentation>Operation to move pan,tilt or zoom to a absolute destination. <br/>
+				The speed argument is optional. If an x/y speed value is given it is up to the device to either use 
+				the x value as absolute resoluting speed vector or to map x and y to the component speed. 
+				If the speed argument is omitted, the default speed set by the PTZConfiguration will be used.
+			</wsdl:documentation>
+			<wsdl:input message="tptz:AbsoluteMoveRequest"/>
+			<wsdl:output message="tptz:AbsoluteMoveResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="Stop">
+			<wsdl:documentation>Operation to stop ongoing pan, tilt and zoom movements of absolute relative and continuous type.
+If no stop argument for pan, tilt or zoom is set, the device will stop all ongoing pan, tilt and zoom movements.</wsdl:documentation>
+			<wsdl:input message="tptz:StopRequest"/>
+			<wsdl:output message="tptz:StopResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresetTours">
+			<wsdl:documentation>Operation to request PTZ preset tours in the selected media profiles.</wsdl:documentation>
+			<wsdl:input message="tptz:GetPresetToursRequest"/>
+			<wsdl:output message="tptz:GetPresetToursResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresetTour">
+			<wsdl:documentation>Operation to request a specific PTZ preset tour in the selected media profile.</wsdl:documentation>
+			<wsdl:input message="tptz:GetPresetTourRequest"/>
+			<wsdl:output message="tptz:GetPresetTourResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresetTourOptions">
+			<wsdl:documentation>Operation to request available options to configure PTZ preset tour.</wsdl:documentation>
+			<wsdl:input message="tptz:GetPresetTourOptionsRequest"/>
+			<wsdl:output message="tptz:GetPresetTourOptionsResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="CreatePresetTour">
+			<wsdl:documentation>Operation to create a preset tour for the selected media profile.</wsdl:documentation>
+			<wsdl:input message="tptz:CreatePresetTourRequest"/>
+			<wsdl:output message="tptz:CreatePresetTourResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="ModifyPresetTour">
+			<wsdl:documentation>Operation to modify a preset tour for the selected media profile.</wsdl:documentation>
+			<wsdl:input message="tptz:ModifyPresetTourRequest"/>
+			<wsdl:output message="tptz:ModifyPresetTourResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="OperatePresetTour">
+			<wsdl:documentation>Operation to perform specific operation on the preset tour in selected media profile.</wsdl:documentation>
+			<wsdl:input message="tptz:OperatePresetTourRequest"/>
+			<wsdl:output message="tptz:OperatePresetTourResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="RemovePresetTour">
+			<wsdl:documentation>Operation to delete a specific preset tour from the media profile.</wsdl:documentation>
+			<wsdl:input message="tptz:RemovePresetTourRequest"/>
+			<wsdl:output message="tptz:RemovePresetTourResponse"/>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleConfigurations">
+			<wsdl:documentation>Operation to get all available PTZConfigurations that can be added to the referenced media profile. <br/>
+				A device providing more than one PTZConfiguration or more than one VideoSourceConfiguration or which has any other resource
+				interdependency between PTZConfiguration entities and other resources listable in a media profile should implement this operation.
+				PTZConfiguration entities returned by this operation shall not fail on adding them to the referenced media profile.
+			</wsdl:documentation>
+			<wsdl:input message="tptz:GetCompatibleConfigurationsRequest"/>
+			<wsdl:output message="tptz:GetCompatibleConfigurationsResponse"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="PTZBinding" type="tptz:PTZ">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="GetServiceCapabilities">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetServiceCapabilities"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetConfigurations">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfigurations"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresets">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresets"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetPreset">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetPreset"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="RemovePreset">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RemovePreset"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GotoPreset">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GotoPreset"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetStatus">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetStatus"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetNodes">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetNodes"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetNode">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetNode"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetConfiguration">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetConfiguration"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetConfigurationOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfigurationOptions"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GotoHomePosition">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GotoHomePosition"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SetHomePosition">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetHomePosition"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="ContinuousMove">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="RelativeMove">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RelativeMove"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="SendAuxiliaryCommand">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SendAuxiliaryCommand"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="AbsoluteMove">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/AbsoluteMove"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="Stop">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/Stop"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresetTours">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTours"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresetTour">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTour"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetPresetTourOptions">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTourOptions"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="CreatePresetTour">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/CreatePresetTour"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="ModifyPresetTour">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ModifyPresetTour"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="OperatePresetTour">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/OperatePresetTour"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="RemovePresetTour">
+			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RemovePresetTour"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+		<wsdl:operation name="GetCompatibleConfigurations">
+			<soap:operation
+				soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetCompatibleConfigurations"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<!--===============================-->
+  <wsdl:service name="PTZ">
+    <wsdl:port name="PTZPort" binding="tptz:PTZBinding" >
+      <soap:address
+        location="http://www.examples.com/PTZ/" />
+    </wsdl:port>
+  </wsdl:service>
+	<!--===============================-->
+</wsdl:definitions>
diff --git a/onvif/wsdl/r-2.xsd b/onvif/wsdl/r-2.xsd
new file mode 100644
index 000000000..21cfbd782
--- /dev/null
+++ b/onvif/wsdl/r-2.xsd
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2005). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+-->
+<xsd:schema 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:wsrf-r="http://docs.oasis-open.org/wsrf/r-2"
+  xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  elementFormDefault="qualified" attributeFormDefault="unqualified" 
+  targetNamespace="http://docs.oasis-open.org/wsrf/r-2" 
+>
+ 
+  <xsd:import 
+     namespace=
+  "http://docs.oasis-open.org/wsrf/bf-2"
+     schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd"
+  />
+
+<!-- ====================== WS-Resource fault types ============= -->
+ 
+      <xsd:complexType name="ResourceUnknownFaultType">
+         <xsd:complexContent>
+            <xsd:extension base="wsrf-bf:BaseFaultType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:element name="ResourceUnknownFault" 
+                   type="wsrf-r:ResourceUnknownFaultType"/>
+
+      <xsd:complexType name="ResourceUnavailableFaultType">
+         <xsd:complexContent>
+            <xsd:extension base="wsrf-bf:BaseFaultType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:element name="ResourceUnavailableFault" 
+                   type="wsrf-r:ResourceUnavailableFaultType"/>
+</xsd:schema>
+
diff --git a/onvif/wsdl/rw-2.wsdl b/onvif/wsdl/rw-2.wsdl
new file mode 100644
index 000000000..04ad487c2
--- /dev/null
+++ b/onvif/wsdl/rw-2.wsdl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2005). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+-->
+
+<wsdl:definitions name="WS-Resource"
+  xmlns="http://schemas.xmlsoap.org/wsdl/" 
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:wsrf-r="http://docs.oasis-open.org/wsrf/r-2" 
+  xmlns:wsrf-rw="http://docs.oasis-open.org/wsrf/rw-2" 
+  targetNamespace="http://docs.oasis-open.org/wsrf/rw-2" 
+>
+  
+<!-- ===================== Types Definitions ====================== -->
+   <wsdl:types>
+     <xsd:schema 
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+        targetNamespace="http://docs.oasis-open.org/wsrf/rw-2"
+        elementFormDefault="qualified" 
+        attributeFormDefault="unqualified">
+
+       <xsd:import 
+         namespace="http://docs.oasis-open.org/wsrf/r-2"
+         schemaLocation="http://docs.oasis-open.org/wsrf/r-2.xsd"
+       /> 
+       
+     </xsd:schema>
+   </wsdl:types>
+
+<!-- ================= WS-Resource faults ========================= -->
+  <wsdl:message name="ResourceUnknownFault">
+     <part name="ResourceUnknownFault"
+           element="wsrf-r:ResourceUnknownFault" />
+  </wsdl:message> 
+
+  <wsdl:message name="ResourceUnavailableFault">
+     <part name="ResourceUnavailableFault"
+           element="wsrf-r:ResourceUnavailableFault" />
+  </wsdl:message> 
+
+</wsdl:definitions>
+
diff --git a/onvif/wsdl/soap-envelop.xsd b/onvif/wsdl/soap-envelop.xsd
new file mode 100644
index 000000000..b1a20e08e
--- /dev/null
+++ b/onvif/wsdl/soap-envelop.xsd
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 envelope
+
+Portions © 2001 DevelopMentor. 
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
+ 
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
+By obtaining, using and/or copying this work, you (the licensee) 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 documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+
+2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
+
+3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
+
+Original W3C files; http://www.w3.org/2001/06/soap-envelope
+Changes made: 
+     - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
+     - reverted mustUnderstand to only allow 0 and 1 as lexical values
+	 - made encodingStyle a global attribute 20020825
+	 - removed default value from mustUnderstand attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
+           targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
+
+     
+  <!-- Envelope, header and body -->
+  <xs:element name="Envelope" type="tns:Envelope" />
+  <xs:complexType name="Envelope" >
+    <xs:sequence>
+      <xs:element ref="tns:Header" minOccurs="0" />
+      <xs:element ref="tns:Body" minOccurs="1" />
+      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Header" type="tns:Header" />
+  <xs:complexType name="Header" >
+    <xs:sequence>
+      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  
+  <xs:element name="Body" type="tns:Body" />
+  <xs:complexType name="Body" >
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" >
+	  <xs:annotation>
+	    <xs:documentation>
+		  Prose in the spec does not specify that attributes are allowed on the Body element
+		</xs:documentation>
+	  </xs:annotation>
+	</xs:anyAttribute>
+  </xs:complexType>
+
+       
+  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them.  -->
+  <xs:attribute name="mustUnderstand" >	
+     <xs:simpleType>
+     <xs:restriction base='xs:boolean'>
+	   <xs:pattern value='0|1' />
+	 </xs:restriction>
+   </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="actor" type="xs:anyURI" />
+
+  <xs:simpleType name="encodingStyle" >
+    <xs:annotation>
+	  <xs:documentation>
+	    'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
+  <xs:attributeGroup name="encodingStyle" >
+    <xs:attribute ref="tns:encodingStyle" />
+  </xs:attributeGroup>
+
+  <xs:element name="Fault" type="tns:Fault" />
+  <xs:complexType name="Fault" final="extension" >
+    <xs:annotation>
+	  <xs:documentation>
+	    Fault reporting structure
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:sequence>
+      <xs:element name="faultcode" type="xs:QName" />
+      <xs:element name="faultstring" type="xs:string" />
+      <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
+      <xs:element name="detail" type="tns:detail" minOccurs="0" />      
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="detail">
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" /> 
+  </xs:complexType>
+
+</xs:schema>
+
+
+
+
+
+
diff --git a/onvif/wsdl/t-1.xsd b/onvif/wsdl/t-1.xsd
new file mode 100644
index 000000000..ae42cfbc7
--- /dev/null
+++ b/onvif/wsdl/t-1.xsd
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+
+Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+-->
+
+
+<xsd:schema 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:wstop = "http://docs.oasis-open.org/wsn/t-1"
+  targetNamespace = "http://docs.oasis-open.org/wsn/t-1"   
+  elementFormDefault="qualified"  attributeFormDefault="unqualified">
+
+<!-- =============== utility type definitions  ==================== -->
+  <xsd:complexType name="Documentation" mixed="true">
+    <xsd:sequence>
+      <xsd:any processContents="lax" minOccurs="0" 
+               maxOccurs="unbounded" namespace="##any"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="ExtensibleDocumented" abstract="true" 
+                   mixed="false">
+    <xsd:sequence>
+      <xsd:element name="documentation" type="wstop:Documentation" 
+                   minOccurs="0" />
+    </xsd:sequence>
+    <xsd:anyAttribute namespace="##other" processContents="lax" />
+</xsd:complexType>
+
+<xsd:complexType name="QueryExpressionType" mixed="true">
+  <xsd:sequence>
+    <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
+  </xsd:sequence>
+  <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
+</xsd:complexType>
+
+<!-- ================== Topic-Namespace Related  ================ -->   
+  <xsd:complexType name="TopicNamespaceType">
+    <xsd:complexContent>
+       <xsd:extension base="wstop:ExtensibleDocumented">
+         <xsd:sequence>
+           <xsd:element name="Topic" 
+                        minOccurs="0" maxOccurs="unbounded">
+              <xsd:complexType>
+              	<xsd:complexContent>
+              	  <xsd:extension base="wstop:TopicType">
+              	    <xsd:attribute name="parent" type="wstop:ConcreteTopicExpression" />
+              	  </xsd:extension>
+              	</xsd:complexContent>
+              </xsd:complexType>
+           </xsd:element>   
+           <xsd:any namespace="##other" 
+                    minOccurs="0" maxOccurs="unbounded" 
+                    processContents="lax"/>
+         </xsd:sequence>
+         <xsd:attribute name="name" type="xsd:NCName"/>
+         <xsd:attribute name="targetNamespace" type="xsd:anyURI" 
+                        use="required"/>
+         <xsd:attribute name="final" type="xsd:boolean" 
+                                     default="false"/>
+       </xsd:extension>
+     </xsd:complexContent> 
+   </xsd:complexType>
+
+  <xsd:element name="TopicNamespace" type="wstop:TopicNamespaceType">
+    <xsd:unique name="rootTopicUniqueness">
+      <xsd:selector xpath="wstop:Topic"/>
+        <xsd:field xpath="@name"/>
+    </xsd:unique>
+  </xsd:element>
+  
+  <xsd:attribute name="topicNamespaceLocation" type="xsd:anyURI"/>
+
+
+
+<!-- ===================== Topic Related  ========================= -->   
+
+  <xsd:complexType name="TopicType">
+    <xsd:complexContent>
+      <xsd:extension base="wstop:ExtensibleDocumented">
+        <xsd:sequence>
+          <xsd:element name="MessagePattern" 
+                       type="wstop:QueryExpressionType" 
+                       minOccurs="0" maxOccurs="1" />
+              <xsd:any minOccurs="0"/>
+<!--          <xsd:element name="Topic" type="wstop:TopicType" 
+                       minOccurs="0" maxOccurs="unbounded"> 
+            <xsd:unique name="childTopicUniqueness">
+              <xsd:selector xpath="wstop:topic"/>
+              <xsd:field xpath="@name"/>
+            </xsd:unique>
+          </xsd:element> -->
+          <xsd:any namespace="##other" minOccurs="0" 
+                                       maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" use="required" type="xsd:NCName"/>
+ <!--
+         <xsd:attribute name="messageTypes">
+          <xsd:simpleType>
+            <xsd:list itemType="xsd:QName"/>
+          </xsd:simpleType>
+        </xsd:attribute>
+-->
+        <xsd:attribute name="final" type="xsd:boolean" 
+                                     default="false"/>
+      </xsd:extension>
+    </xsd:complexContent>  
+  </xsd:complexType>
+
+<!-- ================ Topic Set Related  =================== -->   
+  
+  <xsd:complexType name="TopicSetType">
+    <xsd:complexContent>
+       <xsd:extension base="wstop:ExtensibleDocumented">
+         <xsd:sequence>
+           <xsd:any namespace="##other" 
+                    minOccurs="0" maxOccurs="unbounded" 
+                    processContents="lax"/>
+         </xsd:sequence>
+       </xsd:extension>
+     </xsd:complexContent> 
+   </xsd:complexType>
+
+  <xsd:element name="TopicSet" type="wstop:TopicSetType"/>
+<xsd:attribute name="topic" type="xsd:boolean" default="false"/>
+
+<!-- ================ Topic Expression Related  =================== -->   
+  
+  <xsd:simpleType name="FullTopicExpression">
+    <xsd:restriction base="xsd:token">
+      <xsd:annotation>
+        <xsd:documentation>
+        TopicPathExpression  ::=   TopicPath ( '|' TopicPath )*  
+        TopicPath       ::=   RootTopic ChildTopicExpression* 
+        RootTopic       ::=   NamespacePrefix? ('//')? (NCName | '*')  
+        NamespacePrefix ::=   NCName ':'      
+        ChildTopicExpression ::=   '/' '/'? (QName | NCName | '*'| '.')
+                        
+        </xsd:documentation>
+      </xsd:annotation>
+      <xsd:pattern value= 
+         "([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*(\|([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*)*">
+      </xsd:pattern>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ConcreteTopicExpression">
+    <xsd:restriction base="xsd:token">
+      <xsd:annotation>
+        <xsd:documentation>
+  The pattern allows strings matching the following EBNF:
+    ConcreteTopicPath    ::=   RootTopic ChildTopic*    
+    RootTopic            ::=   QName  
+    ChildTopic           ::=   '/' (QName | NCName) 
+                        
+        </xsd:documentation>
+      </xsd:annotation>
+      <xsd:pattern value=
+"(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)(/([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)*" >
+      </xsd:pattern>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="SimpleTopicExpression">
+    <xsd:restriction base="xsd:QName">
+      <xsd:annotation>
+        <xsd:documentation>
+  The pattern allows strings matching the following EBNF:
+    RootTopic            ::=   QName  
+                        
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+</xsd:schema>
diff --git a/onvif/wsdl/ws-addressing-2004-08.xsd b/onvif/wsdl/ws-addressing-2004-08.xsd
new file mode 100644
index 000000000..b7bfaff6a
--- /dev/null
+++ b/onvif/wsdl/ws-addressing-2004-08.xsd
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright © 2002-2004 BEA Systems Inc., International Business Machines Corporation, 
+Microsoft Corporation, Inc, SAP AG, and Sun Microsystems, Inc.. All rights reserved. 
+
+Permission to copy, display, perform, modify and distribute the WS-Addressing Specification, 
+and to authorize others to do the foregoing, in any medium without fee or royalty is hereby
+granted for the purpose of developing and evaluating the WS-Addressing Specification.
+
+BEA, IBM, Microsoft, SAP AG, and Sun Microsystems (collectively, the "Authors") each agree 
+to grant a license to third parties, under royalty-free  and otherwise reasonable, 
+non-discriminatory terms and conditions, to their respective essential patent claims that
+they deem necessary to implement the WS-Addressing Specification.
+
+DISCLAIMERS:
+
+THE WS-Addressing Specification IS PROVIDED "AS IS", AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE 
+CONTENTS OF THE WS-Addressing Specification IS SUITABLE FOR ANY PURPOSE; NOR THAT THE 
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, 
+TRADEMARKS OR OTHER RIGHTS.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
+DAMAGES ARISING OUT OF ANY USE OF THE WS-Addressing Specification OR THE PERFORMANCE OR 
+IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+You may remove these disclaimers from your modified versions of the WS-Addressing 
+Specification provided that you effectively disclaim all warranties and liabilities on behalf 
+of all copyright holders in the copies of any such modified versions you distribute.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising 
+or publicity pertaining to the WS-Addressing Specification or its contents without specific, 
+written prior permission. Title to copyright in the WS-Addressing Specification will at all 
+times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+-->
+<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" elementFormDefault="qualified" blockDefault="#all">
+  <!-- //////////////////// WS-Addressing //////////////////// -->
+  <!-- Endpoint reference -->
+  <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
+  <xs:complexType name="EndpointReferenceType">
+    <xs:sequence>
+      <xs:element name="Address" type="wsa:AttributedURI"/>
+      <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
+      <xs:element name="ReferenceParameters" type="wsa:ReferenceParametersType" minOccurs="0"/>
+      <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
+      <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
+      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>
+					 If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).
+					</xs:documentation>
+        </xs:annotation>
+      </xs:any>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+  </xs:complexType>
+  <xs:complexType name="ReferencePropertiesType">
+    <xs:sequence>
+      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ReferenceParametersType">
+    <xs:sequence>
+      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="ServiceNameType">
+    <xs:simpleContent>
+      <xs:extension base="xs:QName">
+        <xs:attribute name="PortName" type="xs:NCName"/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <!-- Message information header blocks -->
+  <xs:element name="MessageID" type="wsa:AttributedURI"/>
+  <xs:element name="RelatesTo" type="wsa:Relationship"/>
+  <xs:element name="To" type="wsa:AttributedURI"/>
+  <xs:element name="Action" type="wsa:AttributedURI"/>
+  <xs:element name="From" type="wsa:EndpointReferenceType"/>
+  <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
+  <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
+  <xs:complexType name="Relationship">
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI">
+        <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:simpleType name="RelationshipTypeValues">
+    <xs:restriction base="xs:QName">
+      <xs:enumeration value="wsa:Reply"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <!--
+    June 19, 2007: The ReplyAfter element is deprecated. The name of this element does not match the
+    name (RetryAfter) used in the specification (http://www.w3.org/Submission/2004/SUBM-ws-addressing-20040810/).
+  -->
+  <xs:element name="ReplyAfter" type="wsa:ReplyAfterType"/>
+  <xs:complexType name="ReplyAfterType">
+    <xs:simpleContent>
+      <xs:extension base="xs:nonNegativeInteger">
+        <xs:anyAttribute namespace="##other"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <!--
+    June 19, 2007: The RetryAfter element has been added to be consistent with the specification
+    (http://www.w3.org/Submission/2004/SUBM-ws-addressing-20040810/).
+  -->
+  <xs:element name="RetryAfter" type="wsa:RetryAfterType"/>
+  <xs:complexType name="RetryAfterType">
+    <xs:simpleContent>
+      <xs:extension base="xs:nonNegativeInteger">
+        <xs:anyAttribute namespace="##other"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:simpleType name="FaultSubcodeValues">
+    <xs:restriction base="xs:QName">
+      <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
+      <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
+      <xs:enumeration value="wsa:DestinationUnreachable"/>
+      <xs:enumeration value="wsa:ActionNotSupported"/>
+      <xs:enumeration value="wsa:EndpointUnavailable"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:attribute name="Action" type="xs:anyURI"/>
+  <!-- Common declarations and definitions -->
+  <xs:complexType name="AttributedQName">
+    <xs:simpleContent>
+      <xs:extension base="xs:QName">
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="AttributedURI">
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI">
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+</xs:schema>
diff --git a/onvif/wsdl/ws-discovery-1.0.wsdl b/onvif/wsdl/ws-discovery-1.0.wsdl
new file mode 100644
index 000000000..3f198c634
--- /dev/null
+++ b/onvif/wsdl/ws-discovery-1.0.wsdl
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright Notice
+
+(c) 2004-2005 Microsoft Corporation, Inc. All rights reserved.
+
+Permission to copy, display, perform, modify and distribute the 
+WS-Discovery Specification (the "Specification", which includes 
+WSDL and schema documents), and to authorize others to do the 
+foregoing, in any medium without fee or royalty is hereby granted 
+for the purpose of developing and evaluating the Specification.
+
+BEA Systems, Canon, Intel, Microsoft, and webMethods, Inc. 
+(collectively, the "Co-Developers") each agree to grant a license 
+to third parties, under royalty-free and other reasonable, 
+non-discriminatory terms and conditions, to their respective 
+essential Licensed Claims, which reasonable, non-discriminatory 
+terms and conditions may include, for example, but are not limited 
+to, an affirmation  of the obligation to grant reciprocal licenses 
+under any of the licensee's patents that are necessary to implement 
+the Specification.  
+
+DISCLAIMERS:
+
+THE SPECIFICATION IS PROVIDED "AS IS," AND THE CO-DEVELOPERS MAKE 
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, 
+BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS 
+OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE 
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY 
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+THE CO-DEVELOPERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, 
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY 
+USE OF THE SPECIFICATION OR THE PERFORMANCE OR IMPLEMENTATION OF 
+THE CONTENTS THEREOF.
+
+You may remove these disclaimers from your modified versions of the 
+Specification provided that you effectively disclaim all warranties 
+and liabilities on behalf of all Co-developers and any copyright 
+holders in the copies of any such modified versions you distribute.
+
+The name and trademarks of the Co-developers may NOT be used in any 
+manner, including advertising or publicity pertaining to the 
+Specification or its contents without specific, written prior 
+permission. Title to copyright in the Specification will at all 
+times remain with Microsoft.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+-->
+<wsdl:definitions
+    targetNamespace="http://schemas.xmlsoap.org/ws/2005/04/discovery"
+    xmlns:tns="http://schemas.xmlsoap.org/ws/2005/04/discovery"
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" >
+
+  <wsdl:types>
+    <xs:schema>
+      <xs:import
+          namespace="http://schemas.xmlsoap.org/ws/2005/04/discovery"
+    schemaLocation
+    ="file:wsdl/ws-discovery-1.0.xsd"
+          />
+    </xs:schema>
+  </wsdl:types>
+
+  <wsdl:message name="HelloMsg" >
+    <wsdl:part name="body" element="tns:Hello" />
+  </wsdl:message>
+
+  <wsdl:message name="ByeMsg" >
+    <wsdl:part name="body" element="tns:Bye" />
+  </wsdl:message>
+
+  <wsdl:message name="ProbeMsg" >
+    <wsdl:part name="body" element="tns:Probe" />
+  </wsdl:message>
+
+  <wsdl:message name="ProbeMatchMsg" >
+    <wsdl:part name="body" element="tns:ProbeMatches" />
+  </wsdl:message>
+
+  <wsdl:message name="ResolveMsg" >
+    <wsdl:part name="body" element="tns:Resolve" />
+  </wsdl:message>
+
+  <wsdl:message name="ResolveMatchMsg" >
+    <wsdl:part name="body" element="tns:ResolveMatches" />
+  </wsdl:message>
+
+  <wsdl:portType name="TargetService" >
+    <wsdl:operation name="HelloOp" >
+      <wsdl:output message="tns:HelloMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ByeOp" >
+      <wsdl:output message="tns:ByeMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Bye"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ProbeOp" >
+      <wsdl:input message="tns:ProbeMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ProbeMatchOp" >
+      <wsdl:output message="tns:ProbeMatchMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/ProbeMatches"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ResolveOp" >
+      <wsdl:input message="tns:ResolveMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Resolve"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ResolveMatchOp" >
+      <wsdl:output message="tns:ResolveMatchMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/ResolveMatches"
+      />
+    </wsdl:operation>
+  </wsdl:portType>
+
+  <!-- If this portType is included in EndpointReference/Types, it
+       indicates the Target Service is a Discovery Proxy. Discovery
+       Proxies also implement tns:TargetService and optionally other
+       message exchanges defined elsewhere.
+  -->
+  <wsdl:portType name="DiscoveryProxy">
+     <wsdl:operation name="HelloOp" >
+      <wsdl:input message="tns:HelloMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ByeOp" >
+      <wsdl:input message="tns:ByeMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Bye"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ProbeOp" >
+      <wsdl:input message="tns:ProbeMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe"
+      />
+      <wsdl:output message="tns:ProbeMatchMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/ProbeMatches"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ResolveOp" >
+      <wsdl:input message="tns:ResolveMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/Resolve"
+      />
+      <wsdl:output message="tns:ResolveMatchMsg"
+      wsa:Action
+      ="http://schemas.xmlsoap.org/ws/2005/04/discovery/ResolveMatches"
+      />
+    </wsdl:operation>
+  </wsdl:portType>
+  
+</wsdl:definitions>
diff --git a/onvif/wsdl/ws-discovery-1.0.xsd b/onvif/wsdl/ws-discovery-1.0.xsd
new file mode 100644
index 000000000..11ac790bb
--- /dev/null
+++ b/onvif/wsdl/ws-discovery-1.0.xsd
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright Notice
+
+(c) 2004-2005 Microsoft Corporation, Inc. All rights reserved.
+
+Permission to copy, display, perform, modify and distribute the 
+WS-Discovery Specification (the "Specification", which includes 
+WSDL and schema documents), and to authorize others to do the 
+foregoing, in any medium without fee or royalty is hereby granted 
+for the purpose of developing and evaluating the Specification.
+
+BEA Systems, Canon, Intel, Microsoft, and webMethods, Inc. 
+(collectively, the "Co-Developers") each agree to grant a license 
+to third parties, under royalty-free and other reasonable, 
+non-discriminatory terms and conditions, to their respective 
+essential Licensed Claims, which reasonable, non-discriminatory 
+terms and conditions may include, for example, but are not limited 
+to, an affirmation  of the obligation to grant reciprocal licenses 
+under any of the licensee's patents that are necessary to implement 
+the Specification.  
+
+DISCLAIMERS:
+
+THE SPECIFICATION IS PROVIDED "AS IS," AND THE CO-DEVELOPERS MAKE 
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, 
+BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS 
+OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE 
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY 
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+THE CO-DEVELOPERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, 
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY 
+USE OF THE SPECIFICATION OR THE PERFORMANCE OR IMPLEMENTATION OF 
+THE CONTENTS THEREOF.
+
+You may remove these disclaimers from your modified versions of the 
+Specification provided that you effectively disclaim all warranties 
+and liabilities on behalf of all Co-developers and any copyright 
+holders in the copies of any such modified versions you distribute.
+
+The name and trademarks of the Co-developers may NOT be used in any 
+manner, including advertising or publicity pertaining to the 
+Specification or its contents without specific, written prior 
+permission. Title to copyright in the Specification will at all 
+times remain with Microsoft.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+-->
+<xs:schema
+    targetNamespace="http://schemas.xmlsoap.org/ws/2005/04/discovery"
+    xmlns:tns="http://schemas.xmlsoap.org/ws/2005/04/discovery"
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    blockDefault="#all" >
+
+  <xs:import
+      namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+      schemaLocation="file:wsdl/ws-addressing-2004-08.xsd" />
+
+  <!-- //////////////////// Discovery Messages //////////////////// -->
+
+  <xs:element name="Hello" type="tns:HelloType" />
+  <xs:complexType name="HelloType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:simpleType name="RelationshipType" >
+	<xs:restriction base="xs:QName" >
+	  <xs:enumeration value="tns:Suppression" />
+	</xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="OpenRelationshipType" >
+    <xs:union memberTypes="tns:RelationshipType xs:QName" />
+  </xs:simpleType>
+    
+  <xs:element name="Bye" type="tns:ByeType" />
+  <xs:complexType name="ByeType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" minOccurs="0" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Probe" type="tns:ProbeType" />
+  <xs:complexType name="ProbeType" >
+    <xs:sequence>
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="ProbeMatches" type="tns:ProbeMatchesType" />
+  <xs:complexType name="ProbeMatchesType" >
+    <xs:sequence>
+      <xs:element name="ProbeMatch"
+                  type="tns:ProbeMatchType"
+                  minOccurs="0"
+                  maxOccurs="unbounded" >
+      </xs:element>
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  <xs:complexType name="ProbeMatchType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Resolve" type="tns:ResolveType" />
+  <xs:complexType name="ResolveType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="ResolveMatches" type="tns:ResolveMatchesType" />
+  <xs:complexType name="ResolveMatchesType" >
+    <xs:sequence>
+      <xs:element name="ResolveMatch" 
+                  type="tns:ResolveMatchType"
+                  minOccurs="0" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  <xs:complexType name="ResolveMatchType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" />
+      <xs:element ref="tns:MetadataVersion" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Types" type="tns:QNameListType" />
+  <xs:simpleType name="QNameListType" >
+    <xs:list itemType="xs:QName" />
+  </xs:simpleType>
+
+  <xs:element name="Scopes" type="tns:ScopesType" />
+  <xs:complexType name="ScopesType" >
+    <xs:simpleContent>
+      <xs:extension base="tns:UriListType" >
+        <xs:attribute name="MatchBy" type="xs:anyURI" />
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="XAddrs" type="tns:UriListType" />
+  <xs:simpleType name="UriListType" >
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:element name="MetadataVersion" type="xs:unsignedInt" />
+
+  <!-- //////////////////// Faults //////////////////// -->
+
+  <xs:simpleType name="FaultCodeType" >
+	<xs:restriction base="xs:QName" >
+	  <xs:enumeration value="tns:MatchingRuleNotSupported" />
+	</xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="FaultCodeOpenType" >
+    <xs:union memberTypes="tns:FaultCodeType xs:QName" />
+  </xs:simpleType>
+
+  <xs:element name="SupportedMatchingRules" type="tns:UriListType" />
+
+  <!-- //////////////////// Compact Signature //////////////////// -->
+
+  <xs:attribute name="Id" type="xs:ID"/>
+
+  <xs:element name="Security" type="tns:SecurityType" />
+  <xs:complexType name="SecurityType" >
+    <xs:sequence>
+      <xs:element ref="tns:Sig" minOccurs="0" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType> 
+
+  <xs:element name="Sig" type="tns:SigType" />
+  <xs:complexType name="SigType" >
+    <xs:sequence>
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name="Scheme" type="xs:anyURI" use="required" />
+    <xs:attribute name="KeyId" type="xs:base64Binary" />
+    <xs:attribute name="Refs" type="xs:IDREFS" use="required" />
+    <xs:attribute name="Sig" type="xs:base64Binary" use="required" />
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType> 
+
+  <!-- //////////////////// General Headers //////////////////// -->
+
+  <xs:element name="AppSequence" type="tns:AppSequenceType" />
+  <xs:complexType name="AppSequenceType" >
+    <xs:complexContent>
+      <xs:restriction base="xs:anyType" >
+        <xs:attribute name="InstanceId"
+                      type="xs:unsignedInt"
+                      use="required" />
+        <xs:attribute name="SequenceId" type="xs:anyURI" />
+        <xs:attribute name="MessageNumber"
+                      type="xs:unsignedInt"
+                      use="required" />
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+
+</xs:schema>
diff --git a/onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd b/onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd
new file mode 100644
index 000000000..3307efc1d
--- /dev/null
+++ b/onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) OASIS(r) 2009. All Rights Reserved.
+
+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification.
+
+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent claims that would necessarily be infringed by implementations of this specification by a patent holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification. OASIS may include such claims on its website, but disclaims any obligation to do so.
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to rights in any document or deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any information or list of intellectual property rights will at any time be complete, or that any claims in such list are, in fact, Essential Claims.
+
+The name "OASIS" is trademarks of OASIS, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and implementation and use of, specifications, while reserving the right to enforce its marks against misleading uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
+-->
+<xs:schema
+    targetNamespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
+    xmlns:tns="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
+    xmlns:wsa="http://www.w3.org/2005/08/addressing"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    blockDefault="#all" >
+
+  <xs:import
+      namespace="http://www.w3.org/2005/08/addressing"
+      schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd" />
+
+  <!-- //////////////////// Discovery Messages //////////////////// -->
+
+  <xs:element name="Hello" type="tns:HelloType" />
+  <xs:complexType name="HelloType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Bye" type="tns:ByeType" />
+  <xs:complexType name="ByeType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" minOccurs="0" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Probe" type="tns:ProbeType" />
+  <xs:complexType name="ProbeType" >
+    <xs:sequence>
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="ProbeMatches" type="tns:ProbeMatchesType" />
+  <xs:complexType name="ProbeMatchesType" >
+    <xs:sequence>
+      <xs:element name="ProbeMatch"
+                  type="tns:ProbeMatchType"
+                  minOccurs="0"
+                  maxOccurs="unbounded" >
+      </xs:element>
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  <xs:complexType name="ProbeMatchType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Resolve" type="tns:ResolveType" />
+  <xs:complexType name="ResolveType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="ResolveMatches" type="tns:ResolveMatchesType" />
+  <xs:complexType name="ResolveMatchesType" >
+    <xs:sequence>
+      <xs:element name="ResolveMatch" 
+                  type="tns:ResolveMatchType"
+                  minOccurs="0" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  <xs:complexType name="ResolveMatchType" >
+    <xs:sequence>
+      <xs:element ref="wsa:EndpointReference" />
+      <xs:element ref="tns:Types" minOccurs="0" />
+      <xs:element ref="tns:Scopes" minOccurs="0" />
+      <xs:element ref="tns:XAddrs" minOccurs="0" />
+      <xs:element ref="tns:MetadataVersion" />
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Types" type="tns:QNameListType" />
+  <xs:simpleType name="QNameListType" >
+    <xs:list itemType="xs:QName" />
+  </xs:simpleType>
+
+  <xs:element name="Scopes" type="tns:ScopesType" />
+  <xs:complexType name="ScopesType" >
+    <xs:simpleContent>
+      <xs:extension base="tns:UriListType" >
+        <xs:attribute name="MatchBy" type="xs:anyURI" />
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="XAddrs" type="tns:UriListType" />
+  <xs:simpleType name="UriListType" >
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:element name="MetadataVersion" type="xs:unsignedInt" />
+
+  <!-- //////////////////// Faults //////////////////// -->
+
+  <xs:simpleType name="FaultCodeType" >
+	<xs:restriction base="xs:QName" >
+	  <xs:enumeration value="tns:MatchingRuleNotSupported" />
+	</xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="FaultCodeOpenType" >
+    <xs:union memberTypes="tns:FaultCodeType xs:QName" />
+  </xs:simpleType>
+
+  <xs:element name="SupportedMatchingRules" type="tns:UriListType" />
+
+  <!-- //////////////////// Compact Signature //////////////////// -->
+
+  <xs:attribute name="Id" type="xs:ID"/>
+
+  <xs:element name="Security" type="tns:SecurityType" />
+  <xs:complexType name="SecurityType" >
+    <xs:sequence>
+      <xs:element ref="tns:Sig" minOccurs="0" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType> 
+
+  <xs:element name="Sig" type="tns:SigType" />
+  <xs:complexType name="SigType" >
+    <xs:sequence>
+      <xs:any namespace="##other"
+              processContents="lax"
+              minOccurs="0"
+              maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name="Scheme" type="xs:anyURI" use="required" />
+    <xs:attribute name="KeyId" type="xs:base64Binary" />
+    <xs:attribute name="Refs" type="xs:IDREFS" use="required" />
+    <xs:attribute name="Sig" type="xs:base64Binary" use="required" />
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType> 
+
+  <!-- //////////////////// General Headers //////////////////// -->
+
+  <xs:element name="AppSequence" type="tns:AppSequenceType" />
+  <xs:complexType name="AppSequenceType" >
+    <xs:complexContent>
+      <xs:restriction base="xs:anyType" >
+        <xs:attribute name="InstanceId"
+                      type="xs:unsignedInt"
+                      use="required" />
+        <xs:attribute name="SequenceId" type="xs:anyURI" />
+        <xs:attribute name="MessageNumber"
+                      type="xs:unsignedInt"
+                      use="required" />
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+
+</xs:schema>
diff --git a/onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl b/onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl
new file mode 100644
index 000000000..36936b2a1
--- /dev/null
+++ b/onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) OASIS(r) 2009. All Rights Reserved.
+
+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification.
+
+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent claims that would necessarily be infringed by implementations of this specification by a patent holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification. OASIS may include such claims on its website, but disclaims any obligation to do so.
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to rights in any document or deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any information or list of intellectual property rights will at any time be complete, or that any claims in such list are, in fact, Essential Claims.
+
+The name "OASIS" is trademarks of OASIS, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and implementation and use of, specifications, while reserving the right to enforce its marks against misleading uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
+-->
+<wsdl:definitions
+    targetNamespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
+    xmlns:tns="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
+    xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" >
+  <wsdl:types>
+    <xs:schema>
+      <xs:import
+          namespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
+          schemaLocation="http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-schema-os.xsd" />
+    </xs:schema>
+  </wsdl:types>
+
+  <wsdl:message name="HelloMessage" >
+    <wsdl:part name="parameters" element="tns:Hello" />
+  </wsdl:message>
+
+  <wsdl:message name="ByeMessage" >
+    <wsdl:part name="parameters" element="tns:Bye" />
+  </wsdl:message>
+
+  <wsdl:message name="ProbeMessage" >
+    <wsdl:part name="parameters" element="tns:Probe" />
+  </wsdl:message>
+
+  <wsdl:message name="ProbeMatchMessage" >
+    <wsdl:part name="parameters" element="tns:ProbeMatches" />
+  </wsdl:message>
+
+  <wsdl:message name="ResolveMessage" >
+    <wsdl:part name="parameters" element="tns:Resolve" />
+  </wsdl:message>
+
+  <wsdl:message name="ResolveMatchMessage" >
+    <wsdl:part name="parameters" element="tns:ResolveMatches" />
+  </wsdl:message>
+
+  <wsdl:portType name="TargetService" >
+    <wsdl:operation name="HelloOp" >
+      <wsdl:output message="tns:HelloMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ByeOp" >
+      <wsdl:output message="tns:ByeMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ProbeOp" >
+      <wsdl:input message="tns:ProbeMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ProbeMatchOp" >
+      <wsdl:output message="tns:ProbeMatchMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ResolveOp" >
+      <wsdl:input message="tns:ResolveMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Resolve"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ResolveMatchOp" >
+      <wsdl:output message="tns:ResolveMatchMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ResolveMatches"
+      />
+    </wsdl:operation>
+  </wsdl:portType>
+
+  <!-- If this portType is included in Types, it indicates the 
+       Target Service is a Discovery Proxy operating in a managed mode. 
+       Discovery Proxies also implement tns:TargetService in an ad hoc mode.
+  -->
+  <wsdl:portType name="DiscoveryProxy">
+    <wsdl:operation name="HelloOp" >
+      <wsdl:input message="tns:HelloMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ByeOp" >
+      <wsdl:input message="tns:ByeMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ProbeOp" >
+      <wsdl:input message="tns:ProbeMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"
+      />
+      <wsdl:output message="tns:ProbeMatchMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches"
+      />
+    </wsdl:operation>
+    <wsdl:operation name="ResolveOp" >
+      <wsdl:input message="tns:ResolveMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Resolve"
+      />
+      <wsdl:output message="tns:ResolveMatchMessage"
+      wsaw:Action
+      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ResolveMatches"
+      />
+    </wsdl:operation>
+  </wsdl:portType>
+
+</wsdl:definitions>
diff --git a/onvif/wsdl/wsdiscovery-udp.wsdl b/onvif/wsdl/wsdiscovery-udp.wsdl
new file mode 100644
index 000000000..54b9fc92d
--- /dev/null
+++ b/onvif/wsdl/wsdiscovery-udp.wsdl
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" ?>
+
+<wsdl:definitions targetNamespace="http://127.0.0.1"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+                  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+                  xmlns:wsdd="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01" 
+                  xmlns:local="http://127.0.0.1">
+  <wsdl:import namespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01" 
+               location="http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-wsdl-os.wsdl"/> 
+  <!--===============================-->
+	<wsdl:binding name="WSDiscoveryBinding" type="wsdd:DiscoveryProxy">
+		<soap:binding style="document" transport="http://docs.oasis-open.org/ws-dd/soapoverudp/1.1"/>
+   	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+		<wsdl:operation name="ProbeOp">
+			<soap:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"/>
+			<wsdl:input>
+<!-- <soap:header -->
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="parameters" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+  	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+	</wsdl:binding>
+	<!--===============================-->
+  <wsdl:service name="WSDiscovery">
+    <wsdl:port name="WSDiscoveryPort" binding="local:WSDiscoveryBinding" >
+      <soap:address
+        location="soap.udp://239.255.255.250:3702/" />
+    </wsdl:port>
+  </wsdl:service>
+	<!--===============================-->
+</wsdl:definitions>
diff --git a/onvif/wsdl/wsdiscovery10-udp.wsdl b/onvif/wsdl/wsdiscovery10-udp.wsdl
new file mode 100644
index 000000000..6fddfb822
--- /dev/null
+++ b/onvif/wsdl/wsdiscovery10-udp.wsdl
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" ?>
+
+<wsdl:definitions targetNamespace="http://127.0.0.1"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+                  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+                  xmlns:wsdd="http://schemas.xmlsoap.org/ws/2005/04/discovery" 
+                  xmlns:local="http://127.0.0.1">
+  <wsdl:import namespace="http://schemas.xmlsoap.org/ws/2005/04/discovery" 
+               location="file:wsdl/ws-discovery-1.0.wsdl"/> 
+  <!--===============================-->
+	<wsdl:binding name="WSDiscoveryBinding" type="wsdd:DiscoveryProxy">
+		<soap:binding style="document" transport="http://docs.oasis-open.org/ws-dd/soapoverudp/1.1"/>
+   	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+		<wsdl:operation name="ProbeOp">
+			<soap:operation soapAction="http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe"/>
+			<wsdl:input>
+<!-- <soap:header -->
+				<soap:body parts="body" use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body parts="body" use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+  	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+	</wsdl:binding>
+	<!--===============================-->
+  <wsdl:service name="WSDiscovery">
+    <wsdl:port name="WSDiscoveryPort" binding="local:WSDiscoveryBinding" >
+      <soap:address
+        location="soap.udp://239.255.255.250:3702/" />
+    </wsdl:port>
+  </wsdl:service>
+	<!--===============================-->
+</wsdl:definitions>
diff --git a/onvif/wsdl/wsdl.xsd b/onvif/wsdl/wsdl.xsd
new file mode 100644
index 000000000..a81ab5691
--- /dev/null
+++ b/onvif/wsdl/wsdl.xsd
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!-- 
+ 
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema 
+Files in any medium without fee or royalty as long as this notice and 
+license are distributed with them.  The originals of these files can 
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, 
+including advertising or publicity pertaining to these files or any program 
+or service that uses these files, written prior permission.  Title to copyright 
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+--> 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
+           elementFormDefault="qualified" >
+   
+  <xs:complexType mixed="true" name="tDocumentation" >
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tDocumented" >
+    <xs:annotation>
+      <xs:documentation>
+      This type is extended by  component types to allow them to be documented
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+	 
+  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow attributes from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:anyAttribute namespace="##other" processContents="lax" />    
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tExtensibleDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow elements from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="definitions" type="wsdl:tDefinitions" >
+    <xs:key name="message" >
+      <xs:selector xpath="wsdl:message" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="portType" >
+      <xs:selector xpath="wsdl:portType" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="binding" >
+      <xs:selector xpath="wsdl:binding" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="service" >
+      <xs:selector xpath="wsdl:service" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="import" >
+      <xs:selector xpath="wsdl:import" />
+      <xs:field xpath="@namespace" />
+    </xs:key>
+  </xs:element>
+
+  <xs:group name="anyTopLevelOptionalElement" >
+    <xs:annotation>
+      <xs:documentation>
+      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element name="import" type="wsdl:tImport" />
+      <xs:element name="types" type="wsdl:tTypes" />                     
+      <xs:element name="message"  type="wsdl:tMessage" >
+<!--
+        <xs:unique name="part" >
+          <xs:selector xpath="wsdl:part" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+-->
+      </xs:element>
+      <xs:element name="portType" type="wsdl:tPortType" />
+      <xs:element name="binding"  type="wsdl:tBinding" />
+      <xs:element name="service"  type="wsdl:tService" >
+<!--
+        <xs:unique name="port" >
+          <xs:selector xpath="wsdl:port" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+-->
+	  </xs:element>
+    </xs:choice>
+  </xs:group>
+
+  <xs:complexType name="tDefinitions" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+   
+  <xs:complexType name="tImport" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+   
+  <xs:complexType name="tTypes" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" />
+    </xs:complexContent>   
+  </xs:complexType>
+     
+  <xs:complexType name="tMessage" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+
+  <xs:complexType name="tPart" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="element" type="xs:QName" use="optional" />
+        <xs:attribute name="type" type="xs:QName" use="optional" />    
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+
+  <xs:complexType name="tPortType" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+   
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+	    <xs:sequence>
+          <xs:choice>
+            <xs:group ref="wsdl:request-response-or-one-way-operation" />
+            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
+          </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+    
+  <xs:group name="request-response-or-one-way-operation" >
+    <xs:sequence>
+      <xs:element name="input" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="output" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="solicit-response-or-notification-operation" >
+    <xs:sequence>
+      <xs:element name="output" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="input" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+	  </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+        
+  <xs:complexType name="tParam" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName"  use="required" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="type" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+    
+  <xs:complexType name="tBindingOperationMessage" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="tBindingOperationFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBindingOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tService" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tPort" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="binding" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:attribute name="arrayType" type="xs:string" />
+  <xs:attribute name="required" type="xs:boolean" />
+  <xs:complexType name="tExtensibilityElement" abstract="true" >
+    <xs:attribute ref="wsdl:required" use="optional" />
+  </xs:complexType>
+
+</xs:schema>
diff --git a/onvif/wsdl/wsdl11soap12.xsd b/onvif/wsdl/wsdl11soap12.xsd
new file mode 100644
index 000000000..a5e7a0b94
--- /dev/null
+++ b/onvif/wsdl/wsdl11soap12.xsd
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!-- 
+ 
+Copyright 2001 - 2006, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files
+
+The Authors grant permission to copy and distribute the WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files in any medium without fee or royalty as long as this notice and license are distributed with them.  The originals of these files can be located at:
+
+http://schemas.xmlsoap.org/wsdl/soap12/wsdl11soap12.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity pertaining to these files or any program or service that uses these files, written prior permission.  Title to copyright in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+--> 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           xmlns:wsoap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/soap12/" >
+
+  <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
+
+  <xs:complexType name="tExtensibilityElementOpenAttrs" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="binding" type="wsoap12:tBinding" />
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+        <xs:attribute name="transport" type="xs:anyURI" use="required" />
+        <xs:attribute name="style" type="wsoap12:tStyleChoice" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="tStyleChoice" >
+    <xs:restriction base="xs:string" >
+      <xs:enumeration value="rpc" />
+      <xs:enumeration value="document" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="operation" type="wsoap12:tOperation" />
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+        <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
+        <xs:attribute name="soapActionRequired" type="xs:boolean" use="optional" />
+        <xs:attribute name="style" type="wsoap12:tStyleChoice" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="body" type="wsoap12:tBody" />
+  <xs:attributeGroup name="tBodyAttributes" >
+    <!-- The encodingStyle attribute is now a single URI, instead of a list of URIs -->
+    <xs:attribute name="encodingStyle" type="xs:anyURI" use="optional" />
+    <xs:attribute name="use" type="wsoap12:useChoice" use="optional" />
+    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
+  </xs:attributeGroup>
+  <xs:simpleType name="tParts">
+    <xs:list itemType="xs:NMTOKEN"/>
+  </xs:simpleType>
+  <xs:complexType name="tBody" >
+    <xs:complexContent>
+      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+        <xs:attribute name="parts" type="wsoap12:tParts" use="optional" />
+        <xs:attributeGroup ref = "wsoap12:tBodyAttributes" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="useChoice" >
+    <xs:restriction base="xs:string" >
+      <xs:enumeration value="literal" />
+      <xs:enumeration value="encoded" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="fault" type="wsoap12:tFault" />
+  <xs:complexType name="tFaultRes" abstract="true" >
+    <xs:complexContent>
+      <xs:restriction base="wsoap12:tBody" >
+	    <xs:attribute ref="wsdl:required" use="optional" /> 
+        <xs:attribute name="parts" type="wsoap12:tParts" use="prohibited" />
+		<xs:attributeGroup ref="wsoap12:tBodyAttributes" />
+      </xs:restriction>
+    </xs:complexContent>  	
+  </xs:complexType>
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="wsoap12:tFaultRes">
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+
+  <xs:element name="header" type="wsoap12:tHeader" />
+  <xs:attributeGroup name="tHeaderAttributes" >
+    <xs:attribute name="message" type="xs:QName" use="required" />
+    <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
+    <xs:attribute name="use" type="wsoap12:useChoice" use="required" />
+    <xs:attribute name="encodingStyle" type="xs:anyURI" use="optional" />
+    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />      
+  </xs:attributeGroup>
+  <xs:complexType name="tHeader" >
+    <xs:complexContent>
+      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+        <xs:sequence>
+          <xs:element ref="wsoap12:headerfault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+		<xs:attributeGroup ref="wsoap12:tHeaderAttributes" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="headerfault" type="wsoap12:tHeaderFault" />
+  <xs:complexType name="tHeaderFault" >
+	<xs:attributeGroup ref="wsoap12:tHeaderAttributes" />
+	<xs:anyAttribute namespace="##other" processContents="lax"/>
+  </xs:complexType>
+
+  <xs:element name="address" type="wsoap12:tAddress" />
+  <xs:complexType name="tAddress" >
+    <xs:complexContent>
+      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+</xs:schema>
diff --git a/onvif/wsdl/wsnotification.wsdl b/onvif/wsdl/wsnotification.wsdl
new file mode 100644
index 000000000..2ce67b2e4
--- /dev/null
+++ b/onvif/wsdl/wsnotification.wsdl
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" ?>
+
+<wsdl:definitions targetNamespace="http://127.0.0.1"
+  xmlns:wsntw="http://docs.oasis-open.org/wsn/bw-2"
+  xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
+  xmlns:wsa="http://www.w3.org/2005/08/addressing" 
+  xmlns:wsrf-rw="http://docs.oasis-open.org/wsrf/rw-2" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+  xmlns:local="http://127.0.0.1">
+  
+    
+  <wsdl:import namespace="http://docs.oasis-open.org/wsn/bw-2" 
+               location="file:wsdl/bw-2.wsdl"/> 
+  <!--===============================-->
+	<wsdl:binding name="NotificationProducerBinding" type="wsntw:NotificationProducer">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+   	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+    <wsdl:operation name="Subscribe">
+			<soap:operation soapAction="http://docs.oasis-open.org/wsn/bw-2/Subscribe"/>
+      <wsdl:input>
+        <soap:body parts="SubscribeRequest" use="literal"/>
+			</wsdl:input>         
+      <wsdl:output>
+			 <soap:body parts="SubscribeResponse" use="literal"/>
+		  </wsdl:output>
+         <wsdl:fault  name="ResourceUnknownFault">
+           <soap:fault  name="wsntw:ResourceUnknownFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="InvalidFilterFault" >
+           <soap:fault  name="wsntw:InvalidFilterFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="TopicExpressionDialectUnknownFault">
+           <soap:fault  name="wsntw:TopicExpressionDialectUnknownFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="InvalidTopicExpressionFault"> 
+           <soap:fault name="wsntw:InvalidTopicExpressionFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="TopicNotSupportedFault">
+           <soap:fault name="wsntw:TopicNotSupportedFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="InvalidProducerPropertiesExpressionFault" >
+           <soap:fault name="wsntw:InvalidProducerPropertiesExpressionFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="InvalidMessageContentExpressionFault" >
+           <soap:fault name="wsntw:InvalidMessageContentExpressionFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="UnacceptableInitialTerminationTimeFault" >
+           <soap:fault name="wsntw:UnacceptableInitialTerminationTimeFault"  use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="UnrecognizedPolicyRequestFault" >
+           <soap:fault name="wsntw:UnrecognizedPolicyRequestFault" use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="UnsupportedPolicyRequestFault" >
+           <soap:fault name="wsntw:UnsupportedPolicyRequestFault"  use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="NotifyMessageNotSupportedFault" >
+           <soap:fault name="wsntw:NotifyMessageNotSupportedFault"  use="literal"/>
+         </wsdl:fault> 
+         <wsdl:fault  name="SubscribeCreationFailedFault" >
+           <soap:fault name="wsntw:SubscribeCreationFailedFault"  use="literal"/>
+         </wsdl:fault> 
+    </wsdl:operation>
+    <wsdl:operation name="GetCurrentMessage">
+			<soap:operation soapAction="http://docs.oasis-open.org/wsn/bw-2/GetCurrentMessage"/>
+      <wsdl:input>
+        <soap:body parts="GetCurrentMessageRequest" use="literal"/>
+			</wsdl:input>         
+      <wsdl:output>
+			  <soap:body parts="GetCurrentMessageResponse" use="literal"/>
+			</wsdl:output>
+    </wsdl:operation>
+  	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+	</wsdl:binding>
+	<!--===============================-->
+  <wsdl:binding name="SubscriptionManagerBinding" type="wsntw:SubscriptionManager">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+   	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+    <wsdl:operation name="Renew">
+			<soap:operation soapAction="http://docs.oasis-open.org/wsn/bw-2/Renew"/>
+      <wsdl:input>
+        <soap:body parts="RenewRequest" use="literal"/>
+			</wsdl:input>         
+      <wsdl:output>
+			  <soap:body parts="RenewResponse" use="literal"/>
+			</wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="Unsubscribe">
+			<soap:operation soapAction="http://docs.oasis-open.org/wsn/bw-2/Unsubscribe"/>
+      <wsdl:input>
+        <soap:body parts="UnsubscribeRequest" use="literal"/>
+			</wsdl:input>         
+      <wsdl:output>
+			  <soap:body parts="UnsubscribeResponse" use="literal"/>
+			</wsdl:output>
+    </wsdl:operation>
+   	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+   </wsdl:binding> 
+	<!--===============================-->
+<!-- wsdl2perl.pl does not like operations w/o output 
+  <wsdl:binding name="NotificationConsumerBinding" type="wsntw:NotificationConsumer">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="Notify">
+			<soap:operation soapAction="http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer/Notify"/>
+      <wsdl:input>
+        <soap:body parts="parameters" use="literal"/>
+			</wsdl:input>         
+   </wsdl:operation>
+  </wsdl:binding>
+-->
+	<!--===============================-->
+   <wsdl:service name="WSBaseNotificationSender">
+    <wsdl:port name="NotificationProducerPort" binding="local:NotificationProducerBinding" >
+      <soap:address
+        location="http://docs.oasis-open.org/wsn/bw-2" />
+    </wsdl:port>
+    <wsdl:port name="SubscriptionManagerPort" binding="local:SubscriptionManagerBinding" >
+      <soap:address
+        location="http://docs.oasis-open.org/wsn/bw-2" />
+    </wsdl:port>
+  </wsdl:service>
+	<!--===============================-->
+<!-- wsdl2perl.pl does not like operations w/o output 
+   <wsdl:service name="WSBaseNotificationReceiver">
+    <wsdl:port name="NotificationConsumerPort" binding="local:NotificationConsumerBinding" >
+      <soap:address
+        location="http://docs.oasis-open.org/wsn/bw-2" />
+    </wsdl:port>
+  </wsdl:service>
+-->
+	<!--===============================-->
+</wsdl:definitions>
diff --git a/onvif/wsdl/xmlmime.xsd b/onvif/wsdl/xmlmime.xsd
new file mode 100644
index 000000000..766a07bd9
--- /dev/null
+++ b/onvif/wsdl/xmlmime.xsd
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<!-- 
+   W3C XML Schema defined in the Describing Media Content of Binary Data in XML
+   specification
+     http://www.w3.org/TR/xml-media-types
+
+   Copyright © 2005 World Wide Web Consortium,
+  
+   (Massachusetts Institute of Technology, European Research Consortium for
+   Informatics and Mathematics, Keio University). All Rights Reserved. This
+   work is distributed under the W3C® Software License [1] in the hope that
+   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  
+   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+   $Id: xmlmime.xsd,v 1.1 2005/04/25 17:08:35 hugo Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+           targetNamespace="http://www.w3.org/2005/05/xmlmime" >
+
+  <xs:attribute name="contentType">
+    <xs:simpleType>
+      <xs:restriction base="xs:string" >
+      <xs:minLength value="3" />
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+
+  <xs:attribute name="expectedContentTypes" type="xs:string" />
+
+  <xs:complexType name="base64Binary" >
+    <xs:simpleContent>
+        <xs:extension base="xs:base64Binary" >
+            <xs:attribute ref="xmime:contentType" />
+        </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="hexBinary" >
+    <xs:simpleContent>
+        <xs:extension base="xs:hexBinary" >
+            <xs:attribute ref="xmime:contentType" />
+        </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/onvif/wsdl/xop-include.xsd b/onvif/wsdl/xop-include.xsd
new file mode 100644
index 000000000..edb43a086
--- /dev/null
+++ b/onvif/wsdl/xop-include.xsd
@@ -0,0 +1,13 @@
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' 
+           xmlns:tns='http://www.w3.org/2004/08/xop/include' 
+           targetNamespace='http://www.w3.org/2004/08/xop/include' >
+
+  <xs:element name='Include' type='tns:Include' />
+  <xs:complexType name='Include' >
+	<xs:sequence>
+	  <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:attribute name='href' type='xs:anyURI' use='required' />
+	<xs:anyAttribute namespace='##other' />
+  </xs:complexType>
+</xs:schema>
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index bd1885fbe..5502a42a8 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -9,6 +9,7 @@ configure_file(zmcontrol.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" @ONLY)
 configure_file(zmdc.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" @ONLY)
 configure_file(zmfilter.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" @ONLY)
 configure_file(zmonvif-probe.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmonvif-probe.pl" @ONLY)
+configure_file(zmonvif-trigger.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmonvif-trigger.pl" @ONLY)
 configure_file(zmpkg.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" @ONLY)
 configure_file(zmrecover.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmrecover.pl" @ONLY)
 configure_file(zmtrack.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" @ONLY)
@@ -29,14 +30,31 @@ configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" @ONLY)
 #configure_file(zmeventdump.in zmeventdump @ONLY)
 
 # Generate man files for the perl scripts destined for the bin folder
-file(GLOB perlscripts "*.pl")
+file(GLOB perlscripts "${CMAKE_CURRENT_BINARY_DIR}/*.pl")
 FOREACH(PERLSCRIPT ${perlscripts})
     get_filename_component(PERLSCRIPTNAME ${PERLSCRIPT} NAME)
-    POD2MAN(${PERLSCRIPT} zoneminder-${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX})
+    POD2MAN(${PERLSCRIPT} ${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX})
 ENDFOREACH(PERLSCRIPT ${perlscripts})
 
 # Install the perl scripts
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmonvif-probe.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmrecover.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmstats.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES 
+  "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmonvif-probe.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmonvif-trigger.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmrecover.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl"
+  "${CMAKE_CURRENT_BINARY_DIR}/zmstats.pl"
+  DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(NOT ZM_NO_X10)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif(NOT ZM_NO_X10)
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 10e4b4733..21f9a2d02 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -76,39 +76,42 @@ BEGIN {
 require ZoneMinder::Database;
 
   # Process name, value pairs from the main config file first
-  my $config_file = ZM_CONFIG;
-  process_configfile($config_file);
+  process_configfile(ZM_CONFIG);
 
   # Search for user created config files. If one or more are found then
   # update the Config hash with those values
   if ( ZM_CONFIG_SUBDIR and -d ZM_CONFIG_SUBDIR ) {
     if ( -R ZM_CONFIG_SUBDIR ) {
-      foreach my $filename ( glob ZM_CONFIG_SUBDIR.'/*.conf' ) {
+      foreach my $filename (glob ZM_CONFIG_SUBDIR.'/*.conf' ) {
         process_configfile($filename);
       }
     } else {
-      print( STDERR 'WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on '.ZM_CONFIG_SUBDIR.".\n" );
+      print(STDERR 'WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on '.ZM_CONFIG_SUBDIR.".\n");
     }
   }
 
 	my $dbh = ZoneMinder::Database::zmDbConnect();
+  die "Unable to connect to DB. ZM Cannot continue.\n" if !$dbh;
+
   my $sql = 'SELECT Name,Value FROM Config';
   my $sth = $dbh->prepare_cached($sql) or croak("Can't prepare '$sql': ".$dbh->errstr());
   my $res = $sth->execute() or croak("Can't execute: ".$sth->errstr());
-  while( my $config = $sth->fetchrow_hashref() ) {
+  while ( my $config = $sth->fetchrow_hashref() ) {
+    # If already defined skip it because we want the values in /etc/zm.conf to override the values in Config Table
+    next if exists $Config{$config->{Name}};
     $Config{$config->{Name}} = $config->{Value};
   }
   $sth->finish();
   
-  if ( ! $Config{ZM_SERVER_ID} ) {
+  if ( !$Config{ZM_SERVER_ID} ) {
     $Config{ZM_SERVER_ID} = undef;
-    $sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
+    $sth = $dbh->prepare_cached('SELECT * FROM Servers WHERE Name=?');
     if ( $Config{ZM_SERVER_NAME} ) {
-      $res = $sth->execute( $Config{ZM_SERVER_NAME} );
+      $res = $sth->execute($Config{ZM_SERVER_NAME});
       my $result = $sth->fetchrow_hashref();
       $Config{ZM_SERVER_ID} = $$result{Id};
     } elsif ( $Config{ZM_SERVER_HOST} ) {
-      $res = $sth->execute( $Config{ZM_SERVER_HOST} );
+      $res = $sth->execute($Config{ZM_SERVER_HOST});
       my $result = $sth->fetchrow_hashref();
       $Config{ZM_SERVER_ID} = $$result{Id};
     }
@@ -126,20 +129,20 @@ require ZoneMinder::Database;
     open( my $CONFIG, '<', $config_file )
       or croak("Can't open config file '$config_file': $!");
     foreach my $str ( <$CONFIG> ) {
-		  next if ( $str =~ /^\s*$/ );
+      next if ( $str =~ /^\s*$/ );
       next if ( $str =~ /^\s*#/ );
       my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/;
       if ( !$name ) {
         print(STDERR "Warning, bad line in $config_file: $str\n");
         next;
       } # end if
-      $name =~ tr/a-z/A-Z/;
+      $name = uc $name;
       #if ( !$ZoneMinder::ConfigData::options_hash{$name} ) {
-				#print(STDERR "Warning, unknown config option name $name in $config_file\n");
-#} else {
-				#print(STDERR "Warning, known config option name $name in $config_file\n");
-			#}
-			$Config{$name} = $value;
+      #print(STDERR "Warning, unknown config option name $name in $config_file\n");
+      #} else {
+      #print(STDERR "Warning, known config option name $name in $config_file\n");
+      #}
+      $Config{$name} = $value;
     } # end foreach config line
     close($CONFIG);
   } # end sub process_configfile
@@ -147,11 +150,11 @@ require ZoneMinder::Database;
 } # end BEGIN
 
 sub loadConfigFromDB {
-  print( 'Loading config from DB' );
+  print('Loading config from DB');
   my $dbh = ZoneMinder::Database::zmDbConnect();
   if ( !$dbh ) {
-    print( "Error: unable to load options from database: $DBI::errstr\n" );
-    return( 0 );
+    print("Error: unable to load options from database: $DBI::errstr\n");
+    return(0);
   }
   my $sql = "select * from Config";
   my $sth = $dbh->prepare_cached( $sql )
@@ -161,13 +164,13 @@ sub loadConfigFromDB {
   my $option_count = 0;
   while( my $config = $sth->fetchrow_hashref() ) {
     my ( $name, $value ) = ( $config->{Name}, $config->{Value} );
-#print( "Name = '$name'\n" );
+    #print( "Name = '$name'\n" );
     my $option = $options_hash{$name};
     if ( !$option ) {
       warn( "No option '$name' found, removing.\n" );
       next;
     }
-#next if ( $option->{category} eq 'hidden' );
+    #next if ( $option->{category} eq 'hidden' );
     if ( defined($value) ) {
       if ( $option->{type} == $types{boolean} ) {
         $option->{value} = $value?'yes':'no';
@@ -204,8 +207,8 @@ sub saveConfigToDB {
   my $sth = $dbh->prepare_cached( $sql )
     or croak( "Can't prepare '$sql': ".$dbh->errstr() );
   foreach my $option ( @options ) {
-#next if ( $option->{category} eq 'hidden' );
-#print( $option->{name}."\n" ) if ( !$option->{category} );
+    #next if ( $option->{category} eq 'hidden' );
+    #print( $option->{name}."\n" ) if ( !$option->{category} );
     $option->{db_type} = $option->{type}->{db_type};
     $option->{db_hint} = $option->{type}->{hint};
     $option->{db_pattern} = $option->{type}->{pattern};
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 2b2a20958..cf2b59c85 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -162,6 +162,12 @@ our %types = (
     pattern     => qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|,
     format      => q( $1\@$2 )
   },
+  timezone => {
+    db_type     => 'string',
+    hint        => 'America/Toronto',
+    pattern      => qr|^(.+)$|,
+    format      => q($1)
+  }
 );
 
 our @options = (
@@ -181,7 +187,7 @@ our @options = (
   },
   {
     name        => 'ZM_CSS_DEFAULT',
-    default     => 'classic',
+    default     => 'base',
     description => 'Default set of css files used by web interface',
     help        => q`
       ZoneMinder allows the use of many different web interfaces, and
@@ -246,7 +252,7 @@ our @options = (
       authentication which passes an independently authentication
       'remote' user via http. In this case ZoneMinder would use the
       supplied user without additional authentication provided such a
-      user is configured ion ZoneMinder.
+      user is configured in ZoneMinder.
       `,
     requires    => [ { name=>'ZM_OPT_USE_AUTH', value=>'yes' } ],
     type        => {
@@ -576,26 +582,6 @@ our @options = (
     type        => $types{integer},
     category    => 'images',
   },
-# Deprecated, now stream quality
-  {
-    name        => 'ZM_JPEG_IMAGE_QUALITY',
-    default     => '70',
-    description => q`Set the JPEG quality setting for the streamed 'live' images (1-100)`,
-    help        => q`
-      When viewing a 'live' stream for a monitor ZoneMinder will grab
-      an image from the buffer and encode it into JPEG format before
-      sending it. This option specifies what image quality should be
-      used to encode these images. A higher number means better
-      quality but less compression so will take longer to view over a
-      slow connection. By contrast a low number means quicker to view
-      images but at the price of lower quality images. This option
-      does not apply when viewing events or still images as these are
-      usually just read from disk and so will be encoded at the
-      quality specified by the previous options.
-      `,
-    type        => $types{integer},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_JPEG_STREAM_QUALITY',
     default     => '70',
@@ -777,6 +763,15 @@ our @options = (
     type        => $types{string},
     category    => 'config',
   },
+  {
+    name        => 'ZM_TIMEZONE',
+    default     =>  '',
+    description => 'The timezone that php should use.',
+    help        => q`
+      This should be set equal to the system timezone of the mysql server`,
+    type  =>  $types{timezone},
+    category => 'system',
+  },
   {
     name        => 'ZM_CPU_EXTENSIONS',
     default     => 'yes',
@@ -862,38 +857,6 @@ our @options = (
     type        => $types{integer},
     category    => 'config',
   },
-# Deprecated, really no longer necessary
-  {
-    name        => 'ZM_OPT_REMOTE_CAMERAS',
-    default     => 'no',
-    description => 'Are you going to use remote/networked cameras',
-    help        => q`
-      ZoneMinder can work with both local cameras, ie. those attached
-      physically to your computer and remote or network cameras. If
-      you will be using networked cameras select this option.
-      `,
-    type        => $types{boolean},
-    category    => 'hidden',
-  },
-# Deprecated, now set on a per monitor basis using the Method field
-  {
-    name        => 'ZM_NETCAM_REGEXPS',
-    default     => 'yes',
-    description => 'Use regular expression matching with network cameras',
-    help        => q`
-      Traditionally ZoneMinder has used complex regular regular
-      expressions to handle the multitude of formats that network
-      cameras produce. In versions from 1.21.1 the default is to use
-      a simpler and faster built in pattern matching methodology.
-      This works well with most networks cameras but if you have
-      problems you can try the older, but more flexible, regular
-      expression based method by selecting this option. Note, to use
-      this method you must have libpcre installed on your system.
-      `,
-    requires    => [ { name => 'ZM_OPT_REMOTE_CAMERAS', value => 'yes' } ],
-    type        => $types{boolean},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_HTTP_VERSION',
     default     => '1.0',
@@ -1112,7 +1075,7 @@ our @options = (
   },
   {
     name        => 'ZM_LOG_LEVEL_FILE',
-    default     => '-5',
+    default     => '1',
     description => 'Save logging output to component files',
     help        => q`
       ZoneMinder logging is now more integrated between
@@ -1297,7 +1260,7 @@ our @options = (
   },
   {
     name        => 'ZM_LOG_DEBUG_FILE',
-    default     => '@ZM_LOGDIR@/zm_debug.log+',
+    default     => '',
     description => 'Where extra debug is output to',
     help        => q`
       This option allows you to specify a different target for debug
@@ -1498,6 +1461,26 @@ our @options = (
     type        => $types{boolean},
     category    => 'logging',
   },
+  {
+    name        => 'ZM_WEB_NAVBAR_TYPE',
+    default     => 'normal',
+    description => 'Style of the web console navigation bar',
+    help        => q`
+      Choose between different navigation bar styles for the web
+      console. The "normal" style has a menu across the top, which
+      collapses to a pull down menu on small screens. The "collapsed"
+      style is collapsed all the time. Instead of a menu across the
+      top, menu items are accessed from the drop down menu on the
+      right.
+      `,
+    type        => {
+      db_type     => 'string',
+      hint        => 'normal|collapsed',
+      pattern     => qr|^([nc])|i,
+      format      => q( ($1 =~ /^n/) ? 'normal' : 'collapsed' )
+    },
+    category    => 'web',
+  },
   {
     name        => 'ZM_WEB_TITLE',
     default     => 'ZoneMinder',
@@ -1543,6 +1526,20 @@ our @options = (
     type        => $types{string},
     category    => 'web',
   },
+  {
+    name        => 'ZM_HOME_ABOUT',
+    default     => 'yes',
+    description => 'Whether to enable the ZoneMinder About menu.',
+    help        => q`
+      When enabled, the ZoneMinder logo in the top left corner of the
+      navigation bar becomes a menu with links to: the ZoneMinder
+      website, ZoneMinder Documentation, and the ZoneMinder forum.
+      End users wishing to rebrand their system may want to disable this
+      as the menu items are currently hard coded.
+      `,
+    type        => $types{boolean},
+    category    => 'web',
+  },
   {
     name        => 'ZM_WEB_CONSOLE_BANNER',
     default     => '',
@@ -1925,19 +1922,6 @@ our @options = (
     },
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_HOST',
-    default     => '',
-    description => 'The remote server to upload to',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. This option indicates the name, or ip
-      address, of the server to use.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{hostname},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_HOST',
     default     => '',
@@ -1966,19 +1950,6 @@ our @options = (
     type        => $types{integer},
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_USER',
-    default     => '',
-    description => 'Your ftp username',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. This option indicates the username that
-      ZoneMinder should use to log in for ftp transfer.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{alphanum},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_USER',
     default     => '',
@@ -1992,19 +1963,6 @@ our @options = (
     type        => $types{alphanum},
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_PASS',
-    default     => '',
-    description => 'Your ftp password',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. This option indicates the password that
-      ZoneMinder should use to log in for ftp transfer.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{string},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_PASS',
     default     => '',
@@ -2020,21 +1978,6 @@ our @options = (
     type        => $types{string},
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_LOC_DIR',
-    default     => '@ZM_TMPDIR@',
-    description => 'The local directory in which to create upload files',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. This option indicates the local directory
-      that ZoneMinder should use for temporary upload files. These
-      are files that are created from events, uploaded and then
-      deleted.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{abs_path},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_LOC_DIR',
     default     => '@ZM_TMPDIR@',
@@ -2049,19 +1992,6 @@ our @options = (
     type        => $types{abs_path},
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_REM_DIR',
-    default     => '',
-    description => 'The remote directory to upload to',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. This option indicates the remote directory
-      that ZoneMinder should use to upload event files to.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{rel_path},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_REM_DIR',
     default     => '',
@@ -2075,21 +2005,6 @@ our @options = (
     type        => $types{rel_path},
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_TIMEOUT',
-    default     => '120',
-    description => 'How long to allow the transfer to take for each file',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. This option indicates the maximum ftp
-      inactivity timeout (in seconds) that should be tolerated before
-      ZoneMinder determines that the transfer has failed and closes
-      down the connection.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{integer},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_TIMEOUT',
     default     => '120',
@@ -2142,20 +2057,6 @@ our @options = (
     type        => $types{boolean},
     category    => 'upload',
   },
-  {
-    name        => 'ZM_UPLOAD_FTP_DEBUG',
-    default     => 'no',
-    description => 'Switch ftp debugging on',
-    help        => q`
-      You can use filters to instruct ZoneMinder to upload events to
-      a remote ftp server. If you are having (or expecting) troubles
-      with uploading events then setting this to 'yes' permits
-      additional information to be included in the zmfilter log file.
-      `,
-    requires    => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
-    type        => $types{boolean},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_UPLOAD_DEBUG',
     default     => 'no',
@@ -2188,85 +2089,6 @@ our @options = (
     type        => $types{boolean},
     category    => 'mail',
   },
-  {
-    name        => 'ZM_EMAIL_ADDRESS',
-    default     => '',
-    description => 'The email address to send matching event details to',
-    requires    => [ { name => 'ZM_OPT_EMAIL', value => 'yes' } ],
-    help        => q`
-      This option is used to define the email address that any events
-      that match the appropriate filters will be sent to.
-      `,
-    type        => $types{email},
-    category    => 'mail',
-  },
-  {
-    name        => 'ZM_EMAIL_TEXT',
-    default     => 'subject = "ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)"
-      body = "
-      Hello,
-
-    An alarm has been detected on your installation of the ZoneMinder.
-
-      The details are as follows :-
-
-      Monitor  : %MN%
-      Event Id : %EI%
-      Length   : %EL%
-      Frames   : %EF% (%EFA%)
-      Scores   : t%EST% m%ESM% a%ESA%
-
-      This alarm was matched by the %FN% filter and can be viewed at %EPS%
-
-      ZoneMinder"',
-    description => 'The text of the email used to send matching event details',
-    requires    => [ { name => 'ZM_OPT_EMAIL', value => 'yes' } ],
-    help        => q`
-      This option is used to define the content of the email that is
-      sent for any events that match the appropriate filters.
-      `,
-    type        => $types{text},
-    category    => 'hidden',
-  },
-  {
-    name        => 'ZM_EMAIL_SUBJECT',
-    default     => 'ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)',
-    description => 'The subject of the email used to send matching event details',
-    requires    => [ { name => 'ZM_OPT_EMAIL', value => 'yes' } ],
-    help        => q`
-      This option is used to define the subject of the email that is
-      sent for any events that match the appropriate filters.
-      `,
-    type        => $types{string},
-    category    => 'mail',
-  },
-  {
-    name        => 'ZM_EMAIL_BODY',
-    default     => '
-      Hello,
-
-    An alarm has been detected on your installation of the ZoneMinder.
-
-      The details are as follows :-
-
-      Monitor  : %MN%
-      Event Id : %EI%
-      Length   : %EL%
-      Frames   : %EF% (%EFA%)
-      Scores   : t%EST% m%ESM% a%ESA%
-
-      This alarm was matched by the %FN% filter and can be viewed at %EPS%
-
-      ZoneMinder',
-    description => 'The body of the email used to send matching event details',
-    requires    => [ { name => 'ZM_OPT_EMAIL', value => 'yes' } ],
-    help        => q`
-      This option is used to define the content of the email that is
-      sent for any events that match the appropriate filters.
-      `,
-    type        => $types{text},
-    category    => 'mail',
-  },
   {
     name        => 'ZM_OPT_MESSAGE',
     default     => 'no',
@@ -2298,19 +2120,6 @@ our @options = (
     type        => $types{email},
     category    => 'mail',
   },
-  {
-    name        => 'ZM_MESSAGE_TEXT',
-    default     => 'subject = "ZoneMinder: Alarm - %MN%-%EI%"
-      body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score."',
-    description => 'The text of the message used to send matching event details',
-    requires    => [ { name => 'ZM_OPT_MESSAGE', value => 'yes' } ],
-    help        => q`
-      This option is used to define the content of the message that
-      is sent for any events that match the appropriate filters.
-      `,
-    type        => $types{text},
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_MESSAGE_SUBJECT',
     default     => 'ZoneMinder: Alarm - %MN%-%EI%',
@@ -2453,7 +2262,7 @@ our @options = (
   },
   {
     name        => 'ZM_WATCH_MAX_DELAY',
-    default     => '5',
+    default     => '45',
     description => 'The maximum delay allowed since the last captured image',
     help        => q`
       The zmwatch daemon checks the image capture performance of the
@@ -2603,39 +2412,6 @@ our @options = (
     category    => 'config',
   },
 # Deprecated, superseded by event close mode
-  {
-    name        => 'ZM_FORCE_CLOSE_EVENTS',
-    default     => 'no',
-    description => 'Close events at section ends.',
-    help        => q`
-      When a monitor is running in a continuous recording mode
-      (Record or Mocord) events are usually closed after a fixed
-      period of time (the section length). However in Mocord mode it
-      is possible that motion detection may occur near the end of a
-      section and ordinarily this will prevent the event being closed
-      until the motion has ceased. Switching this option on will
-      force the event closed at the specified time regardless of any
-      motion activity.
-      `,
-    type        => $types{boolean},
-    category    => 'hidden',
-  },
-  {
-    name        => 'ZM_CREATE_ANALYSIS_IMAGES',
-    default     => 'yes',
-    description => 'Create analysed alarm images with motion outlined',
-    help        => q`
-      By default during an alarm ZoneMinder records both the raw
-      captured image and one that has been analysed and had areas
-      where motion was detected outlined. This can be very useful
-      during zone configuration or in analysing why events occurred.
-      However it also incurs some overhead and in a stable system may
-      no longer be necessary. This parameter allows you to switch the
-      generation of these images off.
-      `,
-    type        => $types{boolean},
-    category    => 'config',
-  },
   {
     name        => 'ZM_WEIGHTED_ALARM_CENTRES',
     default     => 'no',
@@ -2749,6 +2525,15 @@ our @options = (
     type        => $types{boolean},
     category    => 'system',
   },
+  {
+    name        => 'ZM_CSP_REPORT_URI',
+    default     =>  '',
+    description =>  'URI to report unsafe inline javascript violations to',
+    help        =>  q`
+    See https://en.wikipedia.org/wiki/Content_Security_Policy for more information.  When the browser detects unsafe inline javascript it will report it to this url, which may warn you of malicious attacks on your ZoneMinder install.`,
+    type        =>  $types{url},
+    category    =>  'system',
+  },
   {
     name        => 'ZM_TELEMETRY_DATA',
     default     => 'no',
@@ -2834,37 +2619,9 @@ our @options = (
     type        => $types{hexadecimal},
     category    => 'system',
   },
-# Deprecated, really no longer necessary
-  {
-    name        => 'ZM_WEB_REFRESH_METHOD',
-    default     => 'javascript',
-    description => 'What method windows should use to refresh themselves',
-    help        => q`
-      Many windows in ZoneMinder need to refresh themselves to keep
-      their information current. This option determines what method
-      they should use to do this. Choosing 'javascript' means that
-      each window will have a short JavaScript statement in with a
-      timer to prompt the refresh. This is the most compatible
-      method. Choosing 'http' means the refresh instruction is put in
-      the HTTP header. This is a cleaner method but refreshes are
-      interrupted or cancelled when a link in the window is clicked
-      meaning that the window will no longer refresh and this would
-      have to be done manually.
-      `,
-    type        => {
-      db_type     =>'string',
-      hint        =>'javascript|http',
-      pattern     =>qr|^([jh])|i,
-      format      =>q( $1 =~ /^j/
-          ? 'javascript'
-          : 'http'
-          )
-    },
-    category    => 'hidden',
-  },
   {
     name        => 'ZM_WEB_EVENT_SORT_FIELD',
-    default     => 'DateTime',
+    default     => 'StartDateTime',
     description => 'Default field the event lists are sorted by',
     help        => q`
       Events in lists can be initially ordered in any way you want.
@@ -2876,7 +2633,7 @@ our @options = (
       `,
     type        => {
       db_type     =>'string',
-      hint        =>'Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
+      hint        =>'Id|Name|Cause|DiskSpace|MonitorName|StartDateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
       pattern     =>qr|.|,
       format      =>q( $1 )
     },
@@ -4001,7 +3758,6 @@ sub initialiseConfig {
     } else {
       $option->{value} = '';
     }
-#next if ( $option->{category} eq 'hidden' );
     $option->{id} = $option_id++;
   }
   $configInitialised = 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
index bbc06a884..acce8eb4a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
@@ -1,6 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Base Control Module, $Date$, $Revision$
+# ZoneMinder Base Control Module
 # Copyright (C) 2001-2008  Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -46,13 +46,13 @@ our $AUTOLOAD;
 sub new {
   my $class = shift;
   my $id = shift;
+  if ( !defined($id) ) {
+    Fatal('No monitor defined when invoking protocol '.$class);
+  }
   my $self = {};
   $self->{name} = $class;
-  if ( !defined($id) ) {
-    Fatal('No monitor defined when invoking protocol '.$self->{name});
-  }
   $self->{id} = $id;
-  bless( $self, $class );
+  bless($self, $class);
   return $self;
 }
 
@@ -61,23 +61,29 @@ sub DESTROY {
 
 sub AUTOLOAD {
   my $self = shift;
-  my $class = ref($self) || Fatal("$self not object");
+  my $class = ref($self);
+  if ( !$class ) {
+    my ( $caller, undef, $line ) = caller;
+    Fatal("$self not object from $caller:$line");
+  }
+
   my $name = $AUTOLOAD;
   $name =~ s/.*://;
   if ( exists($self->{$name}) ) {
     return $self->{$name};
   }
-  Error("Can't access $name $AUTOLOAD member of object of class $class");
+  my ( $caller, undef, $line ) = caller;
+  Error("Can't access name:$name AUTOLOAD:$AUTOLOAD member of object of class $class from $caller:$line");
 }
 
 sub getKey {
   my $self = shift;
-  return( $self->{id} );
+  return $self->{id};
 }
 
 sub open {
   my $self = shift;
-  Fatal( "No open method defined for protocol ".$self->{name} );
+  Fatal('No open method defined for protocol '.$self->{name});
 }
 
 sub close {
@@ -89,8 +95,8 @@ sub close {
 sub loadMonitor {
   my $self = shift;
   if ( !$self->{Monitor} ) {
-    if ( !($self->{Monitor} = zmDbGetMonitor( $self->{id} )) ) {
-      Fatal( "Monitor id ".$self->{id}." not found or not controllable" );
+    if ( !($self->{Monitor} = zmDbGetMonitor($self->{id})) ) {
+      Fatal('Monitor id '.$self->{id}.' not found or not controllable');
     }
     if ( defined($self->{Monitor}->{AutoStopTimeout}) ) {
 # Convert to microseconds.
@@ -106,11 +112,11 @@ sub getParam {
   my $default = shift;
 
   if ( defined($params->{$name}) ) {
-    return( $params->{$name} );
+    return $params->{$name};
   } elsif ( defined($default) ) {
-    return( $default );
+    return $default;
   }
-  Fatal( "Missing mandatory parameter '$name'" );
+  Error("Missing mandatory parameter '$name'");
 }
 
 sub executeCommand {
@@ -126,52 +132,40 @@ sub executeCommand {
 #{
 #Fatal( "Unsupported command '$command'" );
 #}
-  &{$self->{$command}}( $self, $params );
+  &{$self->{$command}}($self, $params);
 }
 
 sub printMsg {
   my $self = shift;
-  Fatal( "No printMsg method defined for protocol ".$self->{name} );
+  my $msg = shift;
+  my $msg_len = length($msg);
+
+  Debug($msg.'['.$msg_len.']');
 }
 
 1;
 __END__
-# Below is stub documentation for your module. You'd better edit it!
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Control - Parent class defining Control API
 
 =head1 SYNOPSIS
 
-use ZoneMinder::Database;
-blah blah blah
+use ZoneMinder::Control;
+
+This should be used as the parent class for packages implementing control
+apis for various cameras.
 
 =head1 DESCRIPTION
 
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
 
-Blah blah blah.
 
 =head2 EXPORT
 
 None by default.
 
 
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
 =head1 AUTHOR
 
 Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
index e95f86cba..59e4f7511 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
@@ -1,16 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Acrest HTTP API Control Protocol Module, 20180214, Rev 3.0
-#
-# Change Log
-#
-# Rev 3.0:
-#  - Fixes incorrect method names
-#  - Updates control sequences to Amcrest HTTP Protocol API v 2.12
-#  - Extends control features
-#  
-# Rev 2.0:
-#  - Fixed installation instructions text, no changes to functionality.
+# ZoneMinder Amcrest HTTP API Control Protocol Module
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -38,6 +28,8 @@ use Time::HiRes qw( usleep );
 
 require ZoneMinder::Base;
 require ZoneMinder::Control;
+require LWP::UserAgent;
+use URI;
 
 our @ISA = qw(ZoneMinder::Control);
 
@@ -50,130 +42,130 @@ our @ISA = qw(ZoneMinder::Control);
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Config qw(:all);
 
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
+sub new {
+  my $class = shift;
+  my $id = shift;
+  my $self = ZoneMinder::Control->new($id);
+  bless($self, $class);
+  return $self;
 }
 
-our $AUTOLOAD;
+sub open {
+  my $self = shift;
 
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    Debug( "Received command: $name" );
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
+  $self->loadMonitor();
+  if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
+    # Has no scheme at the beginning, so won't parse as a URI
+    $self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
+  }
+  my $uri = URI->new($self->{Monitor}->{ControlAddress});
 
-sub open
-{
-    my $self = shift;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
+  my ( $username, $password );
+  my $realm = 'Login to ' . $self->{Monitor}->{ControlDevice};
+  if ( $self->{Monitor}->{ControlAddress} ) {
+    ( $username, $password ) = $uri->authority() =~ /^(.*):(.*)@(.*)$/;
 
-    $self->loadMonitor();
+    $$self{address} = $uri->host_port();
+    $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+    # Testing seems to show that we need the username/password in each url as well as credentials
+    $$self{base_url} = $uri->canonical();
+    Debug('Using initial credentials for '.$uri->host_port().", $realm, $username, $password, base_url: $$self{base_url} auth:".$uri->authority());
+  }
+
+  # Detect REALM, has to be /cgi-bin/ptz.cgi because just / accepts no auth
+  my $res = $self->{ua}->get($$self{base_url}.'cgi-bin/ptz.cgi');
+
+  if ( $res->is_success ) {
     $self->{state} = 'open';
-}
+    return;
+  }
 
-sub initUA
-{
-    my $self = shift;
-    my $user = undef;
-    my $password = undef;
-    my $address = undef;
+  if ( $res->status_line() eq '401 Unauthorized' ) {
 
-    if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ )
-    {
-      $user = $1;
-      $password = $2;
-      $address = $3;
+    my $headers = $res->headers();
+    foreach my $k ( keys %$headers ) {
+      Debug("Initial Header $k => $$headers{$k}");
     }
 
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->credentials("$address", "Login to " . $self->{Monitor}->{ControlDevice}, "$user", "$password");
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+    if ( $$headers{'www-authenticate'} ) {
+      my ( $auth, $tokens ) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/;
+      if ( $tokens =~ /realm="([^"]+)"/i ) {
+        if ( $realm ne $1 ) {
+          $realm = $1;
+          Debug("Changing REALM to ($realm)");
+          $self->{ua}->credentials($$self{address}, $realm, $username, $password);
+          $res = $self->{ua}->get($$self{base_url}.'cgi-bin/ptz.cgi');
+          if ( $res->is_success() ) {
+            $self->{state} = 'open';
+            return;
+          } elsif ( $res->status_line eq '400 Bad Request' ) {
+          # In testing, this second request fails with Bad Request, I assume because we didn't actually give it a command.
+            $self->{state} = 'open';
+            return;
+          } else {
+            Error('Authentication still failed after updating REALM' . $res->status_line);
+            $headers = $res->headers();
+            foreach my $k ( keys %$headers ) {
+              Debug("Header $k => $$headers{$k}");
+            }  # end foreach
+          }
+        } else {
+          Error('Authentication failed, not a REALM problem');
+        }
+      } else {
+        Error('Failed to match realm in tokens');
+      } # end if
+    } else {
+      Debug('No headers line');
+    } # end if headers
+  } else {
+    Error("Failed to get $$self{base_url}cgi-bin/ptz.cgi ".$res->status_line());
+
+  } # end if $res->status_line() eq '401 Unauthorized'
+
+  $self->{state} = 'closed';
 }
 
-sub destroyUA
-{
-    my $self = shift;
-
-    $self->{ua} = undef;
+sub close {
+  my $self = shift;
+  $self->{state} = 'closed';
 }
 
-sub close
-{ 
-    my $self = shift;
-    $self->{state} = 'closed';
-}
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+  my $result = undef;
 
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
+  $self->printMsg($cmd, 'Tx');
 
-    Debug( $msg."[".$msg_len."]" );
-}
+  my $res = $self->{ua}->get($$self{base_url}.$cmd);
 
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $result = undef;
-
-    destroyUA($self);
-    initUA($self);
-
-    my $user = undef;
-    my $password = undef;
-    my $address = undef;
-
-    if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ )
-    {
-      $user = $1;
-      $password = $2;
-      $address = $3;
+  if ( $res->is_success ) {
+    $result = !undef;
+    # Command to camera appears successful, write Info item to log
+    Info('Camera control: \''.$res->status_line().'\' for URL '.$$self{base_url}.$cmd);
+    # TODO: Add code to retrieve $res->message_decode or some such. Then we could do things like check the camera status.
+  } else {
+    # Try again
+    $res = $self->{ua}->get($$self{base_url}.$cmd);
+    if ( $res->is_success ) {
+      # Command to camera appears successful, write Info item to log
+      Info('Camera control 2: \''.$res->status_line().'\' for URL '.$$self{base_url}.$cmd);
+    } else {
+      Error('Camera control command FAILED: \''.$res->status_line().'\' for URL '.$$self{base_url}.$cmd);
+      $res = $self->{ua}->get('http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
     }
+  }
 
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( GET=>"http://$address/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-        # Command to camera appears successful, write Info item to log
-        Info( "Camera control: '".$res->status_line()."' for URL ".$self->{Monitor}->{ControlAddress}."/$cmd" );
-	# TODO: Add code to retrieve $res->message_decode or some such. Then we could do things like check the camera status.
-    }
-    else
-    {
-        Error( "Camera control command FAILED: '".$res->status_line()."' for URL ".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    }
-
-    return( $result );
+  return $result;
 }
 
-sub reset
-{
-    my $self = shift;
-    # This reboots the camera effectively resetting it
-    Debug( "Camera Reset" );
-    $self->sendCmd( 'cgi-bin/magicBox.cgi?action=reboot' );
-    ##FIXME: Exit is a bad idea as it appears to cause zmc to run away.
-    #Exit (0);
+sub reset {
+  my $self = shift;
+  # This reboots the camera effectively resetting it
+  $self->sendCmd('cgi-bin/magicBox.cgi?action=reboot');
 }
 
 # NOTE: I'm putting this in, but absolute camera movement does not seem to be well supported in the classic skin ATM.
@@ -184,163 +176,148 @@ sub reset
 
 sub moveAbs ## Up, Down, Left, Right, etc. ??? Doesn't make sense here...
 {
-    my $self = shift;
-    my $pan_degrees = shift || 0;
-    my $tilt_degrees = shift || 0;
-    my $speed = shift || 1;
-    Debug( "Move ABS" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan_degrees.'&arg2='.$tilt_degrees.'&arg3=0&arg4='.$speed );
+  my $self = shift;
+  my $pan_degrees = shift || 0;
+  my $tilt_degrees = shift || 0;
+  my $speed = shift || 1;
+  Debug('Move ABS');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan_degrees.'&arg2='.$tilt_degrees.'&arg3=0&arg4='.$speed);
 }
 
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Up&channel=0&arg1=0&arg2=1&arg3=0' );
-    usleep (500); ##XXX Should this be passed in as a "speed" parameter?
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Up&channel=0&arg1=0&arg2=1&arg3=0' );
+sub moveConUp {
+  my $self = shift;
+  Debug('Move Up');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Up&channel=0&arg1=0&arg2=1&arg3=0');
+  usleep(500); ##XXX Should this be passed in as a "speed" parameter?
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Up&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Down&channel=0&arg1=0&arg2=1&arg3=0' );
-    usleep (500);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Down&channel=0&arg1=0&arg2=1&arg3=0' );
+sub moveConDown {
+  my $self = shift;
+  Debug('Move Down');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Down&channel=0&arg1=0&arg2=1&arg3=0');
+  usleep(500);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Down&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Left&channel=0&arg1=0&arg2=1&arg3=0' );
-    usleep (500);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Left&channel=0&arg1=0&arg2=1&arg3=0' );
+sub moveConLeft {
+  my $self = shift;
+  Debug('Move Left');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Left&channel=0&arg1=0&arg2=1&arg3=0');
+  usleep(500);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Left&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-#    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=270&arg2=5&arg3=0' );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Right&channel=0&arg1=0&arg2=1&arg3=0' );
-    usleep (500);
-    Debug( "Move Right Stop" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Right&channel=0&arg1=0&arg2=1&arg3=0' );
+sub moveConRight {
+  my $self = shift;
+  Debug('Move Right');
+  #    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=270&arg2=5&arg3=0' );
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Right&channel=0&arg1=0&arg2=1&arg3=0');
+  usleep(500);
+  Debug('Move Right Stop');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Right&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConUpRight
-{
-    my $self = shift;
-    Debug( "Move Diagonally Up Right" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=RightUp&channel=0&arg1=1&arg2=1&arg3=0' );
-    usleep (500);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=RightUp&channel=0&arg1=0&arg2=1&arg3=0' );    
+sub moveConUpRight {
+  my $self = shift;
+  Debug('Move Diagonally Up Right');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=RightUp&channel=0&arg1=1&arg2=1&arg3=0');
+  usleep(500);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=RightUp&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConDownRight
-{
-    my $self = shift;
-    Debug( "Move Diagonally Down Right" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=RightDown&channel=0&arg1=1&arg2=1&arg3=0' );
-    usleep (500);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=RightDown&channel=0&arg1=0&arg2=1&arg3=0' );  
+sub moveConDownRight {
+  my $self = shift;
+  Debug('Move Diagonally Down Right');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=RightDown&channel=0&arg1=1&arg2=1&arg3=0');
+  usleep(500);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=RightDown&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConUpLeft
-{
-    my $self = shift;
-    Debug( "Move Diagonally Up Left" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=LeftUp&channel=0&arg1=1&arg2=1&arg3=0' );
-    usleep (500);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=LeftUp&channel=0&arg1=0&arg2=1&arg3=0' ); 
+sub moveConUpLeft {
+  my $self = shift;
+  Debug('Move Diagonally Up Left');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=LeftUp&channel=0&arg1=1&arg2=1&arg3=0');
+  usleep(500);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=LeftUp&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
-sub moveConDownLeft
-{
-    my $self = shift;
-    Debug( "Move Diagonally Down Left" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=LeftDown&channel=0&arg1=1&arg2=1&arg3=0' );
-    usleep (500);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=LeftDown&channel=0&arg1=0&arg2=1&arg3=0' ); 
+sub moveConDownLeft {
+  my $self = shift;
+  Debug('Move Diagonally Down Left');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=LeftDown&channel=0&arg1=1&arg2=1&arg3=0');
+  usleep (500);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=LeftDown&channel=0&arg1=0&arg2=1&arg3=0');
 }
 
 # Stop is not "correctly" implemented as control_functions.php translates this to "Center"
 # So we'll just send the camera to 0* Horz, 0* Vert, zoom out; Also, Amcrest does not seem to
 # support a generic stop-all-current-action command.
 
-sub moveStop
-{
-    my $self = shift;
-    Debug( "Move Stop/Center" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=0&arg2=0&arg3=0&arg4=1' );
+sub moveStop {
+  my $self = shift;
+  Debug('Move Stop/Center');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=0&arg2=0&arg3=0&arg4=1');
 }
 
 # Move Camera to Home Position
 # The current API does not support a Home per se, so we'll just send the camera to preset #1
 # NOTE: It goes without saying that the user must have set up preset #1 for this to work.
 
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2=1&arg3=0&arg4=0' );
+sub presetHome {
+  my $self = shift;
+  Debug('Home Preset');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2=1&arg3=0&arg4=0');
 }
 
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );    
-    Debug( "Go To Preset $preset" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2='.$preset.'&arg3=0&arg4=0' );
+sub presetGoto {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Go To Preset $preset");
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2='.$preset.'&arg3=0&arg4=0');
 }
 
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=SetPreset&arg1=0&arg2='.$preset.'&arg3=0&arg4=0' );
+sub presetSet {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug('Set Preset');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=SetPreset&arg1=0&arg2='.$preset.'&arg3=0&arg4=0');
 }
 
 # NOTE: This does not appear to be implemented in the classic skin. But we'll leave it here for later.
 
-sub moveMap 
-{
-    my $self = shift;
-    my $params = shift;
+sub moveMap {
+  my $self = shift;
+  my $params = shift;
 
-    my $xcoord = $self->getParam( $params, 'xcoord', $self->{Monitor}{Width}/2 );
-    my $ycoord = $self->getParam( $params, 'ycoord', $self->{Monitor}{Height}/2 );
-    # if the camera is mounted upside down, you may have to inverse these coordinates
-    # just use 360 minus pan instead of pan, 90 minus tilt instead of tilt
-    # Convert xcoord into pan position 0 to 359
-    my $pan = int(360 * $xcoord / $self->{Monitor}{Width});
-    # Convert ycoord into tilt position 0 to 89
-    my $tilt = 90 - int(90 * $ycoord / $self->{Monitor}{Height});
-    # Now get the following url:
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan.'&arg2='.$tilt.'&arg3=1&arg4=1');
+  my $xcoord = $self->getParam( $params, 'xcoord', $self->{Monitor}{Width}/2 );
+  my $ycoord = $self->getParam( $params, 'ycoord', $self->{Monitor}{Height}/2 );
+  # if the camera is mounted upside down, you may have to inverse these coordinates
+  # just use 360 minus pan instead of pan, 90 minus tilt instead of tilt
+  # Convert xcoord into pan position 0 to 359
+  my $pan = int(360 * $xcoord / $self->{Monitor}{Width});
+  # Convert ycoord into tilt position 0 to 89
+  my $tilt = 90 - int(90 * $ycoord / $self->{Monitor}{Height});
+  # Now get the following url:
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan.'&arg2='.$tilt.'&arg3=1&arg4=1');
 }
 
-sub zoomConTele
-{
-    my $self = shift;
-    Debug( "Zoom continuous tele" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0' );
-    usleep (100000);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0' );
+sub zoomConTele {
+  my $self = shift;
+  Debug('Zoom continuous tele');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0');
+  usleep(100000);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0');
 }
 
-sub zoomConWide
-{
-    my $self = shift;
-    Debug( "Zoom continuous wide" );
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0' );
-    usleep (100000);
-    $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0' );
+sub zoomConWide {
+  my $self = shift;
+  Debug('Zoom continuous wide');
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0');
+  usleep (100000);
+  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0');
 }
 
 1;
@@ -355,7 +332,7 @@ ZoneMinder::Control::Amcrest_HTTP - Amcrest camera control
 
 =head1 DESCRIPTION
 
-This module contains the implementation of the Amcrest Camera 
+This module contains the implementation of the Amcrest Camera
 controllable SDK API.
 
 NOTE: This module implements interaction with the camera in clear text.
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
index d63236c86..64e284278 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
@@ -1,6 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Axis version 2 API Control Protocol Module, $Date$, $Revision$
+# ZoneMinder Axis version 2 API Control Protocol Module
 # Copyright (C) 2001-2008  Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -43,349 +43,362 @@ use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Config qw(:all);
 
 use Time::HiRes qw( usleep );
+use URI;
 
-sub open
-{
-    my $self = shift;
+our $uri;
 
-    $self->loadMonitor();
+sub open {
+  my $self = shift;
 
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+  $self->loadMonitor();
+	if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
+		# Has no scheme at the beginning, so won't parse as a URI
+		$self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
+	}
+  $uri = URI->new($self->{Monitor}->{ControlAddress});
 
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->cookie_jar( {} );
+  $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
+  $self->{state} = 'closed';
+
+  my ( $username, $password, $host ) = ( $uri->authority() =~ /^([^:]+):([^@]*)@(.+)$/ );
+  
+  $uri->userinfo(undef);
+
+  my $realm = $self->{Monitor}->{ControlDevice};
+
+  $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+  my $url = '/axis-cgi/param.cgi?action=list&group=Properties.PTZ.PTZ';
+
+  # test auth
+  my $res = $self->{ua}->get($uri->canonical().$url);
+
+  if ( $res->is_success ) {
+    if ( $res->content() ne "Properties.PTZ.PTZ=yes\n" ) {
+      Warning('Response suggests that camera doesn\'t support PTZ. Content:('.$res->content().')');
+    }
     $self->{state} = 'open';
-}
+    return;
+  }
 
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
+  if ( $res->status_line() eq '401 Unauthorized' ) {
 
-    Debug( $msg."[".$msg_len."]" );
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-
-    my $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    #print( "http://$address/$cmd\n" );
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
+    my $headers = $res->headers();
+    foreach my $k ( keys %$headers ) {
+      Debug("Initial Header $k => $$headers{$k}");
     }
 
-    return( $result );
+    if ( $$headers{'www-authenticate'} ) {
+      my ( $auth, $tokens ) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/;
+      if ( $tokens =~ /\w+="([^"]+)"/i ) {
+        if ( $realm ne $1 ) {
+          $realm = $1;
+          $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+          $res = $self->{ua}->get($uri->canonical().$url);
+          if ( $res->is_success() ) {
+            Info("Auth succeeded after setting realm to $realm.  You can set this value in the Control Device field to speed up connections and remove these log entries.");
+            $self->{state} = 'open';
+            return;
+          }
+          Error('Authentication still failed after updating REALM status: '.$res->status_line);
+        } else {
+          Error('Authentication failed, not a REALM problem');
+        }
+      } else {
+        Error('Failed to match realm in tokens');
+      } # end if
+    } else {
+      Debug('No headers line');
+    } # end if headers
+  } else {
+    Debug('Failed to open '.$uri->canonical().$url.' status: '.$res->status_line());
+  } # end if $res->status_line() eq '401 Unauthorized'
+} # end sub open
+
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+
+  $self->printMsg($cmd, 'Tx');
+
+  my $url = $uri->canonical().$cmd;
+  my $res = $self->{ua}->get($url);
+
+  if ( $res->is_success ) {
+    Debug('sndCmd command: '.$url.' content: '.$res->content);
+    return !undef;
+  }
+
+  Error("Error cmd $url failed: '".$res->status_line()."'");
+
+  return undef;
 }
 
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "/axis-cgi/admin/restart.cgi";
-    $self->sendCmd( $cmd );
+sub cameraReset {
+  my $self = shift;
+  Debug('Camera Reset');
+  my $cmd = '/axis-cgi/admin/restart.cgi';
+  $self->sendCmd($cmd);
 }
 
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=up";
-    $self->sendCmd( $cmd );
+sub moveConUp {
+  my $self = shift;
+  Debug('Move Up');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=up';
+  $self->sendCmd($cmd);
 }
 
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=down";
-    $self->sendCmd( $cmd );
+sub moveConDown {
+  my $self = shift;
+  Debug('Move Down');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=down';
+  $self->sendCmd($cmd);
 }
 
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=left";
-    $self->sendCmd( $cmd );
+sub moveConLeft {
+  my $self = shift;
+  Debug('Move Left');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=left';
+  $self->sendCmd($cmd);
 }
 
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=right";
-    $self->sendCmd( $cmd );
+sub moveConRight {
+  my $self = shift;
+  Debug('Move Right');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=right';
+  $self->sendCmd($cmd);
 }
 
-sub moveConUpRight
-{
-    my $self = shift;
-    Debug( "Move Up/Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=upright";
-    $self->sendCmd( $cmd );
+sub moveConUpRight {
+  my $self = shift;
+  Debug('Move Up/Right');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=upright';
+  $self->sendCmd($cmd);
 }
 
-sub moveConUpLeft
-{
-    my $self = shift;
-    Debug( "Move Up/Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=upleft";
-    $self->sendCmd( $cmd );
+sub moveConUpLeft {
+  my $self = shift;
+  Debug('Move Up/Left');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=upleft';
+  $self->sendCmd($cmd);
 }
 
-sub moveConDownRight
-{
-    my $self = shift;
-    Debug( "Move Down/Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=downright";
-    $self->sendCmd( $cmd );
+sub moveConDownRight {
+  my $self = shift;
+  Debug('Move Down/Right');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=downright';
+  $self->sendCmd( $cmd );
 }
 
-sub moveConDownLeft
-{
-    my $self = shift;
-    Debug( "Move Down/Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=downleft";
-    $self->sendCmd( $cmd );
+sub moveConDownLeft {
+  my $self = shift;
+  Debug('Move Down/Left');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=downleft';
+  $self->sendCmd($cmd);
 }
 
-sub moveMap
-{
-    my $self = shift;
-    my $params = shift;
-    my $xcoord = $self->getParam( $params, 'xcoord' );
-    my $ycoord = $self->getParam( $params, 'ycoord' );
-    Debug( "Move Map to $xcoord,$ycoord" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}."&imageheight=".$self->{Monitor}->{Height};
-    $self->sendCmd( $cmd );
+sub moveMap {
+  my $self = shift;
+  my $params = shift;
+  my $xcoord = $self->getParam($params, 'xcoord');
+  my $ycoord = $self->getParam($params, 'ycoord');
+  Debug("Move Map to $xcoord,$ycoord");
+  my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}.'&imageheight='.$self->{Monitor}->{Height};
+  $self->sendCmd($cmd);
 }
 
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=$step";
-    $self->sendCmd( $cmd );
+sub moveRelUp {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'tiltstep');
+  Debug("Step Up $step");
+  my $cmd = '/axis-cgi/com/ptz.cgi?rtilt='.$step;
+  $self->sendCmd($cmd);
 }
 
-sub moveRelDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=-$step";
-    $self->sendCmd( $cmd );
+sub moveRelDown {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'tiltstep');
+  Debug("Step Down $step");
+  my $cmd = '/axis-cgi/com/ptz.cgi?rtilt=-'.$step;
+  $self->sendCmd($cmd);
 }
 
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Left $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$step";
-    $self->sendCmd( $cmd );
+sub moveRelLeft {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'panstep');
+  Debug("Step Left $step");
+  my $cmd = '/axis-cgi/com/ptz.cgi?rpan=-'.$step;
+  $self->sendCmd($cmd);
 }
 
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Right $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$step";
-    $self->sendCmd( $cmd );
+sub moveRelRight {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'panstep');
+  Debug("Step Right $step");
+  my $cmd = '/axis-cgi/com/ptz.cgi?rpan='.$step;
+  $self->sendCmd($cmd);
 }
 
-sub moveRelUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up/Right $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=$tiltstep";
-    $self->sendCmd( $cmd );
+sub moveRelUpRight {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam($params, 'panstep');
+  my $tiltstep = $self->getParam($params, 'tiltstep');
+  Debug("Step Up/Right $tiltstep/$panstep");
+  my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=$tiltstep";
+  $self->sendCmd($cmd);
 }
 
-sub moveRelUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up/Left $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=$tiltstep";
-    $self->sendCmd( $cmd );
+sub moveRelUpLeft {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam($params, 'panstep');
+  my $tiltstep = $self->getParam($params, 'tiltstep');
+  Debug("Step Up/Left $tiltstep/$panstep");
+  my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=$tiltstep";
+  $self->sendCmd($cmd);
 }
 
-sub moveRelDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down/Right $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=-$tiltstep";
-    $self->sendCmd( $cmd );
+sub moveRelDownRight {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam($params, 'panstep');
+  my $tiltstep = $self->getParam($params, 'tiltstep');
+  Debug("Step Down/Right $tiltstep/$panstep");
+  my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=-$tiltstep";
+  $self->sendCmd($cmd);
 }
 
-sub moveRelDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down/Left $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=-$tiltstep";
-    $self->sendCmd( $cmd );
+sub moveRelDownLeft {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam($params, 'panstep');
+  my $tiltstep = $self->getParam($params, 'tiltstep');
+  Debug("Step Down/Left $tiltstep/$panstep");
+  my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=-$tiltstep";
+  $self->sendCmd($cmd);
 }
 
-sub zoomRelTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Tele" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=$step";
-    $self->sendCmd( $cmd );
+sub zoomRelTele {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Zoom Tele');
+  my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=$step";
+  $self->sendCmd($cmd);
 }
 
-sub zoomRelWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Wide" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=-$step";
-    $self->sendCmd( $cmd );
+sub zoomRelWide {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Zoom Wide');
+  my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=-$step";
+  $self->sendCmd($cmd);
 }
 
-sub focusRelNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Near" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step";
-    $self->sendCmd( $cmd );
+sub focusRelNear {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Focus Near');
+  my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step";
+  $self->sendCmd($cmd);
 }
 
-sub focusRelFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Far" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step";
-    $self->sendCmd( $cmd );
+sub focusRelFar {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Focus Far');
+  my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step";
+  $self->sendCmd($cmd);
 }
 
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=on";
-    $self->sendCmd( $cmd );
+sub focusAuto {
+  my $self = shift;
+  Debug('Focus Auto');
+  my $cmd = '/axis-cgi/com/ptz.cgi?autofocus=on';
+  $self->sendCmd($cmd);
 }
 
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=off";
-    $self->sendCmd( $cmd );
+sub focusMan {
+  my $self = shift;
+  Debug('Focus Manual');
+  my $cmd = '/axis-cgi/com/ptz.cgi?autofocus=off';
+  $self->sendCmd($cmd);
 }
 
-sub irisRelOpen
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Iris Open" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?riris=$step";
-    $self->sendCmd( $cmd );
+sub irisRelOpen {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Iris Open');
+  my $cmd = "/axis-cgi/com/ptz.cgi?riris=$step";
+  $self->sendCmd($cmd);
 }
 
-sub irisRelClose
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Iris Close" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?riris=-$step";
-    $self->sendCmd( $cmd );
+sub irisRelClose {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Iris Close');
+  my $cmd = "/axis-cgi/com/ptz.cgi?riris=-$step";
+  $self->sendCmd($cmd);
 }
 
-sub irisAuto
-{
-    my $self = shift;
-    Debug( "Iris Auto" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=on";
-    $self->sendCmd( $cmd );
+sub irisAuto {
+  my $self = shift;
+  Debug('Iris Auto');
+  my $cmd = '/axis-cgi/com/ptz.cgi?autoiris=on';
+  $self->sendCmd($cmd);
 }
 
-sub irisMan
-{
-    my $self = shift;
-    Debug( "Iris Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=off";
-    $self->sendCmd( $cmd );
+sub irisMan {
+  my $self = shift;
+  Debug('Iris Manual');
+  my $cmd = '/axis-cgi/com/ptz.cgi?autoiris=off';
+  $self->sendCmd($cmd);
 }
 
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Clear Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
-    $self->sendCmd( $cmd );
+sub presetClear {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Clear Preset $preset");
+  my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
+  $self->sendCmd($cmd);
 }
 
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?setserverpresetno=$preset";
-    $self->sendCmd( $cmd );
+sub presetSet {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Set Preset $preset");
+  my $cmd = "/axis-cgi/com/ptz.cgi?setserverpresetno=$preset";
+  $self->sendCmd($cmd);
 }
 
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?gotoserverpresetno=$preset";
-    $self->sendCmd( $cmd );
+sub presetGoto {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Goto Preset $preset");
+  my $cmd = "/axis-cgi/com/ptz.cgi?gotoserverpresetno=$preset";
+  $self->sendCmd($cmd);
 }
 
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=home";
-    $self->sendCmd( $cmd );
+sub presetHome {
+  my $self = shift;
+  Debug('Home Preset');
+  my $cmd = '/axis-cgi/com/ptz.cgi?move=home';
+  $self->sendCmd($cmd);
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/DCS5020L.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/DCS5020L.pm
new file mode 100644
index 000000000..2b2cf3fd2
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/DCS5020L.pm
@@ -0,0 +1,310 @@
+# =========================================================================r
+#
+# ZoneMinder D-Link DCS-5020L IP Control Protocol Module, $Date: $, $Revision: $
+# Copyright (C) 2013 Art Scheel
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the D-Link DCS-5020L IP camera control
+# protocol. 
+#
+package ZoneMinder::Control::DCS5020L;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+our $VERSION = $ZoneMinder::Base::VERSION;
+
+# ==========================================================================
+#
+# D-Link DCS-5020L Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub open {
+  my $self = shift;
+
+  $self->loadMonitor();
+
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent('ZoneMinder Control Agent/' . ZoneMinder::Base::ZM_VERSION);
+  $self->{state} = 'open';
+}
+
+sub close {
+  my $self = shift;
+  $self->{state} = 'closed';
+}
+
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+  my $cgi = shift;
+
+  my $result = undef;
+
+  $self->printMsg($cmd, 'Tx');
+
+  my $req = HTTP::Request->new(POST=>"http://$self->{Monitor}->{ControlAddress}/$cgi.cgi");
+  $req->content($cmd);
+  my $res = $self->{ua}->request($req);
+
+  if ( $res->is_success ) {
+    $result = !undef;
+  } else {
+    Error("Error check failed: '".$res->status_line()."'");
+  }
+
+  return $result;
+}
+
+sub move {
+  my $self = shift;
+  my $dir = shift;
+  my $panStep = shift;
+  my $tiltStep = shift;
+  my $cmd = "PanSingleMoveDegree=$panStep&TiltSingleMoveDegree=$tiltStep&PanTiltSingleMove=$dir";
+  $self->sendCmd($cmd, 'pantiltcontrol');
+}
+
+sub moveRel {
+  my $self = shift;
+  my $params = shift;
+  my $panStep = $self->getParam($params, 'panstep', 0);
+  my $tiltStep = $self->getParam($params, 'tiltstep', 0);
+  my $dir = shift;
+  $self->move( $dir, $panStep, $tiltStep );
+}
+
+sub moveRelUpLeft {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 0);
+}
+
+sub moveRelUp {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 1);
+}
+
+sub moveRelUpRight {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 2);
+}
+
+sub moveRelLeft {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 3);
+}
+
+sub moveRelRight {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 5);
+}
+
+sub moveRelDownLeft {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 6);
+}
+
+sub moveRelDown {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 7);
+}
+
+sub moveRelDownRight {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 8);
+}
+
+# moves the camera to center on the point that the user clicked on in the video image. 
+# This isn't extremely accurate but good enough for most purposes 
+sub moveMap {
+  # if the camera moves too much or too little, try increasing or decreasing this value
+  my $f = 11;
+
+  my $self = shift;
+  my $params = shift;
+  my $xcoord = $self->getParam( $params, 'xcoord' );
+  my $ycoord = $self->getParam( $params, 'ycoord' );
+
+  my $hor = $xcoord * 100 / $self->{Monitor}->{Width};
+  my $ver = $ycoord * 100 / $self->{Monitor}->{Height};
+
+  my $direction;
+  my $horSteps;
+  my $verSteps;
+  if ($hor < 50 && $ver < 50) {
+    # up left
+    $horSteps = (50 - $hor) / $f;
+    $verSteps = (50 - $ver) / $f;
+    $direction = 0;
+  } elsif ($hor >= 50 && $ver < 50) {
+    # up right
+    $horSteps = ($hor - 50) / $f;
+    $verSteps = (50 - $ver) / $f;
+    $direction = 2;
+  } elsif ($hor < 50 && $ver >= 50) {
+    # down left
+    $horSteps = (50 - $hor) / $f;
+    $verSteps = ($ver - 50) / $f;
+    $direction = 6;
+  } elsif ($hor >= 50 && $ver >= 50) {
+    # down right
+    $horSteps = ($hor - 50) / $f;
+    $verSteps = ($ver - 50) / $f;
+    $direction = 8;
+  }
+  my $v = int($verSteps + .5);
+  my $h = int($horSteps + .5);
+  Debug("Move Map to $xcoord,$ycoord, hor=$h, ver=$v with direction $direction");
+  $self->move($direction, $h, $v);
+}
+
+sub presetClear {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Clear Preset $preset" );
+  my $cmd = "ClearPosition=$preset";
+  $self->sendCmd( $cmd, 'pantiltcontrol' );
+}
+
+sub presetSet {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Set Preset $preset" );
+  my $cmd = "SetCurrentPosition=$preset&SetName=preset_$preset";
+  $self->sendCmd( $cmd, 'pantiltcontrol' );
+}
+
+sub presetGoto {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Goto Preset $preset" );
+  my $cmd = "PanTiltPresetPositionMove=$preset";
+  $self->sendCmd( $cmd, 'pantiltcontrol' );
+}
+
+sub presetHome {
+  my $self = shift;
+  Debug( "Home Preset" );
+  $self->move( 4, 0, 0 );
+}
+
+#  IR Controls
+#
+#  wake = IR on
+#  sleep = IR off
+#  reset = IR auto
+
+sub setDayNightMode {
+  my $self = shift;
+  my $mode = shift;
+  my $cmd = "DayNightMode=$mode&ConfigReboot=No";
+  $self->sendCmd($cmd, 'daynight');
+}
+
+sub wake {
+  my $self = shift;
+  Debug('Wake - IR on');
+  $self->setDayNightMode(2);
+}
+
+sub sleep {
+  my $self = shift;
+  Debug('Sleep - IR off');
+  $self->setDayNightMode(3);
+}
+
+sub reset {
+  my $self = shift;
+  Debug('Reset - IR auto');
+  $self->setDayNightMode(0);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::Control::DCS5020L - Perl extension for DCS-5020L
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Database;
+  DLINK DCS-5020L
+
+=head1 DESCRIPTION
+
+ZoneMinder driver for the D-Link consumer camera DCS-5020L.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+See if there are better instructions for the DCS-5020L at
+http://www.zoneminder.com/wiki/index.php/Dlink
+
+=head1 AUTHOR
+
+Art Scheel <lt>ascheel (at) gmail<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2018 ZoneMinder LLC
+
+This library 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 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 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.
+
+=cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm
index 8754500fa..a62c756d8 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm
@@ -95,9 +95,9 @@ sub PutCmd {
   my $self = shift;
   my $cmd = shift;
   my $content = shift;
-  my $req = HTTP::Request->new(PUT => "$self->{BaseURL}/$cmd");
+  my $req = HTTP::Request->new(PUT => $self->{BaseURL}.'/'.$cmd);
   if ( defined($content) ) {
-    $req->content_type("application/x-www-form-urlencoded; charset=UTF-8");
+    $req->content_type('application/x-www-form-urlencoded; charset=UTF-8');
     $req->content('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content);
   }
   my $res = $self->{UA}->request($req);
@@ -135,18 +135,18 @@ sub PutCmd {
         # Check for username/password
         #
         if ( $self->{Monitor}{ControlAddress} =~ /.+:(.+)@.+/ ) {
-          Info("Check username/password is correct");
+          Info('Check username/password is correct');
         } elsif ( $self->{Monitor}{ControlAddress} =~ /^[^:]+@.+/ ) {
-          Info("No password in Control Address. Should there be one?");
+          Info('No password in Control Address. Should there be one?');
         } elsif ( $self->{Monitor}{ControlAddress} =~ /^:.+@.+/ ) {
-          Info("Password but no username in Control Address.");
+          Info('Password but no username in Control Address.');
         } else {
-          Info("Missing username and password in Control Address.");
+          Info('Missing username and password in Control Address.');
         }
-        Fatal($res->status_line);
+        Error($res->status_line);
       }
     } else {
-      Fatal($res->status_line);
+      Error($res->status_line);
     }
   } # end unless res->is_success
 } # end sub putCmd
@@ -382,7 +382,7 @@ sub irisRelOpen {
 sub reset {
   my $self = shift;
 
-  $self->PutCmd("ISAPI/System/reboot");
+  $self->PutCmd('ISAPI/System/reboot');
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm
index c18b37485..92855e05b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm
@@ -22,7 +22,7 @@
 # This module contains the implementation of the 
 # IPCC-7210W IP camera control protocol
 #
-package ZoneMinder::Control::IPCC-7210W;
+package ZoneMinder::Control::IPCC7210W;
 
 use 5.006;
 use strict;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
index 11d6ba9b3..ab7bc03ec 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
@@ -109,32 +109,22 @@ sub parseControlAddress {
   ($address, $port) = split /:/, $addressport;
 }
 
-sub digestBase64
-{
+sub digestBase64 {
   my ($nonce, $date, $password) = @_;
   my $shaGenerator = Digest::SHA->new(1);
   $shaGenerator->add($nonce . $date . $password);
-  return encode_base64($shaGenerator->digest, "");
+  return encode_base64($shaGenerator->digest, '');
 }
 
 sub authentificationHeader {
   my ($username, $password) = @_;
-  my $nonce;
-  $nonce .= chr(int(rand(254))) for (0 .. 20);
+  my $nonce = chr(int(rand(254))) for (0 .. 20);
   my $nonceBase64 = encode_base64($nonce, '');
   my $currentDate = DateTime->now()->iso8601().'Z';
 
   return '<s:Header><Security s:mustUnderstand="1" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><UsernameToken xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><Username>' . $username . '</Username><Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . digestBase64($nonce, $currentDate, $password) . '</Password><Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonceBase64 . '</Nonce><Created xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">' . $currentDate . '</Created></UsernameToken></Security></s:Header>';
 }
 
-sub printMsg {
-  my $self = shift;
-  my $msg = shift;
-  my $msg_len = length($msg);
-
-  Debug($msg.'['.$msg_len.']');
-}
-
 sub sendCmd {
   my $self = shift;
   my $cmd = shift;
@@ -142,9 +132,10 @@ sub sendCmd {
   my $content_type = shift;
   my $result = undef;
 
-  printMsg($cmd, 'Tx');
+  $self->printMsg($cmd, 'Tx');
+  $self->printMsg($msg, 'Tx');
 
-  my $server_endpoint = 'http://' . $address . ':' . $port . "/$cmd";
+  my $server_endpoint = 'http://'.$address.':'.$port.'/'.$cmd;
   my $req = HTTP::Request->new(POST => $server_endpoint);
   $req->header('content-type' => $content_type);
   $req->header('Host' => $address . ':' . $port);
@@ -157,6 +148,7 @@ sub sendCmd {
 
   if ( $res->is_success ) {
     $result = !undef;
+Debug("Result: " . $res->content());
   } else {
     Error("After sending PTZ command, camera returned the following error:'".$res->status_line()."'\nMSG:$msg\nResponse:".$res->content);
   }
@@ -166,7 +158,7 @@ sub sendCmd {
 sub getCamParams {
   my $self = shift;
   my $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><GetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken></GetImagingSettings></s:Body></s:Envelope>';
-  my $server_endpoint = 'http://' . $address . ':' . $port . '/onvif/imaging';
+  my $server_endpoint = 'http://'.$address.':'.$port.'/onvif/imaging';
   my $req = HTTP::Request->new(POST => $server_endpoint);
   $req->header('content-type' => 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/GetImagingSettings"');
   $req->header('Host' => $address . ':' . $port);
@@ -218,12 +210,56 @@ sub reset {
   $self->sendCmd($cmd, $msg, $content_type);
 }
 
+sub moveMap {
+  my $self = shift;
+  my $params = shift;
+  my $x = $self->getParam($params,'xcoord');
+  my $y = $self->getParam($params,'ycoord');
+  Debug("Move map to $x x $y");
+
+  my $cmd = 'onvif/PTZ';
+  my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <AbsoluteMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+    <ProfileToken>' . $profileToken . '</ProfileToken>
+    <Position><PanTilt x="'.$x.'" y="'.$y.'" xmlns="http://www.onvif.org/ver10/schema"/></Position>
+    <Speed><Zoom x="1" xmlns="http://www.onvif.org/ver10/schema"/></Speed>
+    </AbsoluteMove></s:Body></s:Envelope>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg, $content_type);
+}
+
+sub moveRel {
+  my $self = shift;
+  my $params = shift;
+  my $x = $self->getParam($params,'xcoord');
+  my $speed = $self->getParam($params,'speed');
+  my $y = $self->getParam($params,'ycoord');
+  Debug("Move rel to $x x $y");
+
+  my $cmd = 'onvif/PTZ';
+  my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <RelativeMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+    <ProfileToken>' . $profileToken . '</ProfileToken>
+    <Translation>
+    <PanTilt x="'.$x.'" y="'.$y.'" xmlns="http://www.onvif.org/ver10/schema" space="http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace"/>
+    <Zoom x="1"/>
+    </Translation>
+    <!--<Speed><Zoom x="'.$speed.'" xmlns="http://www.onvif.org/ver10/schema" space="http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace"/></Speed>_-->
+    </RelativeMove></s:Body></s:Envelope>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg, $content_type);
+}
+
 #Up Arrow
 sub moveConUp {
   Debug('Move Up');
   my $self = shift;
   my $cmd = 'onvif/PTZ';
-  my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>' . $profileToken . '</ProfileToken><Velocity><PanTilt x="0" y="0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+  my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+    <ProfileToken>' . $profileToken . '</ProfileToken>
+    <Velocity><PanTilt x="0" y="0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity>
+   </ContinuousMove></s:Body></s:Envelope>';
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg, $content_type);
   $self->autoStop($self->{Monitor}->{AutoStopTimeout});
@@ -405,17 +441,16 @@ sub irisAbsOpen {
   my $cmd = 'onvif/imaging';
   my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Brightness xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Brightness}.'</Brightness></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
-  $self->sendCmd( $cmd, $msg, $content_type );
+  $self->sendCmd($cmd, $msg, $content_type);
 }
 
 # Decrease Brightness
-sub irisAbsClose
-{
-  Debug( "Iris $CamParams{Brightness}" );
+sub irisAbsClose {
+  Debug("Iris $CamParams{Brightness}");
   my $self = shift;
   my $params = shift;
   $self->getCamParams() unless($CamParams{brightness});
-  my $step = $self->getParam( $params, 'step' );
+  my $step = $self->getParam($params, 'step');
   my $min = 0;
 
   $CamParams{Brightness} -= $step;
@@ -424,7 +459,7 @@ sub irisAbsClose
   my $cmd = 'onvif/imaging';
   my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Brightness xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Brightness}.'</Brightness></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
-  $self->sendCmd( $cmd, $msg, $content_type );
+  $self->sendCmd($cmd, $msg, $content_type);
 }
 
 # Increase Contrast
@@ -433,7 +468,7 @@ sub whiteAbsIn {
   my $self = shift;
   my $params = shift;
   $self->getCamParams() unless($CamParams{Contrast});
-  my $step = $self->getParam( $params, 'step' );
+  my $step = $self->getParam($params, 'step');
   my $max = 100;
 
   $CamParams{Contrast} += $step;
@@ -442,6 +477,7 @@ sub whiteAbsIn {
   my $cmd = 'onvif/imaging';
   my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Contrast xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Contrast}.'</Contrast></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+  $self->sendCmd($cmd, $msg, $content_type);
 }
 
 # Decrease Contrast
@@ -459,6 +495,7 @@ sub whiteAbsOut {
   my $cmd = 'onvif/imaging';
   my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">' . ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') . '<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Contrast xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Contrast}.'</Contrast></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+  $self->sendCmd($cmd, $msg, $content_type);
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
index 7a2f72fc6..be01e6133 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
@@ -134,7 +134,7 @@ sub sendCmd
     my $server_endpoint = "http://".$host.":".$port."/$cmd";
     my $req = HTTP::Request->new( POST => $server_endpoint );
     $req->header('content-type' => $content_type);
-    $req->header('Host' => $host.":".$port);
+    $req->header('Host' => $host.':'.$port);
     $req->header('content-length' => length($msg));
     $req->header('accept-encoding' => 'gzip, deflate');
     $req->header('connection' => 'close');
@@ -145,9 +145,9 @@ sub sendCmd
     if ( $res->is_success ) {
         $result = !undef;
     } else {
-        Error( "After sending PTZ command, camera returned the following error:'".$res->status_line()."'" );
+        Error("After sending PTZ command to $server_endpoint, camera returned the following error:'".$res->status_line()."'" );
     }
-    return( $result );
+    return $result;
 }
 
 sub getCamParams
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm
index 7175d1e84..cd2f568de 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm
@@ -1,6 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Airlink SkyIPCam AICN747/AICN747W Control Protocol Module, $Date: 2008-09-13 17:30:29 +0000 (Sat, 13 Sept 2008) $, $Revision: 2229 $
+# ZoneMinder Airlink SkyIPCam AICN747/AICN747W Control Protocol Module
 # Copyright (C) 2008  Brian Rudy (brudyNO@SPAMpraecogito.com) 
 #
 # This program is free software; you can redistribute it and/or
@@ -43,8 +43,6 @@ our @ISA = qw(ZoneMinder::Control);
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Config qw(:all);
 
-use Time::HiRes qw( usleep );
-
 sub open {
   my $self = shift;
 
@@ -52,58 +50,57 @@ sub open {
 
   use LWP::UserAgent;
   $self->{ua} = LWP::UserAgent->new;
-  $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+  $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
 
   $self->{state} = 'open';
 }
 
-sub printMsg {
-  my $self = shift;
-  my $msg = shift;
-  my $msg_len = length($msg);
-
-  Debug( $msg."[".$msg_len."]" );
-}
-
 sub sendCmd {
   my $self = shift;
   my $cmd = shift;
 
   my $result = undef;
 
-  printMsg( $cmd, "Tx" );
+  $self->printMsg($cmd, 'Tx');
 
   my $url;
-  if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
+  if ( $self->{Monitor}->{ControlAddress} =~ /^http/i ) {
     $url = $self->{Monitor}->{ControlAddress}.$cmd;
   } else {
     $url = 'http://'.$self->{Monitor}->{ControlAddress}.$cmd;
-  } # en dif
-  my $req = HTTP::Request->new( GET=>$url );
+  } # end if
+  my $req = HTTP::Request->new(GET=>$url);
 
   my $res = $self->{ua}->request($req);
 
   if ( $res->is_success ) {
     $result = !undef;
   } else {
-    Error( "Error check failed: '".$res->status_line()."'" );
+    Error('Error check failed: \''.$res->status_line().'\'');
   }
 
-  return( $result );
+  return $result;
+}
+
+sub reboot {
+  my $self = shift;
+  Debug('Camera Rebot');
+  my $cmd = '/admin/reboot.cgi?type=0';
+  $self->sendCmd($cmd);
 }
 
 sub reset {
   my $self = shift;
-  Debug( "Camera Reset" );
-  my $cmd = "/admin/ptctl.cgi?move=reset";
-  $self->sendCmd( $cmd );
+  Debug('Camera Reset');
+  my $cmd = '/admin/ptctl.cgi?move=reset';
+  $self->sendCmd($cmd);
 }
 
 sub moveMap {
   my $self = shift;
   my $params = shift;
-  my $xcoord = $self->getParam( $params, 'xcoord' );
-  my $ycoord = $self->getParam( $params, 'ycoord' );
+  my $xcoord = $self->getParam($params, 'xcoord');
+  my $ycoord = $self->getParam($params, 'ycoord');
 
   my $hor = $xcoord * 100 / $self->{Monitor}->{Width};
   my $ver = $ycoord * 100 / $self->{Monitor}->{Height};
@@ -125,81 +122,81 @@ sub moveMap {
   elsif ( $hor > 50 ) {
 # right
     $horSteps = (($hor - 50) / 50) * $maxhor;
-    $horDir = "right";
+    $horDir = 'right';
   }
 
 # Vertical movement
   if ( $ver < 50 ) {
 # up
     $verSteps = ((50 - $ver) / 50) * $maxver;
-    $verDir = "up";
+    $verDir = 'up';
   }
   elsif ( $ver > 50 ) {
 # down
     $verSteps = (($ver - 50) / 50) * $maxver;
-    $verDir = "down";
+    $verDir = 'down';
   }
 
   my $v = int($verSteps);
   my $h = int($horSteps);
 
-  Debug( "Move Map to $xcoord,$ycoord, hor=$h $horDir, ver=$v $verDir");
+  Debug("Move Map to $xcoord,$ycoord, hor=$h $horDir, ver=$v $verDir");
   my $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$horDir&Degree=$h";
-  $self->sendCmd( $cmd );
+  $self->sendCmd($cmd);
   $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$verDir&Degree=$v";
-  $self->sendCmd( $cmd );
+  $self->sendCmd($cmd);
 }
 
 sub moveRelUp {
   my $self = shift;
   my $params = shift;
-  my $step = $self->getParam( $params, 'tiltstep' );
-  Debug( "Step Up $step" );
-  my $cmd = "/admin/ptctl.cgi?move=up";
-  $self->sendCmd( $cmd );
+  my $step = $self->getParam($params, 'tiltstep');
+  Debug("Step Up $step");
+  my $cmd = '/admin/ptctl.cgi?move=up';
+  $self->sendCmd($cmd);
 }
 
 sub moveRelDown {
   my $self = shift;
   my $params = shift;
-  my $step = $self->getParam( $params, 'tiltstep' );
-  Debug( "Step Down $step" );
-  my $cmd = "/admin/ptctl.cgi?move=down";
-  $self->sendCmd( $cmd );
+  my $step = $self->getParam($params, 'tiltstep');
+  Debug("Step Down $step");
+  my $cmd = '/admin/ptctl.cgi?move=down';
+  $self->sendCmd($cmd);
 }
 
 sub moveRelLeft {
   my $self = shift;
   my $params = shift;
-  my $step = $self->getParam( $params, 'panstep' );
+  my $step = $self->getParam($params, 'panstep');
 
-  if ( $self->{Monitor}->{Orientation} eq "hori" ) {
-    Debug( "Stepping Right because flipped horizontally " );
-    $self->sendCmd( "/admin/ptctl.cgi?move=right" );
+  if ( $self->{Monitor}->{Orientation} eq 'FLIP_HORI' ) {
+    Debug('Stepping Right because flipped horizontally');
+    $self->sendCmd('/admin/ptctl.cgi?move=right');
   } else {
-    Debug( "Step Left" );
-    $self->sendCmd( "/admin/ptctl.cgi?move=left" );
+    Debug('Step Left');
+    $self->sendCmd('/admin/ptctl.cgi?move=left');
   }
 }
 
 sub moveRelRight {
   my $self = shift;
   my $params = shift;
-  my $step = $self->getParam( $params, 'panstep' );
-  if ( $self->{Monitor}->{Orientation} eq "hori" ) {
-    Debug( "Stepping Left because flipped horizontally " );
-    $self->sendCmd( "/admin/ptctl.cgi?move=left" );
+  my $step = $self->getParam($params, 'panstep');
+  if ( $self->{Monitor}->{Orientation} eq 'FLIP_HORI' ) {
+    Debug('Stepping Left because flipped horizontally');
+    $self->sendCmd('/admin/ptctl.cgi?move=left');
   } else {
-    Debug( "Step Right" );
-    $self->sendCmd( "/admin/ptctl.cgi?move=right" );
+    Debug('Step Right');
+    $self->sendCmd('/admin/ptctl.cgi?move=right');
   }
 }
 
 sub presetClear {
   my $self = shift;
   my $params = shift;
-  my $preset = $self->getParam( $params, 'preset' );
-  Debug( "Clear Preset $preset" );
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Clear Preset $preset");
 #my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
 #$self->sendCmd( $cmd );
 }
@@ -207,26 +204,26 @@ sub presetClear {
 sub presetSet {
   my $self = shift;
   my $params = shift;
-  my $preset = $self->getParam( $params, 'preset' );
-  Debug( "Set Preset $preset" );
-  my $cmd = "/admin/ptctl.cgi?position=" . ($preset - 1) . "&positionname=zm$preset";
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Set Preset $preset");
+  my $cmd = '/admin/ptctl.cgi?position=' . ($preset - 1) . "&positionname=zm$preset";
   $self->sendCmd( $cmd );
 }
 
 sub presetGoto {
   my $self = shift;
   my $params = shift;
-  my $preset = $self->getParam( $params, 'preset' );
-  Debug( "Goto Preset $preset" );
-  my $cmd = "/admin/ptctl.cgi?move=p" . ($preset - 1);
-  $self->sendCmd( $cmd );
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Goto Preset $preset");
+  my $cmd = '/admin/ptctl.cgi?move=p'.($preset - 1);
+  $self->sendCmd($cmd);
 }
 
 sub presetHome {
   my $self = shift;
-  Debug( "Home Preset" );
-  my $cmd = "/admin/ptctl.cgi?move=h";
-  $self->sendCmd( $cmd );
+  Debug('Home Preset');
+  my $cmd = '/admin/ptctl.cgi?move=h';
+  $self->sendCmd($cmd);
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Sony.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Sony.pm
new file mode 100644
index 000000000..3e5e0d4f4
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Sony.pm
@@ -0,0 +1,340 @@
+# ==========================================================================
+#
+# ZoneMinder Sony Network Camera SNC-EP521 Control Protocol Module, date: Sun Jun 22 10:26:25 IRDT 2014
+# Copyright (C) 2013-2014  Iman Darabi <iman.darabi@gmail.com>
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the Sony Network Camera PTZ API
+#
+package ZoneMinder::Control::Sony;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+# Sony Network Camera Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+sub open {
+  my $self = shift;
+
+  $self->loadMonitor();
+
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent('ZoneMinder Control Agent/'.$ZoneMinder::Base::VERSION);
+
+  $self->{state} = 'open';
+}
+
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+
+  my $result = undef;
+
+  $self->printMsg($cmd, 'Tx');
+
+  #print( "http://$address/$cmd\n" );
+  my $req = HTTP::Request->new( GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
+  my $res = $self->{ua}->request($req);
+
+  if ( $res->is_success ) {
+    $result = !undef;
+  } else {
+    Error("Error check failed: '".$res->status_line()."'");
+  }
+
+  return $result;
+}
+
+sub moveConUp {
+  my $self = shift;
+  Debug('Move Up');
+
+  my $cmd = '/command/ptzf.cgi?Move=up,8,1';
+  $self->sendCmd($cmd);
+}
+
+sub moveConDown {
+  my $self = shift;
+  Debug( "Move Down" );
+
+  my $cmd = "/command/ptzf.cgi?Move=down,8,1";
+  $self->sendCmd( $cmd );
+}
+
+sub moveConLeft {
+  my $self = shift;
+  Debug( "Move Left" );
+
+  my $cmd = "/command/ptzf.cgi?Move=left,8,1";
+  $self->sendCmd( $cmd );
+}
+
+sub moveConRight {
+  my $self = shift;
+  Debug('Move Right');
+  my $cmd = '/command/ptzf.cgi?Move=right,8,1';
+  $self->sendCmd($cmd);
+}
+
+sub moveConUpRight {
+  my $self = shift;
+  Debug( "Move Up/Right" );
+
+  my $cmd = "/command/ptzf.cgi?Move=up-right,8,1";
+  $self->sendCmd( $cmd );
+}
+
+sub moveConUpLeft {
+  my $self = shift;
+  Debug( "Move Up/Left" );
+
+  my $cmd = "/command/ptzf.cgi?Move=up-left,8,1";
+  $self->sendCmd( $cmd );
+}
+
+sub moveConDownRight {
+  my $self = shift;
+  Debug( "Move Down/Right" );
+
+  my $cmd = "/command/ptzf.cgi?Move=down-right,8,1";
+  $self->sendCmd( $cmd );
+}
+
+sub moveConDownLeft {
+  my $self = shift;
+  Debug( "Move Down/Left" );
+
+  my $cmd = "/command/ptzf.cgi?Move=down-left,8,1";
+  $self->sendCmd( $cmd );
+}
+
+sub moveMap {
+  my $self = shift;
+  my $params = shift;
+  my $xcoord = $self->getParam( $params, 'xcoord' );
+  my $ycoord = $self->getParam( $params, 'ycoord' );
+
+  Debug( "Move Map to $xcoord,$ycoord" );
+
+  my $cmd = "/command/ptzf.cgi?AreaZoom=$xcoord,$ycoord,$self->{Monitor}->{Width},$self->{Monitor}->{Height}";
+  $self->sendCmd( $cmd );
+}
+
+sub moveRelUp {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'tiltstep');
+  Debug("Step Up $step");
+
+  my $cmd = "/command/ptzf.cgi?relative=08$step";
+  $self->sendCmd($cmd);
+}
+
+sub moveRelDown {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'tiltstep');
+  Debug( "Step Down $step" );
+  my $cmd = "/command/ptzf.cgi?relative=02$step";
+  $self->sendCmd($cmd);
+}
+
+sub moveRelLeft {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam( $params, 'panstep' );
+  Debug( "Step Left $step" );
+  my $cmd = "/command/ptzf.cgi?relative=04$step";
+  $self->sendCmd($cmd);
+}
+
+sub moveRelRight {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'panstep');
+  Debug((ref $self)."Step Right $step");
+  my $cmd = "/command/ptzf.cgi?relative=06$step";
+  $self->sendCmd($cmd);
+}
+
+sub moveRelUpRight {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam( $params, 'panstep' );
+  my $tiltstep = $self->getParam( $params, 'tiltstep' );
+  Debug("Step Up/Right $tiltstep/$panstep");
+  my $cmd = "/command/ptzf.cgi?relative=0905";
+  $self->sendCmd($cmd);
+}
+
+sub moveRelUpLeft {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam($params, 'panstep');
+  my $tiltstep = $self->getParam($params, 'tiltstep');
+  Debug("Step Up/Left $tiltstep/$panstep");
+  my $cmd = '/command/ptzf.cgi?relative=0705';
+  $self->sendCmd($cmd);
+}
+
+sub moveRelDownRight {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam($params, 'panstep');
+  my $tiltstep = $self->getParam($params, 'tiltstep');
+  Debug("Step Down/Right $tiltstep/$panstep");
+  my $cmd = '/command/ptzf.cgi?relative=0305';
+  $self->sendCmd($cmd);
+}
+
+sub moveRelDownLeft {
+  my $self = shift;
+  my $params = shift;
+  my $panstep = $self->getParam( $params, 'panstep');
+  my $tiltstep = $self->getParam( $params, 'tiltstep');
+  Debug("Step Down/Left $tiltstep/$panstep");
+  my $cmd = '/command/ptzf.cgi?relative=0105';
+  $self->sendCmd($cmd);
+}
+
+sub moveStop {
+  my $self = shift;
+  Debug('Move Stop');
+
+  $self->sendCmd('/command/ptzf.cgi?Move=stop,pantilt,1');
+  $self->sendCmd('/command/ptzf.cgi?Move=stop,zoom,1');
+}
+
+sub zoomRelTele {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Zoom Tele');
+
+  my $cmd = '/command/ptzf.cgi?Move=tele,8';
+  $self->sendCmd($cmd);
+  $self->sendCmd($cmd);	# do it twice, so faster, why <speed> don't affect?
+
+  my $cmd = '/command/ptzf.cgi?Move=stop,zoom,1';
+  $self->sendCmd($cmd);
+}
+
+sub zoomRelWide {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam($params, 'step');
+  Debug('Zoom Wide');
+
+  my $cmd = '/command/ptzf.cgi?Move=wide,8';
+  $self->sendCmd( $cmd );
+  $self->sendCmd( $cmd );	# do it twice, so faster, why <speed> don't affect?
+
+  my $cmd = '/command/ptzf.cgi?Move=stop,zoom,1';
+  $self->sendCmd( $cmd );
+}
+
+sub zoomConWide {
+  my $self = shift;
+  Debug('zoom ConWide');
+
+  my $cmd = '/command/ptzf.cgi?Move=wide,4';
+  $self->sendCmd( $cmd );
+}
+
+sub zoomConTele {
+  my $self = shift;
+  Debug( "zoom ConTele" );
+
+  my $cmd = "/command/ptzf.cgi?Move=tele,4";
+  $self->sendCmd( $cmd );
+
+}
+
+sub presetClear {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Clear Preset $preset");
+  my $cmd = "/command/presetposition.cgi?PresetClear=$preset,1";
+  $self->sendCmd($cmd);
+}
+
+sub presetSet {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Set Preset $preset");
+  my $cmd = "/command/presetposition.cgi?PresetSet=$preset,No.$preset,on,1";
+  $self->sendCmd($cmd);
+}
+
+sub presetGoto {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Goto Preset $preset");
+  my $cmd = "/command/presetposition.cgi?PresetCall=$preset,12,1";
+  $self->sendCmd($cmd);
+}
+
+sub presetHome {
+  my $self = shift;
+  Debug('Home Preset');
+  my $cmd = '/command/presetposition.cgi?HomePos=ptz-recall';
+  $self->sendCmd( $cmd );
+}
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::Control::Sony - PTZ driver for Sony cameras
+
+=head1 SYNOPSIS
+
+This file is used by zmcontrol.pl to talk to Sony cameras.
+
+=head1 AUTHOR
+
+iman darabi, E<lt>iman.darabi@gmail.com<gt>
+Updated by Isaac Connor E<lt>isaac@zoneminder.com<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2013-2014  Iman Darabi
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+=cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
index 4afba372c..84b3c8a14 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
@@ -100,14 +100,6 @@ sub open {
   } # end if $res->status_line() eq '401 Unauthorized'
 } # end sub open
 
-sub printMsg {
-  my $self = shift;
-  my $msg = shift;
-  my $msg_len = length($msg);
-
-  Debug($msg.'['.$msg_len.']');
-}
-
 sub sendCmd {
 
   # This routine is used for all moving, which are all GET commands...
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
index ea287a42f..c830d28aa 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
@@ -49,211 +49,189 @@ use ZoneMinder::Config qw(:all);
 
 use Time::HiRes qw( usleep );
 
-sub open
-{
-    my $self = shift;
+sub open {
+  my $self = shift;
 
-    $self->loadMonitor();
+  $self->loadMonitor();
 
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
 
-    $self->{state} = 'open';
+  $self->{state} = 'open';
 }
 
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+  my $result = undef;
+  printMsg($cmd, 'Tx');
 
-    Debug( $msg."[".$msg_len."]" );
+  my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
+  my $res = $self->{ua}->request($req);
+
+  if ( $res->is_success ) {
+    $result = !undef;
+  } else {
+    Error("Error check failed:'".$res->status_line()."'" );
+  }
+
+  return $result;
 }
 
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $result = undef;
-    printMsg( $cmd, "Tx" );
+sub getCamParams {
+  my $self = shift;
 
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
+  my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/get_camera_params.cgi');
+  my $res = $self->{ua}->request($req);
 
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed:'".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub getCamParams
-{
-    my $self = shift;
-
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/get_camera_params.cgi" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        # Parse results setting values in %FCParams
-        my $content = $res->decoded_content;
-
-        while ($content =~ s/var\s+([^=]+)=([^;]+);//ms) {
-            $CamParams{$1} = $2;
-        }
-    }
-    else
-    {
-        Error( "Error check failed:'".$res->status_line()."'" );
+  if ( $res->is_success ) {
+    # Parse results setting values in %FCParams
+    my $content = $res->decoded_content;
+
+    while ($content =~ s/var\s+([^=]+)=([^;]+);//ms) {
+      $CamParams{$1} = $2;
     }
+  } else {
+    Error("Error check failed:'".$res->status_line()."'");
+  }
 }
 
 #autoStop
 #This makes use of the ZoneMinder Auto Stop Timeout on the Control Tab
-sub autoStop
-{
-    my $self = shift;
-    my $stop_command = shift;
-    my $autostop = shift;
-    if( $stop_command && $autostop)
-    {
-        Debug( "Auto Stop" );
-        usleep( $autostop );
-        my $cmd = "decoder_control.cgi?command=".$stop_command;
-        $self->sendCmd( $cmd );
-    }
-
+sub autoStop {
+  my $self = shift;
+  my $stop_command = shift;
+  my $autostop = shift;
+  if ( $stop_command && $autostop ) {
+    Debug('Auto Stop');
+    usleep($autostop);
+    my $cmd = 'decoder_control.cgi?command='.$stop_command;
+    $self->sendCmd($cmd);
+  }
 }
 
 # Reset the Camera
-sub reset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "reboot.cgi?";
-    $self->sendCmd( $cmd );
+sub reset {
+  my $self = shift;
+  Debug('Camera Reset');
+  my $cmd = 'reboot.cgi?';
+  $self->sendCmd($cmd);
 }
 
 #Up Arrow
 sub moveConUp
 {
-    my $self = shift;
-    my $stop_command = "1";
-    Debug( "Move Up" );
-    my $cmd = "decoder_control.cgi?command=0";
-    $self->sendCmd( $cmd );
-    $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $self = shift;
+  my $stop_command = "1";
+  Debug( "Move Up" );
+  my $cmd = "decoder_control.cgi?command=0";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
 }
 
 #Down Arrow
 sub moveConDown
 {
-    my $self = shift;
-    my $stop_command = "3";
-    Debug( "Move Down" );
-    my $cmd = "decoder_control.cgi?command=2";
-    $self->sendCmd( $cmd );
-    $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $self = shift;
+  my $stop_command = "3";
+  Debug( "Move Down" );
+  my $cmd = "decoder_control.cgi?command=2";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
 }
 
 #Left Arrow
 sub moveConLeft
 {
-    my $self = shift;
-    my $stop_command = "5";
-    Debug( "Move Left" );
-    my $cmd = "decoder_control.cgi?command=4";
-    $self->sendCmd( $cmd );
-    $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $self = shift;
+  my $stop_command = "5";
+  Debug( "Move Left" );
+  my $cmd = "decoder_control.cgi?command=4";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
 }
 
 #Right Arrow
 sub moveConRight
 {
-    my $self = shift;
-    my $stop_command = "7";
-    Debug( "Move Right" );
-    my $cmd = "decoder_control.cgi?command=6";
-    $self->sendCmd( $cmd );
-    $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $self = shift;
+  my $stop_command = "7";
+  Debug( "Move Right" );
+  my $cmd = "decoder_control.cgi?command=6";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
 }
 
 #Zoom In
 sub zoomConTele
 {
-    my $self = shift;
-    my $stop_command = "17";
-    Debug( "Zoom Tele" );
-    my $cmd = "decoder_control.cgi?command=18";
-    $self->sendCmd( $cmd );
-    $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $self = shift;
+  my $stop_command = "17";
+  Debug( "Zoom Tele" );
+  my $cmd = "decoder_control.cgi?command=18";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
 }
 
 #Zoom Out
 sub zoomConWide
 {
-    my $self = shift;
-    my $stop_command = "19";
-    Debug( "Zoom Wide" );
-    my $cmd = "decoder_control.cgi?command=16";
-    $self->sendCmd( $cmd );
-    $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $self = shift;
+  my $stop_command = "19";
+  Debug( "Zoom Wide" );
+  my $cmd = "decoder_control.cgi?command=16";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
 }
 
 #Diagonally Up Right Arrow
 #This camera does not have builtin diagonal commands so we emulate them
 sub moveConUpRight
 {
-    my $self = shift;
-    Debug( "Move Diagonally Up Right" );
-    $self->moveConUp( );
-    $self->moveConRight( );
+  my $self = shift;
+  Debug( "Move Diagonally Up Right" );
+  $self->moveConUp( );
+  $self->moveConRight( );
 }
 
 #Diagonally Down Right Arrow
 #This camera does not have builtin diagonal commands so we emulate them
 sub moveConDownRight
 {
-    my $self = shift;
-    Debug( "Move Diagonally Down Right" );
-    $self->moveConDown( );
-    $self->moveConRight( );
+  my $self = shift;
+  Debug( "Move Diagonally Down Right" );
+  $self->moveConDown( );
+  $self->moveConRight( );
 }
 
 #Diagonally Up Left Arrow
 #This camera does not have builtin diagonal commands so we emulate them
 sub moveConUpLeft
 {
-    my $self = shift;
-    Debug( "Move Diagonally Up Left" );
-    $self->moveConUp( );
-    $self->moveConLeft( );
+  my $self = shift;
+  Debug( "Move Diagonally Up Left" );
+  $self->moveConUp( );
+  $self->moveConLeft( );
 }
 
 #Diagonally Down Left Arrow
 #This camera does not have builtin diagonal commands so we emulate them
 sub moveConDownLeft
 {
-    my $self = shift;
-    Debug( "Move Diagonally Down Left" );
-    $self->moveConDown( );
-    $self->moveConLeft( );
+  my $self = shift;
+  Debug( "Move Diagonally Down Left" );
+  $self->moveConDown( );
+  $self->moveConLeft( );
 }
 
 #Stop
 sub moveStop
 {
-    my $self = shift;
-    Debug( "Move Stop" );
-    my $cmd = "decoder_control.cgi?command=1";
-    $self->sendCmd( $cmd );
+  my $self = shift;
+  Debug( "Move Stop" );
+  my $cmd = "decoder_control.cgi?command=1";
+  $self->sendCmd( $cmd );
 }
 
 #Set Camera Preset
@@ -261,15 +239,15 @@ sub moveStop
 #Those values are: 30,32,34,36,38,40,42,44 for presets 1-8 respectively
 sub presetSet
 {
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Set Preset $preset" );
 
-    if (( $preset >= 1 ) && ( $preset <= 8 )) {
-        my $cmd = "decoder_control.cgi?command=".(($preset*2) + 28);
-        $self->sendCmd( $cmd );
-    }
+  if (( $preset >= 1 ) && ( $preset <= 8 )) {
+    my $cmd = "decoder_control.cgi?command=".(($preset*2) + 28);
+    $self->sendCmd( $cmd );
+  }
 }
 
 #Recall Camera Preset
@@ -277,101 +255,101 @@ sub presetSet
 #Those values are: 31,33,35,37,39,41,43,45 for presets 1-8 respectively
 sub presetGoto
 {
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Goto Preset $preset" );
 
-    if (( $preset >= 1 ) && ( $preset <= 8 )) {
-        my $cmd = "decoder_control.cgi?command=".(($preset*2) + 29);
-        $self->sendCmd( $cmd );
-    }
+  if (( $preset >= 1 ) && ( $preset <= 8 )) {
+    my $cmd = "decoder_control.cgi?command=".(($preset*2) + 29);
+    $self->sendCmd( $cmd );
+  }
 
-    if ( $preset == 9 ) {
-        $self->horizontalPatrol();
-    }
+  if ( $preset == 9 ) {
+    $self->horizontalPatrol();
+  }
 
-    if ( $preset == 10 ) {
-        $self->horizontalPatrolStop();
-    }
+  if ( $preset == 10 ) {
+    $self->horizontalPatrolStop();
+  }
 }
 
 #Horizontal Patrol - Vertical Patrols are not supported
 sub horizontalPatrol
 {
-    my $self = shift;
-    Debug( "Horizontal Patrol" );
-    my $cmd = "decoder_control.cgi?command=20";
-    $self->sendCmd( $cmd );
+  my $self = shift;
+  Debug( "Horizontal Patrol" );
+  my $cmd = "decoder_control.cgi?command=20";
+  $self->sendCmd( $cmd );
 }
 
 #Horizontal Patrol Stop
 sub horizontalPatrolStop
 {
-    my $self = shift;
-    Debug( "Horizontal Patrol Stop" );
-    my $cmd = "decoder_control.cgi?command=21";
-    $self->sendCmd( $cmd );
+  my $self = shift;
+  Debug( "Horizontal Patrol Stop" );
+  my $cmd = "decoder_control.cgi?command=21";
+  $self->sendCmd( $cmd );
 }
 
 # Increase Brightness
 sub irisAbsOpen
 {
-    my $self = shift;
-    my $params = shift;
-    $self->getCamParams() unless($CamParams{'brightness'});
-    my $step = $self->getParam( $params, 'step' );
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'brightness'});
+  my $step = $self->getParam( $params, 'step' );
 
-    $CamParams{'brightness'} += $step;
-    $CamParams{'brightness'} = 255 if ($CamParams{'brightness'} > 255);
-    Debug( "Iris $CamParams{'brightness'}" );
-    my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
-    $self->sendCmd( $cmd );
+  $CamParams{'brightness'} += $step;
+  $CamParams{'brightness'} = 255 if ($CamParams{'brightness'} > 255);
+  Debug( "Iris $CamParams{'brightness'}" );
+  my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
+  $self->sendCmd( $cmd );
 }
 
 # Decrease Brightness
 sub irisAbsClose
 {
-    my $self = shift;
-    my $params = shift;
-    $self->getCamParams() unless($CamParams{'brightness'});
-    my $step = $self->getParam( $params, 'step' );
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'brightness'});
+  my $step = $self->getParam( $params, 'step' );
 
-    $CamParams{'brightness'} -= $step;
-    $CamParams{'brightness'} = 0 if ($CamParams{'brightness'} < 0);
-    Debug( "Iris $CamParams{'brightness'}" );
-    my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
-    $self->sendCmd( $cmd );
+  $CamParams{'brightness'} -= $step;
+  $CamParams{'brightness'} = 0 if ($CamParams{'brightness'} < 0);
+  Debug( "Iris $CamParams{'brightness'}" );
+  my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
+  $self->sendCmd( $cmd );
 }
 
 # Increase Contrast
 sub whiteAbsIn
 {
-    my $self = shift;
-    my $params = shift;
-    $self->getCamParams() unless($CamParams{'contrast'});
-    my $step = $self->getParam( $params, 'step' );
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'contrast'});
+  my $step = $self->getParam( $params, 'step' );
 
-    $CamParams{'contrast'} += $step;
-    $CamParams{'contrast'} = 6 if ($CamParams{'contrast'} > 6);
-    Debug( "Iris $CamParams{'contrast'}" );
-    my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
-    $self->sendCmd( $cmd );
+  $CamParams{'contrast'} += $step;
+  $CamParams{'contrast'} = 6 if ($CamParams{'contrast'} > 6);
+  Debug( "Iris $CamParams{'contrast'}" );
+  my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
+  $self->sendCmd( $cmd );
 }
 
 # Decrease Contrast
 sub whiteAbsOut
 {
-    my $self = shift;
-    my $params = shift;
-    $self->getCamParams() unless($CamParams{'contrast'});
-    my $step = $self->getParam( $params, 'step' );
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'contrast'});
+  my $step = $self->getParam( $params, 'step' );
 
-    $CamParams{'contrast'} -= $step;
-    $CamParams{'contrast'} = 0 if ($CamParams{'contrast'} < 0);
-    Debug( "Iris $CamParams{'contrast'}" );
-    my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
-    $self->sendCmd( $cmd );
+  $CamParams{'contrast'} -= $step;
+  $CamParams{'contrast'} = 0 if ($CamParams{'contrast'} < 0);
+  Debug( "Iris $CamParams{'contrast'}" );
+  my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
+  $self->sendCmd( $cmd );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 9a1c79237..3fdcab5e2 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -146,15 +146,15 @@ sub zmDbGetMonitors {
 
   if ( $function ) {
     if ( $function == DB_MON_CAPT ) {
-      $sql .= " where Function >= 'Monitor'";
+      $sql .= " WHERE `Function` >= 'Monitor'";
     } elsif ( $function == DB_MON_ACTIVE ) {
-      $sql .= " where Function > 'Monitor'";
+      $sql .= " WHERE `Function` > 'Monitor'";
     } elsif ( $function == DB_MON_MOTION ) {
-      $sql .= " where Function = 'Modect' or Function = 'Mocord'";
+      $sql .= " WHERE `Function` = 'Modect' OR `Function` = 'Mocord'";
     } elsif ( $function == DB_MON_RECORD ) {
-      $sql .= " where Function = 'Record' or Function = 'Mocord'";
+      $sql .= " WHERE `Function` = 'Record' OR `Function` = 'Mocord'";
     } elsif ( $function == DB_MON_PASSIVE ) {
-      $sql .= " where Function = 'Nodect'";
+      $sql .= " WHERE `Function` = 'Nodect'";
     }
   }
   my $sth = $dbh->prepare_cached( $sql );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index 25cfebb5c..0af41b2ca 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -56,7 +56,8 @@ use ZoneMinder::Config qw(:all);
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Database qw(:all);
 
-use vars qw/ $table $primary_key %fields $serial @identified_by %defaults/;
+use vars qw/ $table $primary_key %fields $serial @identified_by %defaults $debug/;
+$debug = 0;
 $table = 'Events';
 @identified_by = ('Id');
 $serial = $primary_key = 'Id';
@@ -133,7 +134,11 @@ sub Path {
 
   if ( ! $$event{Path} ) {
     my $Storage = $event->Storage();
-    $$event{Path} = join('/', $Storage->Path(), $event->RelativePath());
+		if ( (!$$event{StorageId}) or defined $Storage->Id() ) {
+			$$event{Path} = join('/', $Storage->Path(), $event->RelativePath());
+		} else {
+			Error("Storage area for $$event{StorageId} no longer exists in db.");
+		}
   }
   return $$event{Path};
 }
@@ -347,6 +352,11 @@ sub GenerateVideo {
 sub delete {
   my $event = $_[0];
 
+  if ( !$event->canEdit() ) {
+    Warning('No permission to delete event.');
+    return 'No permission to delete event.';
+  }
+
   my $in_zmaudit = ( $0 =~ 'zmaudit.pl$');
 
   if ( ! $in_zmaudit ) {
@@ -358,14 +368,14 @@ sub delete {
       return;
     }
     if ( !($event->Storage()->Path() and -e $event->Storage()->Path()) ) {
-      Warning('Not deleting event because storage path doesn\'t exist');
+      Warning('Not deleting event because storage path ('.$event->Storage()->Path().') doesn\'t exist');
       return;
     }
   }
 
   if ( $$event{Id} ) {
     # Need to have an event Id if we are to delete from the db.  
-    Info("Deleting event $event->{Id} from Monitor $event->{MonitorId} StartTime:$event->{StartTime}");
+    Info("Deleting event $event->{Id} from Monitor $event->{MonitorId} StartTime:$event->{StartTime} from ".$event->Path());
     $ZoneMinder::Database::dbh->ping();
 
     $ZoneMinder::Database::dbh->begin_work();
@@ -397,6 +407,11 @@ sub delete {
 sub delete_files {
   my $event = shift;
 
+  if ( !$event->canEdit() ) {
+    Warning('No permission to delete event.');
+    return 'No permission to delete event.';
+  }
+
   foreach my $Storage (
     @_ ? ($_[0]) : (
       new ZoneMinder::Storage($$event{StorageId}),
@@ -404,12 +419,12 @@ sub delete_files {
     ) ) {
     my $storage_path = $Storage->Path();
 
-    if ( ! $storage_path ) {
+    if ( !$storage_path ) {
       Error("Empty storage path when deleting files for event $$event{Id} with storage id $$event{StorageId}");
       return;
     }
 
-    if ( ! $$event{MonitorId} ) {
+    if ( !$$event{MonitorId} ) {
       Error("No monitor id assigned to event $$event{Id}");
       return;
     }
@@ -421,31 +436,37 @@ sub delete_files {
 
       my $deleted = 0;
       if ( $$Storage{Type} and ( $$Storage{Type} eq 's3fs' ) ) {
-        my ( $aws_id, $aws_secret, $aws_host, $aws_bucket ) = ( $$Storage{Url} =~ /^\s*([^:]+):([^@]+)@([^\/]*)\/(.+)\s*$/ );
+        my $url = $$Storage{Url};
+        $url =~ s/^(s3|s3fs):\/\///ig;
+        my ( $aws_id, $aws_secret, $aws_host, $aws_bucket, $subpath ) = ( $url =~ /^\s*([^:]+):([^@]+)@([^\/]*)\/([^\/]+)(\/.+)?\s*$/ );
+        Debug("S3 url parsed to id:$aws_id secret:$aws_secret host:$aws_host, bucket:$aws_bucket, subpath:$subpath\n from $url");
         eval {
           require Net::Amazon::S3;
           my $s3 = Net::Amazon::S3->new( {
               aws_access_key_id     => $aws_id,
               aws_secret_access_key => $aws_secret,
               ( $aws_host ? ( host => $aws_host ) : () ),
+              authorization_method => 'Net::Amazon::S3::Signature::V4',
             });
           my $bucket = $s3->bucket($aws_bucket);
           if ( ! $bucket ) {
             Error("S3 bucket $bucket not found.");
             die;
           }
-          if ( $bucket->delete_key($event_path) ) {
+          if ( $bucket->delete_key($subpath.$event_path) ) {
             $deleted = 1;
           } else {
             Error('Failed to delete from S3:'.$s3->err . ': ' . $s3->errstr);
           }
         };
         Error($@) if $@;
-      }
+      } # end if s3fs
       if ( !$deleted ) {
         my $command = "/bin/rm -rf $storage_path/$event_path";
         ZoneMinder::General::executeShellCommand($command);
       }
+    } else {
+      Error('No event path in delete files. ' . $event->to_string());
     } # end if event_path
 
     if ( $event->Scheme() eq 'Deep' ) {
@@ -456,6 +477,34 @@ sub delete_files {
         unlink($storage_path.'/'.$link_path) or Error("Unable to unlink '$storage_path/$link_path': $!");
       }
     } # end if Scheme eq Deep
+
+    # Now check for empty directories and delete them.
+    my @path_parts = split('/', $event_path);
+    pop @path_parts;
+    # Guaranteed the first part is the monitor id
+    Debug("Initial path_parts: @path_parts");
+    while ( @path_parts > 1 ) {
+      my $path = join('/', $storage_path, @path_parts);
+      my $dh;
+      if ( !opendir($dh, $path) ) {
+        Warning("Fail to open $path");
+        last;
+      }
+      my @dir =  readdir($dh);
+      closedir($dh);
+      if ( scalar(grep { $_ ne '.' and $_ ne '..' } @dir) == 0 ) {
+        Debug("Removing empty dir at $path");
+        if ( !rmdir $path ) {
+          Warning("Fail to rmdir $path: $!");
+          last;
+        }
+      } else {
+        Debug("Dir $path is not empty @dir");
+        last;
+      }
+      pop @path_parts;
+    } # end while path_parts
+
   } # end foreach Storage
 } # end sub delete_files
 
@@ -464,7 +513,7 @@ sub StorageId {
   if ( @_ ) {
     $$event{StorageId} = shift;
     delete $$event{Storage};
-    delete $$event{Path};
+    $event->Path(undef);
   }
   return $$event{StorageId};
 }
@@ -474,7 +523,7 @@ sub Storage {
     $_[0]{Storage} = $_[1];
     if ( $_[0]{Storage} ) {
       $_[0]{StorageId} = $_[0]{Storage}->Id();
-      delete $_[0]{Path};
+      $_[0]->Path(undef);
     }
   }
   if ( ! $_[0]{Storage} ) {
@@ -531,10 +580,15 @@ sub DiskSpace {
 sub CopyTo {
   my ( $self, $NewStorage ) = @_;
 
+  if ( !$self->canEdit() ) {
+    Warning('No permission to copy event.');
+    return 'No permission to copy event.';
+  }
+
   my $OldStorage = $self->Storage(undef);
   my ( $OldPath ) = ( $self->Path() =~ /^(.*)$/ ); # De-taint
   if ( ! -e $OldPath ) {
-    return "Old path $OldPath does not exist.";
+    return "Src path $OldPath does not exist.";
   }
   # First determine if we can move it to the dest.
   # We do this before bothering to lock the event
@@ -545,8 +599,12 @@ sub CopyTo {
     return 'Event is already located at ' . $NewPath;
   } elsif ( !$NewPath ) {
     return "New path ($NewPath) is empty.";
-  } elsif ( ! -e $NewPath ) {
-    return "New path $NewPath does not exist.";
+  } elsif ( ($$NewStorage{Type} ne 's3fs' ) and ! -e $NewPath ) {
+    if ( ! mkdir($NewPath) ) {
+      return "New path $NewPath does not exist.";
+    }
+  } else {
+    Debug("$NewPath is good");
   }
 
   $ZoneMinder::Database::dbh->begin_work();
@@ -562,8 +620,9 @@ sub CopyTo {
     return 'Old Storage path changed, Event has moved somewhere else.';
   }
 
-	$NewPath .= $self->Relative_Path();
-	$NewPath = ( $NewPath =~ /^(.*)$/ ); # De-taint
+  Debug("Relative Path: " . $self->RelativePath());
+	$NewPath .= '/'.$self->RelativePath();
+	($NewPath) = ( $NewPath =~ /^(.*)$/ ); # De-taint
   if ( $NewPath eq $OldPath ) {
     $ZoneMinder::Database::dbh->commit();
     return "New path and old path are the same! $NewPath";
@@ -574,7 +633,10 @@ sub CopyTo {
 
   if ( $$NewStorage{Type} eq 's3fs' ) {
     if ( $$NewStorage{Url} ) {
-      my ( $aws_id, $aws_secret, $aws_host, $aws_bucket ) = ( $$NewStorage{Url} =~ /^\s*([^:]+):([^@]+)@([^\/]*)\/(.+)\s*$/ );
+      my $url = $$NewStorage{Url};
+      $url =~ s/^(s3|s3fs):\/\///ig;
+      my ( $aws_id, $aws_secret, $aws_host, $aws_bucket, $subpath ) = ( $url =~ /^\s*([^:]+):([^@]+)@([^\/]*)\/([^\/]+)(\/.+)?\s*$/ );
+      Debug("S3 url parsed to id:$aws_id secret:$aws_secret host:$aws_host, bucket:$aws_bucket, subpath:$subpath\n from $url");
       if ( $aws_id and $aws_secret and $aws_host and $aws_bucket ) {
         eval {
           require Net::Amazon::S3;
@@ -583,6 +645,7 @@ sub CopyTo {
               aws_access_key_id     => $aws_id,
               aws_secret_access_key => $aws_secret,
               ( $aws_host ? ( host => $aws_host ) : () ),
+              authorization_method => 'Net::Amazon::S3::Signature::V4',
             });
           my $bucket = $s3->bucket($aws_bucket);
           if ( !$bucket ) {
@@ -590,10 +653,12 @@ sub CopyTo {
             die;
           }
 
-          my $event_path = $self->RelativePath();
-          Debug("Making directory $event_path/");
-          if ( ! $bucket->add_key($event_path.'/', '') ) {
-            die "Unable to add key for $event_path/";
+          my $event_path = $subpath.$self->RelativePath();
+          if ( 0 ) { # Not neccessary
+            Debug("Making directory $event_path/");
+            if ( !$bucket->add_key($event_path.'/', '') ) {
+              Warning("Unable to add key for $event_path/ :". $s3->err . ': '. $s3->errstr());
+            }
           }
 
           my @files = glob("$OldPath/*");
@@ -607,15 +672,23 @@ sub CopyTo {
             if ( ! $size ) {
               Info('Not moving file with 0 size');
             }
-            my $file_contents = File::Slurp::read_file($file);
-            if ( ! $file_contents ) {
-              die 'Loaded empty file, but it had a size. Giving up';
+            if ( 0 ) {
+              my $file_contents = File::Slurp::read_file($file);
+              if ( ! $file_contents ) {
+                die 'Loaded empty file, but it had a size. Giving up';
+              }
+
+              my $filename = $event_path.'/'.File::Basename::basename($file);
+              if ( ! $bucket->add_key($filename, $file_contents) ) {
+                die "Unable to add key for $filename : ".$s3->err . ': ' . $s3->errstr;
+              }
+            } else {
+              my $filename = $event_path.'/'.File::Basename::basename($file);
+              if ( ! $bucket->add_key_filename($filename, $file) ) {
+                die "Unable to add key for $filename " . $s3->err . ': '. $s3->errstr;
+              }
             }
 
-            my $filename = $event_path.'/'.File::Basename::basename($file);
-            if ( ! $bucket->add_key($filename, $file_contents) ) {
-              die "Unable to add key for $filename";
-            }
             my $duration = tv_interval($starttime);
             Debug('PUT to S3 ' . Number::Bytes::Human::format_bytes($size) . " in $duration seconds = " . Number::Bytes::Human::format_bytes($duration?$size/$duration:$size) . '/sec');
           } # end foreach file.
@@ -676,8 +749,13 @@ sub CopyTo {
 } # end sub CopyTo
 
 sub MoveTo {
-
   my ( $self, $NewStorage ) = @_;
+
+  if ( !$self->canEdit() ) {
+    Warning('No permission to move event.');
+    return 'No permission to move event.';
+  }
+
   my $OldStorage = $self->Storage(undef);
 
   my $error = $self->CopyTo($NewStorage);
@@ -782,6 +860,49 @@ sub recover_timestamps {
   }
 }
 
+sub files {
+	my $self = shift;
+
+	if ( ! $$self{files} ) {
+		if ( ! opendir(DIR, $self->Path() ) ) {
+			Error("Can't open directory '$$self{Path}': $!");
+			return;
+		}
+		@{$$self{files}} = readdir(DIR);
+		Debug('Have ' . @{$$self{files}} . " files in $$self{Path}");
+		closedir(DIR);
+	}
+	return @{$$self{files}};
+}
+
+sub has_capture_jpegs {
+	@{$_[0]{capture_jpegs}} = grep(/^\d+\-capture\.jpg$/, $_[0]->files());
+	Debug('have ' . @{$_[0]{capture_jpegs}} . ' capture jpegs');
+	return @{$_[0]{capture_jpegs}} ? 1 : 0;
+}
+
+sub has_analyse_jpegs {
+	@{$_[0]{analyse_jpegs}} = grep(/^\d+\-analyse\.jpg$/, $_[0]->files());
+	Debug('have ' . @{$_[0]{analyse_jpegs}} . ' analyse jpegs');
+	return @{$_[0]{analyse_jpegs}} ? 1 : 0;
+}
+
+sub canEdit {
+  my $self = shift;
+  if ( !$ZoneMinder::user ) {
+    # No user loaded... assume running as system
+    return 1;
+  }
+  if ( !$$ZoneMinder::user{MonitorIds} ) {
+    # User has no monitor limitations
+    return 1;
+  }
+  if ( $$ZoneMinder::user{Events} eq 'Edit' ) {
+    return 1; 
+  }
+  return 0;
+} # end sub canEdit
+
 1;
 __END__
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 611bea059..b48946d1f 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -1,6 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Filter Module, $Date$, $Revision$
+# ZoneMinder Filter Module
 # Copyright (C) 2001-2008  Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -49,54 +49,46 @@ use ZoneMinder::Database qw(:all);
 require ZoneMinder::Storage;
 require ZoneMinder::Server;
 
-sub Name {
-  if ( @_ > 1 ) {
-    $_[0]{Name} = $_[1];
-  }
-  return $_[0]{Name};
-} # end sub Path
+use vars qw/ $table $primary_key %fields /;
+$table = 'Users';
+$primary_key = 'Id';
 
-sub find {
-  shift if $_[0] eq 'ZoneMinder::Filter';
-  my %sql_filters = @_;
-
-  my $sql = 'SELECT * FROM Filters';
-  my @sql_filters;
-  my @sql_values;
-
-  if ( exists $sql_filters{Name} ) {
-    push @sql_filters , ' Name = ? ';
-    push @sql_values, $sql_filters{Name};
-  }
-
-  $sql .= ' WHERE ' . join(' AND ', @sql_filters ) if @sql_filters;
-  $sql .= ' LIMIT ' . $sql_filters{limit} if $sql_filters{limit};
-
-  my $sth = $ZoneMinder::Database::dbh->prepare_cached($sql)
-    or Fatal("Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr());
-  my $res = $sth->execute(@sql_values)
-    or Fatal("Can't execute '$sql': ".$sth->errstr());
-
-  my @results;
-
-  while( my $db_filter = $sth->fetchrow_hashref() ) {
-    my $filter = new ZoneMinder::Filter($$db_filter{Id}, $db_filter);
-    push @results, $filter;
-  } # end while
-  $sth->finish();
-
-  return @results;
-}
-
-sub find_one {
-  my @results = find(@_);
-  return $results[0] if @results;
-}
+%fields = map { $_ => $_ } qw(
+Id
+Name
+Query_json
+AutoArchive
+AutoVideo
+AutoUpload
+AutoEmail
+EmailTo
+EmailSubject
+EmailBody
+AutoMessage
+AutoExecute
+AutoExecuteCmd
+AutoDelete
+AutoMove
+AutoMoveTo
+AutoCopy
+AutoCopyTo
+UpdateDiskSpace
+UserId
+Background
+Concurrent
+);
 
 sub Execute {
   my $self = $_[0];
   my $sql = $self->Sql(undef);
 
+  if ( $$self{PreSQLConditions} and @{$$self{PreSQLConditions}} ) {
+    foreach my $term ( @{$$self{PreSQLConditions}} ) {
+      if ( $$term{attr} eq 'DiskPercent' ) {
+      }
+    }
+  }
+
   if ( $self->{HasDiskPercent} ) {
 		my $disk_percent = getDiskPercent($$self{Storage} ? $$self{Storage}->Path() : ());
     $sql =~ s/zmDiskPercent/$disk_percent/g;
@@ -119,22 +111,35 @@ sub Execute {
     return;
   }
   my @results;
-
   while ( my $event = $sth->fetchrow_hashref() ) {
     push @results, $event;
   }
   $sth->finish();
-  Debug('Loaded ' . @results . " events for filter $_[0]{Name} using query ($sql)");
+  Debug('Loaded ' . @results . ' events for filter '.$$self{Name}.' using query ('.$sql.')"');
+  if ( $self->{PostSQLConditions} ) {
+    my @filtered_events;
+    foreach my $term ( @{$$self{PostSQLConditions}} ) {
+      if ( $$term{attr} eq 'ExistsInFileSystem' ) {
+        foreach my $row ( @results ) {
+          my $event = new ZoneMinder::Event($row);
+          if ( -e $event->Path() ) {
+            push @filtered_events, $row;
+          }
+        }
+      }
+    } # end foreach term
+    @results = @filtered_events;
+  } # end if has PostSQLConditions
   return @results;
-}
+} # end sub Execute
 
 sub Sql {
   my $self = shift;
   $$self{Sql} = shift if @_;
-  if ( ! $$self{Sql} ) {
+  if ( !$$self{Sql} ) {
     $self->{Sql} = '';
-    if ( ! $self->{Query_json} ) {
-      Warning("No query in Filter!");
+    if ( !$self->{Query_json} ) {
+      Warning('No query in Filter!');
       return;
     }
 
@@ -162,7 +167,9 @@ sub Sql {
         my $value = $term->{val};
         my @value_list;
         if ( $term->{attr} ) {
-          if ( $term->{attr} =~ /^Monitor/ ) {
+					if ( $term->{attr} eq 'AlarmedZoneId' ) {
+						$term->{op} = 'EXISTS';
+          } elsif ( $term->{attr} =~ /^Monitor/ ) {
             my ( $temp_attr_name ) = $term->{attr} =~ /^Monitor(.+)$/;
             $self->{Sql} .= 'M.'.$temp_attr_name;
           } elsif ( $term->{attr} eq 'ServerId' or $term->{attr} eq 'MonitorServerId' ) {
@@ -196,25 +203,32 @@ sub Sql {
             $self->{Sql} .= "weekday( E.EndTime )";
 
 # 
+          } elsif ( $term->{attr} eq 'ExistsInFileSystem' ) {
+            push @{$self->{PostSQLConditions}}, $term;
           } elsif ( $term->{attr} eq 'DiskSpace' ) {
             $self->{Sql} .= 'E.DiskSpace';
-            $self->{HasDiskPercent} = !undef;
           } elsif ( $term->{attr} eq 'DiskPercent' ) {
             $self->{Sql} .= 'zmDiskPercent';
             $self->{HasDiskPercent} = !undef;
+            $self->{HasPreCondition} = !undef;
           } elsif ( $term->{attr} eq 'DiskBlocks' ) {
             $self->{Sql} .= 'zmDiskBlocks';
             $self->{HasDiskBlocks} = !undef;
+            $self->{HasPreCondition} = !undef;
           } elsif ( $term->{attr} eq 'SystemLoad' ) {
             $self->{Sql} .= 'zmSystemLoad';
             $self->{HasSystemLoad} = !undef;
+            $self->{HasPreCondition} = !undef;
           } else {
             $self->{Sql} .= 'E.'.$term->{attr};
           }
 
           ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
           foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) ) {
-            if ( $term->{attr} =~ /^MonitorName/ ) {
+	
+            if ( $term->{attr} eq 'AlarmedZoneId' ) {
+							$value = '(SELECT * FROM Stats WHERE EventId=E.Id AND ZoneId='.$value.')';
+            } elsif ( $term->{attr} =~ /^MonitorName/ ) {
               $value = "'$temp_value'";
             } elsif ( $term->{attr} =~ /ServerId/) {
               Debug("ServerId, temp_value is ($temp_value) ($ZoneMinder::Config::Config{ZM_SERVER_ID})");
@@ -236,6 +250,11 @@ sub Sql {
                 || $term->{attr} eq 'Cause'
                 || $term->{attr} eq 'Notes'
                 ) {
+                if ( $term->{op} eq 'LIKE'
+                || $term->{op} eq 'NOT LIKE'
+                ) {
+                $temp_value = '%'.$temp_value.'%' if $temp_value !~ /%/;
+                }
               $value = "'$temp_value'";
             } elsif ( $term->{attr} eq 'DateTime' or $term->{attr} eq 'StartDateTime' or $term->{attr} eq 'EndDateTime' ) {
               if ( $temp_value eq 'NULL' ) {
@@ -251,6 +270,8 @@ sub Sql {
             } elsif ( $term->{attr} eq 'Date' or $term->{attr} eq 'StartDate' or $term->{attr} eq 'EndDate' ) {
               if ( $temp_value eq 'NULL' ) {
                 $value = $temp_value;
+							} elsif ( $temp_value eq 'CURDATE()' or $temp_value eq 'NOW()' ) {
+								$value = 'to_days('.$temp_value.')';
               } else {
                 $value = DateTimeToSQL($temp_value);
                 if ( !$value ) {
@@ -289,12 +310,18 @@ sub Sql {
             } else {
               $self->{Sql} .= " IS $value";
             }
+          } elsif ( $term->{op} eq 'EXISTS' ) {
+            $self->{Sql} .= " EXISTS $value";
           } elsif ( $term->{op} eq 'IS NOT' ) {
             $self->{Sql} .= " IS NOT $value";
           } elsif ( $term->{op} eq '=[]' ) {
             $self->{Sql} .= ' IN ('.join(',', @value_list).')';
           } elsif ( $term->{op} eq '!~' ) {
             $self->{Sql} .= ' NOT IN ('.join(',', @value_list).')';
+          } elsif ( $term->{op} eq 'LIKE' ) {
+            $self->{Sql} .= " LIKE $value";
+          } elsif ( $term->{op} eq 'NOT LIKE' ) {
+            $self->{Sql} .= " NOT LIKE $value";
           } else {
             $self->{Sql} .= ' '.$term->{op}.' '.$value;
           }
@@ -306,14 +333,9 @@ sub Sql {
     } # end if terms
 
     if ( $self->{Sql} ) {
-      if ( $self->{AutoMessage} ) {
 # Include all events, including events that are still ongoing
 # and have no EndTime yet
-        $sql .= ' WHERE ( '.$self->{Sql}.' )';
-      } else {
-# Only include closed events (events with valid EndTime)
-        $sql .= ' WHERE (E.EndTime IS NOT NULL) AND ( '.$self->{Sql}.' )';
-      }
+      $sql .= ' WHERE ( '.$self->{Sql}.' )';
     }
     my @auto_terms;
     if ( $self->{AutoArchive} ) {
@@ -440,6 +462,15 @@ sub DateTimeToSQL {
   return POSIX::strftime('%Y-%m-%d %H:%M:%S', localtime($dt_val));
 }
 
+sub User {
+  my $self = shift;
+  $$self{User} = shift if @_;
+  if ( ! $$self{User} and $$self{UserId} ) {
+    $$self{User} = ZoneMinder::User->find_one(Id=>$$self{UserId});
+  }
+  return $$self{User};
+}
+
 1;
 __END__
 # Below is stub documentation for your module. You'd better edit it!
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index d16c248d5..0d3784185 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -28,6 +28,9 @@ our %EXPORT_TAGS = (
       makePath
       jsonEncode
       jsonDecode
+      systemStatus
+      packageControl
+      daemonControl
       ) ]
     );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
@@ -53,18 +56,18 @@ use POSIX;
 # For running general shell commands
 sub executeShellCommand {
   my $command = shift;
-  my $output = qx( $command );
+  my $output = qx($command);
   my $status = $? >> 8;
   if ( $status || logDebugging() ) {
-    Debug("Command: $command");
-    chomp( $output );
-    Debug("Output: $output");
+    $output = '' if !defined($output);
+    chomp($output);
+    Debug("Command: $command Output: $output");
   }
   return $status;
 }
 
 sub getCmdFormat {
-  Debug("Testing valid shell syntax");
+  Debug('Testing valid shell syntax');
 
   my ( $name ) = getpwuid( $> );
   if ( $name eq $Config{ZM_WEB_USER} ) {
@@ -104,8 +107,8 @@ sub getCmdFormat {
       chomp($output);
       Debug("Test failed, '$output'");
 
-      $prefix = "su ".$Config{ZM_WEB_USER}." -c '";
-      $suffix = "'";
+      $prefix = 'su '.$Config{ZM_WEB_USER}.' -c \'';
+      $suffix = '\'';
       $command = $prefix.$null_command.$suffix;
       Debug("Testing \"$command\"");
       $output = qx($command 2>&1);
@@ -121,7 +124,7 @@ sub getCmdFormat {
       }
     }
   }
-  Error("Unable to find valid 'su' syntax");
+  Error('Unable to find valid su syntax');
   exit -1;
 } # end sub getCmdFormat
 
@@ -193,8 +196,8 @@ sub setFileOwner {
   my $file = shift;
 
   if ( _checkProcessOwner() ) {
-    chown( $_ownerUid, $_ownerGid, $file )
-      or Fatal( "Can't change ownership of file '$file' to '"
+    chown($_ownerUid, $_ownerGid, $file)
+      or Fatal("Can't change ownership of file '$file' to '"
           .$Config{ZM_WEB_USER}.':'.$Config{ZM_WEB_GROUP}."': $!"
           );
   }
@@ -342,7 +345,7 @@ sub createEvent {
             ." to ".$frame->{capturePath}.": $!"
             );
       setFileOwner( $frame->{capturePath} );
-      if ( 0 && $Config{ZM_CREATE_ANALYSIS_IMAGES} ) {
+      if ( $event->{SaveJPEGs} > 1 ) {
         $frame->{analysePath} = sprintf(
             "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}
             ."d-analyse.jpg"
@@ -437,12 +440,12 @@ sub _testJSON {
 
 sub _getJSONType {
   my $value = shift;
-  return( 'null' ) unless( defined($value) );
-  return( 'integer' ) if ( $value =~ /^\d+$/ );
-  return( 'double' ) if ( $value =~ /^\d+$/ );
-  return( 'hash' ) if ( ref($value) eq 'HASH' );
-  return( 'array' ) if ( ref($value) eq 'ARRAY' );
-  return( 'string' );
+  return 'null' unless defined($value);
+  return 'integer' if $value =~ /^\d+$/;
+  return 'double' if $value =~ /^\d+$/;
+  return 'hash' if ref($value) eq 'HASH';
+  return 'array' if ref($value) eq 'ARRAY';
+  return 'string';
 }
 
 sub jsonEncode;
@@ -487,15 +490,15 @@ sub jsonDecode {
 
   _testJSON();
   if ( $hasJSONAny ) {
-    my $object = eval { JSON::MaybeXS->decode_json( $value ) };
-    Fatal( "Unable to decode JSON string '$value': $@" ) unless( $object );
-    return( $object );
+    my $object = eval { JSON::MaybeXS->decode_json($value) };
+    Fatal("Unable to decode JSON string '$value': $@") unless $object;
+    return $object;
   }
 
   my $comment = 0;
   my $unescape = 0;
   my $out = '';
-  my @chars = split( //, $value );
+  my @chars = split(//, $value);
   for ( my $i = 0; $i < @chars; $i++ ) {
     if ( !$comment ) {
       if ( $chars[$i] eq ':' ) {
@@ -526,9 +529,41 @@ sub jsonDecode {
   $out =~ s/`/'/g;
   $out =~ s/qx/qq/g;
   ( $out ) = $out =~ m/^(\{.+\})$/; # Detaint and check it's a valid object syntax
-    my $result = eval $out;
-  Fatal( $@ ) if ( $@ );
-  return( $result );
+  my $result = eval $out;
+  Fatal($@) if $@;
+  return $result;
+}
+
+sub packageControl {
+  my $command = shift;
+  my $string = $Config{ZM_PATH_BIN}.'/zmpkg.pl '.$command;
+  $string .= ' 2>/dev/null >&- <&- >/dev/null';
+  executeShellCommand($string);
+}
+
+sub daemonControl {
+  my ($command, $daemon, $args) = @_;
+  my $string = $Config{ZM_PATH_BIN}.'/zmdc.pl '.$command;
+  if ( $daemon ) {
+    $string .= ' ' . $daemon;
+    if ( $args ) {
+      $string .= ' ' . $args;
+    }
+  }
+  #$string .= ' 2>/dev/null >&- <&- >/dev/null';
+  executeShellCommand($string);
+}
+
+sub systemStatus {
+  my $command = $Config{ZM_PATH_BIN}.'/zmdc.pl check';
+  my $output = qx($command);
+  my $status = $? >> 8;
+  if ( $status || logDebugging() ) {
+    $output = '' if !defined($output);
+    chomp($output);
+    Debug("Command: $command Output: $output");
+  }
+  return $output;
 }
 
 1;
@@ -542,7 +577,6 @@ ZoneMinder::General - Utility Functions for ZoneMinder
 =head1 SYNOPSIS
 
 use ZoneMinder::General;
-blah blah blah
 
 =head1 DESCRIPTION
 
@@ -561,6 +595,9 @@ of the ZoneMinder scripts
       makePath
       jsonEncode
       jsonDecode
+      packageControl
+      daemonControl
+      systemStatus
       ) ]
 
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 18bbc35c5..0513f563e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -128,6 +128,7 @@ our %priorities = (
 
 our $logger;
 our $LOGFILE;
+our $do_log_rotate = 0;
 
 sub new {
   my $class = shift;
@@ -209,7 +210,7 @@ sub initialise( @ ) {
   if ( my $logFile = $this->getTargettedEnv('LOG_FILE') ) {
     $tempLogFile = $logFile;
   }
-  ($tempLogFile) = $tempLogFile =~ /^([\w\.\/]+)$/;
+  ($tempLogFile) = $tempLogFile =~ /^([_\-\w\.\/]+)$/;
 
   my $tempLevel = INFO;
   my $tempTermLevel = $this->{termLevel};
@@ -306,7 +307,7 @@ sub reinitialise {
   my $this = shift;
 
   # So if the logger is initialized, we just return.  Since the logger is NORMALLY initialized... the rest of this function never executes.
-  return unless ( $this->{initialised} );
+  return unless $this->{initialised};
 
 # Bit of a nasty hack to reopen connections to log files and the DB
   my $syslogLevel = $this->syslogLevel();
@@ -455,9 +456,9 @@ sub fileLevel {
   if ( defined($fileLevel) ) {
     $fileLevel = $this->limit($fileLevel);
     # The filename might have changed, so always close and re-open
-    $this->closeFile() if ( $this->{fileLevel} > NOLOG );
+    $this->closeFile() if $this->{fileLevel} > NOLOG;
     $this->{fileLevel} = $fileLevel;
-    $this->openFile() if ( $this->{fileLevel} > NOLOG );
+    $this->openFile() if $this->{fileLevel} > NOLOG;
   }
   return $this->{fileLevel};
 }
@@ -489,7 +490,7 @@ sub closeSyslog {
 sub logFile {
   my $this = shift;
   my $logFile = shift;
-  if ( $logFile =~ /^(.+)\+$/ ) {
+  if ( $logFile and ( $logFile =~ /^(.+)\+$/ ) ) {
     $this->{logFile} = $1.'.'.$$;
   } else {
     $this->{logFile} = $logFile;
@@ -498,15 +499,19 @@ sub logFile {
 
 sub openFile {
   my $this = shift;
+	
   if ( open($LOGFILE, '>>', $this->{logFile}) ) {
     $LOGFILE->autoflush() if $this->{autoFlush};
 
     my $webUid = (getpwnam($ZoneMinder::Config::Config{ZM_WEB_USER}))[2];
+    Error("Can't get uid for $ZoneMinder::Config::Config{ZM_WEB_USER}") if ! defined $webUid;
     my $webGid = (getgrnam($ZoneMinder::Config::Config{ZM_WEB_GROUP}))[2];
+    Error("Can't get gid for $ZoneMinder::Config::Config{ZM_WEB_USER}") if ! defined $webGid;
     if ( $> == 0 ) {
-      chown( $webUid, $webGid, $this->{logFile} )
-        or Fatal("Can't change permissions on log file $$this{logFile}: $!");
-    }
+      # If we are root, we want to make sure that www-data or whatever owns the file
+      chown($webUid, $webGid, $this->{logFile} ) or
+        Error("Can't change permissions on log file $$this{logFile}: $!");
+    } # end if are root
   } else {
     $this->fileLevel(NOLOG);
     $this->termLevel(INFO);
@@ -515,7 +520,6 @@ sub openFile {
 }
 
 sub closeFile {
-  #my $this = shift;
   close($LOGFILE) if fileno($LOGFILE);
 }
 
@@ -523,6 +527,16 @@ sub logPrint {
   my $this = shift;
   my $level = shift;
   my $string = shift;
+
+  if ( $do_log_rotate ) {
+    $do_log_rotate = 0;
+    # Too heavy to do this in the signal handler,
+    # so we just set a flag and logs will be rotated on the next call to log something
+    $this->reinitialise();
+    # Don't know why this would be needed
+    #logSetSignal();
+  }
+
   my ($caller, undef, $line) = @_ ? @_ : caller;
 
   if ( $level <= $this->{effectiveLevel} ) {
@@ -609,11 +623,7 @@ sub logTerm {
 }
 
 sub logHupHandler {
-  my $savedErrno = $!;
-  return unless $logger;
-  fetch()->reinitialise();
-  logSetSignal();
-  $! = $savedErrno;
+  $do_log_rotate = 1;
 }
 
 sub logSetSignal {
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index c04a66c42..c52a12309 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -162,6 +162,8 @@ our $mem_data = {
     imagesize        => { type=>'uint32', seq=>$mem_seq++ },
     epadding1        => { type=>'uint32', seq=>$mem_seq++ },
     startup_time     => { type=>'time_t64', seq=>$mem_seq++ },
+    zmc_heartbeat_time  => { type=>'time_t64', seq=>$mem_seq++ },
+    zma_heartbeat_time  => { type=>'time_t64', seq=>$mem_seq++ },
     last_write_time  => { type=>'time_t64', seq=>$mem_seq++ },
     last_read_time   => { type=>'time_t64', seq=>$mem_seq++ },
     control_state    => { type=>'uint8[256]', seq=>$mem_seq++ },
@@ -254,19 +256,19 @@ sub zmMemVerify {
   my $sd_size = zmMemRead($monitor, 'shared_data:size', 1);
   if ( $sd_size != $mem_data->{shared_data}->{size} ) {
     if ( $sd_size ) {
-      Error( "Shared data size conflict in shared_data for monitor "
+      Error( 'Shared data size conflict in shared_data for monitor '
           .$monitor->{Name}
-          .", expected "
+          .', expected '
           .$mem_data->{shared_data}->{size}
-          .", got "
+          .', got '
           .$sd_size
           );
     } else {
-      Debug( "Shared data size conflict in shared_data for monitor "
+      Debug( 'Shared data size conflict in shared_data for monitor '
           .$monitor->{Name}
-          .", expected "
+          .', expected '
           .$mem_data->{shared_data}->{size}
-          .", got ".$sd_size
+          .', got '.$sd_size
           );
     }
     return undef;
@@ -274,34 +276,34 @@ sub zmMemVerify {
   my $td_size = zmMemRead($monitor, 'trigger_data:size', 1);
   if ( $td_size != $mem_data->{trigger_data}->{size} ) {
     if ( $td_size ) {
-      Error( "Shared data size conflict in trigger_data for monitor "
+      Error( 'Shared data size conflict in trigger_data for monitor '
           .$monitor->{Name}
-          .", expected "
+          .', expected '
           .$mem_data->{triggger_data}->{size}
-          .", got "
+          .', got '
           .$td_size
           );
     } else {
-      Debug( "Shared data size conflict in trigger_data for monitor "
+      Debug( 'Shared data size conflict in trigger_data for monitor '
           .$monitor->{Name}
-          .", expected "
+          .', expected '
           .$mem_data->{triggger_data}->{size}
-          .", got "
+          .', got '
           .$td_size
           );
     }
     return undef;
   }
-  my $valid = zmMemRead($monitor, 'shared_data:valid',1);
+  my $valid = zmMemRead($monitor, 'shared_data:valid', 1);
   if ( !$valid ) {
     Error("Shared data not valid for monitor $$monitor{Id}");
     return undef;
   } else {
-    Debug("Shared data appears vaild for monitor $$monitor{Id}: $valid");
+    Debug("Shared data appears valid for monitor $$monitor{Id}: $valid");
   }
 
   return !undef;
-}
+} # end sub zmMemVerify
 
 sub zmMemRead {
   my $monitor = shift;
@@ -312,54 +314,54 @@ sub zmMemRead {
   }
   my @values;
   foreach my $field ( @$fields ) {
-    my ( $section, $element ) = split( /[\/:.]/, $field );
-    Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
+    my ( $section, $element ) = split(/[\/:.]/, $field);
+    Fatal("Invalid shared data selector '$field'") if ( !$section || !$element );
 
     my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
     my $type = $mem_data->{$section}->{contents}->{$element}->{type};
     my $size = $mem_data->{$section}->{contents}->{$element}->{size};
 
     if (!defined $offset || !defined $type || !defined $size) {
-        Error ("Invalid field:".$field." setting to undef and exiting zmMemRead");
-        zmMemInvalidate( $monitor );
-        return( undef );
+        Error('Invalid field:'.$field.' setting to undef and exiting zmMemRead');
+        zmMemInvalidate($monitor);
+        return undef;
     }   
 
-    my $data = zmMemGet( $monitor, $offset, $size );
+    my $data = zmMemGet($monitor, $offset, $size);
     if ( !defined($data) ) {
-      Error( "Unable to read '$field' from memory for monitor ".$monitor->{Id} );
-      zmMemInvalidate( $monitor );
-      return( undef );
+      Error("Unable to read '$field' from memory for monitor ".$monitor->{Id});
+      zmMemInvalidate($monitor);
+      return undef;
     }
     my $value;
     if ( $type eq 'long' ) {
-      ( $value ) = unpack( 'l!', $data );
+      ( $value ) = unpack('l!', $data);
     } elsif ( $type eq 'ulong' || $type eq 'size_t' ) {
-      ( $value ) = unpack( 'L!', $data );
+      ( $value ) = unpack('L!', $data);
     } elsif ( $type eq 'int64' || $type eq 'time_t64' ) {
 # The 'q' type is only available on 64bit platforms, so use native.
-      ( $value ) = unpack( 'l!', $data );
+      ( $value ) = unpack('l!', $data);
     } elsif ( $type eq 'uint64' ) {
 # The 'q' type is only available on 64bit platforms, so use native.
-      ( $value ) = unpack( 'L!', $data );
+      ( $value ) = unpack('L!', $data);
     } elsif ( $type eq 'int32' ) {
-      ( $value ) = unpack( 'l', $data );
+      ( $value ) = unpack('l', $data);
     } elsif ( $type eq 'uint32' || $type eq 'bool4' ) {
-      ( $value ) = unpack( 'L', $data );
+      ( $value ) = unpack('L', $data);
     } elsif ( $type eq 'int16' ) {
-      ( $value ) = unpack( 's', $data );
+      ( $value ) = unpack('s', $data);
     } elsif ( $type eq 'uint16' ) {
-      ( $value ) = unpack( 'S', $data );
+      ( $value ) = unpack('S', $data);
     } elsif ( $type eq 'int8' ) {
-      ( $value ) = unpack( 'c', $data );
+      ( $value ) = unpack('c', $data);
     } elsif ( $type eq 'uint8' || $type eq 'bool1' ) {
       ( $value ) = unpack( 'C', $data );
     } elsif ( $type =~ /^int8\[\d+\]$/ ) {
-      ( $value ) = unpack( 'Z'.$size, $data );
+      ( $value ) = unpack('Z'.$size, $data);
     } elsif ( $type =~ /^uint8\[\d+\]$/ ) {
-      ( $value ) = unpack( 'C'.$size, $data );
+      ( $value ) = unpack('C'.$size, $data);
     } else {
-      Error( "Unexpected type '".$type."' found for '".$field."'" );
+      Error("Unexpected type '".$type."' found for '".$field."'");
       next;
     }
     push @values, $value;
@@ -374,11 +376,9 @@ sub zmMemInvalidate {
   my $monitor = shift;
   my $mem_key = zmMemKey($monitor);
   if ( $mem_key ) {
-    zmMemDetach( $monitor );
-  } else {
-    print "no memkey in zmMemInvalidate\n";
+    zmMemDetach($monitor);
   }
-}
+} # end sub zmMemInvalidate
 
 sub zmMemTidy {
   zmMemClean();
@@ -389,14 +389,14 @@ sub zmMemWrite {
   my $field_values = shift;
   my $nocheck = shift;
 
-  if ( !($nocheck || zmMemVerify( $monitor )) ) {
-    return( undef );
+  if ( !($nocheck || zmMemVerify($monitor)) ) {
+    return undef;
   }
 
-  while ( my ( $field, $value ) = each( %$field_values ) ) {
-    my ( $section, $element ) = split( /[\/:.]/, $field );
+  while ( my ( $field, $value ) = each(%$field_values) ) {
+    my ( $section, $element ) = split(/[\/:.]/, $field);
     if ( !$section || !$element ) {
-      Fatal( "Invalid shared data selector '$field'" );
+      Fatal("Invalid shared data selector '$field'");
     }
 
     my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
@@ -405,88 +405,88 @@ sub zmMemWrite {
 
     my $data;
     if ( $type eq 'long' ) {
-      $data = pack( 'l!', $value );
+      $data = pack('l!', $value);
     } elsif ( $type eq 'ulong' || $type eq 'size_t' ) {
-      $data = pack( 'L!', $value );
+      $data = pack('L!', $value);
     } elsif ( $type eq 'int64' || $type eq 'time_t64' ) {
 # The 'q' type is only available on 64bit platforms, so use native.
-      $data = pack( 'l!', $value );
+      $data = pack('l!', $value);
     } elsif ( $type eq 'uint64' ) {
 # The 'q' type is only available on 64bit platforms, so use native.
-      $data = pack( 'L!', $value );
+      $data = pack('L!', $value);
     } elsif ( $type eq 'int32' ) {
-      $data = pack( 'l', $value );
+      $data = pack('l', $value);
     } elsif ( $type eq 'uint32' || $type eq 'bool4' ) {
-      $data = pack( 'L', $value );
+      $data = pack('L', $value);
     } elsif ( $type eq 'int16' ) {
-      $data = pack( 's', $value );
+      $data = pack('s', $value);
     } elsif ( $type eq 'uint16' ) {
-      $data = pack( 'S', $value );
+      $data = pack('S', $value);
     } elsif ( $type eq 'int8' ) {
-      $data = pack( 'c', $value );
+      $data = pack('c', $value);
     } elsif ( $type eq 'uint8' || $type eq 'bool1' ) {
-      $data = pack( 'C', $value );
+      $data = pack('C', $value);
     } elsif ( $type =~ /^int8\[\d+\]$/ ) {
-      $data = pack( 'Z'.$size, $value );
+      $data = pack('Z'.$size, $value);
     } elsif ( $type =~ /^uint8\[\d+\]$/ ) {
-      $data = pack( 'C'.$size, $value );
+      $data = pack('C'.$size, $value);
     } else {
-      Fatal( "Unexpected type \"$type\" found for \"$field\"" );
+      Fatal("Unexpected type \"$type\" found for \"$field\"");
     }
 
-    if ( !zmMemPut( $monitor, $offset, $size, $data ) ) {
-      Error( "Unable to write '$value' to '$field' in memory for monitor "
+    if ( !zmMemPut($monitor, $offset, $size, $data) ) {
+      Error("Unable to write '$value' to '$field' in memory for monitor "
           .$monitor->{Id}
           );
-      zmMemInvalidate( $monitor );
-      return( undef );
+      zmMemInvalidate($monitor);
+      return undef;
     }
   }
-  return( !undef );
+  return !undef;
 }
 
 sub zmGetMonitorState {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'shared_data:state' ) );
+  return zmMemRead($monitor, 'shared_data:state');
 }
 
 sub zmGetAlarmLocation {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, [ 'shared_data:alarm_x', 'shared_data:alarm_y' ] ) );
+  return zmMemRead($monitor, ['shared_data:alarm_x', 'shared_data:alarm_y']);
 }
 
 sub zmSetControlState {
   my $monitor = shift;
   my $control_state = shift;
 
-  zmMemWrite( $monitor, { 'shared_data:control_state' => $control_state } );
+  zmMemWrite($monitor, { 'shared_data:control_state' => $control_state });
 }
 
 sub zmGetControlState {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'shared_data:control_state' ) );
+  return zmMemRead($monitor, 'shared_data:control_state');
 }
 
 sub zmSaveControlState {
   my $monitor = shift;
   my $control_state = shift;
 
-  zmSetControlState( $monitor, freeze( $control_state ) );
+  zmSetControlState($monitor, freeze($control_state));
 }
 
 sub zmRestoreControlState {
   my $monitor = shift;
 
-  return( thaw( zmGetControlState( $monitor ) ) );
+  return thaw(zmGetControlState($monitor));
 }
 
 sub zmIsAlarmed {
   my $monitor = shift;
 
-  my $state = zmGetMonitorState( $monitor );
+  my $state = zmGetMonitorState($monitor);
 
   return( $state == STATE_ALARM );
 }
@@ -494,7 +494,7 @@ sub zmIsAlarmed {
 sub zmInAlarm {
   my $monitor = shift;
 
-  my $state = zmGetMonitorState( $monitor );
+  my $state = zmGetMonitorState($monitor);
 
   return( $state == STATE_ALARM || $state == STATE_ALERT );
 }
@@ -503,83 +503,82 @@ sub zmHasAlarmed {
   my $monitor = shift;
   my $last_event_id = shift;
 
-  my ( $state, $last_event ) = zmMemRead( $monitor, [ 'shared_data:state'
-      ,'shared_data:last_event'
-  ]
+  my ( $state, $last_event ) = zmMemRead($monitor,
+    ['shared_data:state', 'shared_data:last_event']
   );
 
-  if ( $state == STATE_ALARM || $state == STATE_ALERT ) {
-    return( $last_event );
+  if ( $state == STATE_ALARM or $state == STATE_ALERT ) {
+    return $last_event;
   } elsif( $last_event != $last_event_id ) {
-    return( $last_event );
+    return $last_event;
   }
-  return( undef );
+  return undef;
 }
 
 sub zmGetStartupTime {
-  return zmMemRead( $_[0], 'shared_data:startup_time' );
+  return zmMemRead($_[0], 'shared_data:startup_time');
 }
 
 sub zmGetLastEvent {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'shared_data:last_event' ) );
+  return zmMemRead($monitor, 'shared_data:last_event');
 }
 
 sub zmGetLastWriteTime {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'shared_data:last_write_time' ) );
+  return zmMemRead($monitor, 'shared_data:last_write_time');
 }
 
 sub zmGetLastReadTime {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'shared_data:last_read_time' ) );
+  return zmMemRead($monitor, 'shared_data:last_read_time');
 }
 
 sub zmGetMonitorActions {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'shared_data:action' ) );
+  return zmMemRead($monitor, 'shared_data:action');
 }
 
 sub zmMonitorEnable {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, 'shared_data:action' );
+  my $action = zmMemRead($monitor, 'shared_data:action');
   $action |= ACTION_SUSPEND;
-  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
+  zmMemWrite($monitor, {'shared_data:action' => $action});
 }
 
 sub zmMonitorDisable {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, 'shared_data:action' );
+  my $action = zmMemRead($monitor, 'shared_data:action');
   $action |= ACTION_RESUME;
-  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
+  zmMemWrite($monitor, {'shared_data:action' => $action});
 }
 
 sub zmMonitorSuspend {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, 'shared_data:action' );
+  my $action = zmMemRead($monitor, 'shared_data:action');
   $action |= ACTION_SUSPEND;
-  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
+  zmMemWrite($monitor, {'shared_data:action' => $action});
 }
 
 sub zmMonitorResume {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, 'shared_data:action' );
+  my $action = zmMemRead($monitor, 'shared_data:action');
   $action |= ACTION_RESUME;
-  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
+  zmMemWrite($monitor, {'shared_data:action' => $action});
 }
 
 sub zmGetTriggerState {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, 'trigger_data:trigger_state' ) );
+  return zmMemRead($monitor, 'trigger_data:trigger_state');
 }
 
 sub zmTriggerEventOn {
@@ -593,11 +592,11 @@ sub zmTriggerEventOn {
     'trigger_data:trigger_score' => $score,
     'trigger_data:trigger_cause' => $cause,
   };
-  $values->{'trigger_data:trigger_text'} = $text if ( defined($text) );
-  $values->{'trigger_data:trigger_showtext'} = $showtext if ( defined($showtext) );
+  $values->{'trigger_data:trigger_text'} = $text if defined($text);
+  $values->{'trigger_data:trigger_showtext'} = $showtext if defined($showtext);
   $values->{'trigger_data:trigger_state'} = TRIGGER_ON; # Write state last so event not read incomplete
 
-  zmMemWrite( $monitor, $values );
+  zmMemWrite($monitor, $values);
 }
 
 sub zmTriggerEventOff {
@@ -611,7 +610,7 @@ sub zmTriggerEventOff {
     'trigger_data:trigger_showtext' => '',
   };
 
-  zmMemWrite( $monitor, $values );
+  zmMemWrite($monitor, $values);
 }
 
 sub zmTriggerEventCancel {
@@ -625,7 +624,7 @@ sub zmTriggerEventCancel {
     'trigger_data:trigger_showtext' => '',
   };
 
-  zmMemWrite( $monitor, $values );
+  zmMemWrite($monitor, $values);
 }
 
 sub zmTriggerShowtext {
@@ -636,7 +635,7 @@ sub zmTriggerShowtext {
     'trigger_data:trigger_showtext' => $showtext,
   };
 
-  zmMemWrite( $monitor, $values );
+  zmMemWrite($monitor, $values);
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
index b9a8b6a1c..cb7920913 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
@@ -51,7 +51,7 @@ our %EXPORT_TAGS = (
     );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{all} } );
 
 our @EXPORT = @EXPORT_OK;
 
@@ -77,17 +77,17 @@ sub zmMemAttach {
   my ( $monitor, $size ) = @_;
 
   if ( !$size ) {
-    Error("No size passed to zmMemAttach for monitor $$monitor{Id}");
+    Error('No size passed to zmMemAttach for monitor '.$$monitor{Id});
     return undef;
   }
   if ( defined($monitor->{MMapAddr}) ) {
-    Debug("zmMemAttach already attached at $monitor->{MMapAddr}");
+    Debug("zmMemAttach already attached at $monitor->{MMapAddr} for $$monitor{Id}");
     return !undef;
   }
 
   my $mmap_file = $Config{ZM_PATH_MAP}.'/zm.mmap.'.$monitor->{Id};
   if ( ! -e $mmap_file ) {
-    Error("Memory map file '$mmap_file' does not exist.  zmc might not be running.");
+    Error("Memory map file '$mmap_file' does not exist in zmMemAttach.  zmc might not be running.");
     return undef;
   }
   my $mmap_file_size = -s $mmap_file;
@@ -119,18 +119,24 @@ sub zmMemDetach {
 
   if ( $monitor->{MMap} ) {
     if ( ! munmap(${$monitor->{MMap}}) ) {
-      Warn( "Unable to munmap for monitor $$monitor{Id}\n");
+      Warn("Unable to munmap for monitor $$monitor{Id}");
     }
     delete $monitor->{MMap};
+  } else {
+    Warn("No MMap for $$monitor{Id}");
   }
   if ( $monitor->{MMapAddr} ) {
     delete $monitor->{MMapAddr};
+  } else {
+    Warn("No MMapAddr in $$monitor{Id}");
   }
   if ( $monitor->{MMapHandle} ) {
     close($monitor->{MMapHandle});
     delete $monitor->{MMapHandle};
+  } else {
+    Warn("No MMapHandle in $$monitor{Id}");
   }
-}
+} # end sub zmMemDetach
 
 sub zmMemGet {
   my $monitor = shift;
@@ -162,7 +168,7 @@ sub zmMemPut {
 }
 
 sub zmMemClean {
-  Debug("Removing memory map files");
+  Debug('Removing memory map files');
   my $mapPath = $Config{ZM_PATH_MAP}.'/zm.mmap.*';
   foreach my $mapFile( glob( $mapPath ) ) {
     ( $mapFile ) = $mapFile =~ /^(.+)$/;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index 47ec7c557..963f75638 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -36,9 +36,172 @@ require ZoneMinder::Server;
 #our @ISA = qw(Exporter ZoneMinder::Base);
 use parent qw(ZoneMinder::Object);
 
-use vars qw/ $table $primary_key /;
+use vars qw/ $table $primary_key %fields $serial %defaults $debug/;
 $table = 'Monitors';
-$primary_key = 'Id';
+$serial = $primary_key = 'Id';
+%fields = map { $_ => $_ } qw(
+  Id
+  Name
+  Notes
+  ServerId
+  StorageId
+  Type
+  Function
+  Enabled
+  LinkedMonitors
+  Triggers
+  Device
+  Channel
+  Format
+  V4LMultiBuffer
+  V4LCapturesPerFrame
+  Protocol
+  Method
+  Host
+  Port
+  SubPath
+  Path
+  Options
+  User
+  Pass
+  Width
+  Height
+  Colours
+  Palette
+  Orientation
+  Deinterlacing
+  DecoderHWAccelName
+  DecoderHWAccelDevice
+  SaveJPEGs
+  VideoWriter
+  OutputCodec
+  OutputContainer
+  EncoderParameters
+  RecordAudio
+  RTSPDescribe
+  Brightness
+  Contrast
+  Hue
+  Colour
+  EventPrefix
+  LabelFormat
+  LabelX
+  LabelY
+  LabelSize
+  ImageBufferCount
+  WarmupCount
+  PreEventCount
+  PostEventCount
+  StreamReplayBuffer
+  AlarmFrameCount
+  SectionLength
+  MinSectionLength
+  FrameSkip
+  MotionFrameSkip
+  AnalysisFPSLimit
+  AnalysisUpdateDelay
+  MaxFPS
+  AlarmMaxFPS
+  FPSReportInterval
+  RefBlendPerc
+  AlarmRefBlendPerc
+  Controllable
+  ControlId
+  ControlDevice
+  ControlAddress
+  AutoStopTimeout
+  TrackMotion
+  TrackDelay
+  ReturnLocation
+  ReturnDelay
+  DefaultRate
+  DefaultScale
+  SignalCheckPoints
+  SignalCheckColour
+  WebColour
+  Exif
+  Sequence
+  );
+
+%defaults = (
+    ServerId => 0,
+    StorageId => 0,
+    Type      => 'Ffmpeg',
+    Function  => 'Mocord',
+    Enabled   => 1,
+    LinkedMonitors => undef,
+    Device  =>  '',
+    Channel =>  0,
+    Format  =>  0,
+    V4LMultiBuffer  =>  undef,
+    V4LCapturesPerFrame =>  1,
+    Protocol  =>  undef,
+    Method  =>  '',
+    Host  =>  undef,
+    Port  =>  '',
+    SubPath =>  '',
+    Path  =>  undef,
+    Options =>  undef,
+    User  =>  undef,
+    Pass  =>  undef,
+    Width => undef,
+    Height => undef,
+    Colours => 4,
+    Palette =>  0,
+    Orientation => undef,
+    Deinterlacing =>  0,
+    DecoderHWAccelName  =>  undef,
+    DecoderHWAccelDevice  =>  undef,
+    SaveJPEGs =>  3,
+    VideoWriter =>  0,
+    OutputCodec =>  undef,
+    OutputContainer => undef,
+    EncoderParameters => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
+    RecordAudio=>0,
+    RTSPDescribe=>0,
+    Brightness  =>  -1,
+    Contrast    =>  -1,
+    Hue         =>  -1,
+    Colour      =>  -1,
+    EventPrefix =>  'Event-',
+    LabelFormat => '%N - %d/%m/%y %H:%M:%S',
+    LabelX      =>  0,
+    LabelY      =>  0,
+    LabelSize   =>  1,
+    ImageBufferCount =>  20,
+    WarmupCount =>  0,
+    PreEventCount =>  5,
+    PostEventCount  =>  5,
+    StreamReplayBuffer  => 0,
+    AlarmFrameCount     =>  1,
+    SectionLength      =>  600,
+    MinSectionLength    =>  10,
+    FrameSkip           =>  0,
+    MotionFrameSkip     =>  0,
+    AnalysisFPSLimit  =>  undef,
+    AnalysisUpdateDelay  =>  0,
+    MaxFPS => undef,
+    AlarmMaxFPS => undef,
+    FPSReportInterval  =>  100,
+    RefBlendPerc        =>  6,
+    AlarmRefBlendPerc   =>  6,
+    Controllable        =>  0,
+    ControlId =>  undef,
+    ControlDevice =>  undef,
+    ControlAddress  =>  undef,
+    AutoStopTimeout => undef,
+    TrackMotion     =>  0,
+    TrackDelay      =>  undef,
+    ReturnLocation  =>  -1,
+    ReturnDelay     =>  undef,
+    DefaultRate =>  100,
+    DefaultScale  =>  100,
+    SignalCheckPoints =>  0,
+    SignalCheckColour =>  '#0000BE',
+    WebColour   =>  '#ff0000',
+    Exif    =>  0,
+    Sequence  =>  undef,
+    );
 
 sub Server {
 	return new ZoneMinder::Server( $_[0]{ServerId} );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in
index 056801d9c..d90a5fea3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in
@@ -39,12 +39,10 @@ our %EXPORT_TAGS = (
     );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{all} } );
 
 our @EXPORT = qw();
 
-our $VERSION = $ZoneMinder::Base::VERSION;
-
 use Data::UUID;
 
 use vars qw( $verbose $soap_version );
@@ -60,13 +58,16 @@ require WSDiscovery::TransportUDP;
 
 sub deserialize_message {
   my ($wsdl_client, $response) = @_;
+  if ( ! $response ) {
+    return;
+  }
 
 # copied and adapted from SOAP::WSDL::Client
 
 # get deserializer 
   my $deserializer = $wsdl_client->get_deserializer();
   
-  if(! $deserializer) {
+  if ( !$deserializer ) {
     $deserializer = SOAP::WSDL::Factory::Deserializer->get_deserializer({
         soap_version => $wsdl_client->get_soap_version(),
         %{ $wsdl_client->get_deserializer_args() },
@@ -74,22 +75,18 @@ sub deserialize_message {
   }
 # set class resolver if serializer supports it
   $deserializer->set_class_resolver( $wsdl_client->get_class_resolver() )
-    if ( $deserializer->can('set_class_resolver') );
+    if $deserializer->can('set_class_resolver');
 
 # Try deserializing response - there may be some,
-# even if transport did not succeed (got a 500 response)
-  if ( ! $response ) {
-    return;
-  }
-
+# even if transport did not succeed (got a 500 response) 
 # as our faults are false, returning a success marker is the only
 # reliable way of determining whether the deserializer succeeded.
 # Custom deserializers may return an empty list, or undef,
 # and $@ is not guaranteed to be undefined.
   my ($success, $result_body, $result_header) = eval {
-    (1, $deserializer->deserialize( $response ));
+    (1, $deserializer->deserialize($response));
   }; 
-  if (defined $success) {
+  if ( defined $success ) {
     return wantarray
     ? ($result_body, $result_header)
     : $result_body;
@@ -97,7 +94,6 @@ sub deserialize_message {
     return $@;
   } 
 
-  #else
   return $deserializer->generate_fault({
       code => 'soap:Server',
       role => 'urn:localhost',
@@ -107,14 +103,11 @@ sub deserialize_message {
 } # end sub deserialize_message
 
 sub interpret_messages {
-  my ($svc_discover, $services, @responses ) = @_;
+  my ( $svc_discover, $services, @responses ) = @_;
 
   my @results;
   foreach my $response ( @responses ) {
-
-    if ( $verbose ) {
-      print "Received message:\n" . $response . "\n";
-    }
+		print "Received message:\n" . $response . "\n" if $verbose;
 
     my $result = deserialize_message($svc_discover, $response);
     if ( not $result ) {
@@ -143,28 +136,26 @@ sub interpret_messages {
     next if defined $services->{$xaddr};
     $services->{$xaddr} = 1;
 
-    print "$xaddr, " . $svc_discover->get_soap_version() . ", ";
+    print $xaddr.', '.$svc_discover->get_soap_version().', ';
 
-    print "(";
+    print '(';
     my $scopes = $result->get_ProbeMatch()->get_Scopes();
     my $count = 0;
     my %scopes;
-    foreach my $scope(split ' ', $scopes) {
-      if($scope =~ m|onvif://www\.onvif\.org/(.+)/(.*)|) {
+    foreach my $scope (split ' ', $scopes) {
+      if ( $scope =~ m|onvif://www\.onvif\.org/(.+)/(.*)| ) {
         my ($attr, $value) = ($1,$2);
-        if( 0 < $count ++) {
-          print ", ";
-        }
-        print $attr . "=\'" . $value . "\'";
+			print ', ' if 0 < $count ++;
+        print $attr . '=\'' . $value . '\'';
         $scopes{$attr} = $value;
       }
     }
     print ")\n";
-    push @results, { xaddr=>$xaddr,
+    push @results, {
+			xaddr					=> $xaddr,
       soap_version  => $svc_discover->get_soap_version(),
-      scopes  =>  \%scopes,
+      scopes 				=> \%scopes,
     };
-
   }
   return @results;
 } # end sub interpret_messages
@@ -172,7 +163,7 @@ sub interpret_messages {
 # functions
 
 sub discover {
-  my ( $soap_version ) = @_;
+  my ($soap_versions, $net_interface) = @_;
   my @results;
 
 ## collect all responses
@@ -185,27 +176,36 @@ sub discover {
     push @responses, $response;
   };
 
-## try both soap versions
-
   my $uuid_gen = Data::UUID->new();
 
-  if ( ( ! $soap_version ) or ( $soap_version eq '1.1' ) ) {
-  my %services;
+  foreach my $version ( $soap_versions ? ( split(',',$soap_versions) ) : ( '1.1', '1.2') ) {
+		my %services;
 
-    if($verbose) {
-      print "Probing for SOAP 1.1\n"
-    }
+    print "Probing for SOAP $version\n" if $verbose;
     my $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({
 #    no_dispatch => '1',
         });
-    $svc_discover->set_soap_version('1.1');
+    $svc_discover->set_soap_version($version);
+		if ( $net_interface ) {
+			my $transport = $svc_discover->get_transport();
+			print "Setting net interface for $transport to $net_interface\n" if $verbose;
+			$transport->set_net_interface($net_interface);
+		}
 
     my $uuid = $uuid_gen->create_str();
 
     my $result = $svc_discover->ProbeOp(
-        { # WSDiscovery::Types::ProbeType
-        Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
-        Scopes =>  { value => '' },
+				{ # WSDiscovery::Types::ProbeType
+				(
+				 ($version eq '1.1') ?
+				   (
+						 Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
+					 ) : (
+						 xmlattr => { 'xmlns:dn'  => 'http://www.onvif.org/ver10/network/wsdl', },
+					 )
+				),
+						 Types => 'dn:NetworkVideoTransmitter', # QNameListType
+				Scopes =>  { value => '' },
         },
         WSDiscovery10::Elements::Header->new({
           Action => { value => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe' },
@@ -213,102 +213,123 @@ sub discover {
           To => { value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' },
           })
         );
-    print $result . "\n" if $verbose;
+    print $result."\n" if $verbose;
 
     push @results, interpret_messages($svc_discover, \%services, @responses);
-    @responses = ();
-  } # end if doing soap 1.1
+		@responses = ();
+  } # end foreach version
 
-  if ( ( ! $soap_version ) or ( $soap_version eq '1.2' ) ) {
-  my %services;
-    if($verbose) {
-      print "Probing for SOAP 1.2\n"
-    }
-    my $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({
-#    no_dispatch => '1',
-        });
-    $svc_discover->set_soap_version('1.2');
-
-# copies of the same Probe message must have the same MessageID. 
-# This is not a copy. So we generate a new uuid.
-    my $uuid = $uuid_gen->create_str();
-
-# Everyone else, like the nodejs onvif code and odm only ask for NetworkVideoTransmitter
-    my $result = $svc_discover->ProbeOp(
-        { # WSDiscovery::Types::ProbeType
-        xmlattr => { 'xmlns:dn'  => 'http://www.onvif.org/ver10/network/wsdl', },
-        Types => 'dn:NetworkVideoTransmitter', # QNameListType
-        Scopes =>  { value => '' },
-        },
-        WSDiscovery10::Elements::Header->new({
-          Action => { value => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe' },
-          MessageID => { value => "urn:uuid:$uuid" },
-          To => { value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' },
-          })
-        );
-    print $result . "\n" if $verbose;
-    push @results, interpret_messages($svc_discover, \%services, @responses);
-  } # end if doing soap 1.2
   return @results;
-}
+} # end sub discover
 
 sub profiles {
-  my ( $client ) = @_;
+  my ($client) = @_;
 
-  my $endpoint = $client->get_endpoint('media');
-  if ( ! $endpoint ) {
-    print "No media enpoint for client.\n";
+  my $media = $client->get_endpoint('media');
+  if ( !$media ) {
+    print "No media endpoint for client.\n";
     return;
   }
 
-  my $result = $endpoint->GetProfiles( { } ,, );
-  if ( ! $result ) {
-    print "No result from GetProfiles\n";
+  my $result = $media->GetProfiles( { } ,, );
+  if ( !$result ) {
+    print "No result from GetProfiles.\n";
     return;
   }
-  if($verbose) {
-    print "Received message:\n" . $result . "\n";
+  if ( $verbose ) {
+    use XML::LibXML;
+    my $dom = XML::LibXML->load_xml(string=>$result);
+    print "Received message:\n" . $dom->toString(1) . "\n";
   }
+  my @Profiles = @{ $result->get_Profiles() };
+  if ( !@Profiles ) {
+    print "No profiles returned from get_Profiles\n";
+    return;
+  }
+  print 'Number of profiles found: ' .(scalar @Profiles)."\n" if $verbose;
+  my @profiles;
 
-  my $profiles = $result->get_Profiles();
-
-  foreach  my $profile ( @{ $profiles } ) {
-
+  foreach my $profile ( @Profiles ) {
     my $token = $profile->attr()->get_token() ;
-    print $token . ", " .
-      $profile->get_Name() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_Encoding() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_Resolution()->get_Width() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_Resolution()->get_Height() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_RateControl()->get_FrameRateLimit() .
-      ", ";
+    my $Name = $profile->get_Name();
+
+    my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
+    if ( ! $VideoEncoderConfiguration ) {
+      print "No VideoEncoderConfiguration in profile $token $Name.\n";
+      next;
+    }
 
 # Specification gives conflicting values for unicast stream types, try both.
 # http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri
-    foreach my $streamtype ( 'RTP_unicast', 'RTP-Unicast' ) {
-      $result = $client->get_endpoint('media')->GetStreamUri( {
+    foreach my $streamtype ( 'RTP_unicast', 'RTP-Unicast', 'RTP-multicast', 'RTP-Multicast' ) {
+      my $StreamUri = $media->GetStreamUri( {
           StreamSetup =>  { # ONVIF::Media::Types::StreamSetup
-          Stream => $streamtype, # StreamType
-          Transport =>  { # ONVIF::Media::Types::Transport
-          Protocol => 'RTSP', # TransportProtocol
-          },
+            Stream => $streamtype, # StreamType
+            Transport =>  { # ONVIF::Media::Types::Transport
+              Protocol => 'RTSP', # TransportProtocol
+            },
           },
           ProfileToken => $token, # ReferenceToken
-          } ,, );
-      last if $result;
-    }
-    die $result if not $result;
-#  print $result . "\n";
+        } );
+      if ( ! ( $StreamUri and $StreamUri->can('get_MediaUri') ) ) {
+        print "No StreamUri or no MediaUri on profile $Name of type $streamtype\n" if $verbose;
+        next;
+      }
+      if ( $verbose ) {
+        eval {
+          use XML::LibXML;
+          my $dom = XML::LibXML->load_xml(string=>$StreamUri);
+          print "Received message:\n" . $dom->toString(1) . "\n";
+        };
+      }
+      my $MediaUri = $StreamUri->get_MediaUri();
+      if ( !$MediaUri ) {
+        print "No MediaUri in profile $Name of type $streamtype\n";
+        next;
+      }
+      if ( $verbose ) {
+        eval {
+          use XML::LibXML;
+          my $dom = XML::LibXML->load_xml(string=>$MediaUri);
+          print "Received message:\n" . $dom->toString(1) . "\n";
+        };
+      }
+      my $Uri = $MediaUri->get_Uri();
+      if ( ! $Uri ) {
+        print "No Uri in profile $Name of type $streamtype\n";
+        next;
+      }
+      if ( $verbose ) {
+        eval {
+          use XML::LibXML;
+          my $dom = XML::LibXML->load_xml(string=>$Uri);
+          print "Received message:\n" . $dom->toString(1) . "\n";
+        };
+      }
+      my $Resolution = $VideoEncoderConfiguration->get_Resolution();
+      my $Width = $Resolution ? $Resolution->get_Width() : 0;
+      my $Height = $Resolution ? $Resolution->get_Height() : 0;
+
+      push @profiles, [
+        $token,
+        $Name,
+        $VideoEncoderConfiguration->get_Encoding(),
+        $Width,
+        $Height,
+        $VideoEncoderConfiguration->get_RateControl()->get_FrameRateLimit(),
+        $streamtype,
+        $Uri,
+      ];
+    } # end foreach streamtype
 
-    print $result->get_MediaUri()->get_Uri() .
-      "\n";
   } # end foreach profile
 
 #
 # use message parser without schema validation ???
 #
+  return @profiles;
 
-}
+} # end sub profiles
 
 sub move {
   my ($client, $dir) = @_;
@@ -320,14 +341,23 @@ sub move {
 } # end sub move
 
 sub metadata {
-  my ( $client ) = @_;
-  my $result = $client->get_endpoint('media')->GetMetadataConfigurations( { } ,, );
-  die $result if not $result;
-  print $result . "\n";
+  my ($client) = @_;
+  my $media = $client->get_endpoint('media');
+  die 'No media endpoint.' if !$media;
 
-  $result = $client->get_endpoint('media')->GetVideoAnalyticsConfigurations( { } ,, );
-  die $result if not $result;
-  print $result . "\n";
+  my $result = $media->GetMetadataConfigurations( { } ,, );
+  if ( !$result ) {
+    print "No MetaDataConfigurations\n" if $verbose;
+  } else {
+    print $result . "\n";
+  }
+
+  $result = $media->GetVideoAnalyticsConfigurations( { } ,, );
+  if ( ! $result ) {
+    print "No VideoAnalyticsConfigurations\n" if $verbose;
+  } else {
+    print $result . "\n";
+  }
 
 #  $result = $client->get_endpoint('analytics')->GetServiceCapabilities( { } ,, );
 #  die $result if not $result;
@@ -335,8 +365,6 @@ sub metadata {
 
 }
 
-
-
 1;
 __END__
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
index a3f08a402..569b3de9d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
@@ -95,32 +95,32 @@ sub new {
 sub load {
   my ( $self, $data ) = @_;
   my $type = ref $self;
-  if ( ! $data ) {
+  if ( !$data ) {
     no strict 'refs';
     my $table = ${$type.'::table'};
     if ( ! $table ) {
-      Error( 'NO table for type ' . $type );
+      Error('No table for type '.$type);
       return;
     } # end if
     my $primary_key = ${$type.'::primary_key'};
-    if ( ! $primary_key ) {
-      Error( 'NO primary_key for type ' . $type );
+    if ( !$primary_key ) {
+      Error('No primary_key for type '.$type);
       return;
     } # end if
 
     if ( ! $$self{$primary_key} ) { 
       my ( $caller, undef, $line ) = caller;
-      Error( (ref $self) . "::load called without $primary_key from $caller:$line");
+      Error("$type ::load called without $primary_key from $caller:$line");
     } else {
-#$log->debug("Object::load Loading from db $type");
       Debug("Loading $type from $table WHERE $primary_key = $$self{$primary_key}");
-      $data = $ZoneMinder::Database::dbh->selectrow_hashref( "SELECT * FROM $table WHERE $primary_key=?", {}, $$self{$primary_key} );
-      if ( ! $data ) {
+      $data = $ZoneMinder::Database::dbh->selectrow_hashref("SELECT * FROM `$table` WHERE `$primary_key`=?", {}, $$self{$primary_key});
+      if ( !$data ) {
         if ( $ZoneMinder::Database::dbh->errstr ) {
           Error( "Failure to load Object record for $$self{$primary_key}: Reason: " . $ZoneMinder::Database::dbh->errstr );
         } else {
           Debug("No Results Loading $type from $table WHERE $primary_key = $$self{$primary_key}");
         } # end if
+				delete $$self{$primary_key};
       } # end if
     } # end if
   } # end if ! $data
@@ -137,26 +137,26 @@ sub lock_and_load {
   no strict 'refs';
   my $table = ${$type.'::table'};
   if ( ! $table ) {
-    Error('NO table for type ' . $type);
+    Error('NO table for type '.$type);
     return;
   } # end if
   my $primary_key = ${$type.'::primary_key'};
-  if ( ! $primary_key ) {
-    Error('NO primary_key for type ' . $type);
+  if ( !$primary_key ) {
+    Error('No primary_key for type ' . $type);
     return;
   } # end if
 
-  if ( ! $$self{$primary_key} ) {
+  if ( !$$self{$primary_key} ) {
     my ( $caller, undef, $line ) = caller;
     Error("$type ::lock_and_load called without $primary_key from $caller:$line");
     return;
   }
 
   Debug("Lock and Load $type from $table WHERE $primary_key = $$self{$primary_key}");
-  my $data = $ZoneMinder::Database::dbh->selectrow_hashref("SELECT * FROM $table WHERE $primary_key=? FOR UPDATE", {}, $$self{$primary_key});
+  my $data = $ZoneMinder::Database::dbh->selectrow_hashref("SELECT * FROM `$table` WHERE `$primary_key`=? FOR UPDATE", {}, $$self{$primary_key});
   if ( ! $data ) {
     if ( $ZoneMinder::Database::dbh->errstr ) {
-      Error("Failure to load Object record for $$self{$primary_key}: Reason: " . $ZoneMinder::Database::dbh->errstr);
+      Error("Failure to load Object record for $$self{$primary_key}: Reason: ".$ZoneMinder::Database::dbh->errstr);
     } else {
       Debug("No Results Lock and Loading $type from $table WHERE $primary_key = $$self{$primary_key}");
     } # end if
@@ -216,12 +216,12 @@ sub save {
 $log->debug("No serial") if $debug;
 			# No serial columns defined, which means that we will do saving by delete/insert instead of insert/update
 			if ( @identified_by ) {
-				my $where = join(' AND ', map { $$fields{$_}.'=?' } @identified_by );
+				my $where = join(' AND ', map { '`'.$$fields{$_}.'`=?' } @identified_by );
 				if ( $debug ) {
-					$log->debug("DELETE FROM $table WHERE $where");
+					$log->debug("DELETE FROM `$table` WHERE $where");
 				} # end if
 				
-				if ( ! ( ( $_ = $local_dbh->prepare("DELETE FROM $table WHERE $where") ) and $_->execute( @$self{@identified_by} ) ) ) {
+				if ( ! ( ( $_ = $local_dbh->prepare("DELETE FROM `$table` WHERE $where") ) and $_->execute( @$self{@identified_by} ) ) ) {
 					$where =~ s/\?/\%s/g;
 					$log->error("Error deleting: DELETE FROM $table WHERE " .  sprintf($where, map { defined $_ ? $_ : 'undef' } ( @$self{@identified_by}) ).'):' . $local_dbh->errstr);
 					$local_dbh->rollback();
@@ -240,7 +240,7 @@ $log->debug("No serial") if $debug;
 					next;
 				}
 				if ( ! $$self{$id} ) {
-          my $s = qq{SELECT `auto_increment` FROM INFORMATION_SCHEMA.TABLES WHERE table_name = '$table'};
+          my $s = qq{SELECT `auto_increment` FROM INFORMATION_SCHEMA.TABLES WHERE `table_name` = '$table'};
 
 					($$self{$id}) = ($sql{$$fields{$id}}) = $local_dbh->selectrow_array( $s );
 					#($$self{$id}) = ($sql{$$fields{$id}}) = $local_dbh->selectrow_array( q{SELECT nextval('} . $serial{$id} . q{')} );
@@ -252,7 +252,7 @@ $log->debug("No serial") if $debug;
 
 		if ( $insert ) {
 			my @keys = keys %sql;
-			my $command = "INSERT INTO $table (" . join(',', @keys ) . ') VALUES (' . join(',', map { '?' } @sql{@keys} ) . ')';
+			my $command = "INSERT INTO `$table` (" . join(',', @keys ) . ') VALUES (' . join(',', map { '?' } @sql{@keys} ) . ')';
 			if ( ! ( ( $_ = $local_dbh->prepare($command) ) and $_->execute( @sql{@keys} ) ) ) {
 				my $error = $local_dbh->errstr;
 				$command =~ s/\?/\%s/g;
@@ -267,7 +267,7 @@ $log->debug("No serial") if $debug;
 			} # end if
 		} else {
 			my @keys = keys %sql;
-			my $command = "UPDATE $table SET " . join(',', map { $_ . ' = ?' } @keys ) . ' WHERE ' . join(' AND ', map { $_ . ' = ?' } @$fields{@identified_by} );
+			my $command = "UPDATE `$table` SET " . join(',', map { '`'.$_ . '` = ?' } @keys ) . ' WHERE ' . join(' AND ', map { '`'.$_ . '` = ?' } @$fields{@identified_by} );
 			if ( ! ( $_ = $local_dbh->prepare($command) and $_->execute( @sql{@keys,@$fields{@identified_by}} ) ) ) {
 				my $error = $local_dbh->errstr;
 				$command =~ s/\?/\%s/g;
@@ -293,12 +293,12 @@ $log->debug("No serial") if $debug;
 			if ( $need_serial ) {
 				if ( $serial ) {
           $log->debug("Getting auto_increments");
-          my $s = qq{SELECT `auto_increment` FROM INFORMATION_SCHEMA.TABLES WHERE table_name = '$table'};
+          my $s = qq{SELECT `auto_increment` FROM INFORMATION_SCHEMA.TABLES WHERE `table_name` = '$table'};
 					@$self{@identified_by} = @sql{@$fields{@identified_by}} = $local_dbh->selectrow_array( $s );
 #@$self{@identified_by} = @sql{@$fields{@identified_by}} = $local_dbh->selectrow_array( q{SELECT nextval('} . $serial . q{')} );
 					if ( $local_dbh->errstr() )  {
-						$log->error("Error getting next id. " . $local_dbh->errstr() );
-						$log->error("SQL statement execution $s returned ".join(',',@$self{@identified_by}));
+						$log->error("Error getting next id. " . $local_dbh->errstr() ."\n".
+              "SQL statement execution $s returned ".join(',',@$self{@identified_by}));
 					} elsif ( $debug or DEBUG_ALL ) {
 						$log->debug("SQL statement execution $s returned ".join(',',@$self{@identified_by}));
 					} # end if
@@ -306,7 +306,7 @@ $log->debug("No serial") if $debug;
 			} # end if
 
 			my @keys = keys %sql;
-			my $command = "INSERT INTO $table (" . join(',', @keys ) . ') VALUES (' . join(',', map { '?' } @sql{@keys} ) . ')';
+			my $command = "INSERT INTO `$table` (" . join(',', map { '`'.$_.'`' } @keys ) . ') VALUES (' . join(',', map { '?' } @sql{@keys} ) . ')';
 			if ( ! ( $_ = $local_dbh->prepare($command) and $_->execute( @sql{@keys} ) ) ) {
 				$command =~ s/\?/\%s/g;
 				my $error = $local_dbh->errstr;
@@ -325,7 +325,7 @@ $log->debug("No serial") if $debug;
       my %identified_by = map { $_, $_ } @identified_by;
 
 			@keys = map { $identified_by{$_} ? () : $$fields{$_} } @keys;
-			my $command = "UPDATE $table SET " . join(',', map { $_ . ' = ?' } @keys ) . ' WHERE ' . join(' AND ', map { $$fields{$_} .'= ?' } @identified_by );
+			my $command = "UPDATE `$table` SET " . join(',', map { '`'.$_ . '` = ?' } @keys ) . ' WHERE ' . join(' AND ', map { '`'.$$fields{$_} .'`= ?' } @identified_by );
 			if ( ! ( $_ = $local_dbh->prepare($command) and $_->execute( @sql{@keys}, @sql{@$fields{@identified_by}} ) ) ) {
 				my $error = $local_dbh->errstr;
 				$command =~ s/\?/\%s/g;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/User.pm b/scripts/ZoneMinder/lib/ZoneMinder/User.pm
new file mode 100644
index 000000000..47ba895a9
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/User.pm
@@ -0,0 +1,80 @@
+# ==========================================================================
+#
+# ZoneMinder User Module
+# Copyright (C) 2020  ZoneMinder LLC
+#
+# 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.
+#
+# ==========================================================================
+ 
+package ZoneMinder::Frame;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Object;
+
+use parent qw(ZoneMinder::Object);
+
+use vars qw/ $table $primary_key %fields /;
+$table = 'Users';
+$primary_key = 'Id';
+
+%fields = map { $_ => $_ } qw(
+Id
+Username
+Password 
+Language
+Enabled
+Stream
+Events
+Control
+Monitors
+Groups
+Devices
+System
+MaxBandwidth
+MonitorIds
+TokenMinExpiry
+APIEnabled
+);
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::User - Perl Class for Users
+
+=head1 SYNOPSIS
+
+use ZoneMinder::User;
+
+=head1 AUTHOR
+
+Isaac Connor, E<lt>isaac@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2017  ZoneMinder LLC
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index d704e169b..80a227e2b 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -112,22 +112,22 @@ if ( -e ZM_AUDIT_PID ) {
 
 if ( open( my $PID, '>', ZM_AUDIT_PID ) ) {
   print( $PID $$ );
-  close( $PID );
+  close($PID);
 } else {
-  Error( "Can't open pid file at " . ZM_PID );
+  Error('Can\'t open pid file at '.ZM_PID);
 }
 
 sub HupHandler {
-  Info("Received HUP, reloading");
+  Info('Received HUP, reloading');
   &ZoneMinder::Logger::logHupHandler();
 }
 sub TermHandler {
-  Info("Received TERM, exiting");
+  Info('Received TERM, exiting');
   Term();
 }
 sub Term {
   unlink ZM_AUDIT_PID;
-  exit( 0 );
+  exit(0);
 }
 $SIG{HUP} = \&HupHandler;
 $SIG{TERM} = \&TermHandler;
@@ -154,7 +154,7 @@ MAIN: while( $loop ) {
     # if we are running continuously, then just skip to the next
     # interval, otherwise we are a one off run, so wait a second and
     # retry until someone kills us.
-    sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
+    sleep($Config{ZM_AUDIT_CHECK_INTERVAL});
   } else {
     sleep 1;
   } # end if
@@ -168,7 +168,7 @@ MAIN: while( $loop ) {
         # if we are running continuously, then just skip to the next
         # interval, otherwise we are a one off run, so wait a second and
         # retry until someone kills us.
-        sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
+        sleep($Config{ZM_AUDIT_CHECK_INTERVAL});
       } else {
         Term();
       } # end if
@@ -186,9 +186,9 @@ MAIN: while( $loop ) {
     }
     Info("Auditing Storage Area $Storage_Areas[0]{Id} $Storage_Areas[0]{Name} at $Storage_Areas[0]{Path}");
   } elsif ( $server_id ) {
-    @Storage_Areas = ZoneMinder::Storage->find( ServerId => $server_id );
+    @Storage_Areas = ZoneMinder::Storage->find(ServerId => $server_id);
     if ( ! @Storage_Areas ) {
-      Error("No Storage Area found with ServerId =" . $server_id);
+      Error('No Storage Area found with ServerId='.$server_id);
       Term();
     }
     foreach my $Storage ( @Storage_Areas ) {
@@ -196,17 +196,17 @@ MAIN: while( $loop ) {
     }
   } else {
     @Storage_Areas = ZoneMinder::Storage->find();
-    Info("Auditing All Storage Areas");
+    Info('Auditing All Storage Areas');
   }
 
   my %Monitors;
   my $db_monitors;
-  my $monitorSelectSql = $monitor_id ? 'SELECT * FROM Monitors WHERE Id=?' : 'SELECT * FROM Monitors ORDER BY Id';
+  my $monitorSelectSql = $monitor_id ? 'SELECT * FROM `Monitors` WHERE `Id`=?' : 'SELECT * FROM `Monitors` ORDER BY `Id`';
   my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql )
     or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
 
-  my $eventSelectSql = 'SELECT Id, (unix_timestamp() - unix_timestamp(StartTime)) AS Age
-    FROM Events WHERE MonitorId = ?'.(@Storage_Areas ? ' AND StorageId IN ('.join(',',map { '?'} @Storage_Areas).')' : '' ). ' ORDER BY Id';
+  my $eventSelectSql = 'SELECT `Id`, (unix_timestamp() - unix_timestamp(`StartTime`)) AS Age
+    FROM `Events` WHERE `MonitorId` = ?'.(@Storage_Areas ? ' AND `StorageId` IN ('.join(',',map { '?'} @Storage_Areas).')' : '' ). ' ORDER BY `Id`';
   my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql )
     or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
 
@@ -222,7 +222,7 @@ MAIN: while( $loop ) {
     while ( my $event = $eventSelectSth->fetchrow_hashref() ) {
       $db_events->{$event->{Id}} = $event->{Age};
     }
-    Debug( 'Got '.int(keys(%$db_events))." events for monitor $monitor->{Id}" );
+    Debug('Got '.int(keys(%$db_events))." events for monitor $monitor->{Id} using $eventSelectSql");
   } # end while monitors
 
   my $fs_monitors;
@@ -245,7 +245,7 @@ MAIN: while( $loop ) {
         next;
       }
 
-      Debug( "Found filesystem monitor '$monitor'" );
+      Debug("Found filesystem monitor '$monitor'");
       $fs_monitors->{$monitor} = {} if ! $fs_monitors->{$monitor};
       my $fs_events = $fs_monitors->{$monitor};
 
@@ -256,19 +256,19 @@ MAIN: while( $loop ) {
         my @day_dirs = glob("$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]");
         Debug(qq`Checking for Deep Events under $$Storage{Path} using glob("$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]") returned `. scalar @day_dirs . ' events');
         foreach my $day_dir ( @day_dirs ) {
-          Debug( "Checking day dir $day_dir" );
+          Debug("Checking day dir $day_dir");
           ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
           if ( !chdir($day_dir) ) {
             Error("Can't chdir to '$$Storage{Path}/$day_dir': $!");
             next;
           }
-          if ( ! opendir(DIR, '.') ) {
+          if ( !opendir(DIR, '.') ) {
             Error("Can't open directory '$$Storage{Path}/$day_dir': $!");
             next;
           }
           my %event_ids_by_path;
 
-          my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
+          my @event_links = sort { $b <=> $a } grep { -l $_ } readdir(DIR);
           Debug("Have " . @event_links . ' event links');
           closedir(DIR);
 
@@ -280,9 +280,10 @@ MAIN: while( $loop ) {
               Warning("Non-event link found $event_link in $day_dir, skipping");
               next;
             }
-            Debug("Checking link $event_link");
             #Event path is hour/minute/sec
             my $event_path = readlink($event_link);
+            $event_path = '' if ! defined($event_path);
+            Debug("Checking link $event_link points to: $event_path");
 
             if ( !($event_path and -e $event_path) ) {
               aud_print("Event link $day_dir/$event_link does not point to valid target at $event_path");
@@ -294,15 +295,50 @@ MAIN: while( $loop ) {
             } else {
               $event_ids_by_path{$event_path} = $event_id;
 
-              Debug("Checking link $event_link points to $event_path ");
-              my $Event = $fs_events->{$event_id} = new ZoneMinder::Event();
-              $$Event{Id} = $event_id;
-              $$Event{Path} = join('/', $Storage->Path(), $day_dir, $event_path);
-              $$Event{RelativePath} = join('/', $day_dir, $event_path);
-              $$Event{Scheme} = 'Deep';
-              $Event->MonitorId( $monitor_dir );
-              $Event->StorageId( $Storage->Id() );
-              $Event->DiskSpace( undef );
+              my $Event = $fs_events->{$event_id} = ZoneMinder::Event->find_one(Id=>$event_id);
+							if ( ! $Event ) {
+								$Event = $fs_events->{$event_id} = new ZoneMinder::Event();
+								$$Event{Id} = $event_id;
+								$$Event{Path} = join('/', $Storage->Path(), $day_dir, $event_path);
+								$$Event{RelativePath} = join('/', $day_dir, $event_path);
+								$$Event{Scheme} = 'Deep';
+								$Event->MonitorId( $monitor_dir );
+								$Event->StorageId( $Storage->Id() );
+								$Event->DiskSpace( undef );
+							} else {
+								my $full_path = join('/', $Storage->Path(), $day_dir, $event_path);
+# Check storage id
+								if ( !$Event->Storage()->Id() ) {
+									Info("Correcting StorageId for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
+									$Event->save({ StorageId=>$Storage->Id() });
+									$Event->Path(undef);
+								} else {
+
+									if ( $Event->Path() ne $full_path ) {
+										if ( ! (-e $Event->Path()) ) {
+											if ( $Event->StorageId() != $Storage->Id() ) {
+												Info("Correcting Storge Id for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
+												$Event->save({ StorageId=>$Storage->Id() });
+												$Event->Path(undef);
+											}
+										} else {
+											Info("Not updating path to event due to it existing at both $$Event{Path} and $event_path");
+										}
+									} # end if change of storage id
+								} # end if valid storage id
+							} # end if event found
+
+							if ( ! $Event->SaveJPEGs() ) {
+								my $saveJPegs = ( $Event->has_capture_jpegs() ? 1 : 0 ) | ( $Event->has_analyse_jpegs() ? 2 : 0 );
+
+								if ( $Event->SaveJPEGs(
+										( $Event->has_capture_jpegs() ? 1 : 0 ) | ( $Event->has_analyse_jpegs() ? 2 : 0 )
+										) ) {
+									Info("Updated Event $$Event{Id} SaveJPEGs to " . $Event->SaveJPEGs());
+									$Event->save();
+								}
+							}
+
             } # event path exists
           } # end foreach event_link
             
@@ -314,14 +350,11 @@ MAIN: while( $loop ) {
             ( $event_dir ) = ( $event_dir =~ /^(.*)$/ ); # De-taint
 
             my $event_id = undef;
+						my $Event = new ZoneMinder::Event();
+						$$Event{Path} = join('/', $Storage->Path(), $day_dir, $event_dir);
 
-            if ( ! opendir(DIR, $event_dir) ) {
-              Error("Can't open directory '$$Storage{Path}/$day_dir': $!");
-              next;
-            }
-            my @contents = readdir( DIR );
+            my @contents = $Event->files();
             Debug("Have " . @contents . " files in $day_dir/$event_dir");
-            closedir(DIR);
 
             my @mp4_files = grep( /^\d+\-video.mp4$/, @contents);
             foreach my $mp4_file ( @mp4_files ) {
@@ -332,25 +365,27 @@ MAIN: while( $loop ) {
                 last;
               }
             }
-            
+
             if ( ! $event_id ) {
               # Look for .id file
               my @hidden_files = grep( /^\.\d+$/, @contents);
-              Debug("Have " . @hidden_files . ' hidden files');
+              Debug('Have ' . @hidden_files . ' hidden files');
               if ( @hidden_files ) {
                 ( $event_id ) = $hidden_files[0] =~ /^.(\d+)$/;
               }
             }
 
             if ( $event_id and ! $fs_events->{$event_id} ) {
-              my $Event = $fs_events->{$event_id} = new ZoneMinder::Event();
+              $fs_events->{$event_id} = $Event;
               $$Event{Id} = $event_id;
-              $$Event{Path} = join('/', $Storage->Path(), $day_dir, $event_dir);
               $$Event{RelativePath} = join('/', $day_dir, $event_dir);
               $$Event{Scheme} = 'Deep';
               $Event->MonitorId( $monitor_dir );
               $Event->StorageId( $Storage->Id() );
               $Event->DiskSpace( undef );
+							$Event->SaveJPEGs(
+								( $Event->has_capture_jpegs() ? 1 : 0 ) | ( $Event->has_analyse_jpegs() ? 2 : 0 )
+									);
               if ( ! $event_ids_by_path{$event_dir} ) {
                 Warning("No event link found at ".$Event->LinkPath() ." for " . $Event->to_string());
               }
@@ -373,8 +408,7 @@ MAIN: while( $loop ) {
               }
               aud_print("Deleting event directories with no event id information at $day_dir/$event_dir");
               if ( confirm() ) {
-                my $command = "rm -rf $event_dir";
-                executeShellCommand( $command );
+                executeShellCommand("rm -rf $event_dir");
                 $cleaned = 1;
               }
             } # end if able to find id
@@ -386,26 +420,27 @@ MAIN: while( $loop ) {
       Debug("Checking for Medium Scheme Events under $$Storage{Path}/$monitor_dir");
       {
         my @event_dirs = glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*");
-        Debug(qq`glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*") returned ` . scalar @event_dirs . ' entries.' );
+        Debug('glob("'.$monitor_dir.'/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*") returned '.(scalar @event_dirs).' entries.');
         foreach my $event_dir ( @event_dirs ) {
           if ( ! -d $event_dir ) {
-            Debug( "$event_dir is not a dir. Skipping" );
+            Debug("$event_dir is not a dir. Skipping");
             next;
           }
           my ( $date, $event_id ) = $event_dir =~ /^$monitor_dir\/(\d{4}\-\d{2}\-\d{2})\/(\d+)$/;
-          if ( ! $event_id ) {
-            Debug("Unable to parse date/event_id from $event_dir");
+          if ( !$event_id ) {
+            Debug('Unable to parse date/event_id from '.$event_dir);
             next;
           }
           my $Event = $fs_events->{$event_id} = new ZoneMinder::Event();
           $$Event{Id} = $event_id;
-          $$Event{Path} = join('/', $Storage->Path(), $event_dir );
-          Debug("Have event $$Event{Id} at $$Event{Path}");
           $$Event{Scheme} = 'Medium';
           $$Event{RelativePath} = $event_dir;
           $Event->MonitorId( $monitor_dir );
           $Event->StorageId( $Storage->Id() );
-          $Event->StartTime( POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($Event->Path())) ) );
+          $Event->Path();
+          $Event->age();
+          Debug("Have event $$Event{Id} at $$Event{Path}");
+          $Event->StartTime(POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($Event->Path()))));
         } # end foreach event
       }
 
@@ -432,13 +467,13 @@ MAIN: while( $loop ) {
         } # end foreach event
         chdir( $Storage->Path() );
       } # if USE_DEEP_STORAGE
-      Debug( 'Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir" );
+      Debug('Got '.int(keys(%$fs_events)).' filesystem events for monitor '.$monitor_dir);
 
       delete_empty_subdirs($$Storage{Path}.'/'.$monitor_dir);
     } # end foreach monitor
 
     if ( $cleaned ) {
-      Debug("First stage cleaning done.  Restarting.");
+      Debug('First stage cleaning done.  Restarting.');
       redo MAIN;
     }
 
@@ -450,7 +485,7 @@ MAIN: while( $loop ) {
           next;
         }
         my @event_ids = keys %$fs_events;
-        Debug('Have ' .scalar @event_ids . " events for monitor $monitor_id");
+        Debug('Have ' .scalar @event_ids . ' events for monitor '.$monitor_id);
 
         foreach my $fs_event_id ( sort { $a <=> $b } keys %$fs_events ) {
 
@@ -465,8 +500,8 @@ MAIN: while( $loop ) {
             }
             my $age = $Event->age();
 
-            if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-              aud_print( "Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old" );
+            if ( $age and ($age > $Config{ZM_AUDIT_MIN_AGE}) ) {
+              aud_print("Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old");
               if ( confirm() ) {
                 $Event->delete_files();
                 $cleaned = 1;
@@ -476,11 +511,10 @@ MAIN: while( $loop ) {
           } # end if ! in db events
         } # end foreach fs event
       } else {
-        aud_print( "Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database" );
+        aud_print("Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database");
 
         if ( confirm() ) {
-          my $command = "rm -rf $monitor_id";
-          executeShellCommand( $command );
+          executeShellCommand("rm -rf $monitor_id");
           $cleaned = 1;
         }
       }
@@ -494,8 +528,7 @@ MAIN: while( $loop ) {
       aud_print("Filesystem monitor link '$link' does not point to valid monitor directory");
       if ( confirm() ) {
         ( $link ) = ( $link =~ /^(.*)$/ ); # De-taint
-        my $command = qq`rm "$link"`;
-        executeShellCommand($command);
+        executeShellCommand(qq`rm "$link"`);
         $cleaned = 1;
       }
     } # end foreach monitor link
@@ -508,17 +541,17 @@ MAIN: while( $loop ) {
 
   $cleaned = 0;
   my $deleteMonitorSql = 'DELETE LOW_PRIORITY FROM Monitors WHERE Id = ?';
-  my $deleteMonitorSth = $dbh->prepare_cached( $deleteMonitorSql )
-    or Fatal( "Can't prepare '$deleteMonitorSql': ".$dbh->errstr() );
+  my $deleteMonitorSth = $dbh->prepare_cached($deleteMonitorSql)
+    or Fatal("Can't prepare '$deleteMonitorSql': ".$dbh->errstr());
   my $deleteEventSql = 'DELETE LOW_PRIORITY FROM Events WHERE Id = ?';
   my $deleteEventSth = $dbh->prepare_cached( $deleteEventSql )
-    or Fatal( "Can't prepare '$deleteEventSql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$deleteEventSql': ".$dbh->errstr());
   my $deleteFramesSql = 'DELETE LOW_PRIORITY FROM Frames WHERE EventId = ?';
   my $deleteFramesSth = $dbh->prepare_cached( $deleteFramesSql )
-    or Fatal( "Can't prepare '$deleteFramesSql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$deleteFramesSql': ".$dbh->errstr());
   my $deleteStatsSql = 'DELETE LOW_PRIORITY FROM Stats WHERE EventId = ?';
   my $deleteStatsSth = $dbh->prepare_cached( $deleteStatsSql )
-    or Fatal( "Can't prepare '$deleteStatsSql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$deleteStatsSql': ".$dbh->errstr());
 
   # Foreach database monitor and it's list of events.
   while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) ) {
@@ -554,7 +587,7 @@ EVENT: while ( my ( $db_event, $age ) = each( %$db_events ) ) {
           } else {
             Debug("$$Event{Id} Not found at $path");
           }
-        }
+        } # end foreach Storage
         if ( $Event->Archived() ) {
           Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
           next;
@@ -606,18 +639,13 @@ EVENT: while ( my ( $db_event, $age ) = each( %$db_events ) ) {
             Info("Updating storage area on event $$Event{Id} from $$Event{StorageId} to $$fs_events{$db_event}{StorageId}");
             $Event->StorageId($$fs_events{$db_event}->StorageId());
           }
-          if ( $$fs_events{$db_event}->StartTime() ne $Event->StartTime() ) {
+          if ( ! $Event->StartTime() ) {
             Info("Updating StartTime on event $$Event{Id} from $$Event{StartTime} to $$fs_events{$db_event}{StartTime}");
-            if ( $$Event{Scheme} eq 'Deep' ) {
-              $Event->StartTime($$fs_events{$db_event}->StartTime());
-            } else {
-              $Event->StartTime($$fs_events{$db_event}->StartTime());
-            }
-            $Event->save();
+            $Event->StartTime($$fs_events{$db_event}->StartTime());
           }
 
           $Event->save();
-        }
+        } # end if Event exists in db and not in filesystem
       } # end if ! in fs_events
     } # foreach db_event
   } # end foreach db_monitor
@@ -631,21 +659,21 @@ if ( $level > 1 ) {
 # Shouldn't be possible anymore with FOREIGN KEYS in place
   $cleaned = 0;
   Debug("Checking for Orphaned Events");
-  my $selectOrphanedEventsSql = 'SELECT Events.Id, Events.Name
-    FROM Events LEFT JOIN Monitors ON (Events.MonitorId = Monitors.Id)
-    WHERE isnull(Monitors.Id)';
+  my $selectOrphanedEventsSql = 'SELECT `Events`.`Id`, `Events`.`Name`
+    FROM `Events` LEFT JOIN `Monitors` ON (`Events`.`MonitorId` = `Monitors`.`Id`)
+    WHERE isnull(`Monitors`.`Id`)';
   my $selectOrphanedEventsSth = $dbh->prepare_cached( $selectOrphanedEventsSql )
-    or Error( "Can't prepare '$selectOrphanedEventsSql': ".$dbh->errstr() );
+    or Error("Can't prepare '$selectOrphanedEventsSql': ".$dbh->errstr());
   $res = $selectOrphanedEventsSth->execute()
-    or Error( "Can't execute: ".$selectOrphanedEventsSth->errstr() );
+    or Error("Can't execute: ".$selectOrphanedEventsSth->errstr());
 
   while( my $event = $selectOrphanedEventsSth->fetchrow_hashref() ) {
-    aud_print( "Found orphaned event with no monitor '$event->{Id}'" );
+    aud_print("Found orphaned event with no monitor '$event->{Id}'");
     if ( confirm() ) {
-      if ( $res = $deleteEventSth->execute( $event->{Id} ) ) {
+      if ( $res = $deleteEventSth->execute($event->{Id}) ) {
         $cleaned = 1;
       } else {
-        Error( "Can't execute: ".$deleteEventSth->errstr() );
+        Error("Can't execute: ".$deleteEventSth->errstr());
       }
     }
   }
@@ -655,42 +683,42 @@ if ( $level > 1 ) {
 # Remove empty events (with no frames)
   $cleaned = 0;
   Debug("Checking for Events with no Frames");
-  my $selectEmptyEventsSql = 'SELECT E.Id AS Id, E.StartTime, F.EventId FROM Events as E LEFT JOIN Frames as F ON (E.Id = F.EventId)
-    WHERE isnull(F.EventId) AND now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second > E.StartTime';
+  my $selectEmptyEventsSql = 'SELECT `E`.`Id` AS `Id`, `E`.`StartTime`, `F`.`EventId` FROM `Events` AS E LEFT JOIN `Frames` AS F ON (`E`.`Id` = `F`.`EventId`)
+    WHERE isnull(`F`.`EventId`) AND now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second > `E`.`StartTime`';
   if ( my $selectEmptyEventsSth = $dbh->prepare_cached( $selectEmptyEventsSql ) ) {
     if ( $res = $selectEmptyEventsSth->execute() ) {
       while( my $event = $selectEmptyEventsSth->fetchrow_hashref() ) {
-        aud_print( "Found empty event with no frame records '$event->{Id}' at $$event{StartTime}" );
+        aud_print("Found empty event with no frame records '$event->{Id}' at $$event{StartTime}");
         if ( confirm() ) {
-          if ( $res = $deleteEventSth->execute( $event->{Id} ) ) {
+          if ( $res = $deleteEventSth->execute($event->{Id}) ) {
             $cleaned = 1;
           } else {
-            Error( "Can't execute: ".$deleteEventSth->errstr() );
+            Error("Can't execute: ".$deleteEventSth->errstr());
           }
         }
       } # end foreach row
     } else {
-      Error( "Can't execute: ".$selectEmptyEventsSth->errstr() );
+      Error("Can't execute: ".$selectEmptyEventsSth->errstr());
     }
   } else {
-    Error( "Can't prepare '$selectEmptyEventsSql': ".$dbh->errstr() );
+    Error("Can't prepare '$selectEmptyEventsSql': ".$dbh->errstr());
   }
   redo MAIN if $cleaned;
 
 # Remove orphaned frame records
   $cleaned = 0;
-  Debug("Checking for Orphaned Frames");
-  my $selectOrphanedFramesSql = 'SELECT DISTINCT EventId FROM Frames
-    WHERE (SELECT COUNT(*) FROM Events WHERE Events.Id=EventId)=0';
+  Debug('Checking for Orphaned Frames');
+  my $selectOrphanedFramesSql = 'SELECT DISTINCT `EventId` FROM `Frames`
+    WHERE (SELECT COUNT(*) FROM `Events` WHERE `Events`.`Id`=`EventId`)=0';
   my $selectOrphanedFramesSth = $dbh->prepare_cached( $selectOrphanedFramesSql )
-    or Fatal( "Can't prepare '$selectOrphanedFramesSql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$selectOrphanedFramesSql': ".$dbh->errstr());
   $res = $selectOrphanedFramesSth->execute()
-    or Fatal( "Can't execute: ".$selectOrphanedFramesSth->errstr() );
+    or Fatal("Can't execute: ".$selectOrphanedFramesSth->errstr());
   while( my $frame = $selectOrphanedFramesSth->fetchrow_hashref() ) {
-    aud_print( "Found orphaned frame records for event '$frame->{EventId}'" );
+    aud_print("Found orphaned frame records for event '$frame->{EventId}'");
     if ( confirm() ) {
-      $res = $deleteFramesSth->execute( $frame->{EventId} )
-        or Fatal( "Can't execute: ".$deleteFramesSth->errstr() );
+      $res = $deleteFramesSth->execute($frame->{EventId})
+        or Fatal("Can't execute: ".$deleteFramesSth->errstr());
       $cleaned = 1;
     }
   }
@@ -699,18 +727,18 @@ if ( $level > 1 ) {
 if ( $level > 1 ) {
 # Remove orphaned stats records
   $cleaned = 0;
-  Debug("Checking for Orphaned Stats");
-  my $selectOrphanedStatsSql = 'SELECT DISTINCT EventId FROM Stats
-    WHERE EventId NOT IN (SELECT Id FROM Events)';
+  Debug('Checking for Orphaned Stats');
+  my $selectOrphanedStatsSql = 'SELECT DISTINCT `EventId` FROM `Stats`
+    WHERE `EventId` NOT IN (SELECT `Id` FROM `Events`)';
   my $selectOrphanedStatsSth = $dbh->prepare_cached( $selectOrphanedStatsSql )
-    or Fatal( "Can't prepare '$selectOrphanedStatsSql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$selectOrphanedStatsSql': ".$dbh->errstr());
   $res = $selectOrphanedStatsSth->execute()
-    or Fatal( "Can't execute: ".$selectOrphanedStatsSth->errstr() );
+    or Fatal("Can't execute: ".$selectOrphanedStatsSth->errstr());
   while( my $stat = $selectOrphanedStatsSth->fetchrow_hashref() ) {
-    aud_print( "Found orphaned statistic records for event '$stat->{EventId}'" );
+    aud_print("Found orphaned statistic records for event '$stat->{EventId}'");
     if ( confirm() ) {
       $res = $deleteStatsSth->execute( $stat->{EventId} )
-        or Fatal( "Can't execute: ".$deleteStatsSth->errstr() );
+        or Fatal("Can't execute: ".$deleteStatsSth->errstr());
       $cleaned = 1;
     }
   }
@@ -732,44 +760,44 @@ if ( $level > 1 ) {
 #WHERE isnull(E.Frames) or isnull(E.EndTime)
 #GROUP BY E.Id HAVING EndTime < (now() - interval ".$Config{ZM_AUDIT_MIN_AGE}.' second)'
 #;
-    'SELECT *, unix_timestamp(StartTime) AS TimeStamp FROM Events WHERE EndTime IS NULL AND StartTime < (now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second)';
+    'SELECT *, unix_timestamp(`StartTime`) AS `TimeStamp` FROM `Events` WHERE `EndTime` IS NULL AND `StartTime` < (now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second)'.($monitor_id?' AND MonitorId=?':'');
 
   my $selectFrameDataSql = '
 SELECT
-  max(TimeStamp) as EndTime,
-  unix_timestamp(max(TimeStamp)) AS EndTimeStamp,
-  max(FrameId) as Frames,
-  count(if(Score>0,1,NULL)) as AlarmFrames,
-  sum(Score) as TotScore,
-  max(Score) as MaxScore
-FROM Frames WHERE EventId=?';
+  max(`TimeStamp`) AS `EndTime`,
+  unix_timestamp(max(`TimeStamp`)) AS `EndTimeStamp`,
+  max(`FrameId`) AS `Frames`,
+  count(if(`Score`>0,1,NULL)) AS `AlarmFrames`,
+  sum(`Score`) AS `TotScore`,
+  max(`Score`) AS `MaxScore`
+FROM `Frames` WHERE `EventId`=?';
   my $selectFrameDataSth = $dbh->prepare_cached($selectFrameDataSql)
-    or Fatal( "Can't prepare '$selectFrameDataSql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$selectFrameDataSql': ".$dbh->errstr());
 
-  my $selectUnclosedEventsSth = $dbh->prepare_cached( $selectUnclosedEventsSql )
-    or Fatal( "Can't prepare '$selectUnclosedEventsSql': ".$dbh->errstr() );
+  my $selectUnclosedEventsSth = $dbh->prepare_cached($selectUnclosedEventsSql)
+    or Fatal("Can't prepare '$selectUnclosedEventsSql': ".$dbh->errstr());
   my $updateUnclosedEventsSql =
-    "UPDATE low_priority Events
-    SET Name = ?,
-        EndTime = ?,
-        Length = ?,
-        Frames = ?,
-        AlarmFrames = ?,
-        TotScore = ?,
-        AvgScore = ?,
-        MaxScore = ?,
-        Notes = concat_ws( ' ', Notes, ? )
-          WHERE Id = ?"
+    "UPDATE low_priority `Events`
+    SET `Name` = ?,
+        `EndTime` = ?,
+        `Length` = ?,
+        `Frames` = ?,
+        `AlarmFrames` = ?,
+        `TotScore` = ?,
+        `AvgScore` = ?,
+        `MaxScore` = ?,
+        `Notes` = concat_ws( ' ', `Notes`, ? )
+          WHERE `Id` = ?"
           ;
   my $updateUnclosedEventsSth = $dbh->prepare_cached( $updateUnclosedEventsSql )
-    or Fatal( "Can't prepare '$updateUnclosedEventsSql': ".$dbh->errstr() );
-  $res = $selectUnclosedEventsSth->execute()
-    or Fatal( "Can't execute: ".$selectUnclosedEventsSth->errstr() );
+    or Fatal("Can't prepare '$updateUnclosedEventsSql': ".$dbh->errstr());
+  $res = $selectUnclosedEventsSth->execute($monitor_id?$monitor_id:())
+    or Fatal("Can't execute: ".$selectUnclosedEventsSth->errstr());
   while( my $event = $selectUnclosedEventsSth->fetchrow_hashref() ) {
-    aud_print( "Found open event '$event->{Id}' on Monitor $event->{MonitorId} at $$event{StartTime}" );
-    if ( confirm( 'close', 'closing' ) ) {
+    aud_print("Found open event '$event->{Id}' on Monitor $event->{MonitorId} at $$event{StartTime}");
+    if ( confirm('close', 'closing') ) {
       if ( ! ( $res = $selectFrameDataSth->execute($event->{Id}) ) ) {
-        Error( "Can't execute: $selectFrameDataSql:".$selectFrameDataSth->errstr() );
+        Error("Can't execute: $selectFrameDataSql:".$selectFrameDataSth->errstr());
         next;
       }
       my $frame = $selectFrameDataSth->fetchrow_hashref();
@@ -792,7 +820,7 @@ FROM Frames WHERE EventId=?';
            $frame->{MaxScore},
            RECOVER_TEXT,
            $event->{Id}
-          ) or Error( 'Can\'t execute: '.$updateUnclosedEventsSth->errstr() );
+          ) or Error('Can\'t execute: '.$updateUnclosedEventsSth->errstr());
       } else {
         Error('SHOULD DELETE');
       } # end if has frame data
@@ -802,7 +830,7 @@ FROM Frames WHERE EventId=?';
 
 # Now delete any old image files
   if ( my @old_files = grep { -M > $max_image_age } <$image_path/*.{jpg,gif,wbmp}> ) {
-    aud_print( 'Deleting '.int(@old_files)." old images\n" );
+    aud_print('Deleting '.int(@old_files)." old images\n");
     my $untainted_old_files = join( ';', @old_files );
     ( $untainted_old_files ) = ( $untainted_old_files =~ /^(.*)$/ );
     unlink( split( /;/, $untainted_old_files ) );
@@ -816,21 +844,21 @@ FROM Frames WHERE EventId=?';
   if ( $Config{ZM_LOG_DATABASE_LIMIT} ) {
     if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^\d+$/ ) {
       # Number of rows
-      my $selectLogRowCountSql = 'SELECT count(*) AS Rows FROM Logs';
+      my $selectLogRowCountSql = 'SELECT count(*) AS `Rows` FROM `Logs`';
       my $selectLogRowCountSth = $dbh->prepare_cached( $selectLogRowCountSql )
-        or Fatal( "Can't prepare '$selectLogRowCountSql': ".$dbh->errstr() );
+        or Fatal("Can't prepare '$selectLogRowCountSql': ".$dbh->errstr());
       $res = $selectLogRowCountSth->execute()
-        or Fatal( "Can't execute: ".$selectLogRowCountSth->errstr() );
+        or Fatal("Can't execute: ".$selectLogRowCountSth->errstr());
       my $row = $selectLogRowCountSth->fetchrow_hashref();
       my $logRows = $row->{Rows};
       if ( $logRows > $Config{ZM_LOG_DATABASE_LIMIT} ) {
-        my $deleteLogByRowsSql = 'DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?';
+        my $deleteLogByRowsSql = 'DELETE low_priority FROM `Logs` ORDER BY `TimeKey` ASC LIMIT ?';
         my $deleteLogByRowsSth = $dbh->prepare_cached( $deleteLogByRowsSql )
-          or Fatal( "Can't prepare '$deleteLogByRowsSql': ".$dbh->errstr() );
+          or Fatal("Can't prepare '$deleteLogByRowsSql': ".$dbh->errstr());
         $res = $deleteLogByRowsSth->execute( $logRows - $Config{ZM_LOG_DATABASE_LIMIT} )
-          or Fatal( "Can't execute: ".$deleteLogByRowsSth->errstr() );
+          or Fatal("Can't execute: ".$deleteLogByRowsSth->errstr());
         if ( $deleteLogByRowsSth->rows() ) {
-          aud_print( 'Deleted '.$deleteLogByRowsSth->rows() ." log table entries by count\n" );
+          aud_print('Deleted '.$deleteLogByRowsSth->rows() ." log table entries by count\n");
         }
       }
     } else {
@@ -843,67 +871,67 @@ FROM Frames WHERE EventId=?';
       my $deleted_rows;
       do {
         my $deleteLogByTimeSql =
-        'DELETE FROM Logs
-        WHERE TimeKey < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 10';
+        'DELETE FROM `Logs`
+        WHERE `TimeKey` < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 10';
         my $deleteLogByTimeSth = $dbh->prepare_cached( $deleteLogByTimeSql )
-          or Fatal( "Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr() );
+          or Fatal("Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr());
         $res = $deleteLogByTimeSth->execute()
-          or Fatal( "Can't execute: ".$deleteLogByTimeSth->errstr() );
+          or Fatal("Can't execute: ".$deleteLogByTimeSth->errstr());
         $deleted_rows = $deleteLogByTimeSth->rows();
-        aud_print( "Deleted $deleted_rows log table entries by time\n" );
+        aud_print("Deleted $deleted_rows log table entries by time\n");
       } while ( $deleted_rows );
     }
   } # end if ZM_LOG_DATABASE_LIMIT
   $loop = $continuous;
 
-  my $eventcounts_sql = q`
-  UPDATE Monitors SET
-  TotalEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id),
-  TotalEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND DiskSpace IS NOT NULL),
-  ArchivedEvents=(SELECT COUNT(Id) FROM Events WHERE MonitorId=Monitors.Id AND Archived=1),
-  ArchivedEventDiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE MonitorId=Monitors.Id AND Archived=1 AND DiskSpace IS NOT NULL)
-  `;
+  my $eventcounts_sql = '
+  UPDATE `Monitors` SET
+  `TotalEvents`=(SELECT COUNT(`Id`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id`),
+  `TotalEventDiskSpace`=(SELECT SUM(`DiskSpace`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id` AND `DiskSpace` IS NOT NULL),
+  `ArchivedEvents`=(SELECT COUNT(`Id`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id` AND `Archived`=1),
+  `ArchivedEventDiskSpace`=(SELECT SUM(`DiskSpace`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id` AND `Archived`=1 AND `DiskSpace` IS NOT NULL)
+  ';
 
   my $eventcounts_sth = $dbh->prepare_cached( $eventcounts_sql );
   $eventcounts_sth->execute();
   $eventcounts_sth->finish();
 
-  my $eventcounts_hour_sql = q`
-  UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId, COUNT(*) AS HourEvents, SUM(COALESCE(DiskSpace,0)) AS HourEventDiskSpace
-  FROM Events_Hour GROUP BY MonitorId
-  ) AS E ON E.MonitorId=Monitors.Id SET
-  Monitors.HourEvents = E.HourEvents,
-  Monitors.HourEventDiskSpace = E.HourEventDiskSpace
-  `;
+  my $eventcounts_hour_sql = '
+  UPDATE `Monitors` INNER JOIN (
+  SELECT  `MonitorId`, COUNT(*) AS `HourEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `HourEventDiskSpace`
+  FROM `Events_Hour` GROUP BY `MonitorId`
+  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
+  `Monitors`.`HourEvents` = `E`.`HourEvents`,
+  `Monitors`.`HourEventDiskSpace` = `E`.`HourEventDiskSpace`
+  ';
 
 
-  my $eventcounts_day_sql = q`
-  UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId, COUNT(*) AS DayEvents, SUM(COALESCE(DiskSpace,0)) AS DayEventDiskSpace
-  FROM Events_Day GROUP BY MonitorId
-  ) AS E ON E.MonitorId=Monitors.Id SET
-  Monitors.DayEvents = E.DayEvents,
-  Monitors.DayEventDiskSpace = E.DayEventDiskSpace
-  `;
+  my $eventcounts_day_sql = '
+  UPDATE `Monitors` INNER JOIN (
+  SELECT  `MonitorId`, COUNT(*) AS `DayEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `DayEventDiskSpace`
+  FROM `Events_Day` GROUP BY `MonitorId`
+  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
+  `Monitors`.`DayEvents` = `E`.`DayEvents`,
+  `Monitors`.`DayEventDiskSpace` = `E`.`DayEventDiskSpace`
+  ';
 
-  my $eventcounts_week_sql = q`
-  UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId, COUNT(*) AS WeekEvents, SUM(COALESCE(DiskSpace,0)) AS WeekEventDiskSpace
-  FROM Events_Week GROUP BY MonitorId
-  ) AS E ON E.MonitorId=Monitors.Id SET
-  Monitors.WeekEvents = E.WeekEvents,
-  Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace
-  `;
+  my $eventcounts_week_sql = '
+  UPDATE `Monitors` INNER JOIN (
+  SELECT  `MonitorId`, COUNT(*) AS `WeekEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `WeekEventDiskSpace`
+  FROM `Events_Week` GROUP BY `MonitorId`
+  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
+  `Monitors`.`WeekEvents` = `E`.`WeekEvents`,
+  `Monitors`.`WeekEventDiskSpace` = `E`.`WeekEventDiskSpace`
+  ';
 
-  my $eventcounts_month_sql = q`
-  UPDATE Monitors INNER JOIN (
-  SELECT  MonitorId, COUNT(*) AS MonthEvents, SUM(COALESCE(DiskSpace,0)) AS MonthEventDiskSpace
-  FROM Events_Month GROUP BY MonitorId
-  ) AS E ON E.MonitorId=Monitors.Id SET
-  Monitors.MonthEvents = E.MonthEvents,
-  Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace
-  `;
+  my $eventcounts_month_sql = '
+  UPDATE `Monitors` INNER JOIN (
+  SELECT  `MonitorId`, COUNT(*) AS `MonthEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `MonthEventDiskSpace`
+  FROM `Events_Month` GROUP BY `MonitorId`
+  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
+  `Monitors`.`MonthEvents` = `E`.`MonthEvents`,
+  `Monitors`.`MonthEventDiskSpace` = `E`.`MonthEventDiskSpace`
+  ';
   my $eventcounts_hour_sth = $dbh->prepare_cached($eventcounts_hour_sql);
   my $eventcounts_day_sth = $dbh->prepare_cached($eventcounts_day_sql);
   my $eventcounts_week_sth = $dbh->prepare_cached($eventcounts_week_sql);
@@ -912,6 +940,10 @@ FROM Frames WHERE EventId=?';
   $eventcounts_day_sth->execute() or Error("Can't execute: ".$eventcounts_sth->errstr());
   $eventcounts_week_sth->execute() or Error("Can't execute: ".$eventcounts_sth->errstr());
   $eventcounts_month_sth->execute() or Error("Can't execute: ".$eventcounts_sth->errstr());
+
+  my $storage_diskspace_sth = $dbh->prepare_cached('UPDATE Storage SET DiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=Storage.Id)');
+  $storage_diskspace_sth->execute() or Error("Can't execute: ".$storage_diskspace_sth->errstr());
+
   sleep($Config{ZM_AUDIT_CHECK_INTERVAL}) if $continuous;
 };
 
@@ -1027,6 +1059,7 @@ sub delete_empty_directories {
   } 
 } # end sub delete_empty_directories
 
+# The idea is that the youngest file in the event directory gives us the event starttime
 sub time_of_youngest_file {
   my $dir = shift;
 
@@ -1035,14 +1068,13 @@ sub time_of_youngest_file {
     return;
   }
   my $youngest = (stat($dir))[9];
-  Debug("stat of $dir is $youngest");
+  Debug("stat of dir $dir is $youngest");
   foreach my $file ( readdir( DIR ) ) {
     next if $file =~ /^\./;
     $_ = (stat($dir))[9];
     $youngest = $_ if $_ and ( $_ < $youngest );
-    #Debug("stat of $dir is $_ < $youngest");
+    Debug("Found younger file $file at $youngest");
   }
-  Debug("stat of $dir is $youngest");
   return $youngest;
 } # end sub time_of_youngest_file
 
diff --git a/scripts/zmcamtool.pl.in b/scripts/zmcamtool.pl.in
index e26aca8a6..3d68b1408 100644
--- a/scripts/zmcamtool.pl.in
+++ b/scripts/zmcamtool.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -351,8 +351,14 @@ sub exportsql {
     }
   }
 
-  if ($ARGV[0]) {
-    $command .= qq( --where="Name = '$ARGV[0]'");
+  my $name = $ARGV[0];
+  if ( $name ) {
+		if ( $name =~ /^([A-Za-z0-9 ,.&()\/\-]+)$/ ) { # Allow alphanumeric and " ,.&()/-"
+			$name = $1;
+			$command .= qq( --where="Name = '$name'");
+		} else {
+			print "Invalid characters in Name\n";
+		}
   }
 
   $command .= " zm Controls MonitorPresets";
diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index 1ac21f0ea..c9a548eef 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -29,7 +29,7 @@ use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 use POSIX qw/strftime EPIPE/;
 use Socket;
-#use Data::Dumper;
+use Data::Dumper;
 use Module::Load::Conditional qw{can_load};
 
 use constant MAX_CONNECT_DELAY => 15;
@@ -41,8 +41,6 @@ $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
-logInit();
-
 my $arg_string = join(' ', @ARGV);
 
 my $id;
@@ -51,9 +49,9 @@ my %options;
 GetOptions(
   'id=i'          =>\$id,
   'command=s'     =>\$options{command},
-  'xcoord=i'      =>\$options{xcoord},
-  'ycoord=i'      =>\$options{ycoord},
-  'speed=i'       =>\$options{speed},
+  'xcoord=f'      =>\$options{xcoord},
+  'ycoord=f'      =>\$options{ycoord},
+  'speed=f'       =>\$options{speed},
   'step=i'        =>\$options{step},
   'panspeed=i'    =>\$options{panspeed},
   'tiltspeed=i'   =>\$options{tiltspeed},
@@ -69,6 +67,7 @@ if ( !$id ) {
 }
 
 ( $id ) = $id =~ /^(\w+)$/;
+logInit($id?(id=>'zmcontrol_'.$id):());
 
 my $sock_file = $Config{ZM_PATH_SOCKS}.'/zmcontrol-'.$id.'.sock';
 Debug("zmcontrol: arg string: $arg_string sock file $sock_file");
@@ -83,8 +82,8 @@ if ( $options{command} ) {
   my $tries = 10;
   my $server_up;
   while ( $tries and ! ( $server_up = connect(CLIENT, $saddr) ) ) {
-    Debug("Failed to connect to $server_up at $sock_file");
-    runCommand("zmdc.pl start zmcontrol.pl --id=$id");
+    Debug("Failed to connect to zmcontrol server at $sock_file");
+    runCommand("zmdc.pl start zmcontrol.pl --id $id");
     sleep 1;
     $tries -= 1;
   }
@@ -109,6 +108,9 @@ if ( $options{command} ) {
     Fatal("Unable to load control data for monitor $id");
   }
   my $protocol = $monitor->{Protocol};
+  if ( !$protocol ) {
+    Fatal('No protocol is set in monitor. Please edit the monitor, edit control type, select the control capability and fill in the Protocol field');
+  }
 
   if ( -x $protocol ) {
     # Protocol is actually a script!
@@ -140,9 +142,9 @@ if ( $options{command} ) {
     .strftime('%y/%m/%d %H:%M:%S', localtime())
   );
 
-  $0 = $0." --id=$id";
+  $0 = $0.' --id '.$id;
 
-  my $control = "ZoneMinder::Control::$protocol"->new($id);
+  my $control = ('ZoneMinder::Control::'.$protocol)->new($id);
   my $control_key = $control->getKey();
   $control->loadMonitor();
 
@@ -174,14 +176,17 @@ if ( $options{command} ) {
         next if !$message;
 
         my $params = jsonDecode($message);
-        #Debug( Dumper( $params ) );
+        Debug( Dumper( $params ) );
 
         my $command = $params->{command};
-        close( CLIENT );
+        close(CLIENT);
         if ( $command eq 'quit' ) {
           last;
+        } elsif ( $command ) {
+          $control->$command($params);
+        } else {
+          Warning("No command in $message");
         }
-        $control->$command($params);
       } else {
         Fatal('Bogus descriptor');
       }
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 596517b4b..dd9cb0578 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -160,19 +160,20 @@ if ( !$server_up ) {
     use ZoneMinder::Server qw(CpuLoad);
     if ( ! defined $dbh->do(q{UPDATE Servers SET Status=?,TotalMem=?,FreeMem=?,TotalSwap=?,FreeSwap=? WHERE Id=?}, undef,
           'NotRunning', &totalmem, &freemem, &totalswap, &freeswap, $Config{ZM_SERVER_ID} ) ) {
-      Error("Failed Updating status of Server record to Not RUnning for Id=$Config{ZM_SERVER_ID}" . $dbh->errstr());
+      Error('Failed Updating status of Server record to Not Running for Id='.$Config{ZM_SERVER_ID}.': '.$dbh->errstr());
     }
   }
 # Server is not up.  Some commands can still be handled
   if ( $command eq 'logrot' ) {
     # If server is not running, then logrotate doesn't need to do anything.
+    Debug('Server is not running, logrotate doesn\'t need to do anything');
     exit();
   }
   if ( $command eq 'check' ) {
     print("stopped\n");
     exit();
   } elsif ( $command ne 'startup' ) {
-    print("Unable to connect to server using socket at " . SOCK_FILE . "\n");
+    print('Unable to connect to server using socket at '.SOCK_FILE."\n");
     exit(-1);
   }
 
@@ -188,10 +189,10 @@ if ( !$server_up ) {
 
     socket(CLIENT, PF_UNIX, SOCK_STREAM, 0) or Fatal("Can't open socket: $!");
     my $attempts = 0;
-    while( !connect(CLIENT, $saddr) ) {
+    while ( !connect(CLIENT, $saddr) ) {
       $attempts++;
-      Debug("Waiting for zmdc.pl server process at ".SOCK_FILE.", attempt $attempts");
-      Fatal("Can't connect: $!") if $attempts > MAX_CONNECT_DELAY;
+      Debug('Waiting for zmdc.pl server process at '.SOCK_FILE.', attempt '.$attempts);
+      Fatal('Can\'t connect to zmdc.pl server process at '.SOCK_FILE.': '.$!) if $attempts > MAX_CONNECT_DELAY;
       usleep(200000);
     } # end while
   } elsif ( defined($cpid) ) {
@@ -254,16 +255,17 @@ sub run {
     close($PID);
   } else {
     # Log not initialized at this point so use die instead
-    die "Can't open pid file at ".ZM_PID."\n";
+    die 'Can\'t open pid file at '.ZM_PID."\n";
   }
 
   my $fd = 0;
 
   # This also closes dbh and CLIENT and SERVER
-  while( $fd < POSIX::sysconf(&POSIX::_SC_OPEN_MAX) ) {
+  while ( $fd < POSIX::sysconf(&POSIX::_SC_OPEN_MAX) ) {
     POSIX::close($fd++);
   }
 
+  # Sets a process group, so that signals to go this and it's children I think
   setpgrp();
 
   # dbh got closed with the rest of the fd's above, so need to reconnect.
@@ -283,7 +285,7 @@ sub run {
   dPrint(ZoneMinder::Logger::INFO, 'Socket should be open at ' .main::SOCK_FILE);
   socket(SERVER, PF_UNIX, SOCK_STREAM, 0) or Fatal("Can't open socket: $!");
   unlink(main::SOCK_FILE) or Error('Unable to unlink ' . main::SOCK_FILE .". Error message was: $!") if -e main::SOCK_FILE;
-  bind(SERVER, $saddr) or Fatal("Can't bind to " . main::SOCK_FILE . ": $!");
+  bind(SERVER, $saddr) or Fatal('Can\'t bind to ' . main::SOCK_FILE . ": $!");
   listen(SERVER, SOMAXCONN) or Fatal("Can't listen: $!");
 
   $SIG{CHLD} = \&chld_sig_handler;
@@ -299,19 +301,20 @@ sub run {
   my $timeout = 1;
   my $secs_count = 0;
 
-  while( !$zm_terminate ) {
+  while ( !$zm_terminate ) {
     
     if ( $Config{ZM_SERVER_ID} ) {
       if ( ! ( $secs_count % 60 ) ) {
         while ( (!$zm_terminate) and !($dbh and $dbh->ping()) ) {
           Warning("Not connected to db ($dbh)".($dbh?' ping('.$dbh->ping().')':''). ($DBI::errstr?" errstr($DBI::errstr)":'').' Reconnecting');
           $dbh = zmDbConnect();
+          sleep 10 if !$dbh;
         }
         last if $zm_terminate;
 
         my @cpuload = CpuLoad();
         Debug("Updating Server record @cpuload");
-        if ( ! defined $dbh->do(q{UPDATE Servers SET Status=?,CpuLoad=?,TotalMem=?,FreeMem=?,TotalSwap=?,FreeSwap=? WHERE Id=?}, undef,
+        if ( ! defined $dbh->do('UPDATE Servers SET Status=?,CpuLoad=?,TotalMem=?,FreeMem=?,TotalSwap=?,FreeSwap=? WHERE Id=?', undef,
             'Running', $cpuload[0], &totalmem, &freemem, &totalswap, &freeswap, $Config{ZM_SERVER_ID} ) ) {
           Error("Failed Updating status of Server record for Id=$Config{ZM_SERVER_ID} :".$dbh->errstr());
         }
@@ -513,7 +516,6 @@ sub send_stop {
 
   my $command = $process->{command};
   if ( $process->{pending} ) {
-
     delete $cmd_hash{$command};
     dPrint(ZoneMinder::Logger::INFO, "Command '$command' removed from pending list at "
         .strftime('%y/%m/%d %H:%M:%S', localtime())
@@ -606,8 +608,11 @@ sub restart {
     start($daemon, @args);
     return;
   }
-  # Start will be handled by the reaper
-  send_stop(0, $process);
+  # Start will be handled by the reaper...
+  # unless it was already pending in which case send_stop will return () so we should start it
+  if ( !send_stop(0, $process) ) {
+    start($daemon, @args);
+  }
   return;
 }
 
@@ -628,8 +633,11 @@ sub logrot {
   logReinit();
   foreach my $process ( values %pid_hash ) {
     if ( $process->{pid} ) {
+      Debug("Hupping $$process{command} at $$process{pid}");
       # && $process->{command} =~ /^zm.*\.pl/ ) {
       kill('HUP', $process->{pid});
+    } else {
+      Debug("Not Hupping $$process{command}");
     }
   }
 }
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 074cba1b5..5ff316078 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -175,10 +175,14 @@ my $dbh = zmDbConnect();
 
 if ( $filter_name ) {
   Info("Scanning for events using filter '$filter_name'");
-} elsif ( $filter_id ) {
-  Info("Scanning for events using filter id '$filter_id'");
+} elsif ( defined($filter_id) ) {
+  if ( $filter_id ) {
+    Info("Scanning for events using filter id '$filter_id'");
+  } else {
+    Fatal('No filter_id specified');
+  }
 } else {
-  Info("Scanning for events using all filters");
+  Info('Scanning for events using all filters');
 }
 
 if ( ! ( $filter_name or $filter_id ) ) {
@@ -192,7 +196,7 @@ my $last_action = 0;
 while( !$zm_terminate ) {
   my $now = time;
   if ( ($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY} ) {
-    Debug("Reloading filters");
+    Debug('Reloading filters');
     $last_action = $now;
     @filters = getFilters({ Name=>$filter_name, Id=>$filter_id });
   }
@@ -221,27 +225,27 @@ sub getFilters {
   my @sql_values;
 
   my @filters;
-  my $sql = 'SELECT * FROM Filters WHERE';
+  my $sql = 'SELECT * FROM `Filters` WHERE';
   if ( $$sql_filters{Name} ) {
-    $sql .= ' Name = ? AND';
+    $sql .= ' `Name` = ? AND';
     push @sql_values, $$sql_filters{Name};
   } elsif ( $$sql_filters{Id} ) {
-    $sql .= ' Id = ? AND';
+    $sql .= ' `Id` = ? AND';
     push @sql_values, $$sql_filters{Id};
   } else {
-    $sql .= ' Background = 1 AND';
+    $sql .= ' `Background` = 1 AND';
   }
-  $sql .= '( AutoArchive = 1
-    or AutoVideo = 1
-    or AutoUpload = 1
-    or AutoEmail = 1
-    or AutoMessage = 1
-    or AutoExecute = 1
-    or AutoDelete = 1
-    or UpdateDiskSpace = 1
-    or AutoMove = 1
-    or AutoCopy = 1
-    ) ORDER BY Name';
+  $sql .= '( `AutoArchive` = 1
+    or `AutoVideo` = 1
+    or `AutoUpload` = 1
+    or `AutoEmail` = 1
+    or `AutoMessage` = 1
+    or `AutoExecute` = 1
+    or `AutoDelete` = 1
+    or `UpdateDiskSpace` = 1
+    or `AutoMove` = 1
+    or `AutoCopy` = 1
+    ) ORDER BY `Name`';
   my $sth = $dbh->prepare_cached($sql)
     or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
   my $res = $sth->execute(@sql_values)
@@ -252,7 +256,7 @@ FILTER: while( my $db_filter = $sth->fetchrow_hashref() ) {
     # The undef here is to make sure the Sql gets regenerated because the Filter object may be cached
     my $filter_sql = $filter->Sql(undef);
 
-    if ( ! $filter_sql ) {
+    if ( !$filter_sql ) {
       Error("Error parsing Sql. skipping filter '$db_filter->{Name}'");
       next FILTER;
     }
@@ -301,7 +305,7 @@ sub checkFilter {
     if ( $filter->{AutoArchive} ) {
       Info("Archiving event $Event->{Id}");
       # Do it individually to avoid locking up the table for new events
-      my $sql = 'UPDATE Events SET Archived = 1 WHERE Id = ?';
+      my $sql = 'UPDATE `Events` SET `Archived` = 1 WHERE `Id` = ?';
       my $sth = $dbh->prepare_cached($sql)
         or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
       my $res = $sth->execute($Event->{Id})
@@ -434,7 +438,7 @@ sub generateVideo {
     }
     return 0;
   } else {
-    my $sql = 'UPDATE Events SET Videoed = 1 WHERE Id = ?';
+    my $sql = 'UPDATE `Events` SET `Videoed` = 1 WHERE `Id` = ?';
     my $sth = $dbh->prepare_cached($sql)
       or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
     my $res = $sth->execute($Event->{Id})
@@ -527,7 +531,7 @@ sub uploadArchFile {
       Debug("Adding $imageFile");
       my $member = $zip->addFile($imageFile);
       if ( !$member ) {
-        Error("Unable toto add image file $imageFile to zip archive $archLocPath");
+        Error("Unable to add image file $imageFile to zip archive $archLocPath");
         $archError = 1;
         last;
       }
@@ -619,7 +623,7 @@ sub uploadArchFile {
         or Error("SFTP - Unable to upload '$archLocPath': ".$sftp->error);
     }
     unlink($archLocPath);
-    my $sql = 'UPDATE Events SET Uploaded = 1 WHERE Id = ?';
+    my $sql = 'UPDATE `Events` SET `Uploaded` = 1 WHERE `Id` = ?';
     my $sth = $dbh->prepare_cached($sql)
       or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
     my $res = $sth->execute($Event->{Id})
@@ -647,12 +651,10 @@ sub substituteTags {
   my $max_alarm_frame;
   my $max_alarm_score = 0;
   if ( $need_images ) {
-    my $sql = q`SELECT * FROM Frames
-      WHERE EventId = ? AND Type = 'Alarm'
-      ORDER BY FrameId`;
+    my $sql = 'SELECT * FROM `Frames` WHERE `EventId`=? AND `Type`=? ORDER BY `FrameId`';
     my $sth = $dbh->prepare_cached($sql)
       or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
-    my $res = $sth->execute($Event->{Id})
+    my $res = $sth->execute($Event->{Id},'Alarm')
       or Fatal("Unable to execute '$sql': ".$dbh->errstr());
     my $rows = 0;
     while( my $frame = $sth->fetchrow_hashref() ) {
@@ -689,6 +691,7 @@ sub substituteTags {
   $text =~ s/%EC%/$Event->{Cause}/g;
   $text =~ s/%ED%/$Event->{Notes}/g;
   $text =~ s/%ET%/$Event->{StartTime}/g;
+  $text =~ s/%EVF%/$$Event{DefaultVideo}/g; # Event video filename
   $text =~ s/%EL%/$Event->{Length}/g;
   $text =~ s/%EF%/$Event->{Frames}/g;
   $text =~ s/%EFA%/$Event->{AlarmFrames}/g;
@@ -697,8 +700,10 @@ sub substituteTags {
   $text =~ s/%ESM%/$Event->{MaxScore}/g;
 
   if ( $first_alarm_frame ) {
-    $text =~ s/%EPI1%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
-    $text =~ s/%EPIM%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
+    $text =~ s/%EPF1%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
+    $text =~ s/%EPFM%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
+    $text =~ s/%EPI1%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
+    $text =~ s/%EPIM%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
     if ( $attachments_ref ) {
       if ( $text =~ s/%EI1%//g ) {
         my $path = generateImage($Event, $first_alarm_frame);
@@ -746,13 +751,14 @@ sub substituteTags {
         }
       }
 
-      if ( $text =~ s/%EIMOD%//g ) {
-        $text =~ s/%EIMOD%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
+      if ( $text =~ s/%EIMOD%//g or $text =~ s/%EFMOD%//g ) {
+        $text =~ s/%EFMOD%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
+        $text =~ s/%EIMOD%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
         my $path = $Event->Path().'/objdetect.jpg';
         if ( -e $path ) {
           push @$attachments_ref, { type=>'image/jpeg', path=>$path };
         } else {
-          Warning('No image for EIMOD at ' . $path);
+          Warning('No image for MOD at '.$path);
         }
       }
 
@@ -794,17 +800,17 @@ sub sendEmail {
     Error('No from email address defined, not sending email');
     return 0;
   }
-  if ( ! $Config{ZM_EMAIL_ADDRESS} ) {
+  if ( ! $$filter{EmailTo} ) {
     Error('No email address defined, not sending email');
     return 0;
   }
 
   Info('Creating notification email');
 
-  my $subject = substituteTags($Config{ZM_EMAIL_SUBJECT}, $filter, $Event);
+  my $subject = substituteTags($$filter{EmailSubject}, $filter, $Event);
   return 0 if !$subject;
   my @attachments;
-  my $body = substituteTags($Config{ZM_EMAIL_BODY}, $filter, $Event, \@attachments);
+  my $body = substituteTags($$filter{EmailBody}, $filter, $Event, \@attachments);
   return 0 if !$body;
 
   Info("Sending notification email '$subject'");
@@ -814,7 +820,7 @@ sub sendEmail {
 ### Create the multipart container
       my $mail = MIME::Lite->new (
           From => $Config{ZM_FROM_EMAIL},
-          To => $Config{ZM_EMAIL_ADDRESS},
+          To => $$filter{EmailTo},
           Subject => $subject,
           Type => 'multipart/mixed'
           );
@@ -824,14 +830,20 @@ sub sendEmail {
           Data => $body
           );
 ### Add the attachments
+      my $total_size = 0;
       foreach my $attachment ( @attachments ) {
-        Info( "Attaching '$attachment->{path}'" );
+        my $size = -s $attachment->{path};
+        $total_size += $size;
+        Info("Attaching '$attachment->{path}' which is $size bytes");
         $mail->attach(
             Path => $attachment->{path},
             Type => $attachment->{type},
             Disposition => 'attachment'
             );
       }
+      if ( $total_size > 10*1024*1024 ) {
+        Warning('Emails larger than 10Mb will often not be delivered! This one is '.int($total_size/(1024*1024)).'Mb');
+      }
 ### Send the Message
       if ( $Config{ZM_SSMTP_MAIL} ) {
         my $ssmtp_location = $Config{ZM_SSMTP_PATH};
@@ -847,7 +859,7 @@ sub sendEmail {
           $mail->send();
         } else {
 ### Send using SSMTP
-          $mail->send('sendmail', $ssmtp_location, $Config{ZM_EMAIL_ADDRESS});
+          $mail->send('sendmail', $ssmtp_location, $$filter{EmailTo});
         }
       } else {
         MIME::Lite->send('smtp', $Config{ZM_EMAIL_HOST}, Timeout=>60);
@@ -855,20 +867,27 @@ sub sendEmail {
       }
     } else {
       my $mail = MIME::Entity->build(
-          From => $Config{ZM_FROM_EMAIL},
-          To => $Config{ZM_EMAIL_ADDRESS},
-          Subject => $subject,
-          Type => (($body=~/<html>/)?'text/html':'text/plain'),
-          Data => $body
-          );
+        From => $Config{ZM_FROM_EMAIL},
+        To => $$filter{EmailTo},
+        Subject => $subject,
+        Type => (($body=~/<html/)?'text/html':'text/plain'),
+        Data => $body
+      );
 
+      my $total_size = 0;
       foreach my $attachment ( @attachments ) {
-        Info("Attaching '$attachment->{path}'");
+        my $size = -s $attachment->{path};
+        $total_size += $size;
+        Info("Attaching '$attachment->{path}' which is $size bytes");
+
         $mail->attach(
-            Path => $attachment->{path},
-            Type => $attachment->{type},
-            Encoding => 'base64'
-            );
+          Path => $attachment->{path},
+          Type => $attachment->{type},
+          Encoding => 'base64'
+        );
+      } # end foreach attachment
+      if ( $total_size > 10*1024*1024 ) {
+        Warning('Emails larger than 10Mb will often not be delivered! This one is '.int($total_size/(1024*1024)).'Mb');
       }
       $mail->smtpsend(Host => $Config{ZM_EMAIL_HOST}, MailFrom => $Config{ZM_FROM_EMAIL});
     }
@@ -879,7 +898,7 @@ sub sendEmail {
   } else {
     Info('Notification email sent');
   }
-  my $sql = 'UPDATE Events SET Emailed = 1 WHERE Id = ?';
+  my $sql = 'UPDATE `Events` SET `Emailed` = 1 WHERE `Id` = ?';
   my $sth = $dbh->prepare_cached($sql)
     or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
   my $res = $sth->execute($Event->{Id})
@@ -960,7 +979,7 @@ sub sendMessage {
           From => $Config{ZM_FROM_EMAIL},
           To => $Config{ZM_MESSAGE_ADDRESS},
           Subject => $subject,
-          Type => (($body=~/<html>/)?'text/html':'text/plain'),
+          Type => (($body=~/<html/)?'text/html':'text/plain'),
           Data => $body
           );
 
@@ -984,7 +1003,7 @@ sub sendMessage {
   } else {
     Info('Notification message sent');
   }
-  my $sql = 'UPDATE Events SET Messaged = 1 WHERE Id = ?';
+  my $sql = 'UPDATE `Events` SET `Messaged` = 1 WHERE `Id` = ?';
   my $sth = $dbh->prepare_cached($sql)
     or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
   my $res = $sth->execute($Event->{Id})
@@ -999,8 +1018,7 @@ sub executeCommand {
 
   my $event_path = $Event->Path();
 
-  my $command = $filter->{AutoExecuteCmd};
-  $command .= " $event_path";
+  my $command = $filter->{AutoExecuteCmd}.' '.$event_path;
   $command = substituteTags($command, $filter, $Event);
 
   Info("Executing '$command'");
@@ -1014,7 +1032,7 @@ sub executeCommand {
     Error("Command '$command' exited with status: $status");
     return 0;
   } else {
-    my $sql = 'UPDATE Events SET Executed = 1 WHERE Id = ?';
+    my $sql = 'UPDATE `Events` SET `Executed` = 1 WHERE `Id` = ?';
     my $sth = $dbh->prepare_cached($sql)
       or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
     my $res = $sth->execute( $Event->{Id} )
diff --git a/scripts/zmonvif-probe.pl.in b/scripts/zmonvif-probe.pl.in
old mode 100755
new mode 100644
index 001d89f83..b9d3cd0bf
--- a/scripts/zmonvif-probe.pl.in
+++ b/scripts/zmonvif-probe.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL_EXECUTABLE@ -w
 use strict;
 #
 # ==========================================================================
@@ -37,12 +37,11 @@ $Getopt::Std::STANDARD_HELP_VERSION = 1;
 
 our ($opt_v);
 
-my $OPTIONS = "v";
+my $OPTIONS = 'v';
 
-sub HELP_MESSAGE
-{
+sub HELP_MESSAGE {
   my ($fh, $pkg, $ver, $opts) = @_;
-  print $fh "Usage: " . __FILE__ . " [-v] probe <soap version>\n";
+  print $fh "Usage: " . __FILE__ . " [-v] probe <soap versions> <network interface>\n";
   print $fh "       " . __FILE__ . " [-v] <command> <device URI> <soap version> <user> <password>\n";
   print $fh  <<EOF
   Commands are:
@@ -54,7 +53,7 @@ sub HELP_MESSAGE
     -v        - increase verbosity
   Device access parameters (for all commands but 'probe'):
     device URL    - the ONVIF Device service URL
-    soap version  - SOAP version (1.1 or 1.2)
+    soap versions - SOAP versions (1.1 or 1.2 or 1.1,1.2)
     user          - username of a user with access to the device
     password      - password for the user
 EOF
@@ -70,7 +69,7 @@ if ( !getopts($OPTIONS) ) {
 
 my $action = shift;
 
-if(!defined $action) {
+if ( !defined $action ) {
   HELP_MESSAGE(\*STDOUT);
   exit(1);
 }
@@ -79,11 +78,14 @@ if(!defined $action) {
 require ZoneMinder::ONVIF;
 if ( defined $opt_v ) {
   $ZoneMinder::ONVIF::verbose = 1;
+} else {
+  $ZoneMinder::ONVIF::verbose = 0;
 }
 
-if ( $action eq "probe" ) {
+if ( $action eq 'probe' ) {
   my $soap_version = shift;
-  ZoneMinder::ONVIF::discover($soap_version);
+	my $net_interface = shift;
+  ZoneMinder::ONVIF::discover($soap_version, $net_interface);
 } else {
 # all other actions need URI and credentials
   my $url_svc_device = shift @ARGV;
@@ -92,26 +94,52 @@ if ( $action eq "probe" ) {
   my $password = @ARGV ? shift @ARGV: '';
 
   my $client = ONVIF::Client->new( { 
-      'url_svc_device' => $url_svc_device, 
-      'soap_version' => $soap_version } );
+      verbose =>  $ZoneMinder::ONVIF::verbose,
+      url_svc_device => $url_svc_device, 
+      soap_version => $soap_version } );
 
   $client->set_credentials($username, $password, 1);
   
   $client->create_services();
 
-  
-  if ( $action eq "profiles" ) {
-    ZoneMinder::ONVIF::profiles($client);
-  } elsif( $action eq "move" ) {
+  if ( $action eq 'profiles' ) {
+    my @profiles = ZoneMinder::ONVIF::profiles($client);
+    foreach my $profile ( @profiles ) {
+        my ( $token, $name, $encoding, $width, $height, $frame_rate_limit, $stream_type, $uri ) = @{$profile};
+        print join(', ', $token,
+          $name,
+          $encoding,
+          $width,
+          $height,
+          $frame_rate_limit,
+          $stream_type,
+          $uri,
+        ) . "\n";
+
+    } # end foreach profile
+  } elsif ( $action eq 'move' ) {
     my $dir = shift;
     ZoneMinder::ONVIF::move($client, $dir);
-  } elsif ( $action eq "metadata" ) {
+  } elsif ( $action eq 'metadata' ) {
     ZoneMinder::ONVIF::metadata($client);
   } else {
-    print("Error: Unknown command\"$action\"");
-    exit(1);
+    my $media = $client->get_endpoint('media');
+    if ( ! $media ) {
+      print "No media endpoint for client.\n";
+      return;
+    }
+
+    my $result = $media->$action( { } ,, );
+    if ( $result ) {
+      use XML::LibXML;
+      my $dom = XML::LibXML->load_xml(string=>$result);
+      print "Received message:\n" . $dom->toString(1) . "\n";
+    } else {
+      print("Error: Unknown command \"$action\"");
+      exit(1);
+    }
   }
-}
+} # end if probe or other
 
 1;
 __END__
@@ -130,6 +158,8 @@ zmonvif-probe.pl - ZoneMinder ONVIF probing tool
     profiles  - print the device's supported stream configurations
     metadata  - print some of the device's configuration settings
     move      - move the device (only ptz cameras)
+    other     - Any command supported by the ONVIF Media element.
+
   Common parameters:
     -v        - increase verbosity
   Device access parameters (for all commands but 'probe'):
@@ -152,4 +182,3 @@ zmonvif-probe.pl - ZoneMinder ONVIF probing tool
  -v, --version              - Print the installed version of ZoneMinder
 
 =cut
-
diff --git a/scripts/zmonvif-trigger.pl.in b/scripts/zmonvif-trigger.pl.in
new file mode 100644
index 000000000..942ee0af0
--- /dev/null
+++ b/scripts/zmonvif-trigger.pl.in
@@ -0,0 +1,682 @@
+#!@PERL_EXECUTABLE@ -w
+#
+# ==========================================================================
+#
+# ZoneMinder ONVIF Event Watcher Script
+# Copyright (C) Jan M. Hochstein
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the ONVIF event watcher
+#
+
+## SETUP:
+##    chmod g+rw /dev/shm/zm*
+##    chgrp users /dev/shm/zm*
+##    systemctl stop iptables
+
+## DEBUG:
+##    hexdump -x -s 0 -n 600 /dev/shm/zm.mmap.1
+##    rm -rf /srv/www/html/zm/events/[...]
+##
+
+use strict;
+use bytes;
+
+use Carp;
+use Data::Dump qw( dump );
+
+use DBI;
+use Getopt::Long qw(:config no_auto_abbrev no_ignore_case bundling);
+use IO::Select;
+use POSIX qw( EINTR );
+use Time::HiRes qw( usleep );
+
+use SOAP::Lite; # +trace;
+use SOAP::Transport::HTTP;
+
+use ZoneMinder;
+
+require ONVIF::Client;
+
+require WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort;
+require WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort;
+require WSNotification::Types::TopicExpressionType;
+
+# ========================================================================
+# Constants
+
+# in seconds
+use constant SUBSCRIPTION_RENEW_INTERVAL => 60;  #3600;
+use constant SUBSCRIPTION_RENEW_EARLY => 5; # 60;
+use constant MONITOR_RELOAD_INTERVAL => 3600;
+
+# ========================================================================
+# Globals
+
+my $verbose = 0;
+my $script;
+my $daemon_pid;
+
+my $monitor_reload_time = 0;
+
+# this does not work on all architectures
+my @EXTRA_SOCK_OPTS = (
+  'ReuseAddr' => '1',
+  #    'ReusePort' => '1',
+  #    'Blocking'  => '0',
+);
+
+
+# =========================================================================
+# signal handling
+
+sub handler { # 1st argument is signal name
+  my ($sig) = @_;
+  Error("Caught a SIG$sig -- shutting down");
+  confess();
+  kill($daemon_pid) if defined $daemon_pid;
+  exit(0);
+}
+
+$SIG{INT} = \&handler;
+$SIG{HUP} = \&handler;
+$SIG{QUIT} = \&handler;
+$SIG{TERM} = \&handler;
+$SIG{__DIE__} = \&handler;
+
+# =========================================================================
+# Debug
+
+#use Data::Hexdumper qw(hexdump);
+#use Devel::Peek;
+
+sub dump_mapped {
+  my ($monitor) = @_;
+
+  if ( !zmMemVerify($monitor) ) {
+    print "Error: Mapped memory not accessible\n";
+  }
+  my $mmap = $monitor->{MMap};
+  print 'Size: '.$ZoneMinder::Memory::mem_size ."\n";
+  printf("Mapped at %x\n", $monitor->{MMapAddr});
+  #  Dump($mmap);
+  if ( $mmap && $$mmap ) {
+    #print hexdump(
+    #data           => $$mmap, # what to dump
+    #output_format  => '  %4a : %S %S %S %S %S %S %S %S         : %d',
+    ##      start_position => 336,   # start at this offset ...
+    #end_position   => 400    # ... and end at this offset
+    #);
+  }
+}
+
+#push @EXPORT, qw(dump_mapped);
+
+# =========================================================================
+# internal methods
+
+sub xs_duration {
+  use integer;
+  my ($seconds) = @_;
+  my $s = $seconds % 60;
+  $seconds /= 60;
+  my $m = $seconds % 60;
+  $seconds /= 60;
+  my $h = $seconds % 24;
+  $seconds /= 24;
+  my $d = $seconds;
+  my $str;
+  if($d > 0) {
+    $str = "P". $d;
+  }
+  else {
+    $str = "P";
+  }
+  $str = $str . "T";
+  if($h > 0) {
+    $str = $str . $h . "H";
+  }
+  if($m > 0) {
+    $str = $str . $m . "M";
+  }
+  if($s > 0) {
+    $str = $str . $s . "S";
+  }
+  return $str;
+}
+
+# =========================================================================
+### ZoneMinder integration
+
+## make this a singleton ?
+{
+  package _ZoneMinder;
+
+  use strict;
+  use bytes;
+
+  use base qw(Class::Std::Fast);
+
+  use DBI;
+  use Encode qw(decode encode);
+  use Time::HiRes qw( usleep );
+  use ZoneMinder;
+
+  #  my %monitors = ();
+  my $dbh;
+  my %monitors_of; #   :ATTR(:name<monitors> :default<{}>);
+
+  sub init {
+    $dbh = zmDbConnect();
+  }
+
+  sub monitors {
+    my ($self) = @_;
+    return $monitors_of{ident $self}?%{ $monitors_of{ident $self} }:undef;
+  }
+
+  sub set_monitors {
+    my ($self, %monitors_par) = @_;
+    $monitors_of{ident $self} = \%monitors_par;
+  }
+
+  ## TODO: remember to refresh this in all threads (daemon is forked)
+  sub loadMonitors {
+    my ($self) = @_;
+    Info("Loading monitors");
+    $monitor_reload_time = time();
+
+    my %new_monitors = ();
+
+    #	my $sql = "select * from Monitors where find_in_set( Function, 'Modect,Mocord,Nodect,ExtDect' )>0 and ConfigType='ONVIF'";
+    my $sql = "SELECT * FROM Monitors WHERE ONVIF_URL != ''";
+    my $sth = $dbh->prepare_cached($sql) or Fatal("Can't prepare '$sql': ".$dbh->errstr());
+    my $res = $sth->execute() or Fatal("Can't execute: ".$sth->errstr());
+    while ( my $monitor = $sth->fetchrow_hashref() ) {
+      if ( !defined $script ) {
+        if ( !zmMemVerify($monitor) ) { # Check shared memory ok
+          zmMemInvalidate($monitor);
+          next if !zmMemVerify($monitor);
+        }
+      }
+
+      Info('Monitor URL: '.$monitor->{ONVIF_URL});
+
+      ## set up ONVIF client for monitor
+      next if ! $monitor->{ONVIF_URL};
+
+      my $soap_version;
+      if ( $monitor->{ONVIF_Options} =~ /SOAP1([12])/ ) {
+        $soap_version = "1.$1";
+      } else {
+        $soap_version = '1.1';
+      }
+      my $client = ONVIF::Client->new( {
+          url_svc_device => $monitor->{ONVIF_URL},
+          soap_version => $soap_version } );
+
+      if ( $monitor->{ONVIF_Username} ) {
+        $client->set_credentials($monitor->{ONVIF_Username}, $monitor->{ONVIF_Password}, 0);
+      }
+
+      $client->create_services();
+      $monitor->{onvif_client} = $client;
+
+      $new_monitors{$monitor->{Id}} = $monitor;
+    } # end foreach monitor
+    $self->set_monitors(%new_monitors);
+  } # end foreach db monitor
+
+  sub freeMonitors {
+    my ($self) = @_;
+    my %monitors = $self->monitors();
+    foreach my $monitor ( values %monitors ) {
+      # Free up any used memory handle
+      zmMemInvalidate($monitor);
+    }
+  }
+
+  sub eventOn {
+    my ($self, $monitorId, $score, $cause, $text, $showtext) = @_;
+    #	Info( "Trigger '$trigger'\n" );
+    Info("On: $monitorId, $score, $cause, $text, $showtext");
+    my %monitors = $self->monitors();
+    my $monitor = $monitors{$monitorId};
+    if ( defined $script ) {
+      #      eval {
+      system($script, 'On', $monitor->{Name}, $monitor->{Path}, $cause);
+      # this goes to "stopped" in ffmpeg when executed from shell - why?
+      #      }
+    } else {
+      # encode() ensures that no utf-8 is written to mmap'ed memory.
+      zmTriggerEventOn($monitor, $score, encode('utf-8', $cause), encode('utf-8', $text));
+      zmTriggerShowtext($monitor, encode('utf-8', $showtext)) if defined($showtext);
+      #      main::dump_mapped($monitor);
+    }
+  }
+
+  sub eventOff {
+    my ($self, $monitorId, $score, $cause, $text, $showtext) = @_;
+    Info("Off: $monitorId, $score, $cause, $text, $showtext");
+    my %monitors = $self->monitors();
+    my $monitor = $monitors{$monitorId};
+    if ( defined $script ) {
+      #      eval {
+      system($script, 'Off', $monitor->{Name}, $monitor->{Path}, $cause);
+      #      }
+    } else {
+      my $last_event = zmGetLastEvent($monitor);
+      zmTriggerEventOff($monitor);
+      # encode() ensures that no utf-8 is written to mmap'ed memory.
+      zmTriggerShowtext($monitor, encode('utf-8', $showtext) ) if defined($showtext);
+      #	Info( "Trigger '$trigger'\n" );
+      # Wait til it's finished
+      while ( zmInAlarm($monitor) && ($last_event == zmGetLastEvent($monitor)) ) {
+        # Tenth of a second
+        usleep(100000);
+      }
+      zmTriggerEventCancel($monitor);
+      #    main::dump_mapped($monitor);
+    }
+  }
+}  # end package _ZoneMinder
+# =========================================================================
+### (experimental) send email
+
+sub send_picture_email {
+  #  'ffmpeg -i "rtsp://admin:admin123@192.168.0.70:554/Streaming/Channels/1?transportmode=mcast&profile=Profile_1" -y -frames 1 -vf scale=1024:-1 /tmp/pic2.jpg'
+}
+
+# =========================================================================
+### Consumer for Notify messages
+
+$SOAP::Constants::DO_NOT_CHECK_MUSTUNDERSTAND = 1;
+
+## make this a singleton ?
+{
+  package _Consumer;
+  use strict;
+  use bytes;
+  use base qw(Class::Std::Fast SOAP::Server::Parameters);
+
+  use ZoneMinder;
+
+  my $zm;
+
+  sub BUILD {
+    my ($self, $ident, $arg_ref) = @_;
+    #    $zm_of{$ident} = check_name( $arg_ref->{zm} );
+    $zm = $arg_ref->{zm};
+  }
+
+  #
+  # called on http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer/Notify
+  #
+  sub Notify {
+    my ($self, $unknown, $som) = @_;
+    Debug('### Notify');
+    my $req = $som->context->request;
+    #    Data::Dump::dump($req);
+    my $id = 0;
+    if ( $req->uri->path =~ m|/ref_(.*)/| ) {
+      $id = $1;
+    } else {
+      Warning('Unknown URL '.$req->uri->path.' called by event');
+      return ();
+    }
+    #    Data::Dump::dump($som);
+    my $action = $som->valueof('/Envelope/Header/Action');
+    Debug('  Action = '.$action);
+    my $msg = $som->match('/Envelope/Body/Notify/NotificationMessage');
+    my $topic = $msg->valueof('Topic');
+    my $msg2  = $msg->match('Message/Message');
+    #    Data::Dump::dump($msg2->current());
+    my $time = $msg2->dataof()->attr->{'UtcTime'};
+
+    my (%source, %data);
+    foreach my $item ($msg2->dataof('Source/SimpleItem')) {
+      $source{$item->attr->{Name}} = $item->attr->{Value};
+      #      print $item->attr->{Name} ."=>". $item->attr->{Value} ."\n";
+    }
+    foreach my $item ($msg2->dataof('Data/SimpleItem')) {
+      $data{$item->attr->{Name}} = $item->attr->{Value};
+    }
+    Debug("Ref=$id, Topic=$topic, $time, Rule=$source{Rule}, isMotion=$data{IsMotion}");
+    if ( lc($data{IsMotion}) eq 'true' ) {
+      $zm->eventOn($id, 100, $source{Rule}, $time);
+    } elsif ( lc($data{IsMotion}) eq 'false' ) {
+      $zm->eventOff($id, 100, $source{Rule}, $time);
+    }
+    return ();
+  }
+} # end Consumer
+
+# =========================================================================
+
+sub daemon_main {
+  my ($daemon) = @_;
+
+  #  $daemon->handle();
+
+  # improve responsiveness with multiple clients (cameras)
+  my $d = $daemon->{_daemon};
+  my $select = IO::Select->new();
+  $select->add($d);
+  while ($select->count() ) {
+    my @ready = $select->can_read();  # blocks
+    foreach my $connection (@ready) {
+      if ( $connection == $d ) {
+        # on the daemon accept and add the connection
+        my $client = $connection->accept();
+        $select->add($client);
+      } else {
+        # it's a client connection
+        my $request = $connection->get_request();
+        if ( $request ) {
+          # process the request (taken from SOAP::Transport::HTTP::Daemon->handle() )
+          $daemon->request($request);
+          $daemon->SOAP::Transport::HTTP::Server::handle();
+          eval {
+            local $SIG{PIPE} = sub { print("SIGPIPE\n") };  # die?
+            $connection->send_response( $daemon->response );
+          };
+          if ( $@ && $@ !~ /^SIGPIPE/ ) {
+            print($@);  # die?
+          }
+        } else {
+          # connection was closed by the client
+          $select->remove($connection);
+          $connection->close();  # is this necessary?
+        }
+      } # end if new connection or existing
+    } # end foreach connection
+  } # end while select->count
+} # end sub daemon_main
+
+sub start_daemon {
+  my ($localip, $localport, $zm) = @_;
+
+  ### daemon
+  my $daemon = SOAP::Transport::HTTP::Daemon->new(
+    LocalAddr => $localip,
+    LocalPort => $localport,
+    #        'deserializer' => $deserializer,
+    @EXTRA_SOCK_OPTS
+  );
+
+  ## handling
+
+  # we only handle one method
+  $daemon->on_dispatch( sub {
+      return ( 'http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer', 'Notify' );
+    });
+
+  $daemon_pid = fork();
+  die "fork() failed: $!" unless defined $daemon_pid;
+  if ( $daemon_pid ) {
+
+    # this is a new process --> use new name and log file
+    $0 = $0.' [http-daemon]';
+    logInit(id => 'zmonvif-trigger-httpd');
+    logSetSignal();
+
+    # $zm is copied and the mmap'ed regions still exist
+    my $consumer = _Consumer->new({zm => $zm});
+    $daemon->dispatch_with({
+        #       "http://docs.oasis-open.org/wsn/bw-2" => $consumer,
+        'http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer' => $consumer,
+      });
+    daemon_main($daemon);
+  } else {
+    return $daemon;
+  }
+} # end sub start_daemon
+
+require WSNotification::Elements::Subscribe;
+require WSNotification::Types::EndpointReferenceType;
+#require WSNotification::Types::ReferenceParametersType;
+#require WSNotification::Elements::Metadata;
+require WSNotification::Types::FilterType;
+require WSNotification::Elements::TopicExpression;
+require WSNotification::Elements::MessageContent;
+require WSNotification::Types::AbsoluteOrRelativeTimeType;
+require WSNotification::Types::AttributedURIType;
+
+sub subscribe {
+  my ($client, $localaddr, $topic_str, $duration, $ref_id) = @_;
+
+  # for debugging:
+  #  $client->get_endpoint('events')->no_dispatch(1);
+
+  my $result = $client->get_endpoint('events')->Subscribe( {
+      ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+        Address =>  { value => 'http://' . $localaddr . '/ref_'. $ref_id . '/' },
+        #      ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+        #      },
+        #      Metadata =>  { # WSNotification::Types::MetadataType
+        #      },
+      },
+      Filter =>  { # WSNotification::Types::FilterType
+        TopicExpression => { # WSNotification::Types::TopicExpressionType
+          xmlattr => {
+            Dialect => "http://www.onvif.org/ver10/tev/topicExpression/ConcreteSet",
+          },
+          value => $topic_str,
+        },
+        #      MessageContent =>  { # WSNotification::Types::QueryExpressionType
+        #      },
+      },
+      InitialTerminationTime => xs_duration($duration), # AbsoluteOrRelativeTimeType
+      #    SubscriptionPolicy =>  {
+      #    },
+    },,
+  );
+
+  die $result if not $result;
+  # print $result . "\n";
+
+  ### build Subscription Manager
+  my $submgr_addr = $result->get_SubscriptionReference()->get_Address()->get_value();
+  Info("Subscription Manager at $submgr_addr");
+
+  my $serializer = $client->service('device', 'ep')->get_serializer();
+
+  my $submgr_svc = WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort->new({
+      serializer => $serializer,
+      proxy => $submgr_addr,
+    });
+
+  return $submgr_svc;
+} # end sub subscribe
+
+sub unsubscribe {
+  my ($submgr_svc) = @_;
+
+  $submgr_svc->Unsubscribe( { },, );
+}
+
+sub renew {
+  my ($submgr_svc, $duration) = @_;
+
+  my $result = $submgr_svc->Renew( {
+      TerminationTime => xs_duration($duration), # AbsoluteOrRelativeTimeType
+    },,
+  );
+  die $result if not $result;
+}
+
+sub events {
+  my ($localip, $localport) = @_;
+
+  my $zm = _ZoneMinder->new();
+  $zm->init();
+  $zm->loadMonitors();  # call before fork()
+
+  my %monitors = $zm->monitors();
+  my $monitor_count = scalar keys(%monitors);
+  if ( $monitor_count == 0 ) {
+    Warning('No active ONVIF monitors found. Exiting');
+    return;
+  }
+  Debug("Found $monitor_count active ONVIF monitors");
+  Info('ONVIF Trigger daemon starting');
+
+  if ( !defined $localip ) {
+    #$localip = '192.168.0.2';
+    #$localport = '0';
+  }
+
+  # re-use local address/port
+  #   @LWP::Protocol::http::EXTRA_SOCK_OPTS =
+  *LWP::Protocol::http::_extra_sock_opts = sub {
+    #      print "### extra_sock_opts ########################################\n";
+    @EXTRA_SOCK_OPTS;
+  };
+
+  #*LWP::Protocol::http::_check_sock = sub
+  #{
+  #    my($self, $req, $sock) = @_;
+  #    print "### check_sock ########################################\n";
+  #    dump($sock);
+  #};
+
+  my $daemon = start_daemon($localip, $localport, $zm);
+  my $port = $daemon->url;
+  $port =~ s|^.*:||;
+  $port =~ s|/.*$||;
+  my $localaddr = $localip . ':' . $port;
+
+  Info('Daemon uses local address '.$localaddr);
+
+  # This value is passed as the LocalAddr argument to IO::Socket::INET.
+  my $transport = SOAP::Transport::HTTP::Client->new(
+    #      'local_address' => $localaddr );     ## REUSE port
+    local_address => $localip );
+
+  foreach my $monitor (values(%monitors)) {
+
+    my $client = $monitor->{onvif_client};
+    my $event_svc = $client->get_endpoint('events');
+    $event_svc->set_transport($transport);
+    #      print "Sending from local address " .
+    #        $event_svc->get_transport()->local_address . "\n";
+
+    my $submgr_svc = subscribe(
+      $client, $localaddr, 'tns1:RuleEngine//.',
+      SUBSCRIPTION_RENEW_INTERVAL, $monitor->{Id});
+
+    if ( !$submgr_svc ) {
+      Warning('Subscription failed for monitor #'.$monitor->{Id});
+      next;
+    }
+
+    $monitor->{submgr_svc} = $submgr_svc;
+  } # end foreach monitor
+
+  while (1) {
+    Info('Sleeping for ' . (SUBSCRIPTION_RENEW_INTERVAL - SUBSCRIPTION_RENEW_EARLY).' seconds');
+    sleep(SUBSCRIPTION_RENEW_INTERVAL - SUBSCRIPTION_RENEW_EARLY);
+    Info('Renewal');
+    my %monitors = $zm->monitors();
+    foreach my $monitor (values(%monitors)) {
+      if ( defined $monitor->{submgr_svc} ) {
+        renew($monitor->{submgr_svc}, SUBSCRIPTION_RENEW_INTERVAL + SUBSCRIPTION_RENEW_EARLY);
+      }
+    }
+  };
+
+  Info('ONVIF Trigger daemon exited');
+
+  %monitors = $zm->monitors();
+  foreach my $monitor (values(%monitors)) {
+    if ( defined $monitor->{submgr_svc} ) {
+      unsubscribe($monitor->{submgr_svc});
+    }
+  }
+} # end sub events
+
+# ========================================================================
+# options processing
+
+sub HELP_MESSAGE {
+  my ($fh, $pkg, $ver, $opts) = @_;
+  print $fh "Usage: " . __FILE__ . " <parameters>\n";
+  print $fh  <<EOF
+  Parameters:
+    -v              - increase verbosity
+    -l|local-addr   - listen on address (host[:port])
+    -s|script       - run script instead of generating ZM events
+EOF
+}
+
+# ========================================================================
+# MAIN
+
+my ($localaddr, $localip, $localport);
+
+# canonicalize command name
+my $command = $0;
+$0 = $command;
+
+print("Init Log $command\n");
+logInit(id=>'zm_onvif-trigger');
+logSetSignal();
+
+if ( !GetOptions(
+    'local-addr|l=s'    => \$localaddr,
+    'script|s=s'        => \$script,
+    'verbose|v=s'       => \$verbose,
+  )) {
+  HELP_MESSAGE(\*STDOUT);
+  exit(1);
+}
+
+if ( defined $localaddr ) {
+  if ( $localaddr =~ /(.*):(.*)/ ) {
+    ($localip, $localport) = ($1, $2);
+  } else {
+    $localip = $localaddr;
+    $localport = '0';
+  }
+}
+
+events($localip, $localport);
+
+1;
+__END__
+
+=head1 NAME
+
+zmonvif-trigger.pl - ZoneMinder ONVIF trigger daemon
+
+=head1 SYNOPSIS
+
+ zmonfig-trigger.pl [-v] [-s] [-l=]
+
+
+=head1 DESCRIPTION
+
+
+=head1 OPTIONS
+
+    local-addr    - local address to bind to
+    script|s=s   - script to run
+    verbose|v=s  - increase verbosity
+
+=cut
+
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 7cc8ee866..5f36f9c05 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -57,7 +57,7 @@ my $dbh = zmDbConnect();
 Debug("Command: $command");
 if ( $command and ( $command !~ /^(?:start|stop|restart|status|logrot|version)$/ ) ) {
   # Check to see if it's a valid run state
-  my $sql = 'SELECT * FROM States WHERE Name=?';
+  my $sql = 'SELECT * FROM `States` WHERE `Name`=?';
   my $sth = $dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$dbh->errstr());
   my $res = $sth->execute($command)
@@ -98,7 +98,7 @@ my $retval = 0;
 
 if ( $command eq 'state' ) {
   Info("Updating DB: $state->{Name}");
-  my $sql = 'SELECT * FROM Monitors' . ($Config{ZM_SERVER_ID} ? ' WHERE ServerId=?' : '' ) .' ORDER BY Id ASC';
+  my $sql = 'SELECT * FROM `Monitors`' . ($Config{ZM_SERVER_ID} ? ' WHERE `ServerId`=?' : '' ) .' ORDER BY `Id` ASC';
   my $sth = $dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$dbh->errstr());
   my $res = $sth->execute($Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID}: ())
@@ -118,7 +118,7 @@ if ( $command eq 'state' ) {
     if ( $monitor->{Function} ne $monitor->{NewFunction}
       || $monitor->{Enabled} ne $monitor->{NewEnabled}
     ) {
-      my $sql = 'UPDATE Monitors SET Function=?, Enabled=? WHERE Id=?';
+      my $sql = 'UPDATE `Monitors` SET `Function`=?, `Enabled`=? WHERE `Id`=?';
       my $sth = $dbh->prepare_cached($sql)
         or Fatal("Can't prepare '$sql': ".$dbh->errstr());
       my $res = $sth->execute($monitor->{NewFunction}, $monitor->{NewEnabled}, $monitor->{Id})
@@ -130,7 +130,7 @@ if ( $command eq 'state' ) {
   # PP - Now mark a specific state as active
   resetStates();
   Info("Marking $store_state as Enabled");
-  $sql = 'UPDATE States SET IsActive = 1 WHERE Name = ?';
+  $sql = 'UPDATE `States` SET `IsActive` = 1 WHERE `Name` = ?';
   $sth = $dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$dbh->errstr());
   $res = $sth->execute($store_state)
@@ -197,11 +197,11 @@ if ( $command =~ /^(?:start|restart)$/ ) {
       require ZoneMinder::Server;
       Info("Multi-server configuration detected. Starting up services for server $Config{ZM_SERVER_ID}");
       $Server = new ZoneMinder::Server($Config{ZM_SERVER_ID});
-      $sql = 'SELECT * FROM Monitors WHERE ServerId=?';
+      $sql = 'SELECT * FROM `Monitors` WHERE `ServerId`=?';
       @values = ( $Config{ZM_SERVER_ID} );
     } else {
       Info('Single server configuration detected. Starting up services.');
-      $sql = 'SELECT * FROM Monitors';
+      $sql = 'SELECT * FROM `Monitors`';
     }
 
     {
@@ -234,7 +234,7 @@ if ( $command =~ /^(?:start|restart)$/ ) {
     }
 
     {
-      my $sql = 'SELECT Id FROM Filters WHERE Background=1';
+      my $sql = 'SELECT `Id` FROM `Filters` WHERE `Background`=1';
       my $sth = $dbh->prepare_cached($sql)
         or Fatal("Can't prepare '$sql': ".$dbh->errstr());
       my $res = $sth->execute()
@@ -308,25 +308,25 @@ sub isActiveSanityCheck {
   $dbh = zmDbConnect() if ! $dbh;
 
 # PP - First, make sure default exists and there is only one
-  my $sql = q`SELECT Name FROM States WHERE Name='default'`;
+  my $sql = 'SELECT `Name` FROM `States` WHERE `Name`=?';
   my $sth = $dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$dbh->errstr());
-  my $res = $sth->execute()
+  my $res = $sth->execute('default')
     or Fatal("Can't execute: ".$sth->errstr());
 
   if ( $sth->rows != 1 ) {
 # PP - no row, or too many rows. Either case is an error
     Info('Fixing States table - either no default state or duplicate default states');
     if ( $sth->rows ) {
-      $dbh->do(q`DELETE FROM States WHERE Name='default'`) or Fatal("Can't execute: ".$dbh->errstr());
+      $dbh->do('DELETE FROM `States` WHERE `Name`=\'default\'') or Fatal("Can't execute: ".$dbh->errstr());
     }
-    $dbh->do(q`INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');`) 
+    $dbh->do('INSERT INTO `States` (`Name`,`Definition`,`IsActive`) VALUES (\'default\',\'\',\'1\');') 
       or Fatal("Can't execute: ".$dbh->errstr());
   }
   $sth->finish();
 
 # PP - Now make sure no two states have IsActive=1
-  $sql = 'SELECT Name FROM States WHERE IsActive = 1';
+  $sql = 'SELECT `Name` FROM `States` WHERE `IsActive`=1';
   $sth = $dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$dbh->errstr());
   $res = $sth->execute()
@@ -335,7 +335,7 @@ sub isActiveSanityCheck {
   if ( $sth->rows != 1 ) {
     Info('Fixing States table so only one run state is active');
     resetStates();
-    $dbh->do(q`UPDATE States SET IsActive=1 WHERE Name='default'`)
+    $dbh->do('UPDATE `States` SET `IsActive`=1 WHERE `Name`=\'default\'')
       or Fatal("Can't execute: ".$dbh->errstr());
   }
   $sth->finish();
@@ -344,7 +344,7 @@ sub isActiveSanityCheck {
 # PP - zeroes out isActive for all states
 sub resetStates {
   $dbh = zmDbConnect() if ! $dbh;
-  $dbh->do('UPDATE States SET IsActive=0')
+  $dbh->do('UPDATE `States` SET `IsActive`=0')
     or Fatal("Can't execute: ".$dbh->errstr());
 }
 
diff --git a/scripts/zmrecover.pl.in b/scripts/zmrecover.pl.in
index 02083d757..58647b946 100644
--- a/scripts/zmrecover.pl.in
+++ b/scripts/zmrecover.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 
 use strict;
 use bytes;
diff --git a/scripts/zmstats.pl.in b/scripts/zmstats.pl.in
index ba6d8302a..555d9c602 100644
--- a/scripts/zmstats.pl.in
+++ b/scripts/zmstats.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 use strict;
 use bytes;
 
@@ -48,6 +48,49 @@ while( 1 ) {
   $dbh->do('DELETE FROM Events_Week WHERE StartTime < DATE_SUB(NOW(), INTERVAL 1 week)') or Error($dbh->errstr());
   $dbh->do('DELETE FROM Events_Month WHERE StartTime < DATE_SUB(NOW(), INTERVAL 1 month)') or Error($dbh->errstr());
 
+  # Prune the Logs table if required
+  if ( $Config{ZM_LOG_DATABASE_LIMIT} ) {
+    if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^\d+$/ ) {
+      # Number of rows
+      my $selectLogRowCountSql = 'SELECT count(*) AS `Rows` FROM `Logs`';
+      my $selectLogRowCountSth = $dbh->prepare_cached( $selectLogRowCountSql )
+        or Fatal("Can't prepare '$selectLogRowCountSql': ".$dbh->errstr());
+      my $res = $selectLogRowCountSth->execute()
+        or Fatal("Can't execute: ".$selectLogRowCountSth->errstr());
+      my $row = $selectLogRowCountSth->fetchrow_hashref();
+      my $logRows = $row->{Rows};
+      if ( $logRows > $Config{ZM_LOG_DATABASE_LIMIT} ) {
+        my $deleteLogByRowsSql = 'DELETE low_priority FROM `Logs` ORDER BY `TimeKey` ASC LIMIT ?';
+        my $deleteLogByRowsSth = $dbh->prepare_cached( $deleteLogByRowsSql )
+          or Fatal("Can't prepare '$deleteLogByRowsSql': ".$dbh->errstr());
+        $res = $deleteLogByRowsSth->execute( $logRows - $Config{ZM_LOG_DATABASE_LIMIT} )
+          or Fatal("Can't execute: ".$deleteLogByRowsSth->errstr());
+        if ( $deleteLogByRowsSth->rows() ) {
+          Debug('Deleted '.$deleteLogByRowsSth->rows().' log table entries by count');
+        }
+      }
+    } else {
+      # Time of record
+
+      # 7 days is invalid.  We need to remove the s
+      if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^(.*)s$/ ) {
+        $Config{ZM_LOG_DATABASE_LIMIT} = $1;
+      }
+      my $deleted_rows;
+      do {
+        my $deleteLogByTimeSql =
+        'DELETE FROM `Logs`
+        WHERE `TimeKey` < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 100';
+        my $deleteLogByTimeSth = $dbh->prepare_cached( $deleteLogByTimeSql )
+          or Fatal("Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr());
+        my $res = $deleteLogByTimeSth->execute()
+          or Fatal("Can't execute: ".$deleteLogByTimeSth->errstr());
+        $deleted_rows = $deleteLogByTimeSth->rows();
+        Debug("Deleted $deleted_rows log table entries by time");
+      } while ( $deleted_rows );
+    }
+  } # end if ZM_LOG_DATABASE_LIMIT
+
   sleep($Config{ZM_STATS_UPDATE_INTERVAL});
 } # end while (1)
 
diff --git a/scripts/zmsystemctl.pl.in b/scripts/zmsystemctl.pl.in
index f46833547..e14bfd630 100644
--- a/scripts/zmsystemctl.pl.in
+++ b/scripts/zmsystemctl.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/pkexec /usr/bin/perl
+#!/usr/bin/pkexec @PERL_EXECUTABLE@
 #
 # ==========================================================================
 #
diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 592ccc295..a3debabdb 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -23,6 +23,7 @@
 
 use strict;
 use bytes;
+use utf8;
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
@@ -34,6 +35,7 @@ use Sys::MemInfo qw(totalmem);
 use Sys::CPU qw(cpu_count);
 use POSIX qw(strftime uname);
 use JSON::MaybeXS;
+use Encode;
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
@@ -43,6 +45,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 my $help = 0;
 my $force = 0;
+my $show = 0;
 # Interval between version checks
 my $interval;
 my $version;
@@ -50,6 +53,7 @@ my $version;
 GetOptions(
   force     => \$force,
   help      => \$help,
+  show      => \$show,
   interval  => \$interval,
   version   => \$version
 );
@@ -57,10 +61,18 @@ if ( $version ) {
   print( ZoneMinder::Base::ZM_VERSION . "\n");
   exit(0);
 }
+if ($show) {
+  my %telemetry;
+  my $dbh = zmDbConnect();
+  collectData($dbh, \%telemetry);
+  my $result = jsonEncode(\%telemetry);
+  print ($result);
+  exit(0);
+}
 if ( $help ) {
   pod2usage(-exitstatus => -1);
 }
-if ( ! defined $interval ) {
+if ( !defined $interval ) {
   $interval = eval($Config{ZM_TELEMETRY_INTERVAL});
 }
 
@@ -69,16 +81,17 @@ if ( !($Config{ZM_TELEMETRY_DATA} or $force) ) {
   exit(0);
 }
   
-print 'ZoneMinder Telemetry Agent starting at '.strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n";
+print 'ZoneMinder Telemetry Agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime())."\n";
 
 my $lastCheck = $Config{ZM_TELEMETRY_LAST_UPLOAD};
 
 while( 1 ) {
   my $now = time();
   my $since_last_check = $now-$lastCheck;
-  Debug(" Last Check time (now($now) - lastCheck($lastCheck)) = $since_last_check > interval($interval) or force($force)");
+  Debug("Last Check time (now($now) - lastCheck($lastCheck)) = $since_last_check > interval($interval) or force($force)");
   if ( $since_last_check < 0 ) {
-    Warning( 'Seconds since last check is negative! Which means that lastCheck is in the future!' );
+    Warning('Seconds since last check is negative! Which means that lastCheck is in the future!');
+		sleep($interval);
     next;
   }
   if ( ( ($since_last_check) > $interval ) or $force ) {
@@ -86,21 +99,9 @@ while( 1 ) {
     my $dbh = zmDbConnect();
 # Build the telemetry hash
 # We should keep *BSD systems in mind when calling system commands
+    
     my %telemetry;
-    $telemetry{uuid} = getUUID($dbh);
-    ($telemetry{city}, $telemetry{region}, $telemetry{country}, $telemetry{latitude}, $telemetry{longitude}) = getGeo();
-    $telemetry{timestamp} = strftime( '%Y-%m-%dT%H:%M:%S%z', localtime() );
-    $telemetry{monitor_count} = countQuery($dbh,'Monitors');
-    $telemetry{event_count} = countQuery($dbh,'Events');
-    $telemetry{architecture} = runSysCmd('uname -p');
-    ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
-    $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
-    $telemetry{system_memory} = totalmem();
-    $telemetry{processor_count} = cpu_count();
-    $telemetry{monitors} = getMonitorRef($dbh);
-
-    Info('Sending data to ZoneMinder Telemetry server.');
-
+    collectData($dbh,\%telemetry);
     my $result = jsonEncode(\%telemetry);
 
     if ( sendData($result) ) {
@@ -123,6 +124,24 @@ print 'ZoneMinder Telemetry Agent exiting at '.strftime('%y/%m/%d %H:%M:%S', loc
 # SUBROUTINES #
 ###############
 
+# collect data to send
+sub collectData {
+  my $dbh = shift;
+  my $telemetry = shift;
+  $telemetry->{uuid} = getUUID($dbh);
+  ($telemetry->{city},$telemetry->{region},$telemetry->{country},$telemetry->{latitude},$telemetry->{longitude})=getGeo();
+  $telemetry->{timestamp} = strftime('%Y-%m-%dT%H:%M:%S%z', localtime());
+  $telemetry->{monitor_count} = countQuery($dbh,'Monitors');
+  $telemetry->{event_count} = countQuery($dbh,'Events');
+  $telemetry->{architecture} = runSysCmd('uname -p');
+  ($telemetry->{kernel}, $telemetry->{distro}, $telemetry->{version}) = getDistro();
+  $telemetry->{zm_version} = ZoneMinder::Base::ZM_VERSION;
+  $telemetry->{system_memory} = totalmem();
+  $telemetry->{processor_count} = cpu_count();
+  $telemetry->{use_event_server} = $Config{ZM_OPT_USE_EVENTNOTIFICATION};
+  $telemetry->{monitors} = getMonitorRef($dbh);
+}
+
 # Find, verify, then run the supplied system command
 sub runSysCmd {
   my $msg = shift;
@@ -138,6 +157,7 @@ sub runSysCmd {
     chomp($path);
     $arguments[0] = $path;
     my $cmd = join(' ',@arguments);
+		($cmd) = $cmd =~ /(.*)/; # detaint
     $result = qx( $cmd );
     chomp($result);
   }
@@ -164,7 +184,7 @@ sub sendData {
   $req->header('content-length' => length($msg));
   $req->header('connection' => 'Close');
 
-  $req->content($msg);
+  $req->content(encode('UTF-8',$msg));
 
   my $resp = $ua->request($req);
   my $resp_msg = $resp->decoded_content;
@@ -194,7 +214,7 @@ sub getUUID {
     $uuid = $Config{ZM_TELEMETRY_UUID} = $sth->fetchrow_array();
     $sth->finish();
 
-    $sql = q`UPDATE Config set Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'`;
+    $sql = q`UPDATE Config SET Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'`;
     $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
     $res = $sth->execute( "$uuid" ) or die( "Can't execute: ".$sth->errstr() );
     $sth->finish();
@@ -221,7 +241,7 @@ sub getGeo {
   } else {
     Warning("Geoip data retrieval returned HTTP POST error code: $resp_code");
     Debug("Geoip data retrieval failure response message: $resp_msg");
-    return ($unknown, $unknown, $unknown, $unknown);
+    return ($unknown, $unknown, $unknown, $unknown, $unknown);
   }
 }
 
@@ -230,9 +250,9 @@ sub countQuery {
   my $dbh = shift;
   my $table = shift;
 
-  my $sql = "SELECT count(*) FROM $table";
-  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+  my $sql = "SELECT count(*) FROM `$table`";
+  my $sth = $dbh->prepare_cached($sql) or die "Can't prepare '$sql': ".$dbh->errstr();
+  my $res = $sth->execute() or die 'Can\'t execute: '.$sth->errstr();
   my $count = $sth->fetchrow_array();
   $sth->finish();
 
@@ -243,7 +263,7 @@ sub countQuery {
 sub getMonitorRef {
   my $dbh = shift;
 
-  my $sql = 'SELECT Id,Name,Type,Function,Width,Height,Colours,MaxFPS,AlarmMaxFPS FROM Monitors';
+  my $sql = 'SELECT `Id`,`Name`,`Type`,`Function`,`Width`,`Height`,`Colours`,`MaxFPS`,`AlarmMaxFPS` FROM `Monitors`';
   my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
   my $arrayref = $sth->fetchall_arrayref({});
@@ -361,7 +381,7 @@ zmtelemetry.pl - Send usage information to the ZoneMinder development team
 
 =head1 SYNOPSIS
 
- zmtelemetry.pl [--force] [--help] [--interval=seconds] [--version]
+ zmtelemetry.pl [--force] [--help] [--show] [--interval=seconds] [--version]
 
 =head1 DESCRIPTION
 
@@ -378,6 +398,7 @@ console under Options.
  --force        Force the script to upload it's data instead of waiting
                 for the defined interval since last upload.
  --help         Display usage information
+ --show         Displays telemetry data that is sent to zoneminder
  --interval     Override the default configured interval since last upload. 
                 The value should be given in seconds, but can be an expression
                 such as 24*60*60.
diff --git a/scripts/zmtrack.pl.in b/scripts/zmtrack.pl.in
index f12f6bff0..10db09664 100644
--- a/scripts/zmtrack.pl.in
+++ b/scripts/zmtrack.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -77,12 +77,12 @@ my $mid = 0;
 GetOptions( 'monitor=s'=>\$mid )
     or pod2usage(-exitstatus => -1);
 
-logInit();
-logSetSignal();
-
 my ( $detaint_mid ) = $mid =~ /^(\d+)$/;
 $mid = $detaint_mid;
 
+logInit($mid?(id=>'zmtrack_m'.$mid):());
+logSetSignal();
+
 print( "Tracker daemon $mid (experimental) starting at "
        .strftime( '%y/%m/%d %H:%M:%S', localtime() )
        ."\n"
@@ -90,146 +90,121 @@ print( "Tracker daemon $mid (experimental) starting at "
 
 my $dbh = zmDbConnect();
 
-my $sql = "SELECT C.*,M.* FROM Monitors as M
+my $sql = 'SELECT C.*,M.* FROM Monitors as M
            LEFT JOIN Controls as C on M.ControlId = C.Id
-           WHERE M.Id = ?"
+           WHERE M.Id = ?'
 ;
 my $sth = $dbh->prepare_cached( $sql )
-    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    or Fatal("Can't prepare '$sql': ".$dbh->errstr());
 
 my $res = $sth->execute( $mid )
-    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    or Fatal("Can't execute '$sql': ".$sth->errstr());
 my $monitor = $sth->fetchrow_hashref();
 
-if ( !$monitor )
-{
-    print( "Can't find monitor '$mid'\n" );
-    exit( -1 );
+if ( !$monitor ) {
+  Fatal("Can't find monitor '$mid'");
 }
-if ( !$monitor->{Controllable} )
-{
-    print( "Monitor '$mid' is not controllable\n" );
-    exit( -1 );
+if ( !$monitor->{Controllable} ) {
+  Fatal("Monitor '$mid' is not controllable");
 }
-if ( !$monitor->{TrackMotion} )
-{
-    print( "Monitor '$mid' is not configured to track motion\n" );
-    exit( -1 );
+if ( !$monitor->{TrackMotion} ) {
+  Fatal("Monitor '$mid' is not configured to track motion");
 }
 
-if ( !$monitor->{CanMoveMap} )
-{
-    print( "Monitor '$mid' cannot move in map mode" );
-    if ( $monitor->{CanMoveRel} )
-    {
-        print( ", falling back to pseudo map mode\n" );
-    }
-    else
-    {
-        print( "\n" );
-        exit( -1 );
-    }
+if ( !$monitor->{CanMoveMap} ) {
+  if ( $monitor->{CanMoveRel} ) {
+    Warning("Monitor '$mid' cannot move in map mode, falling back to pseudo map mode");
+  } else {
+    Fatal("Monitor '$mid' cannot move in map mode");
+  }
 }
 
-Debug( "Found monitor for id '$monitor'\n" );
-exit( -1 ) if ( !zmMemVerify( $monitor ) );
+exit(-1) if !zmMemVerify($monitor);
 
-sub Suspend
-{
-    my $monitor = shift;
-    zmMonitorSuspend( $monitor );
+sub Suspend {
+  my $monitor = shift;
+  zmMonitorSuspend($monitor);
 }
 
-sub Resume
-{
-    my $monitor = shift;
-    sleep( $monitor->{TrackDelay} );
-    zmMonitorResume( $monitor );
+sub Resume {
+  my $monitor = shift;
+  sleep($monitor->{TrackDelay});
+  zmMonitorResume($monitor);
 }
 
-sub Track
-{
-    my $monitor = shift;
-    my ( $x, $y ) = @_;
-    my ( $detaint_x ) = $x =~ /^(\d+)$/; $x = $detaint_x;
-    my ( $detaint_y ) = $y =~ /^(\d+)$/; $y = $detaint_y;
+sub Track {
+  my $monitor = shift;
+  my ( $x, $y ) = @_;
+  my ( $detaint_x ) = $x =~ /^(\d+)$/; $x = $detaint_x;
+  my ( $detaint_y ) = $y =~ /^(\d+)$/; $y = $detaint_y;
 
-    my $ctrlCommand = $Config{ZM_PATH_BIN}
-                      ."/zmcontrol.pl -i "
-                      .$monitor->{Id}
+  my $ctrlCommand = $Config{ZM_PATH_BIN}
+  .'/zmcontrol.pl -i '
+  .$monitor->{Id}
+  ;
+  $ctrlCommand .= ' --command='
+  .( $monitor->{CanMoveMap} ? 'moveMap'
+    : 'movePseudoMap'
+  )
+  ." --xcoord=$x --ycoord=$y"
+  ;
+  executeShellCommand($ctrlCommand);
+}
+
+sub Return {
+  my $monitor = shift;
+
+  my $ctrlCommand = $Config{ZM_PATH_BIN}
+  .'/zmcontrol.pl -i '
+  .$monitor->{Id}
+  ;
+  if ( $monitor->{ReturnLocation} > 0 ) {
+    $ctrlCommand .= ' --command=presetGoto --preset='
+    .$monitor->{ReturnLocation}
     ;
-    $ctrlCommand .= " --command="
-                    .( $monitor->{CanMoveMap} ? "moveMap"
-                                              : "movePseudoMap"
-                     )
-                    ." --xcoord=$x --ycoord=$y"
-    ;
-    executeShellCommand( $ctrlCommand );
-}
-
-sub Return
-{
-    my $monitor = shift;
-
-    my $ctrlCommand = $Config{ZM_PATH_BIN}
-                      ."/zmcontrol.pl -i "
-                      .$monitor->{Id}
-    ;
-    if ( $monitor->{ReturnLocation} > 0 )
-    {
-        $ctrlCommand .= " --command=presetGoto --preset="
-                        .$monitor->{ReturnLocation}
-        ;
-    }
-    else
-    {
-        $ctrlCommand .= " --command=presetHome";
-    }
-    executeShellCommand( $ctrlCommand );
+  } else {
+    $ctrlCommand .= ' --command=presetHome';
+  }
+  executeShellCommand($ctrlCommand);
 }
 
 my $last_alarm = 0;
-if ( ($monitor->{ReturnLocation} >= 0) )
-{
-    Suspend( $monitor );
-    Return( $monitor );
-    Resume( $monitor );
+if ( ($monitor->{ReturnLocation} >= 0) ) {
+  Suspend($monitor);
+  Return($monitor);
+  Resume($monitor);
 }
 
 my $alarmed = undef;
-while( 1 )
-{
-    if ( zmIsAlarmed( $monitor ) )
-    {
-        my ( $alarm_x, $alarm_y ) = zmGetAlarmLocation( $monitor );
-        if ( $alarm_x >= 0 && $alarm_y >= 0 )
-        {
-            Debug( "Got alarm at $alarm_x, $alarm_y\n" );
-            Suspend( $monitor );
-            Track( $monitor, $alarm_x, $alarm_y );
-            Resume( $monitor );
-            $last_alarm = time();
-            $alarmed = !undef;
-        }
+while( 1 ) {
+  if ( zmIsAlarmed($monitor) ) {
+    my ( $alarm_x, $alarm_y ) = zmGetAlarmLocation($monitor);
+    if ( $alarm_x >= 0 && $alarm_y >= 0 ) {
+      Debug("Got alarm at $alarm_x, $alarm_y");
+      Suspend($monitor);
+      Track($monitor, $alarm_x, $alarm_y);
+      Resume($monitor);
+      $last_alarm = time();
+      $alarmed = !undef;
     }
-    else
-    {
-        if ( logDebugging() && $alarmed )
-        {
-            print( "Left alarm state\n" );
-            $alarmed = undef;
-        }
-        if ( ($monitor->{ReturnLocation} >= 0)
-             && ($last_alarm > 0)
-             && ((time()-$last_alarm) > $monitor->{ReturnDelay})
-        )
-        {
-            Debug( "Returning to location ".$monitor->{ReturnLocation}."\n" );
-            Suspend( $monitor );
-            Return( $monitor );
-            Resume( $monitor );
-            $last_alarm = 0;
-        }
+  } else {
+    if ( logDebugging() && $alarmed ) {
+      Info('Left alarm state');
+      $alarmed = undef;
     }
-    usleep( SLEEP_TIME );
+    if ( ($monitor->{ReturnLocation} >= 0)
+      && ($last_alarm > 0)
+      && ((time()-$last_alarm) > $monitor->{ReturnDelay})
+    ) {
+      Debug("Returning to location ".$monitor->{ReturnLocation});
+      Suspend($monitor);
+      Return($monitor);
+      Resume($monitor);
+      $last_alarm = 0;
+    }
+  }
+  usleep(SLEEP_TIME);
 }
+
+1;
+__END__
diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index eda7b2e36..1ee392c1e 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -329,14 +329,13 @@ sub loadMonitor {
 } # end sub loadMonitor
 
 sub loadMonitors {
-  Debug('Loading monitors');
   $monitor_reload_time = time();
 
   my %new_monitors = ();
 
-  my $sql = q`SELECT * FROM Monitors
-    WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )`.
-    ( $Config{ZM_SERVER_ID} ? ' AND ServerId=?' : '' )
+  my $sql = 'SELECT * FROM `Monitors`
+    WHERE find_in_set( `Function`, \'Modect,Mocord,Nodect\' )'.
+    ( $Config{ZM_SERVER_ID} ? ' AND `ServerId`=?' : '' )
     ;
   my $sth = $dbh->prepare_cached( $sql )
     or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
@@ -357,11 +356,16 @@ sub handleMessage {
   my $connection = shift;
   my $message = shift;
 
+  #  CUA  - Axis camera send the message quoted with"
+  #  CUA  - Also Axis camera cannot save the plus sign which
+  $message =~ s/^\"//g;
+  $message =~ s/\"$//g;
+
   my ( $id, $action, $score, $cause, $text, $showtext )
     = split( /\|/, $message );
-  $score = 0 if ( !defined($score) );
-  $cause = '' if ( !defined($cause) );
-  $text = '' if ( !defined($text) );
+  $score = 0 if !defined($score);
+  $cause = '' if !defined($cause);
+  $text = '' if !defined($text);
 
   my $monitor = $monitors{$id};
   if ( !$monitor ) {
@@ -373,7 +377,7 @@ sub handleMessage {
   next if !zmMemVerify($monitor);
 
   Debug("Handling action '$action'");
-  if ( $action =~ /^(enable|disable)(?:\+(\d+))?$/ ) {
+  if ( $action =~ /^(enable|disable)(?:[\+ ](\d+))?$/ ) {
     my $state = $1;
     my $delay = $2;
     if ( $state eq 'enable' ) {
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 8dbc4d14f..b89f6a8f8 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -119,25 +119,30 @@ GetOptions(
     ) or pod2usage(-exitstatus => -1);
 
 my $dbh = zmDbConnect(undef, { mysql_multi_statements=>1 } );
+if ( !$dbh ) {
+  die "Unable to connect to db\n";
+}
 $Config{ZM_DB_USER} = $dbUser;
 $Config{ZM_DB_PASS} = $dbPass;
+# we escape dbpass with single quotes so that $ in the password has no effect, but dbpass could have a ' in it.
+$dbPass =~ s/'/\\'/g;
 
 if ( ! ($check || $freshen || $rename || $zoneFix || $migrateEvents || $version) ) {
   if ( $Config{ZM_DYN_DB_VERSION} ) {
     $version = $Config{ZM_DYN_DB_VERSION};
   } else {
-    print( STDERR "Please give a valid option\n" );
+    print(STDERR "Please give a valid option\n");
     pod2usage(-exitstatus => -1);
   }
 }
 
 if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0)) > 1 ) {
-  print( STDERR "Please give only one option\n" );
+  print(STDERR "Please give only one option\n");
   pod2usage(-exitstatus => -1);
 }
 
 if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
-  print( "Update agent starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+  print('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
 
   my $currVersion = $Config{ZM_DYN_CURR_VERSION};
   my $lastVersion = $Config{ZM_DYN_LAST_VERSION};
@@ -147,23 +152,23 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
     $currVersion = $Config{ZM_VERSION};
 
     my $sql = "update Config set Value = ? where Name = 'ZM_DYN_CURR_VERSION'";
-    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( "$currVersion" ) or die( "Can't execute: ".$sth->errstr() );
+    my $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
+    my $res = $sth->execute($currVersion) or die("Can't execute: ".$sth->errstr());
     $sth->finish();
   }
 
-  while( 1 ) {
+  while ( 1 ) {
     my $now = time();
     if ( !$lastVersion || !$lastCheck || (($now-$lastCheck) > CHECK_INTERVAL) ) {
-      Info( "Checking for updates\n" );
+      Info('Checking for updates');
 
       use LWP::UserAgent;
       my $ua = LWP::UserAgent->new;
-      $ua->agent( "ZoneMinder Update Agent/".ZM_VERSION );
+      $ua->agent('ZoneMinder Update Agent/'.ZM_VERSION);
       if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
-        $ua->proxy( 'http', $Config{ZM_UPDATE_CHECK_PROXY} );
+        $ua->proxy('http', $Config{ZM_UPDATE_CHECK_PROXY});
       }
-      my $req = HTTP::Request->new( GET=>'https://update.zoneminder.com/version.txt' );
+      my $req = HTTP::Request->new(GET=>'https://update.zoneminder.com/version.txt');
       my $res = $ua->request($req);
 
       if ( $res->is_success ) {
@@ -171,63 +176,63 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} ) {
         chomp($lastVersion);
         $lastCheck = $now;
 
-        Info( "Got version: '".$lastVersion."'\n" );
+        Info('Got version: '.$lastVersion);
 
-        my $lv_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_VERSION'";
-        my $lv_sth = $dbh->prepare_cached( $lv_sql ) or die( "Can't prepare '$lv_sql': ".$dbh->errstr() );
-        my $lv_res = $lv_sth->execute( $lastVersion ) or die( "Can't execute: ".$lv_sth->errstr() );
+        my $lv_sql = 'UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_VERSION\'';
+        my $lv_sth = $dbh->prepare_cached($lv_sql) or die("Can't prepare '$lv_sql': ".$dbh->errstr());
+        my $lv_res = $lv_sth->execute($lastVersion) or die("Can't execute: ".$lv_sth->errstr());
         $lv_sth->finish();
 
-        my $lc_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_CHECK'";
-        my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
-        my $lc_res = $lc_sth->execute( $lastCheck ) or die( "Can't execute: ".$lc_sth->errstr() );
+        my $lc_sql = 'UPDATE Config SET Value = ? WHERE Name = \'ZM_DYN_LAST_CHECK\'';
+        my $lc_sth = $dbh->prepare_cached($lc_sql) or die("Can't prepare '$lc_sql': ".$dbh->errstr());
+        my $lc_res = $lc_sth->execute($lastCheck) or die("Can't execute: ".$lc_sth->errstr());
         $lc_sth->finish();
       } else {
-        Error( "Error check failed: '".$res->status_line()."'\n" );
+        Error('Error check failed: \''.$res->status_line().'\'');
       }
     }
-    sleep( 3600 );
+    sleep(3600);
   }
-  print( "Update agent exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+  print('Update agent exiting at '.strftime('%y/%m/%d %H:%M:%S', localtime())."\n");
 }
 
 if ( $rename ) {
   require File::Find;
 
-  chdir( EVENT_PATH );
+  chdir(EVENT_PATH);
 
   sub renameImage {
     my $file = $_;
 
 # Ignore directories
     if ( -d $file ) {
-      print( "Checking directory '$file'\n" );
+      print("Checking directory '$file'\n");
       return;
     }
     if ( $file !~ /(capture|analyse)-(\d+)(\.jpg)/ ) {
       return;
     }
-    my $newFile = "$2-$1$3";
+    my $newFile = $2.'-'.$1.$3;
 
-    print( "Renaming '$file' to '$newFile'\n" );
-    rename( $file, $newFile ) or warn( "Can't rename '$file' to '$newFile'" );
+    print("Renaming '$file' to '$newFile'\n");
+    rename($file, $newFile) or warn("Can't rename '$file' to '$newFile'");
   }
 
-  File::Find::find( \&renameImage, '.' );
-}
-if ( $zoneFix ) {
+  File::Find::find(\&renameImage, '.');
+} # end if rename
 
-  my $sql = "select Z.*, M.Width as MonitorWidth, M.Height as MonitorHeight from Zones as Z inner join Monitors as M on Z.MonitorId = M.Id where Z.Units = 'Percent'";
-  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+if ( $zoneFix ) {
+  my $sql = "SELECT Z.*, M.Width AS MonitorWidth, M.Height AS MonitorHeight FROM Zones AS Z INNER JOIN Monitors AS M ON Z.MonitorId = M.Id WHERE Z.Units = 'Percent'";
+  my $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
+  my $res = $sth->execute() or die("Can't execute: ".$sth->errstr());
   my @zones;
-  while( my $zone = $sth->fetchrow_hashref() ) {
-    push( @zones, $zone );
+  while ( my $zone = $sth->fetchrow_hashref() ) {
+    push(@zones, $zone);
   }
   $sth->finish();
 
-  $sql = 'update Zones set MinAlarmPixels = ?, MaxAlarmPixels = ?, MinFilterPixels = ?, MaxFilterPixels = ?, MinBlobPixels = ?, MaxBlobPixels = ? where Id = ?';
-  $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+  $sql = 'UPDATE Zones SET MinAlarmPixels = ?, MaxAlarmPixels = ?, MinFilterPixels = ?, MaxFilterPixels = ?, MinBlobPixels = ?, MaxBlobPixels = ? WHERE Id = ?';
+  $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
   foreach my $zone ( @zones ) {
     my $zone_width = (($zone->{HiX}*$zone->{MonitorWidth})-($zone->{LoX}*$zone->{MonitorWidth}))/100;
     my $zone_height = (($zone->{HiY}*$zone->{MonitorHeight})-($zone->{LoY}*$zone->{MonitorHeight}))/100;
@@ -241,78 +246,84 @@ if ( $zoneFix ) {
         ($zone->{MinBlobPixels}*$monitor_area)/$zone_area,
         ($zone->{MaxBlobPixels}*$monitor_area)/$zone_area,
         $zone->{Id}
-        ) or die( "Can't execute: ".$sth->errstr() );
+        ) or die("Can't execute: ".$sth->errstr());
   }
   $sth->finish();
-}
+} # end if zoneFix
+
 if ( $migrateEvents ) {
-  my $webUid = (getpwnam( $Config{ZM_WEB_USER} ))[2];
-  my $webGid = (getgrnam( $Config{ZM_WEB_USER} ))[2];
+  my $webUid = (getpwnam($Config{ZM_WEB_USER}))[2];
+  my $webGid = (getgrnam($Config{ZM_WEB_USER}))[2];
 
   if ( !(($> == 0) || ($> == $webUid)) ) {
-    print( "Error, migrating events can only be done as user root or ".$Config{ZM_WEB_USER}.".\n" );
-    exit( -1 );
+    print("Error, migrating events can only be done as user root or ".$Config{ZM_WEB_USER}.".\n");
+    exit(-1);
   }
 
 # Run as web user/group
   $( = $webGid;
-      $) = $webGid;
+  $) = $webGid;
   $< = $webUid;
   $> = $webUid;
 
-  print( "\nAbout to convert saved events to deep storage, please ensure that ZoneMinder is fully stopped before proceeding.\nThis process is not easily reversible. Are you sure you wish to proceed?\n\nPress 'y' to continue or 'n' to abort : " );
+  print('
+About to convert saved events to deep storage, please ensure that ZoneMinder is fully stopped before proceeding.
+This process is not easily reversible. Are you sure you wish to proceed?
+
+Press \'y\' to continue or \'n\' to abort : ');
   my $response = <STDIN>;
-  chomp( $response );
+  chomp($response);
   while ( $response !~ /^[yYnN]$/ ) {
-    print( "Please press 'y' to continue or 'n' to abort only : " );
+    print("Please press 'y' to continue or 'n' to abort only : ");
     $response = <STDIN>;
-    chomp( $response );
+    chomp($response);
   }
 
   if ( $response =~ /^[yY]$/ ) {
-    print( "Converting all events to deep storage.\n" );
+    print("Converting all events to deep storage.\n");
 
-    chdir( $Config{ZM_PATH_WEB} );
-    my $sql = "select *, unix_timestamp(StartTime) as UnixStartTime from Events";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    chdir($Config{ZM_PATH_WEB});
+    my $sql = 'SELECT *, unix_timestamp(StartTime) AS UnixStartTime FROM Events';
+    my $sth = $dbh->prepare_cached($sql) or Fatal("Can't prepare '$sql': ".$dbh->errstr());
     my $res = $sth->execute();
     if ( !$res ) {
-      Fatal( "Can't fetch Events: ".$sth->errstr() );
+      Fatal("Can't fetch Events: ".$sth->errstr());
     }
 
     while( my $event = $sth->fetchrow_hashref() ) {
       my $oldEventPath = $Config{ZM_DIR_EVENTS}.'/'.$event->{MonitorId}.'/'.$event->{Id};
 
       if ( !-d $oldEventPath ) {
-        print( "Warning, can't find old event path '$oldEventPath', already converted?\n" );
+        print("Warning, can't find old event path '$oldEventPath', already converted?\n");
         next;
       }
 
-      print( "Converting event ".$event->{Id}."\n" );
-      my $newDatePath = $Config{ZM_DIR_EVENTS}.'/'.$event->{MonitorId}.'/'.strftime( "%y/%m/%d", localtime($event->{UnixStartTime}) );
-      my $newTimePath = strftime( "%H/%M/%S", localtime($event->{UnixStartTime}) );
+      print('Converting event '.$event->{Id}."\n");
+      my $newDatePath = $Config{ZM_DIR_EVENTS}.'/'.$event->{MonitorId}.'/'.strftime('%y/%m/%d', localtime($event->{UnixStartTime}));
+      my $newTimePath = strftime('%H/%M/%S', localtime($event->{UnixStartTime}));
       my $newEventPath = $newDatePath.'/'.$newTimePath;
       ( my $truncEventPath = $newEventPath ) =~ s|/\d+$||;
-      makePath( $truncEventPath, $Config{ZM_PATH_WEB} );
+      makePath($truncEventPath, $Config{ZM_PATH_WEB});
       my $idLink = $newDatePath.'/.'.$event->{Id};
-      symlink( $newTimePath, $idLink ) or die( "Can't symlink $newTimePath -> $idLink: $!" );
-      rename( $oldEventPath, $newEventPath ) or die( "Can't move $oldEventPath -> $newEventPath: $!" );
+      symlink($newTimePath, $idLink) or die("Can't symlink $newTimePath -> $idLink: $!");
+      rename($oldEventPath, $newEventPath) or die("Can't move $oldEventPath -> $newEventPath: $!");
     }
     $sth->finish();
 
-    print( "Updating configuration.\n" );
-    $sql = "update Config set Value = ? where Name = 'ZM_USE_DEEP_STORAGE'";
-    $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    $res = $sth->execute( 1 ) or die( "Can't execute: ".$sth->errstr() );
+    print("Updating configuration.\n");
+    $sql = "UPDATE `Config` SET `Value` = ? WHERE `Name` = 'ZM_USE_DEEP_STORAGE'";
+    $sth = $dbh->prepare_cached($sql) or die( "Can't prepare '$sql': ".$dbh->errstr());
+    $res = $sth->execute(1) or die("Can't execute: ".$sth->errstr());
     $sth->finish();
 
-    print( "All events converted.\n\n" );
+    print("All events converted.\n\n");
   } else {
-    print( "Aborting event conversion.\n\n" );
+    print("Aborting event conversion.\n\n");
   }
 }
+
 if ( $freshen ) {
-  print( "\nFreshening configuration in database\n" );
+  print("\nFreshening configuration in database\n");
   migratePaths();
   migratePasswords();
   ZoneMinder::Config::loadConfigFromDB();
@@ -323,9 +334,9 @@ if ( $freshen ) {
 if ( $interactive ) {
 # Now check for MyISAM Tables
   my @MyISAM_Tables;
-  my $sql = "SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='zm' AND engine = 'MyISAM'";
-  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+  my $sql = "SELECT `table_name` FROM INFORMATION_SCHEMA.TABLES WHERE `table_schema`='zm' AND `engine` = 'MyISAM'";
+  my $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
+  my $res = $sth->execute() or die("Can't execute: ".$sth->errstr());
 
   while( my $dbTable = $sth->fetchrow() ) {
     push @MyISAM_Tables, $dbTable;
@@ -333,17 +344,22 @@ if ( $interactive ) {
   $sth->finish();
 
   if ( @MyISAM_Tables ) {
-    print( "\nPrevious versions of ZoneMinder used the MyISAM database engine.\nHowever, the recommended database engine is InnoDB.\n");
-    print( "\nHint: InnoDB tables are much less likely to be corrupted during an unclean shutdown.\n\nPress 'y' to convert your tables to InnoDB or 'n' to skip : ");
+    print('
+Previous versions of ZoneMinder used the MyISAM database engine.
+However, the recommended database engine is InnoDB.
+
+Hint: InnoDB tables are much less likely to be corrupted during an unclean shutdown.
+
+Press \'y\' to convert your tables to InnoDB or \'n\' to skip : ');
     my $response = <STDIN>;
     chomp( $response );
     if ( $response =~ /^[yY]$/ ) {
       $dbh->do(q|SET sql_mode='traditional'|); # Elevate warnings to errors
-        print "\nConverting MyISAM tables to InnoDB. Please wait.\n";
-      foreach (@MyISAM_Tables) {
-        my $sql = "ALTER TABLE $_ ENGINE = InnoDB";
-        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+      print "\nConverting MyISAM tables to InnoDB. Please wait.\n";
+      foreach ( @MyISAM_Tables ) {
+        my $sql = "ALTER TABLE `$_` ENGINE = InnoDB";
+        my $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
+        my $res = $sth->execute() or die("Can't execute: ".$sth->errstr());
         $sth->finish();
       }
       $dbh->do(q|SET sql_mode=''|); # Set mode back to default
@@ -360,23 +376,31 @@ if ( $version ) {
     exit(0);
   }
 
-  print( "\nInitiating database upgrade to version ".ZM_VERSION." from version $version\n" );
+  my $start_zm = 0;
+  print("\nInitiating database upgrade to version ".ZM_VERSION." from version $version\n");
   if ( $interactive ) {
-    if ( $Config{ZM_DYN_DB_VERSION} && $Config{ZM_DYN_DB_VERSION} ne $version ) {
-      print( "\nWARNING - You have specified an upgrade from version $version but the database version found is ".$Config{ZM_DYN_DB_VERSION}.". Is this correct?\nPress enter to continue or ctrl-C to abort : " );
+    if ( $Config{ZM_DYN_DB_VERSION} && ($Config{ZM_DYN_DB_VERSION} ne $version) ) {
+      print("\nWARNING - You have specified an upgrade from version $version but the database version found is $Config{ZM_DYN_DB_VERSION}. Is this correct?\nPress enter to continue or ctrl-C to abort : ");
       my $response = <STDIN>;
     }
 
-    print( "\nPlease ensure that ZoneMinder is stopped on your system prior to upgrading the database.\nPress enter to continue or ctrl-C to stop : " );
-    my $response = <STDIN>;
+    if ( systemStatus() eq 'running' ) { 
+      print"\nZoneMinder system appears to be running.  While not strictly required, it is advised to stop ZM during the update process. Would you like to stop ZM now? [Yn]:";
+      my $response = <STDIN>;
+      chomp($response);
+      if ( $response !~ /Yy/ ) {
+        packageControl('stop');
+        $start_zm = 1;
+      }
+    }
 
-    print( "\nDo you wish to take a backup of your database prior to upgrading?\nThis may result in a large file in @ZM_TMPDIR@ if you have a lot of events.\nPress 'y' for a backup or 'n' to continue : " );
-    $response = <STDIN>;
-    chomp( $response );
+    print("\nDo you wish to take a backup of your database prior to upgrading?\nThis may result in a large file in @ZM_TMPDIR@ if you have a lot of events.\nPress 'y' for a backup or 'n' to continue : ");
+    my $response = <STDIN>;
+    chomp($response);
     while ( $response !~ /^[yYnN]$/ ) {
-      print( "Please press 'y' for a backup or 'n' to continue only : " );
+      print("Please press 'y' for a backup or 'n' to continue only : ");
       $response = <STDIN>;
-      chomp( $response );
+      chomp($response);
     }
 
     if ( $response =~ /^[yY]$/ ) {
@@ -384,21 +408,22 @@ if ( $version ) {
       my $command = 'mysqldump';
       if ( defined($portOrSocket) ) {
         if ( $portOrSocket =~ /^\// ) {
-          $command .= " -S".$portOrSocket;
+          $command .= ' -S'.$portOrSocket;
         } else {
-          $command .= " -h".$host." -P".$portOrSocket;
+          $command .= ' -h'.$host.' -P'.$portOrSocket;
         }
       } else {
-        $command .= " -h".$host; 
+        $command .= ' -h'.$host; 
       }
       if ( $dbUser ) {
         $command .= ' -u'.$dbUser;
-        $command .= ' -p"'.$dbPass.'"' if $dbPass;
+        $command .= ' -p\''.$dbPass.'\'' if $dbPass;
       }
-      my $backup = "@ZM_TMPDIR@/".$Config{ZM_DB_NAME}."-".$version.".dump";
-      $command .= " --add-drop-table --databases ".$Config{ZM_DB_NAME}." > ".$backup;
-      print( "Creating backup to $backup. This may take several minutes.\n" );
-      print( "Executing '$command'\n" ) if ( logDebugging() );
+      my $backup = '@ZM_TMPDIR@/'.$Config{ZM_DB_NAME}.'-'.$version.'.dump';
+      $command .= ' --add-drop-table --databases '.$Config{ZM_DB_NAME}.' > '.$backup;
+      print("Creating backup to $backup. This may take several minutes.\n");
+      ($command) = $command =~ /(.*)/; # detaint
+      print("Executing '$command'\n") if logDebugging();
       my $output = qx($command);
       my $status = $? >> 8;
       if ( $status || logDebugging() ) {
@@ -447,7 +472,7 @@ if ( $version ) {
 # Rename the event directories and create a new symlink for the names
     chdir( EVENT_PATH );
 
-    my $sql = "select * from Monitors order by Id";
+    my $sql = "SELECT * FROM `Monitors` ORDER BY `Id`";
     my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
     while( my $monitor = $sth->fetchrow_hashref() ) {
@@ -847,9 +872,9 @@ if ( $version ) {
     }
     $cascade = !undef;
   }
-  if ( $cascade || $version eq "1.24.4" ) {
+  if ( $cascade || $version eq '1.24.4' ) {
 # Patch the database
-    patchDB( $dbh, "1.24.4" );
+    patchDB($dbh, '1.24.4');
 
 # Copy the FTP specific values to the new general config
     my $fetchSql = "select * from Config where Name like 'ZM_UPLOAD_FTP_%'";
@@ -863,12 +888,12 @@ if ( $version ) {
     }
     $cascade = !undef;
   }
-  if ( $cascade || $version lt "1.26.0" ) {
-    my $sth = $dbh->prepare_cached( 'select * from Monitors LIMIT 0,1' );
+  if ( $cascade || $version lt '1.26.0' ) {
+    my $sth = $dbh->prepare_cached('SELECT * FROM Monitors LIMIT 0,1');
     die "Error: " . $dbh->errstr . "\n" unless ($sth);
     die "Error: " . $sth->errstr . "\n" unless ($sth->execute);
 
-    my $columns = $sth->{'NAME'};
+    my $columns = $sth->{NAME};
     if ( ! grep(/^Colours$/, @$columns ) ) {
       $dbh->do(q{alter table Monitors add column `Colours` tinyint(3) unsigned NOT NULL default '1' after `Height`;});
     } # end if
@@ -898,28 +923,31 @@ if ( $version ) {
       die "Should have found upgrade scripts at $updateDir\n";
     } # end if
 
+    my $sql = "UPDATE `Config` SET `Value` = ? WHERE `Name` = 'ZM_DYN_DB_VERSION'";
+    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+
     foreach my $patch ( @files ) {
       my ( $v ) = $patch =~ /^zm_update\-([\d\.]+)\.sql$/;
 #PP make sure we use version compare 
-      if ( version->parse('v' . $v) > version->parse('v' . $version) ) {
-        print( "Upgrading DB to $v from $version\n" );
-        patchDB( $dbh, $v );
-  my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
-  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
-  $sth->finish();
+      if ( version->parse('v'.$v) > version->parse('v'.$version) ) {
+        print("Upgrading DB to $v from $version\n");
+        if ( patchDB($dbh, $v) ) {
+          my $res = $sth->execute($version) or die( "Can't execute: ".$sth->errstr() );
+        }
         #patchDB_using_do( $dbh, $version, $updateDir.'/'.$patch );
       } # end if newer version
     } # end foreach patchfile
+
+    $sth->finish();
     $cascade = !undef;
   } # end if
 
   if ( $cascade ) {
-    my $installed_version = ZM_VERSION;
-    my $sql = 'update Config set Value = ? where Name = ?';
+    # This is basically here so that we don't need zm-update-blah.sql files for versions without db changes
+    my $sql = 'UPDATE `Config` SET `Value` = ? WHERE `Name` = ?';
     my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( "$installed_version", 'ZM_DYN_DB_VERSION' ) or die( "Can't execute: ".$sth->errstr() );
-    $res = $sth->execute( "$installed_version", 'ZM_DYN_CURR_VERSION' ) or die( "Can't execute: ".$sth->errstr() );
+    $sth->execute(ZM_VERSION, 'ZM_DYN_DB_VERSION') or die( "Can't execute: ".$sth->errstr() );
+    $sth->execute(ZM_VERSION, 'ZM_DYN_CURR_VERSION') or die( "Can't execute: ".$sth->errstr() );
     $sth->finish();
   } else {
     zmDbDisconnect();
@@ -930,42 +958,48 @@ if ( $version ) {
   #my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   #my $res = $sth->execute( ) or die( "Can't execute: ".$sth->errstr() );
   #$sth->finish();
-  print( "\nDatabase upgrade to version ".ZM_VERSION." successful.\n\n" );
-}
+  
+  print("\nDatabase upgrade to version ".ZM_VERSION." successful.\n\n");
+  if ( $start_zm ) {
+    print("Starting ZM since we stopped it for the update\n");
+    packageControl('start');
+  }
+} # end if version
+
 zmDbDisconnect();
-exit( 0 );
+exit(0);
 
 sub patchDB_using_do {
   my ( $dbh, $version, $file ) = @_;
 
-  open( my $fh, '<', $file ) or die "Unable to open $file $!";
+  open(my $fh, '<', $file) or die "Unable to open $file $!";
   $/ = undef;
   my $sql = <$fh>;
   close $fh;
   if ( $sql ) {
-    $dbh->{'AutoCommit'} = 0;
+    $dbh->{AutoCommit} = 0;
     $dbh->do($sql);
     if ( $dbh->errstr() ) {
       $dbh->rollback();
-      die "Error: " . $dbh->errstr(). ".  Rolled back.\n";		
+      die 'Error: '.$dbh->errstr().".  Rolled back.\n";		
     } # end if error
 
-    my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
-    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
+    my $sql = 'UPDATE `Config` SET `Value` = ? WHERE `Name` = \'ZM_DYN_DB_VERSION\'';
+    my $sth = $dbh->prepare_cached($sql) or die "Can't prepare '$sql': ".$dbh->errstr();
+    my $res = $sth->execute($version) or die 'Can\'t execute: '.$sth->errstr();
     $sth->finish();
 
-    $dbh->{'AutoCommit'} = 1;
+    $dbh->{AutoCommit} = 1;
   } else {
     Warning("Empty db update file at $file");
   }
-}
+} # end sub patchDB_using_do
+
 sub patchDB {
   my $dbh = shift;
   my $version = shift;
 
-
-  my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
+  my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ ) if $Config{ZM_DB_HOST};
   my $command = 'mysql';
   if ( defined($portOrSocket) ) {
     if ( $portOrSocket =~ /^\// ) {
@@ -973,12 +1007,12 @@ sub patchDB {
     } else {
       $command .= ' -h'.$host.' -P'.$portOrSocket;
     }
-  } else {
+  } elsif ( $host ) {
     $command .= ' -h'.$host;
   }
   if ( $dbUser ) {
     $command .= ' -u'.$dbUser;
-    $command .= ' -p"'.$dbPass.'"' if $dbPass;
+    $command .= ' -p\''.$dbPass.'\'' if $dbPass;
   }
   $command .= ' '.$Config{ZM_DB_NAME}.' < ';
   if ( $updateDir ) {
@@ -988,39 +1022,39 @@ sub patchDB {
   }
   $command .= '/zm_update-'.$version.'.sql';
 
-  print( "Executing '$command'\n" ) if ( logDebugging() );
+  print("Executing '$command'\n") if logDebugging();
+  ($command) = $command =~ /(.*)/; # detaint
   my $output = qx($command);
   my $status = $? >> 8;
   if ( $status || logDebugging() ) {
-    chomp( $output );
-    print( "Output: $output\n" );
+    chomp($output);
+    print("Output: $output\n");
   }
   if ( $status ) {
-    die( "Command '$command' exited with status: $status\n" );
+    die("Command '$command' exited with status: $status\n");
   }
-  print( "\nDatabase successfully upgraded to version $version.\n" );
-
-}
+  print("\nDatabase successfully upgraded to version $version.\n");
+} # end sub patchDB
 
 sub migratePasswords {
-    print ("Migratings passwords, if any...\n");
-    my $sql = "select * from Users";
-    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
-    while( my $user = $sth->fetchrow_hashref() ) {
-      my $scheme = substr($user->{Password}, 0, 1);
-     if ($scheme eq "*") {
-       print ("-->".$user->{Username}. " password will be migrated\n");
-       my $salt = Crypt::Eksblowfish::Bcrypt::en_base64(rand_bits(16*8));
-       my $settings = '$2a$10$'.$salt;
-       my $pass_hash = Crypt::Eksblowfish::Bcrypt::bcrypt($user->{Password},$settings);
-       my $new_pass_hash =  "-ZM-".$pass_hash;
-       $sql = "UPDATE Users SET PASSWORD=? WHERE Username=?";
-       my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-       my $res = $sth->execute($new_pass_hash, $user->{Username}) or die( "Can't execute: ".$sth->errstr() );
-     }
+  print ("Migratings passwords, if any...\n");
+  my $sql = 'SELECT * FROM `Users`';
+  my $sth = $dbh->prepare_cached($sql) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute() or die("Can't execute: ".$sth->errstr());
+  while( my $user = $sth->fetchrow_hashref() ) {
+    my $scheme = substr($user->{Password}, 0, 1);
+    if ($scheme eq '*') {
+      print ('-->'.$user->{Username}." password will be migrated\n");
+      my $salt = Crypt::Eksblowfish::Bcrypt::en_base64(rand_bits(16*8));
+      my $settings = '$2a$10$'.$salt;
+      my $pass_hash = Crypt::Eksblowfish::Bcrypt::bcrypt($user->{Password},$settings);
+      my $new_pass_hash = '-ZM-'.$pass_hash;
+      $sql = 'UPDATE Users SET `Password`=? WHERE `Username`=?';
+      my $sth = $dbh->prepare_cached($sql) or die("Can't prepare '$sql': ".$dbh->errstr());
+      my $res = $sth->execute($new_pass_hash, $user->{Username}) or die("Can't execute: ".$sth->errstr());
     }
-}
+  }
+} # end sub migratePasswords
 
 sub migratePaths {
 
diff --git a/scripts/zmvideo.pl.in b/scripts/zmvideo.pl.in
index 95a395b4d..04cfabb04 100644
--- a/scripts/zmvideo.pl.in
+++ b/scripts/zmvideo.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 9243417f1..504bd456f 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
diff --git a/scripts/zmx10.pl.in b/scripts/zmx10.pl.in
index beb10ae48..de1f74929 100644
--- a/scripts/zmx10.pl.in
+++ b/scripts/zmx10.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL_EXECUTABLE@ -wT
 #
 # ==========================================================================
 #
@@ -83,72 +83,64 @@ my $unit_code;
 my $version;
 
 GetOptions(
-    'command=s'     =>\$command,
-    'unit-code=i'   =>\$unit_code,
-    'version'       =>\$version
+  'command=s'     =>\$command,
+  'unit-code=i'   =>\$unit_code,
+  'version'       =>\$version
 ) or pod2usage(-exitstatus => -1);
 
 if ( $version ) {
-    print ZoneMinder::Base::ZM_VERSION;
-    exit(0);
+  print ZoneMinder::Base::ZM_VERSION;
+  exit(0);
 }
 
-die( 'No command given' ) unless( $command );
-die( 'No unit code given' )
-    unless( $unit_code || ($command =~ /(?:start|status|shutdown)/) );
+die 'No command given' unless $command;
+die 'No unit code given'
+unless( $unit_code || ($command =~ /(?:start|status|shutdown)/) );
 
-if ( $command eq 'start' )
-{
+if ( $command eq 'start' ) {
+  X10Server::runServer();
+  exit();
+}
+
+socket(CLIENT, PF_UNIX, SOCK_STREAM, 0)
+  or Fatal("Can't open socket: $!");
+
+my $saddr = sockaddr_un(SOCK_FILE);
+
+if ( !connect(CLIENT, $saddr) ) {
+  # The server isn't there 
+  print("Unable to connect, starting server\n");
+  close(CLIENT);
+
+  if ( my $cpid = fork() ) {
+    # Parent process just sleep and fall through
+    sleep(2);
+    logReinit();
+    socket(CLIENT, PF_UNIX, SOCK_STREAM, 0)
+      or Fatal("Can't open socket: $!");
+    connect(CLIENT, $saddr)
+      or Fatal("Can't connect: $!");
+  } elsif ( defined($cpid) ) {
+    setpgrp();
+
+    logReinit();
     X10Server::runServer();
-    exit();
-}
-
-socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 )
-    or Fatal( "Can't open socket: $!" );
-
-my $saddr = sockaddr_un( SOCK_FILE );
-
-if ( !connect( CLIENT, $saddr ) )
-{
-    # The server isn't there 
-    print( "Unable to connect, starting server\n" );
-    close( CLIENT );
-
-    if ( my $cpid = fork() )
-    {
-        # Parent process just sleep and fall through
-        sleep( 2 );
-        logReinit();
-        socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 )
-            or Fatal( "Can't open socket: $!" );
-        connect( CLIENT, $saddr )
-            or Fatal( "Can't connect: $!" );
-    }
-    elsif ( defined($cpid) )
-    {
-        setpgrp();
-
-        logReinit();
-        X10Server::runServer();
-    }
-    else
-    {
-        Fatal( "Can't fork: $!" );
-    }
+  } else {
+    Fatal("Can't fork: $!");
+  }
 }
 # The server is there, connect to it
 #print( "Writing commands\n" );
 CLIENT->autoflush();
-my $message = "$command";
-$message .= ";$unit_code" if ( $unit_code );
-print( CLIENT $message );
-shutdown( CLIENT, 1 );
-while ( my $line = <CLIENT> )
-{
-    chomp( $line );
-    print( "$line\n" );
+my $message = $command;
+$message .= ';'.$unit_code if $unit_code;
+print(CLIENT $message);
+shutdown(CLIENT, 1);
+while ( my $line = <CLIENT> ) {
+  chomp($line);
+  print("$line\n");
 }
-close( CLIENT );
+close(CLIENT);
 #print( "Finished writing, bye\n" );
 exit;
 
@@ -178,605 +170,497 @@ our %monitor_hash;
 our %device_hash;
 our %pending_tasks;
 
-sub runServer
-{
-    Info( "X10 server starting\n" );
+sub runServer {
+  Info('X10 server starting');
 
-    socket( SERVER, PF_UNIX, SOCK_STREAM, 0 )
-        or Fatal( "Can't open socket: $!" );
-    unlink( main::SOCK_FILE );
-    my $saddr = sockaddr_un( main::SOCK_FILE );
-    bind( SERVER, $saddr ) or Fatal( "Can't bind: $!" );
-    listen( SERVER, SOMAXCONN ) or Fatal( "Can't listen: $!" );
+  socket(SERVER, PF_UNIX, SOCK_STREAM, 0)
+    or Fatal("Can't open socket: $!");
+  unlink(main::SOCK_FILE);
+  my $saddr = sockaddr_un(main::SOCK_FILE);
+  bind(SERVER, $saddr) or Fatal("Can't bind: $!");
+  listen(SERVER, SOMAXCONN) or Fatal("Can't listen: $!");
 
-    $dbh = zmDbConnect();
+  $dbh = zmDbConnect();
 
-    $x10 = new X10::ActiveHome( port=>$Config{ZM_X10_DEVICE}, house_code=>$Config{ZM_X10_HOUSE_CODE}, debug=>0 );
+  $x10 = new X10::ActiveHome(
+    port=>$Config{ZM_X10_DEVICE},
+    house_code=>$Config{ZM_X10_HOUSE_CODE},
+    debug=>0
+  );
 
-    loadTasks();
+  loadTasks();
 
-    $x10->register_listener( \&x10listen );
+  $x10->register_listener(\&x10listen);
 
-    my $rin = '';
-    vec( $rin, fileno(SERVER),1) = 1;
-    vec( $rin, $x10->select_fds(),1) = 1;
-    my $timeout = 0.2;
-    #print( 'F:'.fileno(SERVER)."\n" );
-    my $reload = undef;
-    my $reload_count = 0;
-    my $reload_limit = $Config{ZM_X10_DB_RELOAD_INTERVAL} / $timeout;
-    while( 1 )
-    {
-        my $nfound = select( my $rout = $rin, undef, undef, $timeout );
-        #print( "Off select, NF:$nfound, ER:$!\n" );
-        #print( vec( $rout, fileno(SERVER),1)."\n" );
-        #print( vec( $rout, $x10->select_fds(),1)."\n" );
-        if ( $nfound > 0 )
-        {
-            if ( vec( $rout, fileno(SERVER),1) )
-            {
-                my $paddr = accept( CLIENT, SERVER );
-                my $message = <CLIENT>;
+  my $rin = '';
+  vec($rin, fileno(SERVER),1) = 1;
+  vec($rin, $x10->select_fds(),1) = 1;
+  my $timeout = 0.2;
+  #print( 'F:'.fileno(SERVER)."\n" );
+  my $reload = undef;
+  my $reload_count = 0;
+  my $reload_limit = $Config{ZM_X10_DB_RELOAD_INTERVAL} / $timeout;
+  while( 1 ) {
+    my $nfound = select(my $rout = $rin, undef, undef, $timeout);
+    #print( "Off select, NF:$nfound, ER:$!\n" );
+    #print( vec( $rout, fileno(SERVER),1)."\n" );
+    #print( vec( $rout, $x10->select_fds(),1)."\n" );
+    if ( $nfound > 0 ) {
+      if ( vec($rout, fileno(SERVER),1) ) {
+        my $paddr = accept(CLIENT, SERVER);
+        my $message = <CLIENT>;
 
-                my ( $command, $unit_code ) = split( /;/, $message );
+        my ($command, $unit_code) = split(';', $message);
 
-                my $device;
-                if ( defined($unit_code) )
-                {
-                    if ( $unit_code < 1 || $unit_code > 16 )
-                    {
-                        dPrint( ZoneMinder::Logger::ERROR, "Invalid unit code '$unit_code'\n" );
-                        next;
-                    }
+        my $device;
+        if ( defined($unit_code) ) {
+          if ( $unit_code < 1 || $unit_code > 16 ) {
+            dPrint(ZoneMinder::Logger::ERROR, "Invalid unit code '$unit_code'\n");
+            next;
+          }
 
-                    $device = $device_hash{$unit_code};
-                    if ( !$device )
-                    {
-                        $device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ),
-                                                               status=>'unknown'
-                                                             };
-                    }
-                }
+          $device = $device_hash{$unit_code};
+          if ( !$device ) {
+            $device = $device_hash{$unit_code} = {
+              appliance=>$x10->Appliance(unit_code=>$unit_code),
+              status=>'unknown'
+            };
+          }
+        } # end if defined($unit_code)
 
-                my $result;
-                if ( $command eq 'on' )
-                {
-                    $result = $device->{appliance}->on();
-                }
-                elsif ( $command eq 'off' )
-                {
-                    $result = $device->{appliance}->off();
-                }
-                #elsif ( $command eq 'dim' )
-                #{
-                    #$result = $device->{appliance}->dim();
-                #}
-                #elsif ( $command eq 'bright' )
-                #{
-                    #$result = $device->{appliance}->bright();
-                #}
-                elsif ( $command eq 'status' )
-                {
-                    if ( $device )
-                    {
-                        dPrint( ZoneMinder::Logger::DEBUG, $unit_code.' '.$device->{status}."\n" );
-                    }
-                    else
-                    {
-                        foreach my $unit_code ( sort( keys(%device_hash) ) )
-                        {
-                            my $device = $device_hash{$unit_code};
-                            dPrint( ZoneMinder::Logger::DEBUG, $unit_code.' '.$device->{status}."\n" );
-                        }
-                    }
-                }
-                elsif ( $command eq 'shutdown' )
-                {
-                    last;
-                }
-                else
-                {
-                    dPrint( ZoneMinder::Logger::ERROR, "Invalid command '$command'\n" );
-                }
-                if ( defined($result) )
-                {
-                    if ( 1 || $result )
-                    {
-                        $device->{status} = uc($command);
-                        dPrint( ZoneMinder::Logger::DEBUG, $device->{appliance}->address()." $command, ok\n" );
-                        #x10listen( new X10::Event( sprintf("%s %s", $device->{appliance}->address, uc($command) ) ) );
-                    }
-                    else
-                    {
-                        dPrint( ZoneMinder::Logger::ERROR, $device->{appliance}->address()." $command, failed\n" );
-                    }
-                }
-                close( CLIENT );
-            }
-            elsif ( vec( $rout, $x10->select_fds(),1) )
-            {
-                $x10->handle_input();
-            }
-            else
-            {
-                Fatal( 'Bogus descriptor' );
-            }
+        my $result;
+        if ( $command eq 'on' ) {
+          $result = $device->{appliance}->on();
+        } elsif ( $command eq 'off' ) {
+          $result = $device->{appliance}->off();
         }
-        elsif ( $nfound < 0 )
-        {
-            if ( $! != EINTR )
-            {
-                Fatal( "Can't select: $!" );
+        #elsif ( $command eq 'dim' )
+        #{
+        #$result = $device->{appliance}->dim();
+        #}
+        #elsif ( $command eq 'bright' )
+        #{
+        #$result = $device->{appliance}->bright();
+        #}
+        elsif ( $command eq 'status' ) {
+          if ( $device ) {
+            dPrint(ZoneMinder::Logger::DEBUG, $unit_code.' '.$device->{status}."\n");
+          } else {
+            foreach my $unit_code ( sort( keys(%device_hash) ) ) {
+              my $device = $device_hash{$unit_code};
+              dPrint(ZoneMinder::Logger::DEBUG, $unit_code.' '.$device->{status}."\n");
             }
+          }
+        } elsif ( $command eq 'shutdown' ) {
+          last;
+        } else {
+          dPrint(ZoneMinder::Logger::ERROR, "Invalid command '$command'\n");
         }
-        else
-        {
-            #print( "Select timed out\n" );
-            # Check for state changes
-            foreach my $monitor_id ( sort(keys(%monitor_hash) ) )
-            {
-                my $monitor = $monitor_hash{$monitor_id};
-                my $state = zmGetMonitorState( $monitor );
-                if ( !defined($state) )
-                {
-                    $reload = !undef;
-                    next;
-                }
-                if ( defined( $monitor->{LastState} ) )
-                {
-                    my $task_list;
-                    if ( ($state == STATE_ALARM || $state == STATE_ALERT)
-                         && ($monitor->{LastState} == STATE_IDLE || $monitor->{LastState} == STATE_TAPE)
-                    ) # Gone into alarm state
-                    {
-                        Debug( "Applying ON_list for $monitor_id\n" );
-                        $task_list = $monitor->{'ON_list'};
-                    }
-                    elsif ( ($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE)
-                            || ($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE)
-                    ) # Come out of alarm state
-                    {
-                        Debug( "Applying OFF_list for $monitor_id\n" );
-                        $task_list = $monitor->{'OFF_list'};
-                    }
-                    if ( $task_list )
-                    {
-                        foreach my $task ( @$task_list )
-                        {
-                            processTask( $task );
-                        }
-                    }
-                }
-                $monitor->{LastState} = $state;
-            }
-
-            # Check for pending tasks
-            my $now = time();
-            foreach my $activation_time ( sort(keys(%pending_tasks) ) )
-            {
-                last if ( $activation_time > $now );
-                my $pending_list = $pending_tasks{$activation_time};
-                foreach my $task ( @$pending_list )
-                {
-                    processTask( $task );
-                }
-                delete( $pending_tasks{$activation_time} );
-            }
-            if ( $reload || ++$reload_count >= $reload_limit )
-            {
-                loadTasks();
-                $reload = undef;
-                $reload_count = 0;
-            }
-        }
-    }
-    Info( "X10 server exiting\n" );
-    close( SERVER );
-    exit();
-}
-
-sub addToDeviceList
-{
-    my $unit_code = shift;
-    my $event = shift;
-    my $monitor = shift;
-    my $function = shift;
-    my $limit = shift;
-
-    Debug( "Adding to device list, uc:$unit_code, ev:$event, mo:"
-           .$monitor->{Id}.", fu:$function, li:$limit\n"
-    );
-    my $device = $device_hash{$unit_code};
-    if ( !$device )
-    {
-        $device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ),
-                                               status=>'unknown'
-                                             };
-    }
-
-    my $task = { type=>'device',
-                 monitor=>$monitor,
-                 address=>$device->{appliance}->address(),
-                 function=>$function
-    };
-    if ( $limit )
-    {
-        $task->{limit} = $limit
-    }
-
-    my $task_list = $device->{$event.'_list'};
-    if ( !$task_list )
-    {
-        $task_list = $device->{$event.'_list'} = [];
-    }
-    push( @$task_list, $task );
-}
-
-sub addToMonitorList
-{
-    my $monitor = shift;
-    my $event = shift;
-    my $unit_code = shift;
-    my $function = shift;
-    my $limit = shift;
-
-    Debug( "Adding to monitor list, uc:$unit_code, ev:$event, mo:".$monitor->{Id}
-          .", fu:$function, li:$limit\n"
-    );
-    my $device = $device_hash{$unit_code};
-    if ( !$device )
-    {
-        $device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ),
-                                               status=>'unknown'
-                                             };
-    }
-
-    my $task = { type=>'monitor',
-                 device=>$device,
-                 id=>$monitor->{Id},
-                 function=>$function
-    };
-    if ( $limit )
-    {
-        $task->{limit} = $limit;
-    }
-
-    my $task_list = $monitor->{$event.'_list'};
-    if ( !$task_list )
-    {
-        $task_list = $monitor->{$event.'_list'} = [];
-    }
-    push( @$task_list, $task );
-}
-
-sub loadTasks
-{
-    %monitor_hash = ();
-
-    Debug( "Loading tasks\n" );
-    # Clear out all old device task lists
-    foreach my $unit_code ( sort( keys(%device_hash) ) )
-    {
-        my $device = $device_hash{$unit_code};
-        $device->{ON_list} = [];
-        $device->{OFF_list} = [];
-    }
-
-    my $sql = "SELECT M.*,T.* from Monitors as M
-               INNER JOIN TriggersX10 as T on (M.Id = T.MonitorId)
-               WHERE find_in_set( M.Function, 'Modect,Record,Mocord,Nodect' )
-                AND M.Enabled = 1
-                AND find_IN_set( 'X10', M.Triggers )"
-    ;
-    my $sth = $dbh->prepare_cached( $sql )
-        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute()
-        or Fatal( "Can't execute: ".$sth->errstr() );
-    while( my $monitor = $sth->fetchrow_hashref() )
-    {
-# Check shared memory ok
-      if ( !zmMemVerify( $monitor ) ) {
-        zmMemInvalidate( $monitor );
-        next ;
+        if ( defined($result) ) {
+          # FIXME
+          if ( 1 || $result ) {
+            $device->{status} = uc($command);
+            dPrint(ZoneMinder::Logger::DEBUG, $device->{appliance}->address()." $command, ok\n");
+            #x10listen( new X10::Event( sprintf("%s %s", $device->{appliance}->address, uc($command) ) ) );
+          } else {
+            dPrint(ZoneMinder::Logger::ERROR, $device->{appliance}->address()." $command, failed\n");
+          }
+        } # end if defined result
+        close(CLIENT);
+      } elsif ( vec($rout, $x10->select_fds(),1) ) {
+        $x10->handle_input();
+      } else {
+        Fatal('Bogus descriptor');
       }
-
-        $monitor_hash{$monitor->{Id}} = $monitor;
-
-        if ( $monitor->{Activation} )
-        {
-            Debug( "$monitor->{Name} has active string '$monitor->{Activation}'\n" );
-            foreach my $code_string ( split( /,/, $monitor->{Activation} ) )
-            {
-                #Debug( "Code string: $code_string\n" );
-                my ( $invert, $unit_code, $modifier, $limit )
-                   = ( $code_string =~ /^([!~])?(\d+)(?:([+-])(\d+)?)?$/ );
-                $limit = 0 if ( !$limit );
-                if ( $unit_code )
-                {
-                    if ( !$modifier || $modifier eq '+' )
-                    {
-                        addToDeviceList( $unit_code,
-                                         'ON',
-                                         $monitor,
-                                         !$invert ? 'start_active'
-                                                  : 'stop_active',
-                                         $limit
-                        );
-                    }
-                    if ( !$modifier || $modifier eq '-' )
-                    {
-                        addToDeviceList( $unit_code,
-                                         'OFF',
-                                         $monitor,
-                                         !$invert ? 'stop_active'
-                                                  : 'start_active',
-                                         $limit
-                        );
-                    }
-                }
-            }
+    } elsif ( $nfound < 0 ) {
+      if ( $! != EINTR ) {
+        Fatal("Can't select: $!");
+      }
+    } else {
+      #print( "Select timed out\n" );
+      # Check for state changes
+      foreach my $monitor_id ( sort(keys(%monitor_hash) ) ) {
+        my $monitor = $monitor_hash{$monitor_id};
+        my $state = zmGetMonitorState($monitor);
+        if ( !defined($state) ) {
+          $reload = !undef;
+          next;
         }
-        if ( $monitor->{AlarmInput} )
-        {
-            Debug( "$monitor->{Name} has alarm input string '$monitor->{AlarmInput}'\n" );
-            foreach my $code_string ( split( /,/, $monitor->{AlarmInput} ) )
-            {
-                #Debug( "Code string: $code_string\n" );
-                my ( $invert, $unit_code, $modifier, $limit )
-                   = ( $code_string =~ /^([!~])?(\d+)(?:([+-])(\d+)?)?$/ );
-                $limit = 0 if ( !$limit );
-                if ( $unit_code )
-                {
-                    if ( !$modifier || $modifier eq '+' )
-                    {
-                        addToDeviceList( $unit_code,
-                                         'ON',
-                                         $monitor,
-                                         !$invert ? 'start_alarm'
-                                                  : 'stop_alarm',
-                                         $limit
-                        );
-                    }
-                    if ( !$modifier || $modifier eq '-' )
-                    {
-                        addToDeviceList( $unit_code,
-                                         'OFF',
-                                         $monitor,
-                                         !$invert ? 'stop_alarm'
-                                                  : 'start_alarm',
-                                         $limit
-                        );
-                    }
-                }
+        if ( defined( $monitor->{LastState} ) ) {
+          my $task_list;
+          if ( ($state == STATE_ALARM || $state == STATE_ALERT)
+            && ($monitor->{LastState} == STATE_IDLE || $monitor->{LastState} == STATE_TAPE)
+          ) # Gone into alarm state
+          {
+            Debug("Applying ON_list for $monitor_id");
+            $task_list = $monitor->{ON_list};
+          } elsif ( ($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE)
+            || ($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE)
+          ) # Come out of alarm state
+          {
+            Debug("Applying OFF_list for $monitor_id");
+            $task_list = $monitor->{OFF_list};
+          }
+          if ( $task_list ) {
+            foreach my $task ( @$task_list ) {
+              processTask($task);
             }
-        }
-        if ( $monitor->{AlarmOutput} )
-        {
-            Debug( "$monitor->{Name} has alarm output string '$monitor->{AlarmOutput}'\n" );
-            foreach my $code_string ( split( /,/, $monitor->{AlarmOutput} ) )
-            {
-                #Debug( "Code string: $code_string\n" );
-                my ( $invert, $unit_code, $modifier, $limit )
-                   = ( $code_string =~ /^([!~])?(\d+)(?:([+-])(\d+)?)?$/ );
-                $limit = 0 if ( !$limit );
-                if ( $unit_code )
-                {
-                    if ( !$modifier || $modifier eq '+' )
-                    {
-                        addToMonitorList( $monitor,
-                                          'ON',
-                                          $unit_code,
-                                          !$invert ? 'on'
-                                                   : 'off',
-                                          $limit
-                        );
-                    }
-                    if ( !$modifier || $modifier eq '-' )
-                    {
-                        addToMonitorList( $monitor,
-                                          'OFF',
-                                          $unit_code,
-                                          !$invert ? 'off'
-                                                   : 'on',
-                                          $limit
-                        );
-                    }
-                }
-            }
-        }
-        zmMemInvalidate( $monitor );
-    }
-}
+          }
+        } # end if defined laststate
+        $monitor->{LastState} = $state;
+      } # end foreach monitor
 
-sub addPendingTask
-{
-    my $task = shift;
-
-    # Check whether we are just extending a previous pending task
-    # and remove it if it's there
-    foreach my $activation_time ( sort(keys(%pending_tasks) ) )
-    {
+      # Check for pending tasks
+      my $now = time();
+      foreach my $activation_time ( sort(keys(%pending_tasks) ) ) {
+        last if ( $activation_time > $now );
         my $pending_list = $pending_tasks{$activation_time};
-        my $new_pending_list = [];
-        foreach my $pending_task ( @$pending_list )
-        {
-            if ( $task->{type} ne $pending_task->{type} )
-            {
-                push( @$new_pending_list, $pending_task )
-            }
-            elsif ( $task->{type} eq 'device' )
-            {
-                if (( $task->{monitor}->{Id} != $pending_task->{monitor}->{Id} )
-                || ( $task->{function} ne $pending_task->{function} ))
-                {
-                    push( @$new_pending_list, $pending_task )
-                }
-            }
-            elsif ( $task->{type} eq 'monitor' )
-            {
-                if (( $task->{device}->{appliance}->unit_code()
-                      != $pending_task->{device}->{appliance}->unit_code()
-                    )
-                    || ( $task->{function} ne $pending_task->{function} )
-                )
-                {
-                    push( @$new_pending_list, $pending_task )
-                }
-            }
-        }
-        if ( @$new_pending_list )
-        {
-            $pending_tasks{$activation_time} = $new_pending_list;
-        }
-        else
-        {
-            delete( $pending_tasks{$activation_time} );
+        foreach my $task ( @$pending_list ) {
+          processTask($task);
         }
+        delete $pending_tasks{$activation_time};
+      }
+      if ( $reload or (++$reload_count >= $reload_limit) ) {
+        loadTasks();
+        $reload = undef;
+        $reload_count = 0;
+      }
+    }
+  }
+  Info("X10 server exiting");
+  close(SERVER);
+  exit();
+}
+
+sub addToDeviceList {
+  my $unit_code = shift;
+  my $event = shift;
+  my $monitor = shift;
+  my $function = shift;
+  my $limit = shift;
+
+  Debug("Adding to device list, uc:$unit_code, ev:$event, mo:"
+    .$monitor->{Id}.", fu:$function, li:$limit"
+  );
+  my $device = $device_hash{$unit_code};
+  if ( !$device ) {
+    $device = $device_hash{$unit_code} = {
+      appliance=>$x10->Appliance(unit_code=>$unit_code),
+      status=>'unknown'
+    };
+  }
+
+  my $task = {
+    type=>'device',
+    monitor=>$monitor,
+    address=>$device->{appliance}->address(),
+    function=>$function
+  };
+
+  if ( $limit ) {
+    $task->{limit} = $limit
+  }
+
+  my $task_list = $device->{$event.'_list'};
+  if ( !$task_list ) {
+    $task_list = $device->{$event.'_list'} = [];
+  }
+  push @$task_list, $task;
+} # end sub addToDeviceList
+
+sub addToMonitorList {
+  my $monitor = shift;
+  my $event = shift;
+  my $unit_code = shift;
+  my $function = shift;
+  my $limit = shift;
+
+  Debug("Adding to monitor list, uc:$unit_code, ev:$event, mo:".$monitor->{Id}
+    .", fu:$function, li:$limit"
+  );
+  my $device = $device_hash{$unit_code};
+  if ( !$device ) {
+    $device = $device_hash{$unit_code} = {
+      appliance=>$x10->Appliance(unit_code=>$unit_code),
+      status=>'unknown'
+    };
+  }
+
+  my $task = {
+    type=>'monitor',
+    device=>$device,
+    id=>$monitor->{Id},
+    function=>$function
+  };
+  if ( $limit ) {
+    $task->{limit} = $limit;
+  }
+
+  my $task_list = $monitor->{$event.'_list'};
+  if ( !$task_list ) {
+    $task_list = $monitor->{$event.'_list'} = [];
+  }
+  push @$task_list, $task;
+} # end sub addToMonitorList
+
+sub loadTasks {
+  %monitor_hash = ();
+
+  Debug('Loading tasks');
+  # Clear out all old device task lists
+  foreach my $unit_code ( sort keys(%device_hash) ) {
+    my $device = $device_hash{$unit_code};
+    $device->{ON_list} = [];
+    $device->{OFF_list} = [];
+  }
+
+  my $sql = 'SELECT M.*,T.* FROM Monitors as M
+  INNER JOIN TriggersX10 as T on (M.Id = T.MonitorId)
+  WHERE find_in_set(M.`Function`, \'Modect,Record,Mocord,Nodect\')
+  AND M.`Enabled` = 1
+  AND find_IN_set(\'X10\', M.Triggers)';
+  my $sth = $dbh->prepare_cached( $sql )
+    or Fatal("Can't prepare '$sql': ".$dbh->errstr());
+  my $res = $sth->execute()
+    or Fatal("Can't execute: ".$sth->errstr());
+  while( my $monitor = $sth->fetchrow_hashref() ) {
+    # Check shared memory ok
+    if ( !zmMemVerify($monitor) ) {
+      zmMemInvalidate($monitor);
+      next;
     }
 
-    my $end_time = time() + $task->{limit};
-    my $pending_list = $pending_tasks{$end_time};
-    if ( !$pending_list )
-    {
-        $pending_list = $pending_tasks{$end_time} = [];
+    $monitor_hash{$monitor->{Id}} = $monitor;
+
+    if ( $monitor->{Activation} ) {
+      Debug("$monitor->{Name} has active string '$monitor->{Activation}'");
+      foreach my $code_string ( split(',', $monitor->{Activation}) ) {
+        #Debug( "Code string: $code_string\n" );
+        my ( $invert, $unit_code, $modifier, $limit )
+        = ( $code_string =~ /^([!~])?(\d+)(?:([+-])(\d+)?)?$/ );
+        $limit = 0 if !$limit;
+        if ( $unit_code ) {
+          if ( !$modifier || $modifier eq '+' ) {
+            addToDeviceList( $unit_code,
+              'ON',
+              $monitor,
+              (!$invert ? 'start_active' : 'stop_active'),
+              $limit
+            );
+          }
+          if ( !$modifier || $modifier eq '-' ) {
+            addToDeviceList( $unit_code,
+              'OFF',
+              $monitor,
+              (!$invert ? 'stop_active' : 'start_active'),
+              $limit
+            );
+          }
+        } # end if unit_code
+      } # end foreach code_string
     }
-    my $pending_task;
-    if ( $task->{type} eq 'device' )
-    {
-        $pending_task = { type=>$task->{type},
-                          monitor=>$task->{monitor},
-                          function=>$task->{function}
+    if ( $monitor->{AlarmInput} ) {
+      Debug("$monitor->{Name} has alarm input string '$monitor->{AlarmInput}'");
+      foreach my $code_string ( split(',', $monitor->{AlarmInput}) ) {
+        #Debug( "Code string: $code_string\n" );
+        my ( $invert, $unit_code, $modifier, $limit )
+        = ( $code_string =~ /^([!~])?(\d+)(?:([+-])(\d+)?)?$/ );
+        $limit = 0 if !$limit;
+        if ( $unit_code ) {
+          if ( !$modifier || $modifier eq '+' ) {
+            addToDeviceList( $unit_code,
+              'ON',
+              $monitor,
+              (!$invert ? 'start_alarm' : 'stop_alarm'),
+              $limit
+            );
+          }
+          if ( !$modifier || $modifier eq '-' ) {
+            addToDeviceList( $unit_code,
+              'OFF',
+              $monitor,
+              (!$invert ? 'stop_alarm' : 'start_alarm'),
+              $limit
+            );
+          }
+        } # end if unit_code
+      } # end foreach code_string
+    } # end if AlarmInput
+    if ( $monitor->{AlarmOutput} ) {
+      Debug("$monitor->{Name} has alarm output string '$monitor->{AlarmOutput}'");
+      foreach my $code_string ( split( ',', $monitor->{AlarmOutput} ) ) {
+        #Debug( "Code string: $code_string\n" );
+        my ( $invert, $unit_code, $modifier, $limit )
+        = ( $code_string =~ /^([!~])?(\d+)(?:([+-])(\d+)?)?$/ );
+        $limit = 0 if !$limit;
+        if ( $unit_code ) {
+          if ( !$modifier || $modifier eq '+' ) {
+            addToMonitorList( $monitor,
+              'ON',
+              $unit_code,
+              (!$invert ? 'on' : 'off'),
+              $limit
+            );
+          }
+          if ( !$modifier || $modifier eq '-' ) {
+            addToMonitorList( $monitor,
+              'OFF',
+              $unit_code,
+              (!$invert ? 'off' : 'on'),
+              $limit
+            );
+          }
+        } # end if unit_code
+      } # end foreach code_string
+    } # end if AlarmOutput
+    zmMemInvalidate($monitor);
+  }
+} # end sub loadTasks
+
+sub addPendingTask {
+  my $task = shift;
+
+  # Check whether we are just extending a previous pending task
+  # and remove it if it's there
+  foreach my $activation_time ( sort keys(%pending_tasks) ) {
+    my $pending_list = $pending_tasks{$activation_time};
+    my $new_pending_list = [];
+    foreach my $pending_task ( @$pending_list ) {
+      if ( $task->{type} ne $pending_task->{type} ) {
+        push( @$new_pending_list, $pending_task )
+      } elsif ( $task->{type} eq 'device' ) {
+        if (( $task->{monitor}->{Id} != $pending_task->{monitor}->{Id} )
+          || ( $task->{function} ne $pending_task->{function} ))
+        {
+          push @$new_pending_list, $pending_task;
+        }
+      } elsif ( $task->{type} eq 'monitor' ) {
+        if (( $task->{device}->{appliance}->unit_code()
+            != $pending_task->{device}->{appliance}->unit_code()
+          )
+          || ( $task->{function} ne $pending_task->{function} )
+        ) {
+          push @$new_pending_list, $pending_task;
+        }
+      } # end switch task->type
+    } # end foreach pending_task
+
+    if ( @$new_pending_list ) {
+      $pending_tasks{$activation_time} = $new_pending_list;
+    } else {
+      delete $pending_tasks{$activation_time};
+    }
+  } # end foreach activation_time
+
+  my $end_time = time() + $task->{limit};
+  my $pending_list = $pending_tasks{$end_time};
+  if ( !$pending_list ) {
+    $pending_list = $pending_tasks{$end_time} = [];
+  }
+  my $pending_task;
+  if ( $task->{type} eq 'device' ) {
+    $pending_task = {
+      type=>$task->{type},
+      monitor=>$task->{monitor},
+      function=>$task->{function}
+    };
+    $pending_task->{function} =~ s/start/stop/;
+  } elsif ( $task->{type} eq 'monitor' ) {
+    $pending_task = {
+      type=>$task->{type},
+      device=>$task->{device},
+      function=>$task->{function}
+    };
+    $pending_task->{function} =~ s/on/off/;
+  }
+  push @$pending_list, $pending_task;
+} # end sub addPendingTask
+
+sub processTask {
+  my $task = shift;
+
+  if ( $task->{type} eq 'device' ) {
+    my ( $instruction, $class ) = ( $task->{function} =~ /^(.+)_(.+)$/ );
+
+    if ( $class eq 'active' ) {
+      if ( $instruction eq 'start' ) {
+        zmMonitorEnable($task->{monitor});
+        if ( $task->{limit} ) {
+          addPendingTask($task);
+        }
+      } elsif( $instruction eq 'stop' ) {
+        zmMonitorDisable($task->{monitor});
+      }
+    } elsif( $class eq 'alarm' ) {
+      if ( $instruction eq 'start' ) {
+        zmTriggerEventOn(
+          $task->{monitor},
+          0,
+          main::CAUSE_STRING,
+          $task->{address}
+        );
+        if ( $task->{limit} ) {
+          addPendingTask($task);
+        }
+      } elsif( $instruction eq 'stop' ) {
+        zmTriggerEventCancel($task->{monitor});
+      }
+    } # end switch class
+  } elsif( $task->{type} eq 'monitor' ) {
+    if ( $task->{function} eq 'on' ) {
+      $task->{device}->{appliance}->on();
+      if ( $task->{limit} ) {
+        addPendingTask($task);
+      }
+    } elsif ( $task->{function} eq 'off' ) {
+      $task->{device}->{appliance}->off();
+    }
+  }
+}
+
+sub dPrint {
+  my $dbg_level = shift;
+  if ( fileno(CLIENT) ) {
+    print CLIENT @_
+  }
+  if ( $dbg_level == ZoneMinder::Logger::DEBUG ) {
+    Debug(@_);
+  } elsif ( $dbg_level == ZoneMinder::Logger::INFO ) {
+    Info(@_);
+  } elsif ( $dbg_level == ZoneMinder::Logger::WARNING ) {
+    Warning(@_);
+  }
+  elsif ( $dbg_level == ZoneMinder::Logger::ERROR ) {
+    Error( @_ );
+  } elsif ( $dbg_level == ZoneMinder::Logger::FATAL ) {
+    Fatal( @_ );
+  }
+}
+
+sub x10listen {
+  foreach my $event ( @_ ) {
+    #print( Data::Dumper( $_ )."\n" );
+    if ( $event->house_code() eq $Config{ZM_X10_HOUSE_CODE} ) {
+      my $unit_code = $event->unit_code();
+      my $device = $device_hash{$unit_code};
+      if ( !$device ) {
+        $device = $device_hash{$unit_code} = {
+          appliance=>$x10->Appliance(unit_code=>$unit_code),
+          status=>'unknown'
         };
-        $pending_task->{function} =~ s/start/stop/;
-    }
-    elsif ( $task->{type} eq 'monitor' )
-    {
-        $pending_task = { type=>$task->{type},
-                          device=>$task->{device},
-                          function=>$task->{function}
-        };
-        $pending_task->{function} =~ s/on/off/;
-    }
-    push( @$pending_list, $pending_task );
-}
-
-sub processTask
-{
-    my $task = shift;
-
-    if ( $task->{type} eq 'device' )
-    {
-        my ( $instruction, $class ) = ( $task->{function} =~ /^(.+)_(.+)$/ );
-
-        if ( $class eq 'active' )
-        {
-            if ( $instruction eq 'start' )
-            {
-                zmMonitorEnable( $task->{monitor} );
-                if ( $task->{limit} )
-                {
-                    addPendingTask( $task );
-                }
-            }
-            elsif( $instruction eq 'stop' )
-            {
-                zmMonitorDisable( $task->{monitor} );
-            }
+      }
+      next if ( $event->func() !~ /(?:ON|OFF)/ );
+      $device->{status} = $event->func();
+      my $task_list = $device->{$event->func().'_list'};
+      if ( $task_list ) {
+        foreach my $task ( @$task_list ) {
+          processTask($task);
         }
-        elsif( $class eq 'alarm' )
-        {
-            if ( $instruction eq 'start' )
-            {
-                zmTriggerEventOn( $task->{monitor},
-                                  0,
-                                  main::CAUSE_STRING,
-                                  $task->{address}
-                );
-                if ( $task->{limit} )
-                {
-                    addPendingTask( $task );
-                }
-            }
-            elsif( $instruction eq 'stop' )
-            {
-                zmTriggerEventCancel( $task->{monitor} );
-            }
-        }
-    }
-    elsif( $task->{type} eq 'monitor' )
-    {
-        if ( $task->{function} eq 'on' )
-        {
-            $task->{device}->{appliance}->on();
-            if ( $task->{limit} )
-            {
-                addPendingTask( $task );
-            }
-        }
-        elsif ( $task->{function} eq 'off' )
-        {
-            $task->{device}->{appliance}->off();
-        }
-    }
-}
-
-sub dPrint
-{
-    my $dbg_level = shift;
-    if ( fileno(CLIENT) )
-    {
-        print CLIENT @_
-    }
-    if ( $dbg_level == ZoneMinder::Logger::DEBUG )
-    {
-        Debug( @_ );
-    }
-    elsif ( $dbg_level == ZoneMinder::Logger::INFO )
-    {
-        Info( @_ );
-    }
-    elsif ( $dbg_level == ZoneMinder::Logger::WARNING )
-    {
-        Warning( @_ );
-    }
-    elsif ( $dbg_level == ZoneMinder::Logger::ERROR )
-    {
-        Error( @_ );
-    }
-    elsif ( $dbg_level == ZoneMinder::Logger::FATAL )
-    {
-        Fatal( @_ );
-    }
-}
-
-sub x10listen
-{
-    foreach my $event ( @_ )
-    {
-        #print( Data::Dumper( $_ )."\n" );
-        if ( $event->house_code() eq $Config{ZM_X10_HOUSE_CODE} )
-        {
-            my $unit_code = $event->unit_code();
-            my $device = $device_hash{$unit_code};
-            if ( !$device )
-            {
-                $device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ),
-                                                       status=>'unknown'
-                                                     };
-            }
-            next if ( $event->func() !~ /(?:ON|OFF)/ );
-            $device->{status} = $event->func();
-            my $task_list = $device->{$event->func().'_list'};
-            if ( $task_list )
-            {
-                foreach my $task ( @$task_list )
-                {
-                    processTask( $task );
-                }
-            }
-        }
-        Info( "Got event - ".$event->as_string()."\n" );
-    }
-}
+      }
+    } # end if correct house code
+    Info('Got event - '.$event->as_string());
+  }
+} # end sub x10listen
 
 1;
+__END__
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a75b37bc1..d0248fb4d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 # CMakeLists.txt for the ZoneMinder binaries
 
 # Create files from the .in files
-configure_file(zm_config.h.in "${CMAKE_CURRENT_BINARY_DIR}/zm_config.h" @ONLY)
+configure_file(zm_config_data.h.in "${CMAKE_CURRENT_BINARY_DIR}/zm_config_data.h" @ONLY)
 
 # Group together all the source files that are used by all the binaries (zmc, zmu, zms etc)
 set(ZM_BIN_SRC_FILES
@@ -27,6 +27,7 @@ set(ZM_BIN_SRC_FILES
  zm_image.cpp
  zm_jpeg.cpp
  zm_libvlc_camera.cpp
+ zm_libvnc_camera.cpp
  zm_local_camera.cpp
  zm_monitor.cpp
  zm_monitorstream.cpp
@@ -79,7 +80,7 @@ target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS} bc
 
 # Generate man files for the binaries destined for the bin folder
 FOREACH(CBINARY zmc zmu)
-    POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8 ${ZM_MANPAGE_DEST_PREFIX})
+    POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp ${CBINARY} 8 ${ZM_MANPAGE_DEST_PREFIX})
 ENDFOREACH(CBINARY zmc zmu)
 
 install(TARGETS zmc zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/src/jwt-cpp/include/jwt-cpp/jwt.h b/src/jwt-cpp/include/jwt-cpp/jwt_cpp.h
similarity index 100%
rename from src/jwt-cpp/include/jwt-cpp/jwt.h
rename to src/jwt-cpp/include/jwt-cpp/jwt_cpp.h
diff --git a/src/libbcrypt/src/bcrypt.c b/src/libbcrypt/src/bcrypt.c
index c32b51b0b..db16d27b3 100644
--- a/src/libbcrypt/src/bcrypt.c
+++ b/src/libbcrypt/src/bcrypt.c
@@ -22,7 +22,7 @@
 #endif
 #include <errno.h>
 
-#ifdef _WIN32 || _WIN64
+#if defined(_WIN32) || defined(_WIN64)
 // On windows we need to generate random bytes differently.
 typedef __int64 ssize_t;
 #define BCRYPT_HASHSIZE 60
@@ -117,7 +117,7 @@ int bcrypt_gensalt(int factor, char salt[BCRYPT_HASHSIZE])
 	char *aux;
 
 	// Note: Windows does not have /dev/urandom sadly.
-#ifdef _WIN32 || _WIN64
+#if defined(_WIN32) || defined(_WIN64)
 	HCRYPTPROV p;
 	ULONG     i;
 
diff --git a/src/zm.cpp b/src/zm.cpp
index e25ce45ce..e541b322f 100644
--- a/src/zm.cpp
+++ b/src/zm.cpp
@@ -20,4 +20,4 @@
 #include "zm.h"
 
 /* This is our argv[0], we need it for backtrace */
-const char* self = 0;
+const char* self = nullptr;
diff --git a/src/zm.h b/src/zm.h
index ad0f89584..60fa67711 100644
--- a/src/zm.h
+++ b/src/zm.h
@@ -22,6 +22,7 @@
 #define ZM_H
 
 #include "zm_config.h"
+#include "zm_signal.h"
 #ifdef SOLARIS
 #undef DEFAULT_TYPE  // pthread defines this which breaks StreamType DEFAULT_TYPE
 #include <string.h>  // define strerror() and friends
diff --git a/src/zm_analysis_thread.cpp b/src/zm_analysis_thread.cpp
index a81e44be8..58f532142 100644
--- a/src/zm_analysis_thread.cpp
+++ b/src/zm_analysis_thread.cpp
@@ -25,7 +25,7 @@ int AnalysisThread::run() {
   monitor->get_ref_image();
   Debug(2, "THREAD: after Getting ref image");
 
-  while( !terminate ) {
+  while ( !terminate ) {
     // Process the next image
     //sigprocmask(SIG_BLOCK, &block_set, 0);
 
@@ -39,6 +39,7 @@ int AnalysisThread::run() {
       }
     }
 
+    Debug(2, "Analyzing");
     if ( !monitor->Analyse() ) {
 Debug(2, "Sleeping for %d", monitor->Active()?ZM_SAMPLE_RATE:ZM_SUSPENDED_RATE);
       usleep(10*(monitor->Active()?ZM_SAMPLE_RATE:ZM_SUSPENDED_RATE));
diff --git a/src/zm_box.h b/src/zm_box.h
index fa377e593..efc12cb18 100644
--- a/src/zm_box.h
+++ b/src/zm_box.h
@@ -33,37 +33,33 @@
 // Class used for storing a box, which is defined as a region
 // defined by two coordinates
 //
-class Box
-{
+class Box {
 private:
   Coord lo, hi;
   Coord size;
 
 public:
-  inline Box()
-  {
-  }
+  inline Box() { }
   explicit inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int p_x_size, int p_y_size ) : lo( 0, 0 ), hi ( p_x_size-1, p_y_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int lo_x, int lo_y, int hi_x, int hi_y ) : lo( lo_x, lo_y ), hi( hi_x, hi_y ), size( Coord::Range( hi, lo ) ) { }
   inline Box( const Coord &p_lo, const Coord &p_hi ) : lo( p_lo ), hi( p_hi ), size( Coord::Range( hi, lo ) ) { }
 
-  inline const Coord &Lo() const { return( lo ); }
-  inline int LoX() const { return( lo.X() ); }
-  inline int LoY() const { return( lo.Y() ); }
-  inline const Coord &Hi() const { return( hi ); }
-  inline int HiX() const { return( hi.X() ); }
-  inline int HiY() const { return( hi.Y() ); }
-  inline const Coord &Size() const { return( size ); }
-  inline int Width() const { return( size.X() ); }
-  inline int Height() const { return( size.Y() ); }
-  inline int Area() const { return( size.X()*size.Y() ); }
+  inline const Coord &Lo() const { return lo; }
+  inline int LoX() const { return lo.X(); }
+  inline int LoY() const { return lo.Y(); }
+  inline const Coord &Hi() const { return hi; }
+  inline int HiX() const { return hi.X(); }
+  inline int HiY() const { return hi.Y(); }
+  inline const Coord &Size() const { return size; }
+  inline int Width() const { return size.X(); }
+  inline int Height() const { return size.Y(); }
+  inline int Area() const { return size.X()*size.Y(); }
 
-  inline const Coord Centre() const
-  {
+  inline const Coord Centre() const {
     int mid_x = int(round(lo.X()+(size.X()/2.0)));
     int mid_y = int(round(lo.Y()+(size.Y()/2.0)));
-    return( Coord( mid_x, mid_y ) );
+    return Coord( mid_x, mid_y );
   }
   inline bool Inside( const Coord &coord ) const
   {
diff --git a/src/zm_buffer.h b/src/zm_buffer.h
index 8f47c7cbc..a4b373b6b 100644
--- a/src/zm_buffer.h
+++ b/src/zm_buffer.h
@@ -34,7 +34,7 @@ protected:
   unsigned char *mTail;
 
 public:
-  Buffer() : mStorage( 0 ), mAllocation( 0 ), mSize( 0 ), mHead( 0 ), mTail( 0 ) {
+  Buffer() : mStorage( nullptr ), mAllocation( 0 ), mSize( 0 ), mHead( nullptr ), mTail( nullptr ) {
   }
   explicit Buffer( unsigned int pSize ) : mAllocation( pSize ), mSize( 0 ) {
     mHead = mStorage = new unsigned char[mAllocation];
diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp
index 0f21826fd..133e50209 100644
--- a/src/zm_camera.cpp
+++ b/src/zm_camera.cpp
@@ -53,13 +53,14 @@ Camera::Camera(
     video_stream(NULL),
     bytes(0)
 {
+  linesize = width * colours;
   pixels = width * height;
-  imagesize = pixels * colours;
+  imagesize = height * linesize;
 
-  Debug(2,"New camera id: %d width: %d height: %d colours: %d subpixelorder: %d capture: %d",
-      monitor_id, width, height, colours, subpixelorder, capture);
+  Debug(2, "New camera id: %d width: %d line size: %d height: %d colours: %d subpixelorder: %d capture: %d",
+      monitor_id, width, linesize, height, colours, subpixelorder, capture);
 
-  monitor = NULL;
+  monitor = nullptr;
 }
 
 Camera::~Camera() {
diff --git a/src/zm_camera.h b/src/zm_camera.h
index eb1c6e018..4163b761a 100644
--- a/src/zm_camera.h
+++ b/src/zm_camera.h
@@ -36,12 +36,13 @@ class Camera;
 //
 class Camera {
 protected:
-  typedef enum { LOCAL_SRC, REMOTE_SRC, FILE_SRC, FFMPEG_SRC, LIBVLC_SRC, CURL_SRC } SourceType;
+  typedef enum { LOCAL_SRC, REMOTE_SRC, FILE_SRC, FFMPEG_SRC, LIBVLC_SRC, CURL_SRC, VNC_SRC } SourceType;
 
   unsigned int  monitor_id;
   Monitor *     monitor; // Null on instantiation, set as soon as possible.
   SourceType    type;
   unsigned int  width;
+  unsigned int  linesize;
   unsigned int  height;
   unsigned int  colours;
   unsigned int  subpixelorder;
@@ -87,7 +88,9 @@ public:
   bool IsFfmpeg() const { return type == FFMPEG_SRC; }
   bool IsLibvlc() const { return type == LIBVLC_SRC; }
   bool IscURL() const { return type == CURL_SRC; }
+  bool IsVNC() const { return type == VNC_SRC; }
   unsigned int Width() const { return width; }
+  unsigned int LineSize() const { return linesize; }
   unsigned int Height() const { return height; }
   unsigned int Colours() const { return colours; }
   unsigned int SubpixelOrder() const { return subpixelorder; }
diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index 4744388af..b7231d4fd 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -142,13 +142,13 @@ SockAddr *SockAddr::newSockAddr( const struct sockaddr &addr, socklen_t len )
     return( new SockAddrUnix( (const struct sockaddr_un *)&addr ) );
   }
   Error( "Unable to create new SockAddr from addr family %d with size %d", addr.sa_family, len );
-  return( 0 );
+  return nullptr;
 }
 
 SockAddr *SockAddr::newSockAddr( const SockAddr *addr )
 {
   if ( !addr )
-    return( 0 );
+    return nullptr;
 
   if ( addr->getDomain() == AF_INET )
   {
@@ -159,7 +159,7 @@ SockAddr *SockAddr::newSockAddr( const SockAddr *addr )
     return( new SockAddrUnix( *(SockAddrUnix *)addr ) );
   }
   Error( "Unable to create new SockAddr from addr family %d", addr->getDomain() );
-  return( 0 );
+  return nullptr;
 }
 
 SockAddrInet::SockAddrInet() : SockAddr( (struct sockaddr *)&mAddrIn )
@@ -170,14 +170,14 @@ bool SockAddrInet::resolve( const char *host, const char *serv, const char *prot
 {
   memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-  struct hostent *hostent=0;
+  struct hostent *hostent=nullptr;
   if ( !(hostent = ::gethostbyname( host ) ) )
   {
     Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
     return( false );
   }
 
-  struct servent *servent=0;
+  struct servent *servent=nullptr;
   if ( !(servent = ::getservbyname( serv, proto ) ) )
   {
     Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
@@ -195,7 +195,7 @@ bool SockAddrInet::resolve( const char *host, int port, const char *proto )
 {
   memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-  struct hostent *hostent=0;
+  struct hostent *hostent=nullptr;
   if ( !(hostent = ::gethostbyname( host ) ) )
   {
     Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
@@ -212,7 +212,7 @@ bool SockAddrInet::resolve( const char *serv, const char *proto )
 {
   memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-  struct servent *servent=0;
+  struct servent *servent=nullptr;
   if ( !(servent = ::getservbyname( serv, proto ) ) )
   {
     Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
@@ -541,7 +541,7 @@ bool InetSocket::connect( const char *host, const char *serv )
      * If socket(2) (or connect(2)) fails, we (close the socket
      * and) try the next address. */
 
-    for (rp = result; rp != NULL; rp = rp->ai_next) {
+    for (rp = result; rp != nullptr; rp = rp->ai_next) {
         if (mSd != -1) {
             if (::connect(mSd, rp->ai_addr, rp->ai_addrlen) != -1)
                 break;                  /* Success */
@@ -576,7 +576,7 @@ bool InetSocket::connect( const char *host, const char *serv )
 
     freeaddrinfo(result);   /* No longer needed */
 
-    if (rp == NULL) {               /* No address succeeded */
+    if (rp == nullptr) {               /* No address succeeded */
         Error( "connect(), Could not connect" );
         mAddressFamily = AF_UNSPEC;
         return( false );
@@ -607,9 +607,9 @@ bool InetSocket::bind( const char * host, const char * serv )
     hints.ai_socktype = getType();
     hints.ai_flags = AI_PASSIVE;    /* For wildcard IP address */
     hints.ai_protocol = 0;          /* Any protocol */
-    hints.ai_canonname = NULL;
-    hints.ai_addr = NULL;
-    hints.ai_next = NULL;
+    hints.ai_canonname = nullptr;
+    hints.ai_addr = nullptr;
+    hints.ai_next = nullptr;
 
     s = getaddrinfo(host, serv, &hints, &result);
     if (s != 0) {
@@ -621,7 +621,7 @@ bool InetSocket::bind( const char * host, const char * serv )
     * Try each address until we successfully bind(2).
     * If socket(2) (or bind(2)) fails, we (close the socket
     * and) try the next address. */
-    for (rp = result; rp != NULL; rp = rp->ai_next) {
+    for (rp = result; rp != nullptr; rp = rp->ai_next) {
         memset(&buf, 0, sizeof(buf));
         if (rp->ai_family == AF_INET) {
             inet_ntop(AF_INET, &((struct sockaddr_in *)rp->ai_addr)->sin_addr, buf, sizeof(buf)-1);
@@ -645,7 +645,7 @@ bool InetSocket::bind( const char * host, const char * serv )
         mSd = -1;
     }
 
-    if (rp == NULL) {               /* No address succeeded */
+    if (rp == nullptr) {               /* No address succeeded */
         Error( "bind(), Could not bind" );
         return( false );
     }
@@ -657,7 +657,7 @@ bool InetSocket::bind( const char * host, const char * serv )
 
 bool InetSocket::bind( const char * serv )
 {
-    return bind( NULL, serv);
+    return bind( nullptr, serv);
 }
 
 bool InetSocket::bind( const char * host, int port )
@@ -673,7 +673,7 @@ bool InetSocket::bind( int port )
     char serv[8];
     snprintf(serv, sizeof(serv), "%d", port);
 
-    return bind( NULL, serv );
+    return bind( nullptr, serv );
 }
 
 bool TcpInetServer::listen()
@@ -689,7 +689,7 @@ bool TcpInetServer::accept()
 bool TcpInetServer::accept( TcpInetSocket *&newSocket )
 {
   int newSd = -1;
-  newSocket = 0;
+  newSocket = nullptr;
 
   if ( !Socket::accept( newSd ) )
     return( false );
@@ -702,7 +702,7 @@ bool TcpInetServer::accept( TcpInetSocket *&newSocket )
 bool TcpUnixServer::accept( TcpUnixSocket *&newSocket )
 {
   int newSd = -1;
-  newSocket = 0;
+  newSocket = nullptr;
 
   if ( !Socket::accept( newSd ) )
     return( false );
@@ -830,7 +830,7 @@ void Select::clearWriters()
 int Select::wait()
 {
   struct timeval tempTimeout = mTimeout;
-  struct timeval *selectTimeout = mHasTimeout?&tempTimeout:NULL;
+  struct timeval *selectTimeout = mHasTimeout?&tempTimeout:nullptr;
 
   fd_set rfds;
   fd_set wfds;
@@ -845,7 +845,7 @@ int Select::wait()
   for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
     FD_SET((*iter)->getWriteDesc(),&wfds);
 
-  int nFound = select( mMaxFd+1, &rfds, &wfds, NULL, selectTimeout );
+  int nFound = select( mMaxFd+1, &rfds, &wfds, nullptr, selectTimeout );
   if( nFound == 0 )
   {
     Debug( 1, "Select timed out" );
diff --git a/src/zm_comms.h b/src/zm_comms.h
index e93951a85..46face33c 100644
--- a/src/zm_comms.h
+++ b/src/zm_comms.h
@@ -416,8 +416,8 @@ public:
   }
 
 public:
-  virtual int sendto( const void *msg, int len, const SockAddr *addr=0 ) const {
-    ssize_t nBytes = ::sendto( mSd, msg, len, 0, addr?addr->getAddr():NULL, addr?addr->getAddrSize():0 );
+  virtual int sendto( const void *msg, int len, const SockAddr *addr=nullptr ) const {
+    ssize_t nBytes = ::sendto( mSd, msg, len, 0, addr?addr->getAddr():nullptr, addr?addr->getAddrSize():0 );
     if ( nBytes < 0 )
       Debug( 1, "Sendto of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
     return( nBytes );
@@ -432,7 +432,7 @@ public:
         Debug( 1, "Recvfrom of %d bytes max on sd %d (with address) failed: %s", len, mSd, strerror(errno) );
       }
     } else {
-      nBytes = ::recvfrom( mSd, msg, len, 0, NULL, 0 );
+      nBytes = ::recvfrom( mSd, msg, len, 0, nullptr, 0 );
       if ( nBytes < 0 )
         Debug( 1, "Recvfrom of %d bytes max on sd %d (no address) failed: %s", len, mSd, strerror(errno) );
     }
diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 54c17654c..8cf57b1bb 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -30,94 +30,100 @@
 #include "zm_utils.h"
 #include "zm_config.h"
 
+// Note that Error and Debug calls won't actually go anywhere unless you 
+// set the relevant ENV vars because the logger gets it's setting from the 
+// config.
+
 void zmLoadConfig() {
 
   // Process name, value pairs from the main config file first
-  char configFile[PATH_MAX] = ZM_CONFIG;
-  process_configfile(configFile);
+  process_configfile(ZM_CONFIG);
 
   // Search for user created config files. If one or more are found then
   // update the Config hash with those values
   DIR* configSubFolder = opendir(ZM_CONFIG_SUBDIR);
   if ( configSubFolder ) { // subfolder exists and is readable
     char glob_pattern[PATH_MAX] = "";
-    snprintf( glob_pattern, sizeof(glob_pattern), "%s/*.conf", ZM_CONFIG_SUBDIR );
+    snprintf(glob_pattern, sizeof(glob_pattern), "%s/*.conf", ZM_CONFIG_SUBDIR);
 
     glob_t pglob;
-    int glob_status = glob( glob_pattern, 0, 0, &pglob );
+    int glob_status = glob(glob_pattern, 0, 0, &pglob);
     if ( glob_status != 0 ) {
       if ( glob_status < 0 ) {
-        Error( "Can't glob '%s': %s", glob_pattern, strerror(errno) );
+        Error("Can't glob '%s': %s", glob_pattern, strerror(errno));
       } else {
-        Debug( 1, "Can't glob '%s': %d", glob_pattern, glob_status );
+        Debug(1, "Can't glob '%s': %d", glob_pattern, glob_status);
       }
     } else {
       for ( unsigned int i = 0; i < pglob.gl_pathc; i++ ) {
         process_configfile(pglob.gl_pathv[i]);
       }
     }
-    globfree( &pglob );
+    globfree(&pglob);
     closedir(configSubFolder);
   }
 
-  zmDbConnect();
+  if ( !zmDbConnect() ) {
+    Fatal("Can't connect to db. Can't continue.");
+  }
   config.Load();
   config.Assign();
 
   // Populate the server config entries
-  if ( ! staticConfig.SERVER_ID ) {
-    if ( ! staticConfig.SERVER_NAME.empty() ) {
+  if ( !staticConfig.SERVER_ID ) {
+    if ( !staticConfig.SERVER_NAME.empty() ) {
 
-      Debug( 1, "Fetching ZM_SERVER_ID For Name = %s", staticConfig.SERVER_NAME.c_str() );
-      std::string sql = stringtf("SELECT `Id` FROM `Servers` WHERE `Name`='%s'", staticConfig.SERVER_NAME.c_str() );
+      Debug(1, "Fetching ZM_SERVER_ID For Name = %s", staticConfig.SERVER_NAME.c_str());
+      std::string sql = stringtf("SELECT `Id` FROM `Servers` WHERE `Name`='%s'",
+          staticConfig.SERVER_NAME.c_str());
       zmDbRow dbrow;
-      if ( dbrow.fetch( sql.c_str() ) ) {
+      if ( dbrow.fetch(sql.c_str()) ) {
         staticConfig.SERVER_ID = atoi(dbrow[0]);
       } else {
-        Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
+        Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str());
       }
 
     } // end if has SERVER_NAME
   } else if ( staticConfig.SERVER_NAME.empty() ) {
-    Debug( 1, "Fetching ZM_SERVER_NAME For Id = %d", staticConfig.SERVER_ID );
-    std::string sql = stringtf("SELECT `Name` FROM `Servers` WHERE `Id`='%d'", staticConfig.SERVER_ID );
+    Debug(1, "Fetching ZM_SERVER_NAME For Id = %d", staticConfig.SERVER_ID);
+    std::string sql = stringtf("SELECT `Name` FROM `Servers` WHERE `Id`='%d'", staticConfig.SERVER_ID);
     
     zmDbRow dbrow;
-    if ( dbrow.fetch( sql.c_str() ) ) {
+    if ( dbrow.fetch(sql.c_str()) ) {
       staticConfig.SERVER_NAME = std::string(dbrow[0]);
     } else {
-      Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
+      Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID);
     }
 
     if ( staticConfig.SERVER_ID ) {
-        Debug( 3, "Multi-server configuration detected. Server is %d.", staticConfig.SERVER_ID );
-    } else {
-        Debug( 3, "Single server configuration assumed because no Server ID or Name was specified." );
-    }
+			Debug(3, "Multi-server configuration detected. Server is %d.", staticConfig.SERVER_ID);
+		} else {
+			Debug(3, "Single server configuration assumed because no Server ID or Name was specified.");
+		}
   }
 
-  snprintf( staticConfig.capture_file_format, sizeof(staticConfig.capture_file_format), "%%s/%%0%dd-capture.jpg", config.event_image_digits );
-  snprintf( staticConfig.analyse_file_format, sizeof(staticConfig.analyse_file_format), "%%s/%%0%dd-analyse.jpg", config.event_image_digits );
-  snprintf( staticConfig.general_file_format, sizeof(staticConfig.general_file_format), "%%s/%%0%dd-%%s", config.event_image_digits );
-  snprintf( staticConfig.video_file_format, sizeof(staticConfig.video_file_format), "%%s/%%s");
+  snprintf(staticConfig.capture_file_format, sizeof(staticConfig.capture_file_format), "%%s/%%0%dd-capture.jpg", config.event_image_digits);
+  snprintf(staticConfig.analyse_file_format, sizeof(staticConfig.analyse_file_format), "%%s/%%0%dd-analyse.jpg", config.event_image_digits);
+  snprintf(staticConfig.general_file_format, sizeof(staticConfig.general_file_format), "%%s/%%0%dd-%%s", config.event_image_digits);
+  snprintf(staticConfig.video_file_format, sizeof(staticConfig.video_file_format), "%%s/%%s");
 }
 
-void process_configfile( char* configFile) {
+void process_configfile(char const *configFile) {
   FILE *cfg;
   char line[512];
-  if ( (cfg = fopen( configFile, "r")) == NULL ) {
-    Fatal( "Can't open %s: %s", configFile, strerror(errno) );
+  if ( (cfg = fopen(configFile, "r")) == nullptr ) {
+    Fatal("Can't open %s: %s", configFile, strerror(errno));
     return;
   }
-  while ( fgets( line, sizeof(line), cfg ) != NULL ) {
+  while ( fgets(line, sizeof(line), cfg) != nullptr ) {
     char *line_ptr = line;
 
     // Trim off any cr/lf line endings
-    int chomp_len = strcspn( line_ptr, "\r\n" );
+    int chomp_len = strcspn(line_ptr, "\r\n");
     line_ptr[chomp_len] = '\0';
 
     // Remove leading white space
-    int white_len = strspn( line_ptr, " \t" );
+    int white_len = strspn(line_ptr, " \t");
     line_ptr += white_len;
 
     // Check for comment or empty line
@@ -132,9 +138,9 @@ void process_configfile( char* configFile) {
     }
 
     // Now look for the '=' in the middle of the line
-    temp_ptr = strchr( line_ptr, '=' );
+    temp_ptr = strchr(line_ptr, '=');
     if ( !temp_ptr ) {
-      Warning( "Invalid data in %s: '%s'", configFile, line );
+      Warning("Invalid data in %s: '%s'", configFile, line);
       continue;
     }
 
@@ -149,49 +155,49 @@ void process_configfile( char* configFile) {
     } while ( *temp_ptr == ' ' || *temp_ptr == '\t' );
 
     // Remove leading white space and leading quotes from the value part
-    white_len = strspn( val_ptr, " \t" );
-    white_len += strspn( val_ptr, "\'\"" );
+    white_len = strspn(val_ptr, " \t");
+    white_len += strspn(val_ptr, "\'\"");
     val_ptr += white_len;
 
-    if ( strcasecmp( name_ptr, "ZM_DB_HOST" ) == 0 )
+    if ( strcasecmp(name_ptr, "ZM_DB_HOST") == 0 )
       staticConfig.DB_HOST = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DB_NAME" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DB_NAME") == 0 )
       staticConfig.DB_NAME = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DB_USER" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DB_USER") == 0 )
       staticConfig.DB_USER = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DB_PASS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DB_PASS") == 0 )
       staticConfig.DB_PASS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DB_SSL_CA_CERT" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DB_SSL_CA_CERT") == 0 )
       staticConfig.DB_SSL_CA_CERT = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DB_SSL_CLIENT_KEY" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DB_SSL_CLIENT_KEY") == 0 )
       staticConfig.DB_SSL_CLIENT_KEY = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DB_SSL_CLIENT_CERT" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DB_SSL_CLIENT_CERT") == 0 )
       staticConfig.DB_SSL_CLIENT_CERT = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_WEB" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_WEB") == 0 )
       staticConfig.PATH_WEB = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_SERVER_HOST" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_SERVER_HOST") == 0 )
       staticConfig.SERVER_NAME = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_SERVER_NAME" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_SERVER_NAME") == 0 )
       staticConfig.SERVER_NAME = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_SERVER_ID" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_SERVER_ID") == 0 )
       staticConfig.SERVER_ID = atoi(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DIR_EVENTS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DIR_EVENTS") == 0 )
       staticConfig.DIR_EVENTS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DIR_SOUNDS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DIR_SOUNDS") == 0 )
       staticConfig.DIR_SOUNDS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DIR_EXPORTS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_DIR_EXPORTS") == 0 )
       staticConfig.DIR_EXPORTS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_ZMS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_ZMS") == 0 )
       staticConfig.PATH_ZMS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_MAP" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_MAP") == 0 )
       staticConfig.PATH_MAP = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_SOCKS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_SOCKS") == 0 )
       staticConfig.PATH_SOCKS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_LOGS" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_LOGS") == 0 )
       staticConfig.PATH_LOGS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_SWAP" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_SWAP") == 0 )
       staticConfig.PATH_SWAP = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_PATH_ARP" ) == 0 )
+    else if ( strcasecmp(name_ptr, "ZM_PATH_ARP") == 0 )
       staticConfig.PATH_ARP = std::string(val_ptr);
     else {
       // We ignore this now as there may be more parameters than the
@@ -199,18 +205,18 @@ void process_configfile( char* configFile) {
       // Warning( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG );
     }
   } // end foreach line of the config
-  fclose( cfg );
+  fclose(cfg);
 }
 
 StaticConfig staticConfig;
 
-ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *const p_type ) {
+ConfigItem::ConfigItem(const char *p_name, const char *p_value, const char *const p_type) {
   name = new char[strlen(p_name)+1];
-  strcpy( name, p_name );
+  strcpy(name, p_name);
   value = new char[strlen(p_value)+1];
-  strcpy( value, p_value );
+  strcpy(value, p_value);
   type = new char[strlen(p_type)+1];
-  strcpy( type, p_type );
+  strcpy(type, p_type);
 
   //Info( "Created new config item %s = %s (%s)\n", name, value, type );
 
@@ -218,28 +224,28 @@ ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *con
   accessed = false;
 }
 
-ConfigItem::ConfigItem( const ConfigItem &item ) {
+ConfigItem::ConfigItem(const ConfigItem &item) {
   name = new char[strlen(item.name)+1];
-  strcpy( name, item.name );
+  strcpy(name, item.name);
   value = new char[strlen(item.value)+1];
-  strcpy( value, item.value );
+  strcpy(value, item.value);
   type = new char[strlen(item.type)+1];
-  strcpy( type, item.type );
+  strcpy(type, item.type);
 
   //Info( "Created new config item %s = %s (%s)\n", name, value, type );
 
   accessed = false;
 }
-void ConfigItem::Copy( const ConfigItem &item ) {
+void ConfigItem::Copy(const ConfigItem &item) {
   if (name) delete name;
   name = new char[strlen(item.name)+1];
-  strcpy( name, item.name );
+  strcpy(name, item.name);
   if (value) delete value;
   value = new char[strlen(item.value)+1];
-  strcpy( value, item.value );
+  strcpy(value, item.value);
   if (type) delete type;
   type = new char[strlen(item.type)+1];
-  strcpy( type, item.type );
+  strcpy(type, item.type);
 
   //Info( "Created new config item %s = %s (%s)\n", name, value, type );
   accessed = false;
@@ -254,16 +260,16 @@ ConfigItem::~ConfigItem() {
 void ConfigItem::ConvertValue() const {
   if ( !strcmp( type, "boolean" ) ) {
     cfg_type = CFG_BOOLEAN;
-    cfg_value.boolean_value = (bool)strtol( value, 0, 0 );
-  } else if ( !strcmp( type, "integer" ) ) {
+    cfg_value.boolean_value = (bool)strtol(value, nullptr, 0);
+  } else if ( !strcmp(type, "integer") ) {
     cfg_type = CFG_INTEGER;
-    cfg_value.integer_value = strtol( value, 0, 10 );
-  } else if ( !strcmp( type, "hexadecimal" ) ) {
+    cfg_value.integer_value = strtol(value, nullptr, 10);
+  } else if ( !strcmp(type, "hexadecimal") ) {
     cfg_type = CFG_INTEGER;
-    cfg_value.integer_value = strtol( value, 0, 16 );
-  } else if ( !strcmp( type, "decimal" ) ) {
+    cfg_value.integer_value = strtol(value, nullptr, 16);
+  } else if ( !strcmp(type, "decimal") ) {
     cfg_type = CFG_DECIMAL;
-    cfg_value.decimal_value = strtod( value, 0 );
+    cfg_value.decimal_value = strtod(value, nullptr);
   } else {
     cfg_type = CFG_STRING;
     cfg_value.string_value = value;
@@ -276,11 +282,11 @@ bool ConfigItem::BooleanValue() const {
     ConvertValue();
 
   if ( cfg_type != CFG_BOOLEAN ) {
-    Error( "Attempt to fetch boolean value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-    exit( -1 );
+    Error("Attempt to fetch boolean value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type);
+    exit(-1);
   }
 
-  return( cfg_value.boolean_value );
+  return cfg_value.boolean_value;
 }
 
 int ConfigItem::IntegerValue() const {
@@ -288,11 +294,11 @@ int ConfigItem::IntegerValue() const {
     ConvertValue();
 
   if ( cfg_type != CFG_INTEGER ) {
-    Error( "Attempt to fetch integer value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-    exit( -1 );
+    Error("Attempt to fetch integer value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type);
+    exit(-1);
   }
 
-  return( cfg_value.integer_value );
+  return cfg_value.integer_value;
 }
 
 double ConfigItem::DecimalValue() const {
@@ -300,11 +306,11 @@ double ConfigItem::DecimalValue() const {
     ConvertValue();
 
   if ( cfg_type != CFG_DECIMAL ) {
-    Error( "Attempt to fetch decimal value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-    exit( -1 );
+    Error("Attempt to fetch decimal value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type);
+    exit(-1);
   }
 
-  return( cfg_value.decimal_value );
+  return cfg_value.decimal_value;
 }
 
 const char *ConfigItem::StringValue() const {
@@ -312,11 +318,11 @@ const char *ConfigItem::StringValue() const {
     ConvertValue();
 
   if ( cfg_type != CFG_STRING ) {
-    Error( "Attempt to fetch string value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-    exit( -1 );
+    Error("Attempt to fetch string value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type);
+    exit(-1);
   }
 
-  return( cfg_value.string_value );
+  return cfg_value.string_value;
 }
 
 Config::Config() {
@@ -328,64 +334,64 @@ Config::~Config() {
   if ( items ) {
     for ( int i = 0; i < n_items; i++ ) {
       delete items[i];
-      items[i] = NULL;
+      items[i] = nullptr;
     }
     delete[] items;
-    items = NULL;
+    items = nullptr;
   }
 }
 
 void Config::Load() {
   static char sql[ZM_SQL_SML_BUFSIZ];
    
-  strncpy( sql, "select Name, Value, Type from Config order by Id", sizeof(sql) );
-  if ( mysql_query( &dbconn, sql ) ) {
-    Error( "Can't run query: %s", mysql_error( &dbconn ) );
-    exit( mysql_errno( &dbconn ) );
+  strncpy(sql, "SELECT `Name`, `Value`, `Type` FROM `Config` ORDER BY `Id`", sizeof(sql) );
+  if ( mysql_query(&dbconn, sql) ) {
+    Error("Can't run query: %s", mysql_error(&dbconn));
+    exit(mysql_errno(&dbconn));
   }
 
-  MYSQL_RES *result = mysql_store_result( &dbconn );
+  MYSQL_RES *result = mysql_store_result(&dbconn);
   if ( !result ) {
-    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-    exit( mysql_errno( &dbconn ) );
+    Error("Can't use query result: %s", mysql_error(&dbconn));
+    exit(mysql_errno(&dbconn));
   }
-  n_items = mysql_num_rows( result );
+  n_items = mysql_num_rows(result);
 
   if ( n_items <= ZM_MAX_CFG_ID ) {
-    Error( "Config mismatch, expected %d items, read %d. Try running 'zmupdate.pl -f' to reload config.", ZM_MAX_CFG_ID+1, n_items );
-    exit( -1 );
+    Error("Config mismatch, expected %d items, read %d. Try running 'zmupdate.pl -f' to reload config.", ZM_MAX_CFG_ID+1, n_items);
+    exit(-1);
   }
 
   items = new ConfigItem *[n_items];
-  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) {
-    items[i] = new ConfigItem( dbrow[0], dbrow[1], dbrow[2] );
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+    items[i] = new ConfigItem(dbrow[0], dbrow[1], dbrow[2]);
   }
-  mysql_free_result( result );
+  mysql_free_result(result);
 }
 
 void Config::Assign() {
 ZM_CFG_ASSIGN_LIST
 }
 
-const ConfigItem &Config::Item( int id ) {
+const ConfigItem &Config::Item(int id) {
   if ( !n_items ) {
     Load();
     Assign();
   }
 
   if ( id < 0 || id > ZM_MAX_CFG_ID ) {
-    Error( "Attempt to access invalid config, id = %d. Try running 'zmupdate.pl -f' to reload config.", id );
-    exit( -1 );
+    Error("Attempt to access invalid config, id = %d. Try running 'zmupdate.pl -f' to reload config.", id);
+    exit(-1);
   }
 
   ConfigItem *item = items[id];
   
   if ( !item ) {
-    Error( "Can't find config item %d", id );
-    exit( -1 );
+    Error("Can't find config item %d", id);
+    exit(-1);
   }
     
-  return( *item );
+  return *item;
 }
 
 Config config;
diff --git a/src/zm_config.h.in b/src/zm_config.h
similarity index 91%
rename from src/zm_config.h.in
rename to src/zm_config.h
index 9831677f0..d348f38e9 100644
--- a/src/zm_config.h.in
+++ b/src/zm_config.h
@@ -1,21 +1,21 @@
 //
 // ZoneMinder Configuration, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // 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.
-// 
+//
 
 #ifndef ZM_CONFIG_H
 #define ZM_CONFIG_H
@@ -23,19 +23,13 @@
 #if !defined(PATH_MAX)
 #define PATH_MAX 1024
 #endif
+
 #include "config.h"
 #include "zm_config_defines.h"
+#include "zm_config_data.h"
 
 #include <string>
 
-#define ZM_CONFIG        "@ZM_CONFIG@"  // Path to config file
-#define ZM_CONFIG_SUBDIR "@ZM_CONFIG_SUBDIR@"  // Path to the ZoneMinder config subfolder
-#define ZM_VERSION        "@VERSION@"  // ZoneMinder Version
-
-#define ZM_HAS_V4L1       @ZM_HAS_V4L1@
-#define ZM_HAS_V4L2       @ZM_HAS_V4L2@
-#define ZM_HAS_V4L        @ZM_HAS_V4L@
-
 #ifdef HAVE_LIBAVFORMAT
 #define ZM_HAS_FFMPEG       1
 #endif // HAVE_LIBAVFORMAT
@@ -62,7 +56,7 @@
 
 extern void zmLoadConfig();
 
-extern void process_configfile( char* configFile );
+extern void process_configfile(char const *configFile);
 
 struct StaticConfig {
   std::string DB_HOST;
diff --git a/src/zm_config_data.h.in b/src/zm_config_data.h.in
new file mode 100644
index 000000000..1209dcbf5
--- /dev/null
+++ b/src/zm_config_data.h.in
@@ -0,0 +1,31 @@
+//
+// ZoneMinder Configuration, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+// 
+
+#ifndef ZM_CONFIG_DATA_H
+#define ZM_CONFIG_DATA_H
+
+#define ZM_CONFIG        "@ZM_CONFIG@"  // Path to config file
+#define ZM_CONFIG_SUBDIR "@ZM_CONFIG_SUBDIR@"  // Path to the ZoneMinder config subfolder
+#define ZM_VERSION        "@VERSION@"  // ZoneMinder Version
+
+#define ZM_HAS_V4L1       @ZM_HAS_V4L1@
+#define ZM_HAS_V4L2       @ZM_HAS_V4L2@
+#define ZM_HAS_V4L        @ZM_HAS_V4L@
+
+#endif // ZM_CONFIG_DATA_H
diff --git a/src/zm_coord.h b/src/zm_coord.h
index 9bf31144c..c6234fb1c 100644
--- a/src/zm_coord.h
+++ b/src/zm_coord.h
@@ -25,8 +25,7 @@
 //
 // Class used for storing an x,y pair, i.e. a coordinate
 //
-class Coord
-{
+class Coord {
 private:
   int x, y;
 
@@ -44,8 +43,7 @@ public:
   inline int &Y() { return( y ); }
   inline const int &Y() const { return( y ); }
 
-  inline static Coord Range( const Coord &coord1, const Coord &coord2 )
-  {
+  inline static Coord Range( const Coord &coord1, const Coord &coord2 ) {
     Coord result( (coord1.x-coord2.x)+1, (coord1.y-coord2.y)+1 );
     return( result );
   }
diff --git a/src/zm_crypt.cpp b/src/zm_crypt.cpp
index e6b460e49..8e42b3b3c 100644
--- a/src/zm_crypt.cpp
+++ b/src/zm_crypt.cpp
@@ -1,13 +1,81 @@
 #include "zm.h"
-# include "zm_crypt.h"
+#include "zm_crypt.h"
 #include "BCrypt.hpp"
-#include "jwt.h"
+#if HAVE_LIBJWT
+#include <jwt.h>
+#else
+#include "jwt_cpp.h"
+#endif
 #include <algorithm>
+#if HAVE_LIBCRYPTO
 #include <openssl/sha.h>
+#elif HAVE_GNUTLS_GNUTLS_H
+#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
+#endif
 #include <string.h>
 
-
 // returns username if valid, "" if not
+#if HAVE_LIBJWT
+std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std::string key) {
+  std::string username = "";
+  unsigned int token_issued_at = 0;
+  int err = 0;
+  jwt_t *jwt = nullptr;
+
+  err = jwt_new(&jwt);
+  if( err ) {
+    Error("Unable to Allocate JWT object");
+    return std::make_pair("", 0);
+  }
+
+  err = jwt_set_alg(jwt, JWT_ALG_HS256, (const unsigned char*)key.c_str(), key.length());
+  if( err ) {
+    jwt_free(jwt);
+    Error("Error setting Algorithm for JWT decode");
+    return std::make_pair("", 0);
+  }
+  
+  err = jwt_decode(&jwt, jwt_token_str.c_str(), nullptr, 0);
+  if( err ) {
+    jwt_free(jwt);
+    Error("Could not decode JWT");
+    return std::make_pair("", 0);
+  }
+  
+  const char *c_type = jwt_get_grant(jwt, (const char*)"type");
+  if ( !c_type ) {
+    jwt_free(jwt);
+    Error("Missing token type. This should not happen");
+    return std::make_pair("", 0);
+  } else if ( std::string(c_type) != "access" ) {
+    jwt_free(jwt);
+    Error("Only access tokens are allowed. Please do not use refresh tokens");
+    return std::make_pair("", 0);
+  }
+
+  const char *c_username = jwt_get_grant(jwt, (const char*)"user");
+  if( !c_username ) {
+    jwt_free(jwt);
+    Error("User not found in claim");
+    return std::make_pair("", 0);
+  }
+
+  username = std::string(c_username);
+  Debug(1, "Got %s as user claim from token", username.c_str());
+  
+  token_issued_at = (unsigned int)jwt_get_grant_int(jwt, "iat");
+  if ( errno == ENOENT ) {
+    jwt_free(jwt);
+    Error("IAT not found in claim. This should not happen");
+    return std::make_pair("", 0);
+  }
+  
+  Debug(1, "Got IAT token=%u", token_issued_at);
+  jwt_free(jwt);
+  return std::make_pair(username, token_issued_at);
+}
+#else // HAVE_LIBJWT
 std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std::string key) {
   std::string username = "";
   unsigned int token_issued_at = 0;
@@ -22,48 +90,44 @@ std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std
     verifier.verify(decoded);
 
     // make sure it has fields we need
-    if (decoded.has_payload_claim("type")) {
+    if ( decoded.has_payload_claim("type") ) {
       std::string type = decoded.get_payload_claim("type").as_string();
-      if (type != "access") {
-        Error ("Only access tokens are allowed. Please do not use refresh tokens");
-        return std::make_pair("",0);
+      if ( type != "access" ) {
+        Error("Only access tokens are allowed. Please do not use refresh tokens");
+        return std::make_pair("", 0);
       }
-    }
-    else {
+    } else {
       // something is wrong. All ZM tokens have type
-      Error ("Missing token type. This should not happen");
+      Error("Missing token type. This should not happen");
       return std::make_pair("",0);
     }
-    if (decoded.has_payload_claim("user")) {
+    if ( decoded.has_payload_claim("user") ) {
       username  = decoded.get_payload_claim("user").as_string();
-      Debug (1, "Got %s as user claim from token", username.c_str());
-    } 
-    else {
-      Error ("User not found in claim");
-      return std::make_pair("",0);
+      Debug(1, "Got %s as user claim from token", username.c_str());
+    } else {
+      Error("User not found in claim");
+      return std::make_pair("", 0);
     }
 
-     if (decoded.has_payload_claim("iat")) {
+    if ( decoded.has_payload_claim("iat") ) {
       token_issued_at = (unsigned int) (decoded.get_payload_claim("iat").as_int());
-      Debug (1,"Got IAT token=%u", token_issued_at);
-     
-    } 
-    else {
-      Error ("IAT not found in claim. This should not happen");
-      return std::make_pair("",0);
+      Debug(1, "Got IAT token=%u", token_issued_at);
+    } else {
+      Error("IAT not found in claim. This should not happen");
+      return std::make_pair("", 0);
     }
   } // try
-  catch (const std::exception &e) {
+  catch ( const std::exception &e ) {
       Error("Unable to verify token: %s", e.what());
-      return std::make_pair("",0);
+      return std::make_pair("", 0);
   }
   catch (...) {
-     Error ("unknown exception");
-     return std::make_pair("",0);
-
+     Error("unknown exception");
+     return std::make_pair("", 0);
   }
-  return std::make_pair(username,token_issued_at);
+  return std::make_pair(username, token_issued_at);
 }
+#endif // HAVE_LIBJWT
 
 bool verifyPassword(const char *username, const char *input_password, const char *db_password_hash) {
   bool password_correct = false;
@@ -76,10 +140,16 @@ bool verifyPassword(const char *username, const char *input_password, const char
     // MYSQL PASSWORD
     Debug(1, "%s is using an MD5 encoded password", username);
     
-    SHA_CTX ctx1, ctx2;
+    #ifndef SHA_DIGEST_LENGTH
+      #define SHA_DIGEST_LENGTH 20
+    #endif
+  
     unsigned char digest_interim[SHA_DIGEST_LENGTH];
     unsigned char digest_final[SHA_DIGEST_LENGTH];
-
+    
+#if HAVE_LIBCRYPTO
+    SHA_CTX ctx1, ctx2;
+    
     //get first iteration
     SHA1_Init(&ctx1);
     SHA1_Update(&ctx1, input_password, strlen(input_password));
@@ -89,6 +159,15 @@ bool verifyPassword(const char *username, const char *input_password, const char
     SHA1_Init(&ctx2);
     SHA1_Update(&ctx2, digest_interim,SHA_DIGEST_LENGTH);
     SHA1_Final (digest_final, &ctx2);
+#elif HAVE_GNUTLS_GNUTLS_H
+    //get first iteration
+    gnutls_hash_fast(GNUTLS_DIG_SHA1, input_password, strlen(input_password), digest_interim);
+    //2nd iteration
+    gnutls_hash_fast(GNUTLS_DIG_SHA1, digest_interim, SHA_DIGEST_LENGTH, digest_final);
+#else
+    Error("Authentication Error. ZoneMinder not built with GnuTLS or Openssl");
+    return false;
+#endif
 
     char final_hash[SHA_DIGEST_LENGTH * 2 +2];
     final_hash[0] = '*';
@@ -102,7 +181,7 @@ bool verifyPassword(const char *username, const char *input_password, const char
   } else if (
       (db_password_hash[0] == '$')
       &&
-      (db_password_hash[1]== '2')
+      (db_password_hash[1] == '2')
       &&
       (db_password_hash[3] == '$')
       ) {
diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp
index 88b44a454..cedce9850 100644
--- a/src/zm_curl_camera.cpp
+++ b/src/zm_curl_camera.cpp
@@ -15,8 +15,9 @@
 // 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.
-// 
+//
 
+#include <dlfcn.h>
 #include "zm.h"
 
 #include "zm_curl_camera.h"
@@ -25,6 +26,18 @@
 
 #if HAVE_LIBCURL
 
+/* Func ptrs for libcurl functions */
+static void *curl_lib = nullptr;
+static CURLcode (*curl_global_init_f)(long) = nullptr;
+static void (*curl_global_cleanup_f)(void) = nullptr;
+static const char* (*curl_easy_strerror_f)(CURLcode) = nullptr;
+static char* (*curl_version_f)(void) = nullptr;
+static CURL* (*curl_easy_init_f)(void) = nullptr;
+static CURLcode (*curl_easy_getinfo_f)(CURL* , CURLINFO, ...) = nullptr;
+static CURLcode (*curl_easy_perform_f)(CURL*) = nullptr;
+static CURLcode (*curl_easy_setopt_f)(CURL*, CURLoption, ...) = nullptr;
+static void (*curl_easy_cleanup_f)(CURL*) = nullptr;
+
 #define CURL_MAXRETRY 5
 #define CURL_BUFFER_INITIAL_SIZE 65536
 
@@ -33,6 +46,31 @@ const char* content_type_match = "Content-Type:";
 size_t content_length_match_len;
 size_t content_type_match_len;
 
+void bind_libcurl_symbols() {
+
+  if(curl_lib)
+    return;
+
+  curl_lib = dlopen("libcurl.so", RTLD_LAZY | RTLD_GLOBAL);
+  if(!curl_lib)
+    curl_lib = dlopen("libcurl-gnutls.so.4", RTLD_LAZY | RTLD_GLOBAL);
+  if (!curl_lib) {
+    Error("Could not load libcurl: %s", dlerror());
+    return;
+  }
+
+  // Load up all required symbols here
+  *(void**) (&curl_global_init_f) = dlsym(curl_lib, "curl_global_init");
+  *(void**) (&curl_global_cleanup_f) = dlsym(curl_lib, "curl_global_cleanup");
+  *(void**) (&curl_easy_strerror_f) = dlsym(curl_lib, "curl_easy_strerror");
+  *(void**) (&curl_version_f) = dlsym(curl_lib, "curl_version");
+  *(void**) (&curl_easy_init_f) = dlsym(curl_lib, "curl_easy_init");
+  *(void**) (&curl_easy_getinfo_f) = dlsym(curl_lib, "curl_easy_getinfo");
+  *(void**) (&curl_easy_perform_f) = dlsym(curl_lib, "curl_easy_perform");
+  *(void**) (&curl_easy_setopt_f) = dlsym(curl_lib, "curl_easy_setopt");
+  *(void**) (&curl_easy_cleanup_f) = dlsym(curl_lib, "curl_easy_cleanup");
+}
+
 cURLCamera::cURLCamera( int p_id, const std::string &p_path, const std::string &p_user, const std::string &p_pass, unsigned int p_width, unsigned int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
   Camera( p_id, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
   mPath( p_path ), mUser( p_user ), mPass ( p_pass ), bTerminate( false ), bReset( false ), mode ( MODE_UNSET )
@@ -55,35 +93,42 @@ void cURLCamera::Initialise() {
   content_type_match_len = strlen(content_type_match);
 
   databuffer.expand(CURL_BUFFER_INITIAL_SIZE);
-
+  
+  bind_libcurl_symbols();
   /* cURL initialization */
-  CURLcode cRet = curl_global_init(CURL_GLOBAL_ALL);
+  CURLcode cRet = (*curl_global_init_f)(CURL_GLOBAL_ALL);
   if(cRet != CURLE_OK) {
-    Fatal("libcurl initialization failed: ", curl_easy_strerror(cRet));
+    Error("libcurl initialization failed: ", (*curl_easy_strerror_f)(cRet));
+    dlclose(curl_lib);
+    return;
   }
 
-  Debug(2,"libcurl version: %s",curl_version());
+  Debug(2,"libcurl version: %s", (*curl_version_f)());
 
   /* Create the shared data mutex */
-  int nRet = pthread_mutex_init(&shareddata_mutex, NULL);
+  int nRet = pthread_mutex_init(&shareddata_mutex, nullptr);
   if(nRet != 0) {
-    Fatal("Shared data mutex creation failed: %s",strerror(nRet));
+    Error("Shared data mutex creation failed: %s",strerror(nRet));
+    return;
   }
   /* Create the data available condition variable */
-  nRet = pthread_cond_init(&data_available_cond, NULL);
+  nRet = pthread_cond_init(&data_available_cond, nullptr);
   if(nRet != 0) {
-    Fatal("Data available condition variable creation failed: %s",strerror(nRet));
+    Error("Data available condition variable creation failed: %s",strerror(nRet));
+    return;
   }
   /* Create the request complete condition variable */
-  nRet = pthread_cond_init(&request_complete_cond, NULL);
+  nRet = pthread_cond_init(&request_complete_cond, nullptr);
   if(nRet != 0) {
-    Fatal("Request complete condition variable creation failed: %s",strerror(nRet));
+    Error("Request complete condition variable creation failed: %s",strerror(nRet));
+    return;
   }
 
   /* Create the thread */
-  nRet = pthread_create(&thread, NULL, thread_func_dispatcher, this);
+  nRet = pthread_create(&thread, nullptr, thread_func_dispatcher, this);
   if(nRet != 0) {
-    Fatal("Thread creation failed: %s",strerror(nRet));
+    Error("Thread creation failed: %s",strerror(nRet));
+    return;
   }
 }
 
@@ -92,7 +137,7 @@ void cURLCamera::Terminate() {
   bTerminate = true;
 
   /* Wait for thread termination */
-  pthread_join(thread, NULL);
+  pthread_join(thread, nullptr);
 
   /* Destroy condition variables */
   pthread_cond_destroy(&request_complete_cond);
@@ -102,8 +147,10 @@ void cURLCamera::Terminate() {
   pthread_mutex_destroy(&shareddata_mutex);
 
   /* cURL cleanup */
-  curl_global_cleanup();
+  (*curl_global_cleanup_f)();
 
+  if(curl_lib)
+    dlclose(curl_lib);
 }
 
 int cURLCamera::PrimeCapture() {
@@ -287,7 +334,8 @@ int cURLCamera::Capture( ZMPacket &zm_packet ) {
       }
     } else {
       /* Failed to match content-type */
-      Fatal("Unable to match Content-Type. Check URL, username and password");
+      Error("Unable to match Content-Type. Check URL, username and password");
+      return -21;
     } /* mode */
 
   } /* frameComplete loop */
@@ -370,60 +418,88 @@ void* cURLCamera::thread_func() {
   long tRet;
   double dSize;
 
-  c = curl_easy_init();
-  if(c == NULL) {
-    Fatal("Failed getting easy handle from libcurl");
+  c = (*curl_easy_init_f)();
+  if(c == nullptr) {
+    dlclose(curl_lib);
+    Error("Failed getting easy handle from libcurl");
+    tRet = -51;
+    return (void*)tRet;
   }
 
   CURLcode cRet;
   /* Set URL */
-  cRet = curl_easy_setopt(c, CURLOPT_URL, mPath.c_str());
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl URL: %s", curl_easy_strerror(cRet));
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_URL, mPath.c_str());
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl URL: %s", *(curl_easy_strerror_f)(cRet));
+    tRet = -52;
+    return (void*)tRet;
+  }
   
   /* Header callback */
-  cRet = curl_easy_setopt(c, CURLOPT_HEADERFUNCTION, &header_callback_dispatcher);
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl header callback function: %s", curl_easy_strerror(cRet));
-  cRet = curl_easy_setopt(c, CURLOPT_HEADERDATA, this);
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl header callback object: %s", curl_easy_strerror(cRet));
-
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_HEADERFUNCTION, &header_callback_dispatcher);
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl header callback function: %s", (*curl_easy_strerror_f)(cRet));
+    tRet = -53;
+    return (void*)tRet;
+  }
+  
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_HEADERDATA, this);
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl header callback object: %s", (*curl_easy_strerror_f)(cRet));
+    tRet = -54;
+    return (void*)tRet;
+  }
   /* Data callback */
-  cRet = curl_easy_setopt(c, CURLOPT_WRITEFUNCTION, &data_callback_dispatcher);
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl data callback function: %s", curl_easy_strerror(cRet));
-  cRet = curl_easy_setopt(c, CURLOPT_WRITEDATA, this);
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl data callback object: %s", curl_easy_strerror(cRet));
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_WRITEFUNCTION, &data_callback_dispatcher);
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl data callback function: %s", (*curl_easy_strerror_f)(cRet));
+    tRet = -55;
+    return (void*)tRet;
+  }
 
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_WRITEDATA, this);
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl data callback object: %s", (*curl_easy_strerror_f)(cRet));
+    tRet = -56;
+    return (void*)tRet;
+  }
   /* Progress callback */
-  cRet = curl_easy_setopt(c, CURLOPT_NOPROGRESS, 0);
-  if(cRet != CURLE_OK)
-    Fatal("Failed enabling libcurl progress callback function: %s", curl_easy_strerror(cRet));  
-  cRet = curl_easy_setopt(c, CURLOPT_PROGRESSFUNCTION, &progress_callback_dispatcher);
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl progress callback function: %s", curl_easy_strerror(cRet));
-  cRet = curl_easy_setopt(c, CURLOPT_PROGRESSDATA, this);
-  if(cRet != CURLE_OK)
-    Fatal("Failed setting libcurl progress callback object: %s", curl_easy_strerror(cRet));
-
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_NOPROGRESS, 0);
+  if(cRet != CURLE_OK) {
+    Error("Failed enabling libcurl progress callback function: %s", (*curl_easy_strerror_f)(cRet));  
+    tRet = -57;
+    return (void*)tRet;
+  }
+  
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_PROGRESSFUNCTION, &progress_callback_dispatcher);
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl progress callback function: %s", (*curl_easy_strerror_f)(cRet));
+    tRet = -58;
+    return (void*)tRet;
+  }
+  
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_PROGRESSDATA, this);
+  if(cRet != CURLE_OK) {
+    Error("Failed setting libcurl progress callback object: %s", (*curl_easy_strerror_f)(cRet));
+    tRet = -59;
+    return (void*)tRet;
+  }
   /* Set username and password */
   if(!mUser.empty()) {
-    cRet = curl_easy_setopt(c, CURLOPT_USERNAME, mUser.c_str());
+    cRet = (*curl_easy_setopt_f)(c, CURLOPT_USERNAME, mUser.c_str());
     if(cRet != CURLE_OK)
-      Error("Failed setting username: %s", curl_easy_strerror(cRet));
+      Error("Failed setting username: %s", (*curl_easy_strerror_f)(cRet));
   }
   if(!mPass.empty()) {
-    cRet = curl_easy_setopt(c, CURLOPT_PASSWORD, mPass.c_str());
+    cRet = (*curl_easy_setopt_f)(c, CURLOPT_PASSWORD, mPass.c_str());
     if(cRet != CURLE_OK)
-      Error("Failed setting password: %s", curl_easy_strerror(cRet));
+      Error("Failed setting password: %s", (*curl_easy_strerror_f)(cRet));
   }
 
   /* Authenication preference */
-  cRet = curl_easy_setopt(c, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+  cRet = (*curl_easy_setopt_f)(c, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
   if(cRet != CURLE_OK)
-    Warning("Failed setting libcurl acceptable http authenication methods: %s", curl_easy_strerror(cRet));
+    Warning("Failed setting libcurl acceptable http authenication methods: %s", (*curl_easy_strerror_f)(cRet));
 
 
   /* Work loop */
@@ -431,14 +507,14 @@ void* cURLCamera::thread_func() {
     tRet = 0;
     while(!bTerminate) {
       /* Do the work */
-      cRet = curl_easy_perform(c);
+      cRet = (*curl_easy_perform_f)(c);
 
       if(mode == MODE_SINGLE) {
         if(cRet != CURLE_OK) {
           break;
         }
         /* Attempt to get the size of the file */
-        cRet = curl_easy_getinfo(c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &dSize);
+        cRet = (*curl_easy_getinfo_f)(c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &dSize);
         if(cRet != CURLE_OK) {
           break;
         }
@@ -448,12 +524,16 @@ void* cURLCamera::thread_func() {
         if(dSize > 0) {
           single_offsets.push_back(dSize);
         } else {
-          Fatal("Unable to get the size of the image");
+          Error("Unable to get the size of the image");
+          tRet = -60;
+          return (void*)tRet;
         }
         /* Signal the request complete condition variable */
         tRet = pthread_cond_signal(&request_complete_cond);
         if(tRet != 0) {
           Error("Failed signaling request completed condition variable: %s",strerror(tRet));
+          tRet = -61;
+          return (void*)tRet;
         }
         /* Unlock */
         unlock();
@@ -469,7 +549,7 @@ void* cURLCamera::thread_func() {
       break;
     } else if (cRet != CURLE_OK) {
       /* Some error */
-      Error("cURL Request failed: %s",curl_easy_strerror(cRet));
+      Error("cURL Request failed: %s",(*curl_easy_strerror_f)(cRet));
       if(attempt < CURL_MAXRETRY) {
         Error("Retrying.. Attempt %d of %d",attempt,CURL_MAXRETRY);
         /* Do a reset */
@@ -485,8 +565,8 @@ void* cURLCamera::thread_func() {
   }
       
   /* Cleanup */
-  curl_easy_cleanup(c);
-  c = NULL;
+  (*curl_easy_cleanup_f)(c);
+  c = nullptr;
   
   return (void*)tRet;
 }
diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index 806ef8e5c..37c3cd0f7 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -32,7 +32,7 @@ bool zmDbConnect() {
   // For some reason having these lines causes memory corruption and crashing on newer debian/ubuntu
 	// But they really need to be here in order to prevent a double open of mysql
   if ( zmDbConnected )  {
-    Warning("Calling zmDbConnect when already connected");
+    //Warning("Calling zmDbConnect when already connected");
     return true;
   }
 
@@ -40,7 +40,7 @@ bool zmDbConnect() {
     Error("Can't initialise database connection: %s", mysql_error(&dbconn));
     return false;
   }
-  my_bool reconnect = 1;
+  bool reconnect = 1;
   if ( mysql_options(&dbconn, MYSQL_OPT_RECONNECT, &reconnect) )
     Error("Can't set database auto reconnect option: %s", mysql_error(&dbconn));
   if ( !staticConfig.DB_SSL_CA_CERT.empty() )
@@ -48,10 +48,10 @@ bool zmDbConnect() {
         staticConfig.DB_SSL_CLIENT_KEY.c_str(),
         staticConfig.DB_SSL_CLIENT_CERT.c_str(),
         staticConfig.DB_SSL_CA_CERT.c_str(),
-        NULL, NULL);
+        nullptr, nullptr);
   std::string::size_type colonIndex = staticConfig.DB_HOST.find(":");
   if ( colonIndex == std::string::npos ) {
-    if ( !mysql_real_connect(&dbconn, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), NULL, 0, NULL, 0) ) {
+    if ( !mysql_real_connect(&dbconn, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), nullptr, 0, nullptr, 0) ) {
       Error( "Can't connect to server: %s", mysql_error(&dbconn));
       return false;
     }
@@ -59,12 +59,12 @@ bool zmDbConnect() {
     std::string dbHost = staticConfig.DB_HOST.substr( 0, colonIndex );
     std::string dbPortOrSocket = staticConfig.DB_HOST.substr( colonIndex+1 );
     if ( dbPortOrSocket[0] == '/' ) {
-      if ( !mysql_real_connect(&dbconn, NULL, staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), NULL, 0, dbPortOrSocket.c_str(), 0) ) {
+      if ( !mysql_real_connect(&dbconn, nullptr, staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), nullptr, 0, dbPortOrSocket.c_str(), 0) ) {
         Error("Can't connect to server: %s", mysql_error(&dbconn));
         return false;
       }
     } else {
-      if ( !mysql_real_connect( &dbconn, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), NULL, atoi(dbPortOrSocket.c_str()), NULL, 0 ) ) {
+      if ( !mysql_real_connect( &dbconn, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), nullptr, atoi(dbPortOrSocket.c_str()), nullptr, 0 ) ) {
         Error( "Can't connect to server: %s", mysql_error( &dbconn ) );
         return false;
       }
@@ -81,10 +81,11 @@ bool zmDbConnect() {
 void zmDbClose() {
   if ( zmDbConnected ) {
     db_mutex.lock();
-    mysql_close( &dbconn );
+    mysql_close(&dbconn);
     // mysql_init() call implicitly mysql_library_init() but
     // mysql_close() does not call mysql_library_end()
-    mysql_library_end();
+    // We get segfaults and a hang when we call this.  So just don't.
+    //mysql_library_end();
     zmDbConnected = false;
     db_mutex.unlock();
   }
@@ -93,14 +94,20 @@ void zmDbClose() {
 MYSQL_RES * zmDbFetch(const char * query) {
   if ( !zmDbConnected ) {
     Error("Not connected.");
-    return NULL;
+    return nullptr;
   }
   db_mutex.lock();
+  // Might have been disconnected while we waited for the lock
+  if ( !zmDbConnected ) {
+    db_mutex.unlock();
+    Error("Not connected.");
+    return nullptr;
+  }
 
   if ( mysql_query(&dbconn, query) ) {
     db_mutex.unlock();
     Error("Can't run query: %s", mysql_error(&dbconn));
-    return NULL;
+    return nullptr;
   }
   Debug(4, "Success running query: %s", query);
   MYSQL_RES *result = mysql_store_result(&dbconn);
@@ -117,7 +124,7 @@ zmDbRow *zmDbFetchOne(const char *query) {
     return row;
   } 
   delete row;
-  return NULL;
+  return nullptr;
 }
 
 MYSQL_RES *zmDbRow::fetch(const char *query) {
@@ -128,14 +135,14 @@ MYSQL_RES *zmDbRow::fetch(const char *query) {
   if ( n_rows != 1 ) {
     Error("Bogus number of lines return from query, %d returned for query %s.", n_rows, query);
     mysql_free_result(result_set);
-    result_set = NULL;
+    result_set = nullptr;
     return result_set;
   }
 
   row = mysql_fetch_row(result_set);
   if ( ! row ) {
     mysql_free_result(result_set);
-    result_set = NULL;
+    result_set = nullptr;
     Error("Error getting row from query %s. Error is %s", query, mysql_error(&dbconn));
   } else {
     Debug(5, "Success");
@@ -146,6 +153,6 @@ MYSQL_RES *zmDbRow::fetch(const char *query) {
 zmDbRow::~zmDbRow() {
   if ( result_set ) {
     mysql_free_result(result_set);
-    result_set = NULL;
+    result_set = nullptr;
   }
 }
diff --git a/src/zm_db.h b/src/zm_db.h
index c707ad2b7..11fc9faaa 100644
--- a/src/zm_db.h
+++ b/src/zm_db.h
@@ -28,7 +28,7 @@ class zmDbRow {
     MYSQL_RES *result_set;
     MYSQL_ROW row;
   public:
-    zmDbRow() { result_set = NULL; row = NULL; };
+    zmDbRow() { result_set = nullptr; row = nullptr; };
     MYSQL_RES *fetch( const char *query );
     zmDbRow( MYSQL_RES *, MYSQL_ROW *row );
     ~zmDbRow();
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 89b829bc9..f69723bb6 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -91,7 +91,7 @@ Event::Event(
       "INSERT INTO `Events` "
       "( `MonitorId`, `StorageId`, `Name`, `StartTime`, `Width`, `Height`, `Cause`, `Notes`, `StateId`, `Orientation`, `Videoed`, `DefaultVideo`, `SaveJPEGs`, `Scheme` )"
       " VALUES "
-      "( %d, %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', %d, %d, %d, '', %d, '%s' )",
+      "( %d, %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', %d, %d, %d, '%s', %d, '%s' )",
       monitor->Id(), 
       storage->Id(),
       start_time.tv_sec,
@@ -102,6 +102,7 @@ Event::Event(
       state_id,
       monitor->getOrientation(),
       ( monitor->GetOptVideoWriter() != 0 ? 1 : 0 ),
+			( monitor->GetOptVideoWriter() != 0 ? "video.mp4" : "" ),
       monitor->GetOptSaveJPEGs(),
       storage->SchemeString().c_str()
       );
@@ -113,6 +114,7 @@ Event::Event(
     return;
   }
   id = mysql_insert_id(&dbconn);
+
   db_mutex.unlock();
   if ( untimedEvent ) {
     Warning("Event %d has zero time, setting to current", id);
@@ -126,12 +128,13 @@ Event::Event(
   alarm_frame_written = false;
 
   struct tm *stime = localtime(&start_time.tv_sec);
+  std::string id_file;
 
   path = stringtf("%s/%d", storage->Path(), monitor->Id());
   // Try to make the Monitor Dir.  Normally this would exist, but in odd cases might not.
   if ( mkdir(path.c_str(), 0755) ) {
     if ( errno != EEXIST )
-      Error("Can't mkdir %s: %s", path, strerror(errno));
+      Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
   }
 
   if ( storage->Scheme() == Storage::DEEP ) {
@@ -143,30 +146,29 @@ Event::Event(
     dt_parts[4] = stime->tm_min;
     dt_parts[5] = stime->tm_sec;
 
-    char date_path[PATH_MAX] = "";
-    char time_path[PATH_MAX] = "";
-    char *time_path_ptr = time_path;
+    std::string date_path;
+    std::string time_path;
+
     for ( unsigned int i = 0; i < sizeof(dt_parts)/sizeof(*dt_parts); i++ ) {
       path += stringtf("/%02d", dt_parts[i]);
 
-      errno = 0;
       if ( mkdir(path.c_str(), 0755) ) {
         // FIXME This should not be fatal.  Should probably move to a different storage area.
         if ( errno != EEXIST )
           Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
       }
       if ( i == 2 )
-        strncpy(date_path, path.c_str(), sizeof(date_path));
-      else if ( i >= 3 )
-        time_path_ptr += snprintf(time_path_ptr, sizeof(time_path)-(time_path_ptr-time_path), "%s%02d", i>3?"/":"", dt_parts[i]);
+				date_path = path;
     }
+		time_path = stringtf("%02d/%02d/%02d", stime->tm_hour, stime->tm_min, stime->tm_sec);
+
     // Create event id symlink
-    std::string id_file = stringtf("%s/.%" PRIu64, date_path, id);
-    if ( symlink(time_path, id_file.c_str()) < 0 )
-      Error("Can't symlink %s -> %s: %s", id_file.c_str(), path.c_str(), strerror(errno));
+    id_file = stringtf("%s/.%" PRIu64, date_path.c_str(), id);
+    if ( symlink(time_path.c_str(), id_file.c_str()) < 0 )
+      Error("Can't symlink %s -> %s: %s", id_file.c_str(), time_path.c_str(), strerror(errno));
   } else if ( storage->Scheme() == Storage::MEDIUM ) {
     path += stringtf("/%04d-%02d-%02d",
-         stime->tm_year+1900, stime->tm_mon+1, stime->tm_mday
+        stime->tm_year+1900, stime->tm_mon+1, stime->tm_mday
         );
     if ( mkdir(path.c_str(), 0755) ) {
       if ( errno != EEXIST )
@@ -185,18 +187,19 @@ Event::Event(
     }
 
     // Create empty id tag file
-    std::string id_file = stringtf("%s/.%" PRIu64, path.c_str(), id);
-    if ( FILE *id_fp = fopen(id_file.c_str(), "w") )
+    id_file = stringtf("%s/.%" PRIu64, path.c_str(), id);
+    if ( FILE *id_fp = fopen(id_file.c_str(), "w") ) {
       fclose(id_fp);
-    else
+    } else {
       Error("Can't fopen %s: %s", id_file.c_str(), strerror(errno));
+		}
   } // deep storage or not
 
   Debug(2, "Created event %d at %s", id, path.c_str());
 
   last_db_frame = 0;
 
-  video_name[0] = 0;
+  video_name = "";
 
   snapshot_file = path + "/snapshot.jpg";
   alarm_file = path + "/alarm.jpg";
@@ -204,7 +207,6 @@ Event::Event(
   /* Save as video */
 
   if ( monitor->GetOptVideoWriter() != 0 ) {
-    Debug(2,"Video writer was %d", monitor->GetOptVideoWriter());
     std::string container = monitor->OutputContainer();
     if ( container == "auto" || container == "" ) {
       if ( monitor->OutputCodec() == AV_CODEC_ID_H264 ) {
@@ -214,58 +216,77 @@ Event::Event(
       }
     }
         
-    snprintf(video_name, sizeof(video_name), "%" PRIu64 "-%s.%s", id, "video", container.c_str());
-    snprintf(video_file, sizeof(video_file), staticConfig.video_file_format, path.c_str(), video_name);
-    Debug(1,"Writing video file to %s", video_file);
+    video_name = stringtf("%" PRIu64 "-%s.%s", id, "video", container.c_str());
+    snprintf(sql, sizeof(sql), "UPDATE Events SET DefaultVideo = '%s' WHERE Id=%" PRIu64, video_name.c_str(), id);
+    if ( mysql_query(&dbconn, sql) ) {
+      Error("Can't update event: %s. sql was (%s)", mysql_error(&dbconn), sql);
+      db_mutex.unlock();
+      return;
+    }
+    video_file = path + "/" + video_name;
+    Debug(1, "Writing video file to %s", video_file.c_str());
     Camera * camera = monitor->getCamera();
     videoStore = new VideoStore(
-        video_file,
+        video_file.c_str(),
         container.c_str(),
         camera->get_VideoStream(),
-        ( monitor->RecordAudio() ? camera->get_AudioStream() : NULL ),
+        ( monitor->RecordAudio() ? camera->get_AudioStream() : nullptr ),
         monitor );
 
-    if ( ! videoStore->open() ) {
+    if ( !videoStore->open() ) {
       delete videoStore;
-      videoStore = NULL;
+      videoStore = nullptr;
       save_jpegs |= 1; // Turn on jpeg storage
     }
   }
-
 } // Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent )
 
 Event::~Event() {
-
   // We close the videowriter first, because if we finish the event, we might try to view the file, but we aren't done writing it yet.
 
   /* Close the video file */
-  if ( videoStore ) {
-    Debug(2,"Deleting video store");
+  if ( videoStore != nullptr ) {
+    Debug(2, "Deleting video store");
     delete videoStore;
-    videoStore = NULL;
+    videoStore = nullptr;
   }
 
   struct DeltaTimeval delta_time;
   DELTA_TIMEVAL(delta_time, end_time, start_time, DT_PREC_2);
   Debug(2, "start_time:%d.%d end_time%d.%d", start_time.tv_sec, start_time.tv_usec, end_time.tv_sec, end_time.tv_usec);
 
+#if 0  // This closing frame has no image. There is no point in adding a db record for it, I think. ICON
   if ( frames > last_db_frame ) {
     frames ++;
     Debug(1, "Adding closing frame %d to DB", frames);
     frame_data.push(new Frame(id, frames, NORMAL, end_time, delta_time, 0));
   }
+#endif
   if ( frame_data.size() )
     WriteDbFrames();
 
+  // update frame deltas to refer to video start time which may be a few frames before event start
+  struct timeval video_offset = {0};
+  struct timeval video_start_time  = monitor->GetVideoWriterStartTime();
+  if ( video_start_time.tv_sec > 0 ) {
+     timersub(&video_start_time, &start_time, &video_offset);
+     Debug(1, "Updating frames delta by %d sec %d usec",
+           video_offset.tv_sec, video_offset.tv_usec);
+     UpdateFramesDelta(video_offset.tv_sec + video_offset.tv_usec*1e-6);
+  } else {
+     Debug(3, "Video start_time %d sec %d usec not valid -- frame deltas not updated",
+           video_start_time.tv_sec, video_start_time.tv_usec);
+  }
+
   // Should not be static because we might be multi-threaded
   char sql[ZM_SQL_LGE_BUFSIZ];
-  snprintf(sql, sizeof(sql), 
-      "UPDATE Events SET Name='%s %" PRIu64 "', EndTime = from_unixtime( %ld ), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, DefaultVideo = '%s' WHERE Id = %" PRIu64,
+  snprintf(sql, sizeof(sql),
+      "UPDATE Events SET Name='%s%" PRIu64 "', EndTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64 " AND Name='New Event'",
       monitor->EventPrefix(), id, end_time.tv_sec,
       delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
       frames, alarm_frames,
       tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
-      video_name, id );
+      id);
   db_mutex.lock();
   while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
     db_mutex.unlock();
@@ -273,9 +294,24 @@ Event::~Event() {
     sleep(1);
     db_mutex.lock();
   }
+  if ( !mysql_affected_rows(&dbconn) ) {
+    // Name might have been changed during recording, so just do the update without changing the name.
+    snprintf(sql, sizeof(sql),
+        "UPDATE Events SET EndTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64,
+        end_time.tv_sec,
+        delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
+        frames, alarm_frames,
+        tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
+        id);
+    while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
+      db_mutex.unlock();
+      Error("Can't update event: %s reason: %s", sql, mysql_error(&dbconn));
+      sleep(1);
+      db_mutex.lock();
+    }
+  }  // end if no changed rows due to Name change during recording
   db_mutex.unlock();
-
-} // Event::~Event()
+}  // Event::~Event()
 
 void Event::createNotes(std::string &notes) {
   if ( !notes.empty() ) {
@@ -293,33 +329,42 @@ void Event::createNotes(std::string &notes) {
   } else {
     notes = "";
   }
-}
+}  // void Event::createNotes(std::string &notes)
 
-bool Event::WriteFrameImage(Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame) {
+bool Event::WriteFrameImage(
+    Image *image,
+    struct timeval timestamp,
+    const char *event_file,
+    bool alarm_frame) {
+
+  int thisquality = 
+    (alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality)) ?
+    config.jpeg_alarm_file_quality : 0;   // quality to use, zero is default
 
-  int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use, zero is default
   bool rc;
-Debug(3, "Writing image to %s", event_file);
 
   if ( !config.timestamp_on_capture ) {
     // stash the image we plan to use in another pointer regardless if timestamped.
+    // exif is only timestamp at present this switches on or off for write
     Image *ts_image = new Image(*image);
     monitor->TimestampImage(ts_image, &timestamp);
-    rc = ts_image->WriteJpeg(event_file, thisquality, (monitor->Exif() ? timestamp : (timeval){0,0})); // exif is only timestamp at present this switches on or off for write
+    rc = ts_image->WriteJpeg(event_file, thisquality,
+        (monitor->Exif() ? timestamp : (timeval){0,0}));
     delete(ts_image);
   } else {
-    rc = image->WriteJpeg(event_file, thisquality, (monitor->Exif() ? timestamp : (timeval){0,0})); // exif is only timestamp at present this switches on or off for write
+    rc = image->WriteJpeg(event_file, thisquality,
+        (monitor->Exif() ? timestamp : (timeval){0,0}));
   }
 
   return rc;
-} // end Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
+}  // end Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
 
 bool Event::WritePacket(ZMPacket &packet) {
   
   if ( videoStore->writePacket(&packet) < 0 )
     return false;
   return true;
-}
+}  // bool Event::WriteFrameVideo
 
 void Event::updateNotes(const StringSetMap &newNoteSetMap) {
   bool update = false;
@@ -330,7 +375,9 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
       noteSetMap = newNoteSetMap;
       update = true;
     } else {
-      for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin(); newNoteSetMapIter != newNoteSetMap.end(); ++newNoteSetMapIter ) {
+      for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin();
+          newNoteSetMapIter != newNoteSetMap.end();
+          ++newNoteSetMapIter ) {
         const std::string &newNoteGroup = newNoteSetMapIter->first;
         const StringSet &newNoteSet = newNoteSetMapIter->second;
         //Info( "Got %d new strings", newNoteSet.size() );
@@ -343,7 +390,9 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
           } else {
             StringSet &noteSet = noteSetMapIter->second;
             //Info( "Found note group %s, got %d strings", newNoteGroup.c_str(), newNoteSet.size() );
-            for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin(); newNoteSetIter != newNoteSet.end(); ++newNoteSetIter ) {
+            for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin();
+                newNoteSetIter != newNoteSet.end();
+                ++newNoteSetIter ) {
               const std::string &newNote = *newNoteSetIter;
               StringSet::iterator noteSetIter = noteSet.find(newNote);
               if ( noteSetIter == noteSet.end() ) {
@@ -370,16 +419,16 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
     unsigned long notesLen = 0;
 
     if ( !stmt ) {
-      const char *sql = "update Events set Notes = ? where Id = ?";
+      const char *sql = "UPDATE `Events` SET `Notes` = ? WHERE `Id` = ?";
 
-      stmt = mysql_stmt_init( &dbconn );
-      if ( mysql_stmt_prepare( stmt, sql, strlen(sql) ) ) {
-        Fatal( "Unable to prepare sql '%s': %s", sql, mysql_stmt_error(stmt) );
+      stmt = mysql_stmt_init(&dbconn);
+      if ( mysql_stmt_prepare(stmt, sql, strlen(sql)) ) {
+        Fatal("Unable to prepare sql '%s': %s", sql, mysql_stmt_error(stmt));
       }
 
       /* Get the parameter count from the statement */
-      if ( mysql_stmt_param_count( stmt ) != 2 ) {
-        Fatal( "Unexpected parameter count %ld in sql '%s'", mysql_stmt_param_count( stmt ), sql );
+      if ( mysql_stmt_param_count(stmt) != 2 ) {
+        Error("Unexpected parameter count %ld in sql '%s'", mysql_stmt_param_count(stmt), sql);
       }
 
       MYSQL_BIND  bind[2];
@@ -398,30 +447,30 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
       bind[1].length= 0;
 
       /* Bind the buffers */
-      if ( mysql_stmt_bind_param( stmt, bind ) ) {
-        Fatal( "Unable to bind sql '%s': %s", sql, mysql_stmt_error(stmt) );
+      if ( mysql_stmt_bind_param(stmt, bind) ) {
+        Error("Unable to bind sql '%s': %s", sql, mysql_stmt_error(stmt));
       }
     } // end if ! stmt
 
-    strncpy( notesStr, notes.c_str(), sizeof(notesStr) );
+    strncpy(notesStr, notes.c_str(), sizeof(notesStr));
 
-    if ( mysql_stmt_execute( stmt ) ) {
-      Fatal( "Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt) );
+    if ( mysql_stmt_execute(stmt) ) {
+      Error("Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt));
     }
 #else
     static char escapedNotes[ZM_SQL_MED_BUFSIZ];
 
     mysql_real_escape_string(&dbconn, escapedNotes, notes.c_str(), notes.length());
 
-    snprintf(sql, sizeof(sql), "UPDATE Events SET Notes = '%s' WHERE Id = %" PRIu64, escapedNotes, id);
+    snprintf(sql, sizeof(sql), "UPDATE `Events` SET `Notes` = '%s' WHERE `Id` = %" PRIu64, escapedNotes, id);
     db_mutex.lock();
     if ( mysql_query(&dbconn, sql) ) {
       Error("Can't insert event: %s", mysql_error(&dbconn));
     }
     db_mutex.unlock();
 #endif
-  } // end if update
-}
+  }  // end if update
+}  // void Event::updateNotes(const StringSetMap &newNoteSetMap)
 
 void Event::AddFrames(int n_frames, Image **images, struct timeval **timestamps) {
   for (int i = 0; i < n_frames; i += ZM_SQL_BATCH_SIZE) {
@@ -431,7 +480,7 @@ void Event::AddFrames(int n_frames, Image **images, struct timeval **timestamps)
 
 void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, struct timeval **timestamps) {
   static char sql[ZM_SQL_LGE_BUFSIZ];
-  strncpy(sql, "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ", sizeof(sql));
+  strncpy(sql, "INSERT INTO `Frames` (`EventId`, `FrameId`, `TimeStamp`, `Delta`) VALUES ", sizeof(sql));
   int frameCount = 0;
   for ( int i = start_frame; i < n_frames && i - start_frame < ZM_SQL_BATCH_SIZE; i++ ) {
     if ( timestamps[i]->tv_sec <= 0 ) {
@@ -447,26 +496,27 @@ void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, str
     frames++;
 
     if ( save_jpegs & 1 ) {
-      static char event_file[PATH_MAX];
-      snprintf(event_file, sizeof(event_file), staticConfig.capture_file_format, path.c_str(), frames);
+			std::string event_file = stringtf(staticConfig.capture_file_format, path.c_str(), frames);
       Debug(1, "Writing pre-capture frame %d", frames);
-      WriteFrameImage(images[i], *(timestamps[i]), event_file);
-    } else {
-      //If this is the first frame, we should add a thumbnail to the event directory
-      // ICON: We are working through the pre-event frames so this snapshot won't 
-      // neccessarily be of the motion.  But some events are less than 10 frames, 
-      // so I am changing this to 1, but we should overwrite it later with a better snapshot.
-      if ( frames == 1 ) {
-        WriteFrameImage(images[i], *(timestamps[i]), snapshot_file.c_str());
-      }
+      WriteFrameImage(images[i], *(timestamps[i]), event_file.c_str());
+    }
+    //If this is the first frame, we should add a thumbnail to the event directory
+    // ICON: We are working through the pre-event frames so this snapshot won't 
+    // neccessarily be of the motion.  But some events are less than 10 frames, 
+    // so I am changing this to 1, but we should overwrite it later with a better snapshot.
+    if ( frames == 1 ) {
+      WriteFrameImage(images[i], *(timestamps[i]), snapshot_file.c_str());
     }
 
     struct DeltaTimeval delta_time;
-    DELTA_TIMEVAL( delta_time, *(timestamps[i]), start_time, DT_PREC_2 );
+    DELTA_TIMEVAL(delta_time, *(timestamps[i]), start_time, DT_PREC_2);
     // Delta is Decimal(8,2) so 6 integer digits and 2 decimal digits
     if ( delta_time.sec > 999999 ) {
       Warning("Invalid delta_time from_unixtime(%ld), %s%ld.%02ld", 
-           timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
+           timestamps[i]->tv_sec,
+           (delta_time.positive?"":"-"),
+           delta_time.sec,
+           delta_time.fsec);
         delta_time.sec = 0;
     }
 
@@ -489,7 +539,7 @@ void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, str
   } else {
     Debug(1, "No valid pre-capture frames to add");
   }
-}
+}  // void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, struct timeval **timestamps)
 
 void Event::AddPacket(ZMPacket *packet, int score, Image *alarm_image) {
 
@@ -536,6 +586,26 @@ void Event::WriteDbFrames() {
   db_mutex.unlock();
 } // end void Event::WriteDbFrames()
 
+// Subtract an offset time from frames deltas to match with video start time
+void Event::UpdateFramesDelta(double offset) {
+  char sql[ZM_SQL_MED_BUFSIZ];
+
+  if ( offset == 0.0 ) return;
+  // the table is set to auto update timestamp so we force it to keep current value
+  snprintf(sql, sizeof(sql),
+    "UPDATE Frames SET timestamp = timestamp, Delta = Delta - (%.4f) WHERE EventId = %" PRIu64,
+    offset, id);
+
+  db_mutex.lock();
+  if ( mysql_query(&dbconn, sql) ) {
+    db_mutex.unlock();
+    Error("Can't update frames: %s, sql was %s", mysql_error(&dbconn), sql);
+    return;
+  }
+  db_mutex.unlock();
+  Info("Updating frames delta by %0.2f sec to match video file", offset);
+}
+
 void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *alarm_image) {
   if ( !timestamp.tv_sec ) {
     Debug(1, "Not adding new frame, zero timestamp");
@@ -547,46 +617,65 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
   bool write_to_db = false;
 
   if ( save_jpegs & 1 ) {
-    if ( frames == 1 )
-      write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
-    static char event_file[PATH_MAX];
-    snprintf(event_file, sizeof(event_file), staticConfig.capture_file_format, path, frames);
-    Debug(1, "Writing capture frame %d to %s", frames, event_file);
-    if ( ! WriteFrameImage(image, timestamp, event_file) ) {
+    std::string event_file = stringtf(staticConfig.capture_file_format, path.c_str(), frames);
+    Debug(1, "Writing capture frame %d to %s", frames, event_file.c_str());
+    if ( !WriteFrameImage(image, timestamp, event_file.c_str()) ) {
       Error("Failed to write frame image");
     }
-  } else {
-    //If this is the first frame, we should add a thumbnail to the event directory
-    if ( (frames == 1) || (score > (int)max_score) ) {
-      write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
-      WriteFrameImage(image, timestamp, snapshot_file.c_str());
-    }
-    // The first frame with a score will be the frame that alarmed the event
-    if ( (!alarm_frame_written) && (score > 0) ) {
-      write_to_db = true; // OD processing will need it, so the db needs to know about it
-      alarm_frame_written = true;
-      WriteFrameImage(image, timestamp, alarm_file.c_str());
-    }
   } // end if save_jpegs
 
-  struct DeltaTimeval delta_time;
-  DELTA_TIMEVAL(delta_time, timestamp, start_time, DT_PREC_2);
+  // If this is the first frame, we should add a thumbnail to the event directory
+  if ( (frames == 1) || (score > (int)max_score) ) {
+    write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
+    WriteFrameImage(image, timestamp, snapshot_file.c_str());
+  }
 
   FrameType frame_type = score>0?ALARM:(score<0?BULK:NORMAL);
   // < 0 means no motion detection is being done.
   if ( score < 0 )
     score = 0;
 
+  // We are writing an Alarm frame
+  if ( frame_type == ALARM ) {
+    // The first frame with a score will be the frame that alarmed the event
+    if ( !alarm_frame_written ) {
+      write_to_db = true; // OD processing will need it, so the db needs to know about it
+      alarm_frame_written = true;
+      WriteFrameImage(image, timestamp, alarm_file.c_str());
+    }
+    alarm_frames++;
+
+    tot_score += score;
+    if ( score > (int)max_score )
+      max_score = score;
+
+    if ( alarm_image ) {
+      if ( save_jpegs & 2 ) {
+        std::string event_file = stringtf(staticConfig.analyse_file_format, path.c_str(), frames);
+        Debug(1, "Writing analysis frame %d", frames);
+        if ( ! WriteFrameImage(alarm_image, timestamp, event_file.c_str(), true) ) {
+          Error("Failed to write analysis frame image");
+        }
+      }
+    }
+  }
+
   bool db_frame = ( frame_type != BULK ) || (frames==1) || ((frames%config.bulk_frame_interval)==0) ;
   if ( db_frame ) {
 
     static char sql[ZM_SQL_MED_BUFSIZ];
+    struct DeltaTimeval delta_time;
+    DELTA_TIMEVAL(delta_time, timestamp, start_time, DT_PREC_2);
 
+    // The idea is to write out 1/sec
     frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score));
-    if ( write_to_db || ( frame_data.size() > 20 ) ) {
-      Debug(1, "Adding %d frames to DB", frame_data.size());
+    double fps = monitor->get_capture_fps();
+    if ( write_to_db || ( fps && (frame_data.size() > fps) ) ) {
+      Debug(1, "Adding %d frames to DB because write_to_db:%d or frames > fps %f",
+					frame_data.size(), write_to_db, fps);
       WriteDbFrames();
       last_db_frame = frames;
+      Debug(1, "Adding %d frames to DB, done", frame_data.size());
     }
 
     // We are writing a Bulk frame
@@ -615,24 +704,4 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
 
   end_time = timestamp;
 
-  // We are writing an Alarm frame
-  if ( frame_type == ALARM ) {
-    alarm_frames++;
-
-    tot_score += score;
-    if ( score > (int)max_score )
-      max_score = score;
-
-    if ( alarm_image ) {
-      if ( save_jpegs & 2 ) {
-        static char event_file[PATH_MAX];
-        snprintf(event_file, sizeof(event_file), staticConfig.analyse_file_format, path.c_str(), frames);
-        Debug(1, "Writing analysis frame %d", frames);
-        if ( ! WriteFrameImage(alarm_image, timestamp, event_file, true) ) {
-          Error("Failed to write analysis frame image");
-        }
-      }
-    }
-  } // end if frame_type == ALARM
-
-}
+}  // end void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *alarm_image)
diff --git a/src/zm_event.h b/src/zm_event.h
index 56fa38cf5..ea6dd53aa 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -91,13 +91,13 @@ class Event {
     unsigned int  tot_score;
     unsigned int  max_score;
     std::string path;
-    VideoStore *videoStore;
     std::string snapshot_file;
     std::string alarm_file;
+    VideoStore *videoStore;
 
     VideoWriter* videowriter;
-    char video_name[PATH_MAX];
-    char video_file[PATH_MAX];
+    std::string video_name;
+    std::string video_file;
     int        last_db_frame;
     bool have_video_keyframe; // a flag to tell us if we have had a video keyframe when writing an mp4.  The first frame SHOULD be a video keyframe.
     Storage::Schemes  scheme;
@@ -128,26 +128,27 @@ class Event {
     void updateNotes( const StringSetMap &stringSetMap );
 
     void AddFrames( int n_frames, Image **images, struct timeval **timestamps );
-    void AddFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=NULL );
-    void AddPacket( ZMPacket *p, int score=0, Image *alarm_frame=NULL );
+    void AddFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=nullptr );
+    void AddPacket( ZMPacket *p, int score=0, Image *alarm_frame=nullptr );
     bool WritePacket( ZMPacket &p );
 
   private:
     void AddFramesInternal( int n_frames, int start_frame, Image **images, struct timeval **timestamps );
     void WriteDbFrames();
+    void UpdateFramesDelta(double offset);
 
   public:
     static const char *getSubPath( struct tm *time ) {
       static char subpath[PATH_MAX] = "";
-      snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
-      return( subpath );
+      snprintf(subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec);
+      return subpath;
     }
     static const char *getSubPath( time_t *time ) {
       return Event::getSubPath( localtime( time ) );
     }
 
-    char* getEventFile(void) {
-      return video_file;
+    const char* getEventFile(void) {
+      return video_file.c_str();
     }
 
   public:
@@ -155,28 +156,35 @@ class Event {
       return pre_alarm_count;
     }
     static void EmptyPreAlarmFrames() {
-      if ( pre_alarm_count > 0 ) {
-        for ( int i = 0; i < MAX_PRE_ALARM_FRAMES; i++ ) {
-          delete pre_alarm_data[i].image;
-          delete pre_alarm_data[i].alarm_frame;
-        }
-        memset( pre_alarm_data, 0, sizeof(pre_alarm_data) );
-      }
+      while ( pre_alarm_count > 0 ) {
+				int i = pre_alarm_count - 1;
+				delete pre_alarm_data[i].image;
+				pre_alarm_data[i].image = nullptr;
+				if ( pre_alarm_data[i].alarm_frame ) {
+					delete pre_alarm_data[i].alarm_frame;
+					pre_alarm_data[i].alarm_frame = nullptr;
+				}
+				pre_alarm_count--;
+			}
       pre_alarm_count = 0;
     }
-    static void AddPreAlarmFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=NULL ) {
-      pre_alarm_data[pre_alarm_count].image = new Image( *image );
+    static void AddPreAlarmFrame(Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=nullptr) {
+      pre_alarm_data[pre_alarm_count].image = new Image(*image);
       pre_alarm_data[pre_alarm_count].timestamp = timestamp;
       pre_alarm_data[pre_alarm_count].score = score;
       if ( alarm_frame ) {
-        pre_alarm_data[pre_alarm_count].alarm_frame = new Image( *alarm_frame );
+        pre_alarm_data[pre_alarm_count].alarm_frame = new Image(*alarm_frame);
       }
       pre_alarm_count++;
     }
     void SavePreAlarmFrames() {
       for ( int i = 0; i < pre_alarm_count; i++ ) {
-        AddFrame( pre_alarm_data[i].image, pre_alarm_data[i].timestamp, pre_alarm_data[i].score, pre_alarm_data[i].alarm_frame );
-      }
+        AddFrame(
+						pre_alarm_data[i].image,
+						pre_alarm_data[i].timestamp,
+						pre_alarm_data[i].score,
+						pre_alarm_data[i].alarm_frame);
+			}
       EmptyPreAlarmFrames();
     }
 };
diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 4b894c153..b9abf5e76 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -76,7 +76,7 @@ bool EventStream::loadInitialEventData(int monitor_id, time_t event_time) {
     curr_frame_id = 1; // curr_frame_id is 1-based
     if ( event_time >= event_data->start_time ) {
       Debug(2, "event time is after event start");
-      for (unsigned int i = 0; i < event_data->frame_count; i++ ) {
+      for ( unsigned int i = 0; i < event_data->frame_count; i++ ) {
         //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
         if ( event_data->frames[i].timestamp >= event_time ) {
           curr_frame_id = i+1;
@@ -100,6 +100,7 @@ bool EventStream::loadInitialEventData(uint64_t init_event_id, unsigned int init
     if ( init_frame_id >= event_data->frame_count ) {
       Error("Invalid frame id specified. %d > %d", init_frame_id, event_data->frame_count);
       curr_stream_time = event_data->start_time;
+      curr_frame_id = 1;
     } else {
       curr_stream_time = event_data->frames[init_frame_id-1].timestamp;
       curr_frame_id = init_frame_id;
@@ -116,8 +117,8 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
   snprintf(sql, sizeof(sql),
       "SELECT `MonitorId`, `StorageId`, `Frames`, unix_timestamp( `StartTime` ) AS StartTimestamp, "
-      "(SELECT max(`Delta`)-min(`Delta`) FROM `Frames` WHERE `EventId`=`Events.Id`) AS Duration, "
-      "`DefaultVideo`, `Scheme`, `SaveJPEGs` FROM `Events` WHERE `Id` = %" PRIu64, event_id);
+      "(SELECT max(`Delta`)-min(`Delta`) FROM `Frames` WHERE `EventId`=`Events`.`Id`) AS Duration, "
+      "`DefaultVideo`, `Scheme`, `SaveJPEGs`, `Orientation`+0 FROM `Events` WHERE `Id` = %" PRIu64, event_id);
 
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
@@ -147,7 +148,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
   event_data->monitor_id = atoi(dbrow[0]);
   event_data->storage_id = dbrow[1] ? atoi(dbrow[1]) : 0;
-  event_data->frame_count = dbrow[2] == NULL ? 0 : atoi(dbrow[2]);
+  event_data->frame_count = dbrow[2] == nullptr ? 0 : atoi(dbrow[2]);
   event_data->start_time = atoi(dbrow[3]);
   event_data->duration = dbrow[4] ? atof(dbrow[4]) : 0.0;
   strncpy(event_data->video_file, dbrow[5], sizeof(event_data->video_file)-1);
@@ -159,10 +160,26 @@ bool EventStream::loadEventData(uint64_t event_id) {
   } else {
     event_data->scheme = Storage::SHALLOW;
   }
-  event_data->SaveJPEGs = dbrow[7] == NULL ? 0 : atoi(dbrow[7]);
+  event_data->SaveJPEGs = dbrow[7] == nullptr ? 0 : atoi(dbrow[7]);
+  event_data->Orientation = (Monitor::Orientation)(dbrow[8] == nullptr ? 0 : atoi(dbrow[8]));
   mysql_free_result(result);
 
-  Storage * storage = new Storage(event_data->storage_id);
+  if ( !monitor ) {
+    monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY);
+  } else if ( monitor->Id() != event_data->monitor_id ) {
+    delete monitor;
+    monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY);
+  }
+  if ( !monitor ) {
+    Fatal("Unable to load monitor id %d for streaming", event_data->monitor_id);
+  }
+
+  if ( !storage ) {
+    storage = new Storage(event_data->storage_id);
+  } else if ( storage->Id() != event_data->storage_id ) {
+    delete storage;
+    storage = new Storage(event_data->storage_id);
+  }
   const char *storage_path = storage->Path();
 
   if ( event_data->scheme == Storage::DEEP ) {
@@ -170,13 +187,13 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
     if ( storage_path[0] == '/' )
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d",
+          "%s/%d/%02d/%02d/%02d/%02d/%02d/%02d",
           storage_path, event_data->monitor_id,
           event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday,
           event_time->tm_hour, event_time->tm_min, event_time->tm_sec);
     else
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d",
+          "%s/%s/%d/%02d/%02d/%02d/%02d/%02d/%02d",
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
           event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday,
           event_time->tm_hour, event_time->tm_min, event_time->tm_sec);
@@ -184,27 +201,26 @@ bool EventStream::loadEventData(uint64_t event_id) {
     struct tm *event_time = localtime(&event_data->start_time);
     if ( storage_path[0] == '/' )
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%ld/%04d-%02d-%02d/%" PRIu64,
+          "%s/%d/%04d-%02d-%02d/%" PRIu64,
           storage_path, event_data->monitor_id,
           event_time->tm_year+1900, event_time->tm_mon+1, event_time->tm_mday,
           event_data->event_id);
     else
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%s/%ld/%04d-%02d-%02d/%" PRIu64,
+          "%s/%s/%d/%04d-%02d-%02d/%" PRIu64,
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
           event_time->tm_year+1900, event_time->tm_mon+1, event_time->tm_mday, 
           event_data->event_id);
 
   } else {
     if ( storage_path[0] == '/' )
-      snprintf(event_data->path, sizeof(event_data->path), "%s/%ld/%" PRIu64,
+      snprintf(event_data->path, sizeof(event_data->path), "%s/%d/%" PRIu64,
           storage_path, event_data->monitor_id, event_data->event_id);
     else
-      snprintf(event_data->path, sizeof(event_data->path), "%s/%s/%ld/%" PRIu64, 
+      snprintf(event_data->path, sizeof(event_data->path), "%s/%s/%d/%" PRIu64, 
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
           event_data->event_id);
   }
-  delete storage; storage = NULL;
 
   updateFrameRate((double)event_data->frame_count/event_data->duration);
   Debug(3, "fps set by frame_count(%d)/duration(%f)",
@@ -244,7 +260,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
         event_data->frames[i-1].timestamp = last_timestamp + ((i-last_id)*frame_delta);
         event_data->frames[i-1].offset = event_data->frames[i-1].timestamp - event_data->start_time;
         event_data->frames[i-1].in_db = false;
-        Debug(3,"Frame %d timestamp:(%f), offset(%f) delta(%f), in_db(%d)",
+        Debug(3, "Frame %d timestamp:(%f), offset(%f) delta(%f), in_db(%d)",
             i,
             event_data->frames[i-1].timestamp,
             event_data->frames[i-1].offset,
@@ -260,7 +276,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
     last_id = id;
     last_delta = delta;
     last_timestamp = event_data->frames[id-1].timestamp;
-    Debug(4, "Frame %d timestamp:(%f), offset(%f) delta(%f), in_db(%d)",
+    Debug(3, "Frame %d timestamp:(%f), offset(%f) delta(%f), in_db(%d)",
         id,
         event_data->frames[id-1].timestamp,
         event_data->frames[id-1].offset,
@@ -275,7 +291,10 @@ bool EventStream::loadEventData(uint64_t event_id) {
 
   mysql_free_result(result);
 
-  if ( event_data->video_file[0] ) {
+  if ( event_data->video_file[0] || (monitor->GetOptVideoWriter() > 0) ) {
+    if ( !event_data->video_file[0] ) {
+      snprintf(event_data->video_file, sizeof(event_data->video_file), "%" PRIu64 "-%s", event_data->event_id, "video.mp4");
+    }
     std::string filepath = std::string(event_data->path) + "/" + std::string(event_data->video_file);
     //char filepath[PATH_MAX];
     //snprintf(filepath, sizeof(filepath), "%s/%s", event_data->path, event_data->video_file);
@@ -284,7 +303,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
     if ( 0 > ffmpeg_input->Open(filepath.c_str()) ) {
       Warning("Unable to open ffmpeg_input %s", filepath.c_str());
       delete ffmpeg_input;
-      ffmpeg_input = NULL;
+      ffmpeg_input = nullptr;
     }
   }
 
@@ -303,7 +322,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
 void EventStream::processCommand(const CmdMsg *msg) {
   Debug(2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0]);
   // Check for incoming command
-  switch( (MsgCommand)msg->msg_data[0] ) {
+  switch ( (MsgCommand)msg->msg_data[0] ) {
     case CMD_PAUSE :
         Debug(1, "Got PAUSE command");
 
@@ -372,16 +391,20 @@ void EventStream::processCommand(const CmdMsg *msg) {
         }
         break;
     case CMD_SLOWFWD :
-        Debug(1, "Got SLOW FWD command");
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = 1;
+        if ( (unsigned int)curr_frame_id < event_data->frame_count )
+          curr_frame_id += 1;
+        Debug(1, "Got SLOWFWD command new frame id %d", curr_frame_id);
         break;
     case CMD_SLOWREV :
-        Debug(1, "Got SLOW REV command");
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = -1;
+        curr_frame_id -= 1;
+        if ( curr_frame_id < 1 ) curr_frame_id = 1;
+        Debug(1, "Got SLOWREV command new frame id %d", curr_frame_id);
         break;
     case CMD_FASTREV :
         Debug(1, "Got FAST REV command");
@@ -498,6 +521,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
         // Do nothing, for now
         break;
   }
+
   struct {
     uint64_t event_id;
     int progress;
@@ -535,24 +559,24 @@ void EventStream::processCommand(const CmdMsg *msg) {
     exit(0);
 
   updateFrameRate((double)event_data->frame_count/event_data->duration);
-} // void EventStream::processCommand(const CmdMsg *msg)
+}  // void EventStream::processCommand(const CmdMsg *msg)
 
-void EventStream::checkEventLoaded() {
+bool EventStream::checkEventLoaded() {
   static char sql[ZM_SQL_SML_BUFSIZ];
 
   if ( curr_frame_id <= 0 ) {
     snprintf(sql, sizeof(sql),
-        "SELECT `Id` FROM `Events` WHERE `MonitorId` = %ld AND `Id` < %" PRIu64 " ORDER BY `Id` DESC LIMIT 1",
+        "SELECT `Id` FROM `Events` WHERE `MonitorId` = %d AND `Id` < %" PRIu64 " ORDER BY `Id` DESC LIMIT 1",
         event_data->monitor_id, event_data->event_id);
   } else if ( (unsigned int)curr_frame_id > event_data->frame_count ) {
     snprintf(sql, sizeof(sql),
-        "SELECT `Id` FROM `Events` WHERE `MonitorId` = %ld AND `Id` > %" PRIu64 " ORDER BY `Id` ASC LIMIT 1",
+        "SELECT `Id` FROM `Events` WHERE `MonitorId` = %d AND `Id` > %" PRIu64 " ORDER BY `Id` ASC LIMIT 1",
         event_data->monitor_id, event_data->event_id);
   } else {
     // No event change required
     Debug(3, "No event change required, as curr frame %d <=> event frames %d",
         curr_frame_id, event_data->frame_count);
-    return;
+    return false;
   }
 
   // Event change required.
@@ -580,12 +604,12 @@ void EventStream::checkEventLoaded() {
 
       loadEventData(event_id);
 
-      Debug(2, "Current frame id = %d", curr_frame_id);
       if ( replay_rate < 0 )  // rewind
         curr_frame_id = event_data->frame_count;
       else
         curr_frame_id = 1;
       Debug(2, "New frame id = %d", curr_frame_id);
+      return true;
     } else {
       Debug(2, "No next event loaded using %s. Pausing", sql);
       if ( curr_frame_id <= 0 )
@@ -594,7 +618,7 @@ void EventStream::checkEventLoaded() {
         curr_frame_id = event_data->frame_count;
       paused = true;
       sendTextFrame("No more event data found");
-    } // end if found a new event or not
+    }  // end if found a new event or not
     mysql_free_result(result);
     forceEventChange = false;
   } else {
@@ -605,7 +629,8 @@ void EventStream::checkEventLoaded() {
       curr_frame_id = event_data->frame_count;
     paused = true;
   }
-} // void EventStream::checkEventLoaded()
+  return false;
+}  // void EventStream::checkEventLoaded()
 
 Image * EventStream::getImage( ) {
   static char filepath[PATH_MAX];
@@ -621,7 +646,6 @@ bool EventStream::sendFrame(int delta_us) {
 
   static char filepath[PATH_MAX];
   static struct stat filestat;
-  FILE *fdj = NULL;
 
   // This needs to be abstracted.  If we are saving jpgs, then load the capture file.
   // If we are only saving analysis frames, then send that.
@@ -637,7 +661,6 @@ bool EventStream::sendFrame(int delta_us) {
         filepath[0] = 0;
       }
     }
-
   } else if ( !ffmpeg_input ) {
     Fatal("JPEGS not saved. zms is not capable of streaming jpegs from mp4 yet");
     return false;
@@ -650,7 +673,8 @@ bool EventStream::sendFrame(int delta_us) {
     Image *send_image = prepareImage(&image);
 
     if ( !vid_stream ) {
-      vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height());
+      vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps,
+          send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height());
       fprintf(stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType());
       vid_stream->OpenStream();
     }
@@ -658,44 +682,31 @@ bool EventStream::sendFrame(int delta_us) {
   } else
 #endif // HAVE_LIBAVCODEC
   {
-    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
 
+    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
     int img_buffer_size = 0;
     uint8_t *img_buffer = temp_img_buffer;
 
-    bool send_raw = ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE)) && filepath[0];
+    bool send_raw = (type == STREAM_JPEG) && ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE)) && filepath[0];
 
-    fprintf(stdout, "--ZoneMinderFrame\r\n");
-
-    if ( (type != STREAM_JPEG) || (!filepath[0]) )
-      send_raw = false;
+    fprintf(stdout, "--" BOUNDARY "\r\n");
 
     if ( send_raw ) {
-      fdj = fopen(filepath, "rb");
-      if ( !fdj ) {
-        Error("Can't open %s: %s", filepath, strerror(errno));
+      if ( !send_file(filepath) ) {
+        Error("Can't send %s: %s", filepath, strerror(errno));
         return false;
       }
-#if HAVE_SENDFILE
-      if ( fstat(fileno(fdj),&filestat) < 0 ) {
-        Error("Failed getting information about file %s: %s", filepath, strerror(errno));
-        return false;
-      }
-#else
-      img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
-#endif
     } else {
-      Image *image = NULL;
+      Image *image = nullptr;
 
       if ( filepath[0] ) {
-Debug(1, "Loading image");
         image = new Image(filepath);
       } else if ( ffmpeg_input ) {
         // Get the frame from the mp4 input
-        Debug(1,"Getting frame from ffmpeg");
-        AVFrame *frame;
         FrameData *frame_data = &event_data->frames[curr_frame_id-1];
-        frame = ffmpeg_input->get_frame( ffmpeg_input->get_video_stream_id(), frame_data->offset );
+        AVFrame *frame = ffmpeg_input->get_frame(
+            ffmpeg_input->get_video_stream_id(),
+            frame_data->offset);
         if ( frame ) {
           image = new Image(frame);
           //av_frame_free(&frame);
@@ -703,6 +714,34 @@ Debug(1, "Loading image");
           Error("Failed getting a frame.");
           return false;
         }
+
+        // when stored as an mp4, we just have the rotation as a flag in the headers
+        // so we need to rotate it before outputting
+        if (
+            (monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH)
+            and
+            (event_data->Orientation != Monitor::ROTATE_0)
+            ) {
+          Debug(2, "Rotating image %d", event_data->Orientation);
+          switch ( event_data->Orientation ) {
+            case Monitor::ROTATE_0 :
+              // No action required
+              break;
+            case Monitor::ROTATE_90 :
+            case Monitor::ROTATE_180 :
+            case Monitor::ROTATE_270 :
+              image->Rotate((event_data->Orientation-1)*90);
+              break;
+            case Monitor::FLIP_HORI :
+            case Monitor::FLIP_VERT :
+              image->Flip(event_data->Orientation==Monitor::FLIP_HORI);
+              break;
+            default:
+              Error("Invalid Orientation: %d", event_data->Orientation);
+          }
+        } else {
+          Debug(2, "Not Rotating image %d", event_data->Orientation);
+        } // end if have rotation
       } else {
         Error("Unable to get a frame");
         return false;
@@ -713,77 +752,32 @@ Debug(1, "Loading image");
       switch ( type ) {
         case STREAM_JPEG :
           send_image->EncodeJpeg(img_buffer, &img_buffer_size);
+          fputs("Content-Type: image/jpeg\r\n", stdout);
           break;
         case STREAM_ZIP :
-#if HAVE_ZLIB_H
           unsigned long zip_buffer_size;
           send_image->Zip(img_buffer, &zip_buffer_size);
           img_buffer_size = zip_buffer_size;
+          fputs("Content-Type: image/x-rgbz\r\n", stdout);
           break;
-#else
-          Error("zlib is required for zipped images. Falling back to raw image");
-          type = STREAM_RAW;
-#endif // HAVE_ZLIB_H
         case STREAM_RAW :
           img_buffer = (uint8_t*)(send_image->Buffer());
           img_buffer_size = send_image->Size();
+          fputs("Content-Type: image/x-rgb\r\n", stdout);
           break;
         default:
           Fatal("Unexpected frame type %d", type);
           break;
       }
+      send_buffer(img_buffer, img_buffer_size);
       delete image;
-      image = NULL;
-    } // end if send_raw or not
-
-    switch ( type ) {
-      case STREAM_JPEG :
-        fputs("Content-Type: image/jpeg\r\n", stdout);
-        break;
-      case STREAM_RAW :
-        fputs("Content-Type: image/x-rgb\r\n", stdout);
-        break;
-      case STREAM_ZIP :
-        fputs("Content-Type: image/x-rgbz\r\n", stdout);
-        break;
-      default :
-        Fatal("Unexpected frame type %d", type);
-        break;
-    }
-
-    if ( send_raw ) {
-#if HAVE_SENDFILE
-      fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size);
-      if ( zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size) != (int)filestat.st_size ) {
-        /* sendfile() failed, use standard way instead */
-        img_buffer_size = fread( img_buffer, 1, sizeof(temp_img_buffer), fdj );
-        if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
-          fclose(fdj); /* Close the file handle */
-          Error("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
-          return false;
-        }
-      }
-#else
-      fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size);
-      if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
-        fclose(fdj); /* Close the file handle */
-        Error("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
-        return false;
-      }
-#endif
-      fclose(fdj); /* Close the file handle */
-    } else {
-      Debug(3, "Content length: %d", img_buffer_size);
-      fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size);
-      if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
-        Error("Unable to send stream frame: %s", strerror(errno));
-        return false;
-      }
+      image = nullptr;
     }  // end if send_raw or not
 
-    fputs("\r\n\r\n", stdout);
-    fflush(stdout);
   }  // end if stream MPEG or other
+
+  fputs("\r\n\r\n", stdout);
+  fflush(stdout);
   last_frame_sent = TV_2_FLOAT(now);
   return true;
 }  // bool EventStream::sendFrame( int delta_us )
@@ -794,7 +788,7 @@ void EventStream::runStream() {
   checkInitialised();
 
   if ( type == STREAM_JPEG )
-    fputs("Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n", stdout);
+    fputs("Content-Type: multipart/x-mixed-replace;boundary=" BOUNDARY "\r\n\r\n", stdout);
 
   if ( !event_data ) {
     sendTextFrame("No event data found");
@@ -803,11 +797,15 @@ void EventStream::runStream() {
 
   Debug(3, "frame rate is: (%f)", (double)event_data->frame_count/event_data->duration);
   updateFrameRate((double)event_data->frame_count/event_data->duration);
-  gettimeofday(&start, NULL);
+  gettimeofday(&start, nullptr);
   uint64_t start_usec = start.tv_sec * 1000000 + start.tv_usec;
+  uint64_t last_frame_offset = 0;
+
+  bool in_event = true;
+  double time_to_event = 0;
 
   while ( !zm_terminate ) {
-    gettimeofday(&now, NULL);
+    gettimeofday(&now, nullptr);
 
     int delta_us = 0;
     send_frame = false;
@@ -816,132 +814,111 @@ void EventStream::runStream() {
       // commands may set send_frame to true
       while ( checkCommandQueue() && !zm_terminate ) {
         // The idea is to loop here processing all commands before proceeding.
-        Debug(1, "Have command queue");
       }
-      Debug(2, "Done command queue");
 
       // Update modified time of the socket .lock file so that we can tell which ones are stale.
       if ( now.tv_sec - last_comm_update.tv_sec > 3600 ) {
         touch(sock_path_lock);
         last_comm_update = now;
       }
-    } else {
-      Debug(2, "Not checking command queue");
     }
 
-    //if ( step != 0 )// Adding 0 is cheaper than an if 0
-    // curr_frame_id starts at 1 though, so we might skip the first frame?
-      curr_frame_id += step;
-
-    // Detects when we hit end of event and will load the next event or previous event
-    checkEventLoaded();
-
     // Get current frame data
     FrameData *frame_data = &event_data->frames[curr_frame_id-1];
 
-    //Info( "cst:%.2f", curr_stream_time );
-    //Info( "cfid:%d", curr_frame_id );
-    //Info( "fdt:%d", frame_data->timestamp );
     if ( !paused ) {
-      Debug(3, "Not paused at frame %d", curr_frame_id);
-
-      // This next bit is to determine if we are in the current event time wise
-      // and whether to show an image saying how long until the next event.
-      bool in_event = true;
-      double time_to_event = 0;
-      if ( replay_rate > 0 ) {
-        time_to_event = event_data->frames[0].timestamp - curr_stream_time;
-        if ( time_to_event > 0 )
-          in_event = false;
-      } else if ( replay_rate < 0 ) {
-        time_to_event = curr_stream_time - event_data->frames[event_data->frame_count-1].timestamp;
-        if ( time_to_event > 0 )
-          in_event = false;
-      }
-      Debug(1, "replay rate(%d) in_event(%d) time_to_event(%f)=curr_stream_time(%f)-frame timestamp:%f",
-          replay_rate, in_event, time_to_event, curr_stream_time, event_data->frames[event_data->frame_count-1].timestamp);
-      if ( !in_event ) {
-        double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
-        Debug(1, "Ctual delta time = %f = %f - %f", actual_delta_time , TV_2_FLOAT(now) , last_frame_sent);
-        // > 1 second
-        if ( actual_delta_time > 1 ) {
-          Debug(1, "Sending time to next event frame");
-          static char frame_text[64];
-          snprintf(frame_text, sizeof(frame_text), "Time to next event = %d seconds", (int)time_to_event);
-          if ( !sendTextFrame(frame_text) )
-            zm_terminate = true;
-        } else {
-          Debug(1, "Not Sending time to next event frame because actual delta time is %f", actual_delta_time);
-        }
-        //else
-        //{
-        // FIXME ICON But we are not paused.  We are somehow still in the event?
-          double sleep_time = (replay_rate>0?1:-1) * ((1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000));
-          //double sleep_time = (replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
-          //// ZM_RATE_BASE == 100, and 1x replay_rate is 100
-          //double sleep_time = ((replay_rate/ZM_RATE_BASE) * STREAM_PAUSE_WAIT)/1000000;
-          if ( ! sleep_time ) {
-            sleep_time += STREAM_PAUSE_WAIT/1000000;
-          }
-          curr_stream_time += sleep_time;
-          Debug(2, "Sleeping (%dus) because we are not at the next event yet, adding %f", STREAM_PAUSE_WAIT, sleep_time);
-          usleep(STREAM_PAUSE_WAIT);
-          
-          //curr_stream_time += (1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
-        //}
-        continue;
-      } // end if !in_event
-
       // Figure out if we should send this frame
-      Debug(3, "cur_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
+      Debug(3, "not paused at cur_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
       // If we are streaming and this frame is due to be sent
       // frame mod defaults to 1 and if we are going faster than max_fps will get multiplied by 2
       // so if it is 2, then we send every other frame, if is it 4 then every fourth frame, etc.
+ 
       if ( (frame_mod == 1) || (((curr_frame_id-1)%frame_mod) == 0) ) {
-        delta_us = (unsigned int)(frame_data->delta * 1000000);
-        Debug(3, "frame delta %uus ", delta_us);
-        // if effective > base we should speed up frame delivery
-        delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
-        Debug(3, "delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
-        // but must not exceed maxfps
-        delta_us = max(delta_us, 1000000 / maxfps);
-        Debug(3, "delta %u = base_fps(%f)/effective fps(%f) from 30fps", delta_us, base_fps, effective_fps);
         send_frame = true;
       }
     } else if ( step != 0 ) {
-      Debug(2, "Paused with step");
+      Debug(2, "Paused with step %d", step);
       // We are paused and are just stepping forward or backward one frame
       step = 0;
       send_frame = true;
     } else if ( !send_frame ) {
-      // We are paused, not stepping and doing nothing
+      // We are paused, not stepping and doing nothing, meaning that comms didn't set send_frame to true
       double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
       if ( actual_delta_time > MAX_STREAM_DELAY ) {
         // Send keepalive
         Debug(2, "Sending keepalive frame");
         send_frame = true;
-      //} else {
-        //Debug(2, "Not Sending keepalive frame");
       }
-    } // end if streaming stepping or doing nothing
+    }  // end if streaming stepping or doing nothing
+
+    // time_to_event > 0 means that we are not in the event
+    if ( time_to_event > 0 ) {
+      double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
+      Debug(1, "Actual delta time = %f = %f - %f", actual_delta_time, TV_2_FLOAT(now), last_frame_sent);
+      // > 1 second
+      if ( actual_delta_time > 1 ) {
+        Debug(1, "Sending time to next event frame");
+        static char frame_text[64];
+        snprintf(frame_text, sizeof(frame_text), "Time to next event = %d seconds", (int)time_to_event);
+        if ( !sendTextFrame(frame_text) )
+          zm_terminate = true;
+      } else {
+        Debug(1, "Not Sending time to next event frame because actual delta time is %f", actual_delta_time);
+      }
+      //else
+      //{
+      // FIXME ICON But we are not paused.  We are somehow still in the event?
+      double sleep_time = (replay_rate>0?1:-1) * ((1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000));
+      //double sleep_time = (replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
+      //// ZM_RATE_BASE == 100, and 1x replay_rate is 100
+      //double sleep_time = ((replay_rate/ZM_RATE_BASE) * STREAM_PAUSE_WAIT)/1000000;
+      if ( !sleep_time ) {
+        sleep_time += STREAM_PAUSE_WAIT/1000000;
+      }
+      curr_stream_time += sleep_time;
+      time_to_event -= sleep_time;
+      Debug(2, "Sleeping (%dus) because we are not at the next event yet, adding %f", STREAM_PAUSE_WAIT, sleep_time);
+      usleep(STREAM_PAUSE_WAIT);
+
+      //curr_stream_time += (1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
+      //}
+      continue;
+    } // end if !in_event
 
     if ( send_frame ) {
-      //Debug(3,"sending frame");
-      if ( !sendFrame(delta_us) )
+      if ( !sendFrame(delta_us) ) {
         zm_terminate = true;
+        break;
+      }
     }
 
     curr_stream_time = frame_data->timestamp;
 
     if ( !paused ) {
+
+      // delta is since the last frame
+      delta_us = (unsigned int)(frame_data->delta * 1000000);
+      Debug(3, "frame delta %uus ", delta_us);
+      // if effective > base we should speed up frame delivery
+      delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
+      Debug(3, "delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
+      // but must not exceed maxfps
+      delta_us = max(delta_us, 1000000/maxfps);
+      Debug(3, "delta %u = base_fps(%f)/effective fps(%f) from 30fps", delta_us, base_fps, effective_fps);
+
       // +/- 1? What if we are skipping frames?
       curr_frame_id += (replay_rate>0) ? frame_mod : -1*frame_mod;
       // sending the frame may have taken some time, so reload now
-      gettimeofday(&now, NULL);
+      gettimeofday(&now, nullptr);
       uint64_t now_usec = (now.tv_sec * 1000000 + now.tv_usec);
 
       // we incremented by replay_rate, so might have jumped past frame_count
-      if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id >= event_data->frame_count) ) {
+      if ( (mode == MODE_SINGLE) && (
+            (curr_frame_id < 1 )
+            ||
+            ((unsigned int)curr_frame_id >= event_data->frame_count) 
+            )
+         ) {
         Debug(2, "Have mode==MODE_SINGLE and at end of event, looping back to start");
         curr_frame_id = 1;
         // Have to reset start_usec to now when replaying
@@ -956,10 +933,25 @@ void EventStream::runStream() {
       // There are two ways to go about this, not sure which is correct.
       // you can calculate the relationship between now and the start
       // or calc the relationship from the last frame.  I think from the start is better as it self-corrects
+      //
+      if ( last_frame_offset ) {
+        // We assume that we are going forward and the next frame is in the future.
+        delta_us = frame_data->offset * 1000000 - (now_usec-start_usec);
+       // - (now_usec - start_usec);
+        Debug(2, "New delta_us now %" PRIu64 " - start %" PRIu64 " = %d offset %" PRId64 " - elapsed = %dusec",
+            now_usec, start_usec, now_usec-start_usec, frame_data->offset * 1000000, delta_us);
+      } else {
+        Debug(2, "No last frame_offset, no sleep");
+        delta_us = 0;
+      }
+      last_frame_offset = frame_data->offset * 1000000;
 
-      if ( send_frame && type != STREAM_MPEG ) {
+      if ( send_frame && (type != STREAM_MPEG) ) {
         if ( delta_us > 0 ) {
-          Debug(3, "dUs: %d", delta_us);
+          if ( delta_us > MAX_SLEEP_USEC ) {
+            Debug(1, "Limiting sleep to %d because calculated sleep is too long %d", MAX_SLEEP_USEC, delta_us);
+            delta_us = MAX_SLEEP_USEC;
+          }
           usleep(delta_us);
           Debug(3, "Done sleeping: %d usec", delta_us);
         }
@@ -971,37 +963,115 @@ void EventStream::runStream() {
           (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))),
           ZM_RATE_BASE,
           (base_fps?base_fps:1),
-          (replay_rate?abs(replay_rate*2):200)
+          (replay_rate?abs(replay_rate*2):0)
           );
-      if ( delta_us > 0 and delta_us < 500000 ) {
+      if ( delta_us > 0 ) {
+        if ( delta_us > MAX_SLEEP_USEC ) {
+          Debug(1, "Limiting sleep to %d because calculated sleep is too long %d", MAX_SLEEP_USEC, delta_us);
+          delta_us = MAX_SLEEP_USEC;
+        }
         usleep(delta_us);
-      } else {
-        // Never want to sleep for too long, limit to .1s
-        Warning("sleeping .5s because delta_us (%d) not good!", delta_us);
-        usleep(500000);
       }
-    } // end if !paused
-  } // end while ! zm_terminate
+      // We are paused, so might be stepping
+      //if ( step != 0 )// Adding 0 is cheaper than an if 0
+      // curr_frame_id starts at 1 though, so we might skip the first frame?
+      curr_frame_id += step;
+
+      // Detects when we hit end of event and will load the next event or previous event
+      if ( checkEventLoaded() ) {
+        // Have change of event
+
+        // This next bit is to determine if we are in the current event time wise
+        // and whether to show an image saying how long until the next event.
+        if ( replay_rate > 0 ) {
+          // This doesn't make sense unless we have hit the end of the event.
+          time_to_event = event_data->frames[0].timestamp - curr_stream_time;
+          Debug(1, "replay rate(%d) time_to_event(%f)=frame timestamp:%f - curr_stream_time(%f)",
+              replay_rate, time_to_event,
+              event_data->frames[0].timestamp,
+              curr_stream_time);
+
+        } else if ( replay_rate < 0 ) {
+          time_to_event = curr_stream_time - event_data->frames[event_data->frame_count-1].timestamp;
+          Debug(1, "replay rate(%d) time_to_event(%f)=curr_stream_time(%f)-frame timestamp:%f",
+              replay_rate, time_to_event, curr_stream_time, event_data->frames[event_data->frame_count-1].timestamp);
+        }  // end if forward or reverse
+
+      }  // end if checkEventLoaded
+    }  // end if !paused
+  }  // end while ! zm_terminate
 #if HAVE_LIBAVCODEC
   if ( type == STREAM_MPEG )
     delete vid_stream;
 #endif // HAVE_LIBAVCODEC
 
   closeComms();
-} // void EventStream::runStream()
+} // end void EventStream::runStream()
 
-void EventStream::setStreamStart( uint64_t init_event_id, unsigned int init_frame_id=0 ) {
-  loadInitialEventData(init_event_id, init_frame_id);
-  if ( !(monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY)) ) {
-    Fatal("Unable to load monitor id %d for streaming", event_data->monitor_id);
-    return;
+bool EventStream::send_file(const char * filepath) {
+  static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+
+  int img_buffer_size = 0;
+  uint8_t *img_buffer = temp_img_buffer;
+
+  FILE *fdj = NULL;
+  fdj = fopen(filepath, "rb");
+  if ( !fdj ) {
+    Error("Can't open %s: %s", filepath, strerror(errno));
+    return false;
   }
-}
+  bool size_sent = false;
+
+#if HAVE_SENDFILE
+  static struct stat filestat;
+  if ( fstat(fileno(fdj), &filestat) < 0 ) {
+    Error("Failed getting information about file %s: %s", filepath, strerror(errno));
+    return false;
+  }
+  if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size) ) {
+    fclose(fdj); /* Close the file handle */
+    Info("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+    return false;
+  }
+  size_sent = true;
+
+  if ( zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size) != (int)filestat.st_size ) {
+    fclose(fdj); /* Close the file handle */
+    return true;
+  }
+#endif
+  img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
+  if ( !size_sent ) {
+    if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size) ) {
+      fclose(fdj); /* Close the file handle */
+      Info("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+      return false;
+    }
+  }
+  if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
+    Error("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+    return false;
+  }
+
+  fclose(fdj); /* Close the file handle */
+  return true;
+}  // end bool EventStream::send_file(const char * filepath)
+
+bool EventStream::send_buffer(uint8_t* buffer, int size) {
+  fprintf(stdout, "Content-Length: %d\r\n\r\n", size);
+  if ( fwrite(buffer, size, 1, stdout) != 1 ) {
+    Error("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+    return false;
+  }
+  return true;
+}  // end bool EventStream::send_buffer(uint8_t* buffer, int size)
+
+void EventStream::setStreamStart(
+    uint64_t init_event_id,
+    unsigned int init_frame_id=0) {
+  loadInitialEventData(init_event_id, init_frame_id);
+}  // end void EventStream::setStreamStart(init_event_id,init_frame_id=0)
 
 void EventStream::setStreamStart(int monitor_id, time_t event_time) {
   loadInitialEventData(monitor_id, event_time);
-  if ( !(monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY)) ) {
-    Fatal("Unable to load monitor id %d for streaming", monitor_id);
-    return;
-  }
 }
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 5e7d91bb2..023dd7a99 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -20,9 +20,6 @@
 #ifndef ZM_EVENTSTREAM_H
 #define ZM_EVENTSTREAM_H
 
-#include <set>
-#include <map>
-
 #include "zm_image.h"
 #include "zm_stream.h"
 #include "zm_video.h"
@@ -55,7 +52,7 @@ class EventStream : public StreamBase {
 
     struct EventData {
       uint64_t  event_id;
-      unsigned long   monitor_id;
+      unsigned int    monitor_id;
       unsigned long   storage_id;
       unsigned long   frame_count;
       time_t          start_time;
@@ -66,6 +63,7 @@ class EventStream : public StreamBase {
       char            video_file[PATH_MAX];
       Storage::Schemes  scheme;
       int             SaveJPEGs;
+      Monitor::Orientation Orientation;
     };
 
   protected:
@@ -82,35 +80,51 @@ class EventStream : public StreamBase {
     struct timeval start;     // clock time when started the event
 
     EventData *event_data;
-    FFmpeg_Input  *ffmpeg_input;
 
   protected:
     bool loadEventData( uint64_t event_id );
     bool loadInitialEventData( uint64_t init_event_id, unsigned int init_frame_id );
     bool loadInitialEventData( int monitor_id, time_t event_time );
 
-    void checkEventLoaded();
+    bool checkEventLoaded();
     void processCommand( const CmdMsg *msg );
     bool sendFrame( int delta_us );
 
   public:
-    EventStream() {
-      mode = DEFAULT_MODE;
-    replay_rate = DEFAULT_RATE;
-
-      forceEventChange = false;
-
-      curr_frame_id = 0;
-      curr_stream_time = 0.0;
-      send_frame = false;
-
-      event_data = 0;
-
+    EventStream() :
+      mode(DEFAULT_MODE),
+      forceEventChange(false),
+      curr_frame_id(0),
+      curr_stream_time(0.0),
+      send_frame(false),
+      event_data(nullptr),
+      storage(nullptr),
+      ffmpeg_input(nullptr),
       // Used when loading frames from an mp4
-      input_codec_context = 0;
-      input_codec = 0;
-
-      ffmpeg_input = NULL;
+      input_codec_context(nullptr),
+      input_codec(nullptr)
+    {}
+    ~EventStream() {
+        if ( event_data ) {
+          if ( event_data->frames ) {
+            delete[] event_data->frames;
+            event_data->frames = nullptr;
+          }
+          delete event_data;
+          event_data = nullptr;
+        }
+        if ( monitor ) {
+          delete monitor;
+          monitor = nullptr;
+        }
+        if ( storage ) {
+          delete storage;
+          storage = nullptr;
+        }
+        if ( ffmpeg_input ) {
+          delete ffmpeg_input;
+          ffmpeg_input = nullptr;
+        }
     }
     void setStreamStart( uint64_t init_event_id, unsigned int init_frame_id );
     void setStreamStart( int monitor_id, time_t event_time );
@@ -120,8 +134,12 @@ class EventStream : public StreamBase {
     void runStream();
     Image *getImage();
   private:
-      AVCodecContext *input_codec_context;
-      AVCodec *input_codec;
+    bool send_file( const char *file_path );
+    bool send_buffer( uint8_t * buffer, int size );
+    Storage *storage;
+    FFmpeg_Input  *ffmpeg_input;
+    AVCodecContext *input_codec_context;
+    AVCodec *input_codec;
 };
 
 #endif // ZM_EVENTSTREAM_H
diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 230520c0c..161827f64 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -27,7 +27,7 @@ extern "C" {
 
 #if HAVE_LIBAVCODEC || HAVE_LIBAVUTIL || HAVE_LIBSWSCALE
 
-void log_libav_callback( void *ptr, int level, const char *fmt, va_list vargs ) {
+void log_libav_callback(void *ptr, int level, const char *fmt, va_list vargs) {
   Logger *log = Logger::fetch();
   int log_level = 0;
   if ( level == AV_LOG_QUIET ) { // -8
@@ -62,8 +62,11 @@ void log_libav_callback( void *ptr, int level, const char *fmt, va_list vargs )
   }
 
   if ( log ) {
-    char            logString[8192];
+    char logString[8192];
     vsnprintf(logString, sizeof(logString)-1, fmt, vargs);
+    int length = strlen(logString);
+    // ffmpeg logs have a carriage return, so replace it with terminator
+    logString[length-1] = 0;
     log->logPrint(false, __FILE__, __LINE__, log_level, logString);
   }
 }
@@ -74,15 +77,14 @@ void FFMPEGInit() {
 
   if ( !bInit ) {
     if ( logDebugging()  && config.log_ffmpeg ) {
-      av_log_set_level( AV_LOG_DEBUG ); 
+      av_log_set_level(AV_LOG_DEBUG);
       av_log_set_callback(log_libav_callback); 
       Info("Enabling ffmpeg logs, as LOG_DEBUG+LOG_FFMPEG are enabled in options");
     } else {
-      Info("Not enabling ffmpeg logs, as LOG_FFMPEG and/or LOG_DEBUG is disabled in options, or this monitor not part of your debug targets");
-      av_log_set_level( AV_LOG_QUIET ); 
+      Debug(1,"Not enabling ffmpeg logs, as LOG_FFMPEG and/or LOG_DEBUG is disabled in options, or this monitor is not part of your debug targets");
+      av_log_set_level(AV_LOG_QUIET);
     }
-#if LIBAVFORMAT_VERSION_CHECK(58, 9, 0, 64, 0)
-#else
+#if !LIBAVFORMAT_VERSION_CHECK(58, 9, 0, 64, 0)
     av_register_all();
 #endif
     avformat_network_init();
@@ -149,7 +151,7 @@ static int parse_key_value_pair(AVDictionary **pm, const char **buf,
                                 int flags)
 {
     char *key = av_get_token(buf, key_val_sep);
-    char *val = NULL;
+    char *val = nullptr;
     int ret;
 
     if (key && *key && strspn(*buf, key_val_sep)) {
@@ -223,7 +225,7 @@ int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat
   AVFormatContext *s = avformat_alloc_context();
   int ret = 0;
 
-  *avctx = NULL;
+  *avctx = nullptr;
   if (!s) {
     av_log(s, AV_LOG_ERROR, "Out of memory\n");
     ret = AVERROR(ENOMEM);
@@ -232,13 +234,13 @@ int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat
 
   if (!oformat) {
     if (format) {
-      oformat = av_guess_format(format, NULL, NULL);
+      oformat = av_guess_format(format, nullptr, nullptr);
       if (!oformat) {
         av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format);
         ret = AVERROR(EINVAL);
       }
     } else {
-      oformat = av_guess_format(NULL, filename, NULL);
+      oformat = av_guess_format(nullptr, filename, nullptr);
       if (!oformat) {
         ret = AVERROR(EINVAL);
         av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", filename);
@@ -265,7 +267,7 @@ int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat
       ret = AVERROR(ENOMEM);
       return ret;
     }
-    s->priv_data = NULL;
+    s->priv_data = nullptr;
   }
 #endif
 
@@ -289,24 +291,27 @@ static void zm_log_fps(double d, const char *postfix) {
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
 void zm_dump_codecpar ( const AVCodecParameters *par ) {
-  Debug(1, "Dumping codecpar codec_type(%d) codec_id(%d) codec_tag(%d) width(%d) height(%d) bit_rate(%d) format(%d = %s)", 
-    par->codec_type,
-    par->codec_id,
-    par->codec_tag,
-    par->width,
-    par->height,
-    par->bit_rate,
-    par->format,
-    ((AVPixelFormat)par->format == AV_PIX_FMT_NONE ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format))
-); 
+  Debug(1, "Dumping codecpar codec_type(%d %s) codec_id(%d %s) codec_tag(%" PRIu32 ") width(%d) height(%d) bit_rate(%" PRIu64 ") format(%d %s)",
+      par->codec_type,
+      av_get_media_type_string(par->codec_type),
+      par->codec_id,
+      avcodec_get_name(par->codec_id),
+      par->codec_tag,
+      par->width,
+      par->height,
+      par->bit_rate,
+      par->format,
+      (((AVPixelFormat)par->format == AV_PIX_FMT_NONE) ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format))
+      ); 
 }
 #endif
 
 void zm_dump_codec(const AVCodecContext *codec) {
-  Debug(1, "Dumping codec_context codec_type(%d) codec_id(%d) width(%d) height(%d)  timebase(%d/%d) format(%s)\n"
+  Debug(1, "Dumping codec_context codec_type(%d) codec_id(%d %s) width(%d) height(%d)  timebase(%d/%d) format(%s) "
       "gop_size %d max_b_frames %d me_cmp %d me_range %d qmin %d qmax %d",
     codec->codec_type,
     codec->codec_id,
+    avcodec_get_name(codec->codec_id),
     codec->width,
     codec->height,
     codec->time_base.num,
@@ -327,11 +332,10 @@ void zm_dump_codec(const AVCodecContext *codec) {
 
 /* "user interface" functions */
 void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output) {
-  char buf[256];
   Debug(1, "Dumping stream index i(%d) index(%d)", i, index );
   int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
   AVStream *st = ic->streams[i];
-  AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
+  AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", nullptr, 0);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   AVCodecParameters *codec = st->codecpar;
 #else
@@ -350,8 +354,14 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
       st->codec_info_nb_frames, codec->frame_size,
       st->time_base.num, st->time_base.den
       );
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  Debug(1, "codec: %s", avcodec_get_name(st->codecpar->codec_id));
+#else
+  char buf[256];
   avcodec_string(buf, sizeof(buf), st->codec, is_output);
   Debug(1, "codec: %s", buf);
+#endif
 
   if ( st->sample_aspect_ratio.num && // default
       av_cmp_q(st->sample_aspect_ratio, codec->sample_aspect_ratio)
@@ -427,9 +437,38 @@ unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src ) {
   dst->stream_index = src->stream_index;
   return 0;
 }
+const char *avcodec_get_name(enum AVCodecID id) {
+  const AVCodecDescriptor *cd;
+  if ( id == AV_CODEC_ID_NONE)
+    return "none";
+  cd = avcodec_descriptor_get(id);
+  if (cd)
+    return cd->name;
+  AVCodec *codec;
+  codec = avcodec_find_decoder(id);
+  if (codec) 
+    return codec->name;
+  codec = avcodec_find_encoder(id);
+  if (codec)
+    return codec->name;
+  return "unknown codec";
+}
+
+void av_packet_rescale_ts(
+    AVPacket *pkt,
+    AVRational src_tb,
+    AVRational dst_tb
+    ) {
+  if ( pkt->pts != AV_NOPTS_VALUE)
+    pkt->pts = av_rescale_q(pkt->pts, src_tb, dst_tb);
+  if ( pkt->dts != AV_NOPTS_VALUE)
+    pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb);
+  if ( pkt->duration != AV_NOPTS_VALUE)
+    pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb);
+}
 #endif
 
-bool is_video_stream( AVStream * stream ) {
+bool is_video_stream(const AVStream * stream) {
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       if ( stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ) {
   #else
@@ -441,10 +480,14 @@ bool is_video_stream( AVStream * stream ) {
   #endif
     return true;
   }
+  #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      Debug(2, "Not a video type %d != %d", stream->codecpar->codec_type, AVMEDIA_TYPE_VIDEO);
+  #endif
+
   return false;
 }
 
-bool is_video_context( AVCodecContext *codec_context ) {
+bool is_video_context(const AVCodecContext *codec_context ) {
   return
   #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
       ( codec_context->codec_type == AVMEDIA_TYPE_VIDEO );
@@ -453,7 +496,7 @@ bool is_video_context( AVCodecContext *codec_context ) {
   #endif
 }
 
-bool is_audio_stream( AVStream * stream ) {
+bool is_audio_stream(const AVStream * stream ) {
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       if ( stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) {
   #else
@@ -468,7 +511,7 @@ bool is_audio_stream( AVStream * stream ) {
   return false;
 }
 
-bool is_audio_context( AVCodecContext *codec_context ) {
+bool is_audio_context(const AVCodecContext *codec_context ) {
   return
   #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
       ( codec_context->codec_type == AVMEDIA_TYPE_AUDIO );
@@ -477,20 +520,51 @@ bool is_audio_context( AVCodecContext *codec_context ) {
   #endif
 }
 
-int zm_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet) {
+int zm_receive_packet(AVCodecContext *context, AVPacket &packet) {
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  int ret = avcodec_receive_packet(context, &packet);
+  if ( ret < 0 ) {
+    if ( AVERROR_EOF != ret ) {
+      Error("Error encoding (%d) (%s)", ret,
+          av_err2str(ret));
+    }
+    return 0;
+  }
+  return 1;
+#else
+  int got_packet = 0;
+  int ret = avcodec_encode_audio2(context, &packet, nullptr, &got_packet);
+  if ( ret < 0 ) {
+    Error("Error encoding (%d) (%s)", ret, av_err2str(ret));
+  }
+  return got_packet;
+#endif
+}  // end int zm_receive_packet(AVCodecContext *context, AVPacket &packet)
+
+int zm_send_packet_receive_frame(
+    AVCodecContext *context,
+    AVFrame *frame,
+    AVPacket &packet) {
   int ret;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  if ( (ret = avcodec_send_packet(context, &packet)) < 0  ) {
-    Error( "Unable to send packet %s, continuing",
-       av_make_error_string(ret).c_str() );
+  if ( (ret = avcodec_send_packet(context, &packet)) < 0 ) {
+    Error("Unable to send packet %s, continuing",
+       av_make_error_string(ret).c_str());
     return ret;
   }
 
   if ( (ret = avcodec_receive_frame(context, frame)) < 0 ) {
-    Error("Unable to send packet %s, continuing",
-        av_make_error_string(ret).c_str());
+    if ( AVERROR(EAGAIN) == ret ) {
+      // The codec may need more samples than it has, perfectly valid
+      Debug(2, "Codec not ready to give us a frame");
+    } else {
+      Error("Could not recieve frame (error %d = '%s')", ret,
+          av_make_error_string(ret).c_str());
+    }
     return ret;
   }
+  // In this api the packet is always consumed, so return packet.bytes
+  return packet.size;
 # else
   int frameComplete = 0;
   while ( !frameComplete ) {
@@ -504,30 +578,32 @@ int zm_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet)
       return ret;
     }
   } // end while !frameComplete
+  return ret;
 #endif
-  return 0;
-} // end int zm_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet)
+} // end int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet)
 
-int zm_send_frame(AVCodecContext *ctx, AVFrame *frame, AVPacket &packet) {
+/* Returns < 0 on error, 0 if codec not ready, 1 on success
+ */
+int zm_send_frame_receive_packet(AVCodecContext *ctx, AVFrame *frame, AVPacket &packet) {
   int ret;
-   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     if ( (ret = avcodec_send_frame(ctx, frame)) < 0 ) {
       Error("Could not send frame (error '%s')",
             av_make_error_string(ret).c_str());
-      zm_av_packet_unref(&packet);
-      return 0;
+      return ret;
     }
 
     if ( (ret = avcodec_receive_packet(ctx, &packet)) < 0 ) {
       if ( AVERROR(EAGAIN) == ret ) {
         // The codec may need more samples than it has, perfectly valid
         Debug(2, "Codec not ready to give us a packet");
+        return 0;
       } else {
         Error("Could not recieve packet (error %d = '%s')", ret,
               av_make_error_string(ret).c_str());
       }
       zm_av_packet_unref(&packet);
-      return 0;
+      return ret;
     }
   #else
     int data_present;
@@ -536,7 +612,7 @@ int zm_send_frame(AVCodecContext *ctx, AVFrame *frame, AVPacket &packet) {
       Error("Could not encode frame (error '%s')",
             av_make_error_string(ret).c_str());
       zm_av_packet_unref(&packet);
-      return 0;
+      return ret;
     }
     if ( !data_present ) {
       Debug(2, "Not ready to out a frame yet.");
@@ -545,7 +621,7 @@ int zm_send_frame(AVCodecContext *ctx, AVFrame *frame, AVPacket &packet) {
     }
   #endif
   return 1;
-}  // wend zm_send_frame
+}  // end int zm_send_frame_receive_packet
 
 void dumpPacket(AVStream *stream, AVPacket *pkt, const char *text) {
   char b[10240];
@@ -611,3 +687,125 @@ void dumpPacket(AVPacket *pkt, const char *text) {
            pkt->duration);
   Debug(2, "%s:%d:%s: %s", __FILE__, __LINE__, text, b);
 }
+
+void zm_packet_copy_rescale_ts(const AVPacket *ipkt, AVPacket *opkt, const AVRational src_tb, const AVRational dst_tb) {
+  opkt->pts = ipkt->pts;
+  opkt->dts = ipkt->dts;
+  opkt->duration = ipkt->duration;
+  av_packet_rescale_ts(opkt, src_tb, dst_tb);
+}
+
+#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
+int zm_resample_audio(
+#if defined(HAVE_LIBSWRESAMPLE)
+    SwrContext *resample_ctx,
+#else
+#if defined(HAVE_LIBAVRESAMPLE)
+    AVAudioResampleContext *resample_ctx,
+#endif
+#endif
+    AVFrame *in_frame,
+    AVFrame *out_frame
+    ) {
+#if defined(HAVE_LIBSWRESAMPLE)
+  if ( in_frame ) {
+    // Resample the in_frame into the audioSampleBuffer until we process the whole
+    // decoded data. Note: pts does not survive resampling or converting
+    Debug(2, "Converting %d to %d samples using swresample",
+        in_frame->nb_samples, out_frame->nb_samples);
+  } else {
+    Debug(2, "Sending NULL frame to flush resampler");
+  }
+  int ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
+  if ( ret < 0 ) {
+    Error("Could not resample frame (error '%s')",
+        av_make_error_string(ret).c_str());
+    return 0;
+  }
+  Debug(3,"swr_get_delay %d",
+      swr_get_delay(resample_ctx, out_frame->sample_rate));
+#else
+#if defined(HAVE_LIBAVRESAMPLE)
+  if ( ! in_frame ) {
+    Error("Flushing resampler not supported by AVRESAMPLE");
+    return 0;
+  }
+  int ret = avresample_convert(resample_ctx, nullptr, 0, 0, in_frame->data,
+                            0, in_frame->nb_samples);
+  if ( ret < 0 ) {
+    Error("Could not resample frame (error '%s')",
+        av_make_error_string(ret).c_str());
+    return 0;
+  }
+  int samples_available = avresample_available(resample_ctx);
+  if ( samples_available < out_frame->nb_samples ) {
+    Debug(1, "Not enough samples yet (%d)", samples_available);
+    return 0;
+  }
+
+  // Read a frame audio data from the resample fifo
+  if ( avresample_read(resample_ctx, out_frame->data, out_frame->nb_samples) !=
+      out_frame->nb_samples) {
+    Warning("Error reading resampled audio.");
+    return 0;
+  }
+#endif
+#endif
+  zm_dump_frame(out_frame, "Out frame after resample");
+  return 1;
+}
+
+int zm_resample_get_delay(
+#if defined(HAVE_LIBSWRESAMPLE)
+        SwrContext *resample_ctx,
+#else
+#if defined(HAVE_LIBAVRESAMPLE)
+        AVAudioResampleContext *resample_ctx,
+#endif
+#endif
+        int time_base
+    ) { 
+#if defined(HAVE_LIBSWRESAMPLE)
+  return swr_get_delay(resample_ctx, time_base);
+#else
+#if defined(HAVE_LIBAVRESAMPLE)
+  return avresample_available(resample_ctx);
+#endif
+#endif
+}
+#endif
+
+int zm_add_samples_to_fifo(AVAudioFifo *fifo, AVFrame *frame) {
+  int ret = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + frame->nb_samples);
+  if ( ret < 0 ) {
+    Error("Could not reallocate FIFO to %d samples",
+        av_audio_fifo_size(fifo) + frame->nb_samples);
+    return 0;
+  }
+  /** Store the new samples in the FIFO buffer. */
+  ret = av_audio_fifo_write(fifo, (void **)frame->data, frame->nb_samples);
+  if ( ret < frame->nb_samples ) {
+    Error("Could not write data to FIFO. %d written, expecting %d. Reason %s",
+        ret, frame->nb_samples, av_make_error_string(ret).c_str());
+    return 0;
+  }
+  return 1;
+}
+
+int zm_get_samples_from_fifo(AVAudioFifo *fifo, AVFrame *frame) {
+  // AAC requires 1024 samples per encode.  Our input tends to be something else, so need to buffer them.
+  if ( frame->nb_samples > av_audio_fifo_size(fifo) ) {
+    Debug(1, "Not enough samples in fifo for AAC codec frame_size %d > fifo size %d",
+         frame->nb_samples, av_audio_fifo_size(fifo));
+    return 0;
+  }
+
+  if ( av_audio_fifo_read(fifo, (void **)frame->data, frame->nb_samples) < frame->nb_samples ) {
+    Error("Could not read data from FIFO");
+    return 0;
+  }
+//out_frame->nb_samples = frame_size;
+  zm_dump_frame(frame, "Out frame after fifo read");
+  return 1;
+}
+
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index 9e8a2a22b..2a25acba7 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -24,6 +24,14 @@
 
 extern "C" {
 
+#ifdef HAVE_LIBSWRESAMPLE
+  #include "libswresample/swresample.h"
+#else
+  #ifdef HAVE_LIBAVRESAMPLE
+    #include "libavresample/avresample.h"
+  #endif
+#endif
+
 // AVUTIL
 #if HAVE_LIBAVUTIL_AVUTIL_H
 #include "libavutil/avassert.h"
@@ -31,6 +39,8 @@ extern "C" {
 #include <libavutil/base64.h>
 #include <libavutil/mathematics.h>
 #include <libavutil/avstring.h>
+#include "libavutil/audio_fifo.h"
+#include "libavutil/imgutils.h"
 
 /* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg
  * The original source is vlc (in modules/codec/avcodec/avcommon_compat.h)
@@ -299,21 +309,6 @@ void zm_dump_codec(const AVCodecContext *codec);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
 void zm_dump_codecpar(const AVCodecParameters *par);
 #endif
-#if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
-#define zm_dump_frame(frame, text) Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d" \
-      " duration %" PRId64 \
-      " layout %d pts %" PRId64,\
-      text, \
-      frame->format, \
-      av_get_sample_fmt_name((AVSampleFormat)frame->format), \
-      frame->sample_rate, \
-      frame->nb_samples, \
-      frame->channels, \
-      frame->pkt_duration, \
-      frame->channel_layout, \
-      frame->pts \
-      );
-#else
 #define zm_dump_frame(frame, text) Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d" \
       " duration %" PRId64 \
       " layout %d pts %" PRId64, \
@@ -327,8 +322,7 @@ void zm_dump_codecpar(const AVCodecParameters *par);
       frame->pts \
       );
 
-#endif
-
+#if LIBAVUTIL_VERSION_CHECK(54, 4, 0, 74, 100)
 #define zm_dump_video_frame(frame,text) Debug(1, "%s: format %d %s %dx%d linesize:%dx%d pts: %" PRId64, \
       text, \
       frame->format, \
@@ -339,12 +333,27 @@ void zm_dump_codecpar(const AVCodecParameters *par);
       frame->pts \
       );
 
+#else
+#define zm_dump_video_frame(frame,text) Debug(1, "%s: format %d %s %dx%d linesize:%dx%d pts: %" PRId64, \
+      text, \
+      frame->format, \
+      "unsupported", \
+      frame->width, \
+      frame->height, \
+      frame->linesize[0], frame->linesize[1], \
+      frame->pts \
+      );
+#endif
+
 #if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
     #define zm_av_packet_unref(packet) av_packet_unref(packet)
     #define zm_av_packet_ref(dst, src) av_packet_ref(dst, src)
 #else
-    #define zm_av_packet_unref(packet) av_free_packet(packet)
-unsigned int zm_av_packet_ref(AVPacket *dst, AVPacket *src);
+    unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src );
+    #define zm_av_packet_unref( packet ) av_free_packet( packet )
+    const char *avcodec_get_name(AVCodecID id);
+
+    void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb);
 #endif
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
       #define zm_avcodec_decode_video( context, rawFrame, frameComplete, packet ) \
@@ -370,21 +379,47 @@ unsigned int zm_av_packet_ref(AVPacket *dst, AVPacket *src);
 
 int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt);
 
-bool is_video_stream(AVStream *);
-bool is_audio_stream(AVStream *);
-bool is_video_context(AVCodec *);
-bool is_audio_context(AVCodec *);
+bool is_video_stream(const AVStream *);
+bool is_audio_stream(const AVStream *);
+bool is_video_context(const AVCodec *);
+bool is_audio_context(const AVCodec *);
 
-int zm_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet);
-int zm_send_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet);
+int zm_receive_packet(AVCodecContext *context, AVPacket &packet);
+
+int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet);
+int zm_send_frame_receive_packet(AVCodecContext *context, AVFrame *frame, AVPacket &packet);
 
 void dumpPacket(AVStream *, AVPacket *,const char *text="");
 void dumpPacket(AVPacket *,const char *text="");
-#ifndef HAVE_LIBSWRESAMPLE
-#ifdef HAVE_LIBAVRESAMPLE
-#define av_opt_set_channel_layout(ctx, setting, value, 0) av_opt_set_int(ctx, setting, value, 0);
-#define av_opt_set_sample_fmt(ctx, setting, value, 0) av_opt_set_int(ctx, setting, value, 0);
+void zm_packet_copy_rescale_ts(const AVPacket *ipkt, AVPacket *opkt, const AVRational src_tb, const AVRational dst_tb);
+
+#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
+int zm_resample_audio(
+#if defined(HAVE_LIBSWRESAMPLE)
+    SwrContext *resample_ctx,
 #else
+#if defined(HAVE_LIBAVRESAMPLE)
+    AVAudioResampleContext *resample_ctx,
 #endif
 #endif
+    AVFrame *in_frame,
+    AVFrame *out_frame
+    );
+int zm_resample_get_delay(
+#if defined(HAVE_LIBSWRESAMPLE)
+    SwrContext *resample_ctx,
+#else
+#if defined(HAVE_LIBAVRESAMPLE)
+    AVAudioResampleContext *resample_ctx,
+#endif
+#endif
+    int time_base
+    );
+
+#endif
+
+int zm_add_samples_to_fifo(AVAudioFifo *fifo, AVFrame *frame);
+int zm_get_samples_from_fifo(AVAudioFifo *fifo, AVFrame *frame);
+
+
 #endif // ZM_FFMPEG_H
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index bd767da60..f7bf1c2cc 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -19,6 +19,7 @@
 
 #include "zm.h"
 #include "zm_signal.h"
+#include "zm_utils.h"
 
 #if HAVE_LIBAVFORMAT
 
@@ -60,31 +61,31 @@ static enum AVPixelFormat get_hw_format(
 }
 #if !LIBAVUTIL_VERSION_CHECK(56, 22, 0, 14, 0)
 static enum AVPixelFormat find_fmt_by_hw_type(const enum AVHWDeviceType type) {
-    enum AVPixelFormat fmt;
-    switch (type) {
+  enum AVPixelFormat fmt;
+  switch (type) {
     case AV_HWDEVICE_TYPE_VAAPI:
-        fmt = AV_PIX_FMT_VAAPI;
-        break;
+      fmt = AV_PIX_FMT_VAAPI;
+      break;
     case AV_HWDEVICE_TYPE_DXVA2:
-        fmt = AV_PIX_FMT_DXVA2_VLD;
-        break;
+      fmt = AV_PIX_FMT_DXVA2_VLD;
+      break;
     case AV_HWDEVICE_TYPE_D3D11VA:
-        fmt = AV_PIX_FMT_D3D11;
-        break;
+      fmt = AV_PIX_FMT_D3D11;
+      break;
     case AV_HWDEVICE_TYPE_VDPAU:
-        fmt = AV_PIX_FMT_VDPAU;
-        break;
+      fmt = AV_PIX_FMT_VDPAU;
+      break;
     case AV_HWDEVICE_TYPE_CUDA:
-        fmt = AV_PIX_FMT_CUDA;
-        break;
+      fmt = AV_PIX_FMT_CUDA;
+      break;
     case AV_HWDEVICE_TYPE_VIDEOTOOLBOX:
-        fmt = AV_PIX_FMT_VIDEOTOOLBOX;
-        break;
+      fmt = AV_PIX_FMT_VIDEOTOOLBOX;
+      break;
     default:
-        fmt = AV_PIX_FMT_NONE;
-        break;
-    }
-    return fmt;
+      fmt = AV_PIX_FMT_NONE;
+      break;
+  }
+  return fmt;
 }
 #endif
 #endif
@@ -131,27 +132,65 @@ FfmpegCamera::FfmpegCamera(
     FFMPEGInit();
   }
 
-  mFormatContext = NULL;
+  mFormatContext = nullptr;
   mVideoStreamId = -1;
   mAudioStreamId = -1;
-  mVideoCodecContext = NULL;
-  mAudioCodecContext = NULL;
-  mVideoCodec = NULL;
-  mAudioCodec = NULL;
-  mRawFrame = NULL;
-  mFrame = NULL;
+  mVideoCodecContext = nullptr;
+  mAudioCodecContext = nullptr;
+  mVideoCodec = nullptr;
+  mAudioCodec = nullptr;
+  mRawFrame = nullptr;
+  mFrame = nullptr;
   frameCount = 0;
   mCanCapture = false;
   error_count = 0;
+  use_hwaccel = true;
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
-  hwFrame = NULL;
-  hw_device_ctx = NULL;
+  hwFrame = nullptr;
+  hw_device_ctx = nullptr;
 #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
   hw_pix_fmt = AV_PIX_FMT_NONE;
 #endif
 #endif
 
-} // end FFmpegCamera::FFmpegCamera
+#if HAVE_LIBSWSCALE
+  mConvertContext = nullptr;
+#endif
+  /* Has to be located inside the constructor so other components such as zma
+   * will receive correct colours and subpixel order */
+  if ( colours == ZM_COLOUR_RGB32 ) {
+    subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+    imagePixFormat = AV_PIX_FMT_RGBA;
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    subpixelorder = ZM_SUBPIX_ORDER_RGB;
+    imagePixFormat = AV_PIX_FMT_RGB24;
+  } else if ( colours == ZM_COLOUR_GRAY8 ) {
+    subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    imagePixFormat = AV_PIX_FMT_GRAY8;
+  } else {
+    Panic("Unexpected colours: %d", colours);
+  }
+
+  frame_buffer = nullptr;
+  // sws_scale needs 32bit aligned width and an extra 16 bytes padding, so recalculate imagesize, which was width*height*bytes_per_pixel
+#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+  alignment = 32;
+  imagesize = av_image_get_buffer_size(imagePixFormat, width, height, alignment);
+  // av_image_get_linesize isn't aligned, so we have to do that.
+  linesize = FFALIGN(av_image_get_linesize(imagePixFormat, width, 0), alignment);
+#else
+  alignment = 1;
+  linesize = FFALIGN(av_image_get_linesize(imagePixFormat, width, 0), alignment);
+  imagesize = avpicture_get_size(imagePixFormat, width, height);
+#endif
+  if ( linesize != width * colours ) {
+    Debug(1, "linesize %d != width %d * colours %d = %d, allocating frame_buffer", linesize, width, colours, width*colours);
+    frame_buffer = (uint8_t *)av_malloc(imagesize);
+  }
+
+  Debug(1, "ffmpegcamera: width %d height %d linesize %d colours %d image linesize %d imagesize %d",
+      width, height, linesize, colours, width*colours, imagesize);
+}  // FfmpegCamera::FfmpegCamera
 
 FfmpegCamera::~FfmpegCamera() {
   Close();
@@ -161,12 +200,12 @@ FfmpegCamera::~FfmpegCamera() {
 
 int FfmpegCamera::PrimeCapture() {
   if ( mCanCapture ) {
-    Info("Priming capture from %s, Closing", mPath.c_str());
+    Debug(1, "Priming capture from %s, Closing", mPath.c_str());
     Close();
   }
   mVideoStreamId = -1;
   mAudioStreamId = -1;
-  Info("Priming capture from %s", mPath.c_str());
+  Debug(1, "Priming capture from %s", mPath.c_str());
 
   return ! OpenFfmpeg();
 }
@@ -216,18 +255,19 @@ int FfmpegCamera::OpenFfmpeg() {
 
   // Open the input, not necessarily a file
 #if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
-  if ( av_open_input_file(&mFormatContext, mPath.c_str(), NULL, 0, NULL) != 0 )
+  if ( av_open_input_file(&mFormatContext, mPath.c_str(), nullptr, 0, nullptr) != 0 )
 #else
   // Handle options
-  AVDictionary *opts = NULL;
+  AVDictionary *opts = nullptr;
   ret = av_dict_parse_string(&opts, Options().c_str(), "=", ",", 0);
   if ( ret < 0 ) {
     Warning("Could not parse ffmpeg input options '%s'", Options().c_str());
   }
 
-  std::locale locale;
-  if ( std::toupper(mPath.substr(0, 3), locale) == "RTSP" ) {
-    // Set transport method as specified by method field, rtpUni is default
+  // Set transport method as specified by method field, rtpUni is default
+  std::string protocol = mPath.substr(0, 4);
+  string_toupper(protocol);
+  if ( protocol == "RTSP" ) {
     const std::string method = Method();
     if ( method == "rtpMulti" ) {
       ret = av_dict_set(&opts, "rtsp_transport", "udp_multicast", 0);
@@ -240,12 +280,11 @@ int FfmpegCamera::OpenFfmpeg() {
     } else {
       Warning("Unknown method (%s)", method.c_str());
     }
-    // #av_dict_set(&opts, "timeout", "10000000", 0); // in microseconds.
-
     if ( ret < 0 ) {
       Warning("Could not set rtsp_transport method '%s'", method.c_str());
     }
-  }
+  }  // end if RTSP
+  // #av_dict_set(&opts, "timeout", "10000000", 0); // in microseconds.
 
   Debug(1, "Calling avformat_open_input for %s", mPath.c_str());
 
@@ -257,7 +296,7 @@ int FfmpegCamera::OpenFfmpeg() {
   mFormatContext->interrupt_callback.callback = FfmpegInterruptCallback;
   mFormatContext->interrupt_callback.opaque = this;
 
-  ret = avformat_open_input(&mFormatContext, mPath.c_str(), NULL, &opts);
+  ret = avformat_open_input(&mFormatContext, mPath.c_str(), nullptr, &opts);
   if ( ret != 0 )
 #endif
   {
@@ -268,25 +307,24 @@ int FfmpegCamera::OpenFfmpeg() {
 #else
     if ( mFormatContext ) {
       avformat_close_input(&mFormatContext);
-      mFormatContext = NULL;
+      mFormatContext = nullptr;
     }
 #endif
     av_dict_free(&opts);
 
     return -1;
   }
-  AVDictionaryEntry *e = NULL;
-  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
+  AVDictionaryEntry *e = nullptr;
+  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != nullptr ) {
     Warning("Option %s not recognized by ffmpeg", e->key);
   }
   av_dict_free(&opts);
 
-  Info("Stream open %s, parsing streams...", mPath.c_str());
-
+  Debug(1, "Finding stream info");
 #if !LIBAVFORMAT_VERSION_CHECK(53, 6, 0, 6, 0)
   ret = av_find_stream_info(mFormatContext);
 #else
-  ret = avformat_find_stream_info(mFormatContext, 0);
+  ret = avformat_find_stream_info(mFormatContext, nullptr);
 #endif
   if ( ret < 0 ) {
     Error("Unable to find stream info from %s due to: %s",
@@ -316,8 +354,11 @@ int FfmpegCamera::OpenFfmpeg() {
       }
     }
   }  // end foreach stream
-  if ( mVideoStreamId == -1 )
-    Fatal("Unable to locate video stream in %s", mPath.c_str());
+
+  if ( mVideoStreamId == -1 ) {
+    Error("Unable to locate video stream in %s", mPath.c_str());
+    return -1;
+  }
 
   Debug(3, "Found video stream at index %d, audio stream at index %d",
       mVideoStreamId, mAudioStreamId);
@@ -337,7 +378,7 @@ int FfmpegCamera::OpenFfmpeg() {
 #endif
 
   if ( mVideoCodecContext->codec_id == AV_CODEC_ID_H264 ) {
-    if ( (mVideoCodec = avcodec_find_decoder_by_name("h264_mmal")) == NULL ) {
+    if ( (mVideoCodec = avcodec_find_decoder_by_name("h264_mmal")) == nullptr ) {
       Debug(1, "Failed to find decoder (h264_mmal)");
     } else {
       Debug(1, "Success finding decoder (h264_mmal)");
@@ -353,14 +394,13 @@ int FfmpegCamera::OpenFfmpeg() {
     }
   }
 
-  Debug(1, "Video Found decoder %s", mVideoCodec->name);
   zm_dump_stream_format(mFormatContext, mVideoStreamId, 0, 0);
 
-  if ( hwaccel_name != "" ) {
+  if ( use_hwaccel && (hwaccel_name != "") ) {
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
     // 3.2 doesn't seem to have all the bits in place, so let's require 3.3 and up
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-// Print out available types
+  #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
+    // Print out available types
     enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE;
     while ( (type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE )
       Debug(1, "%s", av_hwdevice_get_type_name(type));
@@ -373,8 +413,8 @@ int FfmpegCamera::OpenFfmpeg() {
       Debug(1, "Found hwdevice %s", av_hwdevice_get_type_name(type));
     }
 
-#if LIBAVUTIL_VERSION_CHECK(56, 22, 0, 14, 0)
-    // Get h_pix_fmt
+    #if LIBAVUTIL_VERSION_CHECK(56, 22, 0, 14, 0)
+    // Get hw_pix_fmt
     for ( int i = 0;; i++ ) {
       const AVCodecHWConfig *config = avcodec_get_hw_config(mVideoCodec, i);
       if ( !config ) {
@@ -388,53 +428,50 @@ int FfmpegCamera::OpenFfmpeg() {
         hw_pix_fmt = config->pix_fmt;
         break;
       } else {
-        Debug(1, "decoder %s hwConfig doesn't match our type: %s, pix_fmt %s.",
+        Debug(1, "decoder %s hwConfig doesn't match our type: %s != %s, pix_fmt %s.",
             mVideoCodec->name,
+            av_hwdevice_get_type_name(type),
             av_hwdevice_get_type_name(config->device_type),
             av_get_pix_fmt_name(config->pix_fmt)
             );
       }
     }  // end foreach hwconfig
-#else
+    #else
     hw_pix_fmt = find_fmt_by_hw_type(type);
-#endif
+    #endif
     if ( hw_pix_fmt != AV_PIX_FMT_NONE ) {
-      Debug(1, "Selected gw_pix_fmt %d %s",
-          hw_pix_fmt,
-          av_get_pix_fmt_name(hw_pix_fmt));
+      Debug(1, "Selected hw_pix_fmt %d %s",
+          hw_pix_fmt, av_get_pix_fmt_name(hw_pix_fmt));
 
-      mVideoCodecContext->get_format = get_hw_format;
-
-      Debug(1, "Creating hwdevice for %s",
-          (hwaccel_device != "" ? hwaccel_device.c_str() : ""));
       ret = av_hwdevice_ctx_create(&hw_device_ctx, type,
-          (hwaccel_device != "" ? hwaccel_device.c_str(): NULL), NULL, 0);
+          (hwaccel_device != "" ? hwaccel_device.c_str(): nullptr), nullptr, 0);
       if ( ret < 0 ) {
-        Error("Failed to create specified HW device.");
-        return -1;
+        Error("Failed to create hwaccel device. %s",av_make_error_string(ret).c_str());
+        hw_pix_fmt = AV_PIX_FMT_NONE;
+      } else {
+        Debug(1, "Created hwdevice for %s", hwaccel_device.c_str());
+        mVideoCodecContext->get_format = get_hw_format;
+        mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx);
+        hwFrame = zm_av_frame_alloc();
       }
-      Debug(1, "Created hwdevice");
-      mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx);
-      hwaccel = true;
-      hwFrame = zm_av_frame_alloc();
     } else {
-      Debug(1, "Failed to setup hwaccel.");
+      Debug(1, "Failed to find suitable hw_pix_fmt.");
     }
-#else
+  #else
     Debug(1, "AVCodec not new enough for hwaccel");
-#endif
+  #endif
 #else
     Warning("HWAccel support not compiled in.");
 #endif
-  }  // end if hwacel_name
+  }  // end if hwaccel_name
 
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
   ret = avcodec_open(mVideoCodecContext, mVideoCodec);
 #else
   ret = avcodec_open2(mVideoCodecContext, mVideoCodec, &opts);
 #endif
-  e = NULL;
-  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
+  e = nullptr;
+  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != nullptr ) {
     Warning("Option %s not recognized by ffmpeg", e->key);
   }
   if ( ret < 0 ) {
@@ -444,11 +481,7 @@ int FfmpegCamera::OpenFfmpeg() {
   }
   zm_dump_codec(mVideoCodecContext);
 
-  if ( mVideoCodecContext->hwaccel != NULL ) {
-    Debug(1, "HWACCEL in use");
-  } else {
-    Debug(1, "HWACCEL not in use");
-  }
+  Debug(1, hwFrame ? "HWACCEL in use" : "HWACCEL not in use");
 
   if ( mAudioStreamId >= 0 ) {
     if ( (mAudioCodec = avcodec_find_decoder(
@@ -457,7 +490,7 @@ int FfmpegCamera::OpenFfmpeg() {
 #else
             mFormatContext->streams[mAudioStreamId]->codec->codec_id
 #endif
-            )) == NULL ) {
+            )) == nullptr ) {
       Debug(1, "Can't find codec for audio stream from %s", mPath.c_str());
     } else {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -476,7 +509,7 @@ int FfmpegCamera::OpenFfmpeg() {
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
       if ( avcodec_open(mAudioCodecContext, mAudioCodec) < 0 )
 #else
-      if ( avcodec_open2(mAudioCodecContext, mAudioCodec, 0) < 0 )
+      if ( avcodec_open2(mAudioCodecContext, mAudioCodec, nullptr) < 0 )
 #endif
       {
         Error("Unable to open codec for audio stream from %s", mPath.c_str());
@@ -504,16 +537,16 @@ int FfmpegCamera::Close() {
 
   if ( mFrame ) {
     av_frame_free(&mFrame);
-    mFrame = NULL;
+    mFrame = nullptr;
   }
   if ( mRawFrame ) {
     av_frame_free(&mRawFrame);
-    mRawFrame = NULL;
+    mRawFrame = nullptr;
   }
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
   if ( hwFrame ) {
     av_frame_free(&hwFrame);
-    hwFrame = NULL;
+    hwFrame = nullptr;
   }
 #endif
 
@@ -522,14 +555,14 @@ int FfmpegCamera::Close() {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // avcodec_free_context(&mVideoCodecContext);
 #endif
-    mVideoCodecContext = NULL;  // Freed by av_close_input_file
+    mVideoCodecContext = nullptr;  // Freed by av_close_input_file
   }
   if ( mAudioCodecContext ) {
     avcodec_close(mAudioCodecContext);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     avcodec_free_context(&mAudioCodecContext);
 #endif
-    mAudioCodecContext = NULL;  // Freed by av_close_input_file
+    mAudioCodecContext = nullptr;  // Freed by av_close_input_file
   }
 
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
@@ -544,12 +577,126 @@ int FfmpegCamera::Close() {
 #else
     avformat_close_input(&mFormatContext);
 #endif
-    mFormatContext = NULL;
+    mFormatContext = nullptr;
   }
 
   return 0;
 }  // end FfmpegCamera::Close
 
+int FfmpegCamera::transfer_to_image(
+    Image &image,
+    AVFrame *output_frame,
+    AVFrame *input_frame
+    ) {
+  uint8_t* image_buffer;  // pointer to buffer in image
+  uint8_t* buffer;        // pointer to either image_buffer or frame_buffer
+
+  /* Request a writeable buffer of the target image */
+  image_buffer = image.WriteBuffer(width, height, colours, subpixelorder);
+  if ( image_buffer == nullptr ) {
+    Error("Failed requesting writeable buffer for the captured image.");
+    return -1;
+  }
+  // if image_buffer was allocated then use it.
+  buffer = frame_buffer ? frame_buffer : image_buffer;
+
+#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+  // From what I've read, we should align the linesizes to 32bit so that ffmpeg can use SIMD instructions too.
+  int size = av_image_fill_arrays(
+      output_frame->data, output_frame->linesize,
+      buffer, imagePixFormat, width, height,
+      alignment
+      );
+  if ( size < 0 ) {
+    Error("Problem setting up data pointers into image %s",
+        av_make_error_string(size).c_str());
+  } else {
+    Debug(4, "av_image_fill_array %dx%d alignment: %d = %d, buffer size is %d",
+        width, height, alignment, size, image.Size());
+  }
+  Debug(1, "ffmpegcamera: width %d height %d linesize %d colours %d imagesize %d", width, height, linesize, colours, imagesize);
+  if ( linesize != (unsigned int)output_frame->linesize[0] ) {
+    Error("Bad linesize expected %d got %d", linesize, output_frame->linesize[0]);
+  }
+#else
+  avpicture_fill((AVPicture *)output_frame, buffer,
+      imagePixFormat, width, height);
+#endif
+
+#if HAVE_LIBSWSCALE
+  if ( !mConvertContext ) {
+    mConvertContext = sws_getContext(
+        input_frame->width,
+        input_frame->height,
+        (AVPixelFormat)input_frame->format,
+        width, height,
+        imagePixFormat, SWS_BICUBIC, nullptr,
+        nullptr, nullptr);
+    if ( mConvertContext == nullptr ) {
+      Error("Unable to create conversion context for %s from %s to %s",
+          mPath.c_str(),
+          av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+          av_get_pix_fmt_name(imagePixFormat)
+          );
+      return -1;
+    }
+    Debug(1, "Setup conversion context for %dx%d %s to %dx%d %s",
+          input_frame->width, input_frame->height,
+          av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+          width, height,
+          av_get_pix_fmt_name(imagePixFormat)
+        );
+  }
+
+  int ret =
+      sws_scale(
+        mConvertContext, input_frame->data, input_frame->linesize,
+        0, mVideoCodecContext->height,
+        output_frame->data, output_frame->linesize);
+  if ( ret < 0 ) {
+    Error("Unable to convert format %u %s linesize %d,%d height %d to format %u %s linesize %d,%d at frame %d codec %u %s lines %d: code: %d",
+        input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+        input_frame->linesize[0], input_frame->linesize[1], mVideoCodecContext->height,
+        imagePixFormat,
+        av_get_pix_fmt_name(imagePixFormat),
+        output_frame->linesize[0], output_frame->linesize[1],
+        frameCount,
+        mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt),
+        mVideoCodecContext->height,
+        ret
+        );
+    return -1;
+  }
+  Debug(4, "Able to convert format %u %s linesize %d,%d height %d to format %u %s linesize %d,%d at frame %d codec %u %s %dx%d ",
+      input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+      input_frame->linesize[0], input_frame->linesize[1], mVideoCodecContext->height,
+      imagePixFormat,
+      av_get_pix_fmt_name(imagePixFormat),
+      output_frame->linesize[0], output_frame->linesize[1],
+      frameCount,
+      mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt),
+      output_frame->width,
+      output_frame->height
+      );
+#else  // HAVE_LIBSWSCALE
+  Fatal("You must compile ffmpeg with the --enable-swscale "
+      "option to use ffmpeg cameras");
+#endif  // HAVE_LIBSWSCALE
+  if ( buffer != image_buffer ) {
+    Debug(1, "Copying image-buffer to buffer");
+    // Have to copy contents of image_buffer to directbuffer.
+    // Since linesize isn't the same have to copy line by line
+    uint8_t *image_buffer_ptr = image_buffer;
+    int row_size = output_frame->width * colours;
+    for ( int i = 0; i < output_frame->height; i++ ) {
+      memcpy(image_buffer_ptr, buffer, row_size);
+      image_buffer_ptr += row_size;
+      buffer += output_frame->linesize[0];
+    }
+  }
+  return 0;
+}  // end int FfmpegCamera::transfer_to_image
+
 int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
   // FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*>(ctx);
   // Debug(4, "FfmpegInterruptCallback");
diff --git a/src/zm_ffmpeg_camera.h b/src/zm_ffmpeg_camera.h
index a24815b9f..35df3a65e 100644
--- a/src/zm_ffmpeg_camera.h
+++ b/src/zm_ffmpeg_camera.h
@@ -46,6 +46,8 @@ class FfmpegCamera : public Camera {
     std::string         hwaccel_device;
 
     int frameCount;    
+  
+    int alignment;      /* ffmpeg wants line sizes to be 32bit aligned.  Especially 4.3+ */
 
 #if HAVE_LIBAVFORMAT
     AVFormatContext     *mFormatContext;
@@ -53,14 +55,14 @@ class FfmpegCamera : public Camera {
     AVCodec             *mAudioCodec;
     AVFrame             *mRawFrame; 
     AVFrame             *mFrame;
+    _AVPIXELFORMAT      imagePixFormat;
 
     AVFrame             *input_frame;         // Use to point to mRawFrame or hwFrame;
 
-    bool hwaccel;
-    AVFrame             *hwFrame;
+    AVFrame             *hwFrame; // Will also be used to indicate if hwaccel is in use
+    bool                use_hwaccel; //will default to on if hwaccel specified, will get turned off if there is a failure
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
-    DecodeContext       decode;
-  AVBufferRef *hw_device_ctx = NULL;
+    AVBufferRef *hw_device_ctx = nullptr;
 #endif
 
     // Used to store the incoming packet, it will get copied when queued. 
@@ -76,6 +78,7 @@ class FfmpegCamera : public Camera {
 #if HAVE_LIBSWSCALE
     struct SwsContext   *mConvertContext;
 #endif
+    uint8_t *frame_buffer;
 
     int                 error_count;
 
diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp
index 77fb1c8cf..bcf612a7b 100644
--- a/src/zm_ffmpeg_input.cpp
+++ b/src/zm_ffmpeg_input.cpp
@@ -4,12 +4,13 @@
 #include "zm_ffmpeg.h"
 
 FFmpeg_Input::FFmpeg_Input() {
-  input_format_context = NULL;
+  input_format_context = nullptr;
   video_stream_id = -1;
   audio_stream_id = -1;
   FFMPEGInit();
-  streams = NULL;
-  frame = NULL;
+  streams = nullptr;
+  frame = nullptr;
+	last_seek_request = -1;
 }
 
 FFmpeg_Input::~FFmpeg_Input() {
@@ -17,9 +18,39 @@ FFmpeg_Input::~FFmpeg_Input() {
     Close();
   }
   if ( streams ) {
-    delete streams;
-    streams = NULL;
+    for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
+      avcodec_close(streams[i].context);
+      streams[i].context = nullptr;
+    }
+    delete[] streams;
+    streams = nullptr;
   }
+  if ( frame ) {
+    av_frame_free(&frame);
+    frame = nullptr;
+  }
+  if ( input_format_context ) {
+#if !LIBAVFORMAT_VERSION_CHECK(53, 17, 0, 25, 0)
+    av_close_input_file(input_format_context);
+#else
+    avformat_close_input(&input_format_context);
+#endif
+    input_format_context = nullptr;
+  }
+}  // end ~FFmpeg_Input()
+
+int FFmpeg_Input::Open(
+    const AVStream * video_in_stream,
+    const AVStream * audio_in_stream
+    ) {
+  video_stream_id = video_in_stream->index;
+  int max_stream_index = video_in_stream->index;
+
+  if ( audio_in_stream ) {
+    max_stream_index = video_in_stream->index > audio_in_stream->index ? video_in_stream->index : audio_in_stream->index;
+    audio_stream_id = audio_in_stream->index;
+  }
+  streams = new stream[max_stream_index];
 }
 
 int FFmpeg_Input::Open(const char *filepath) {
@@ -27,16 +58,16 @@ int FFmpeg_Input::Open(const char *filepath) {
   int error;
 
   /** Open the input file to read from it. */
-  error = avformat_open_input(&input_format_context, filepath, NULL, NULL);
+  error = avformat_open_input(&input_format_context, filepath, nullptr, nullptr);
   if ( error < 0 ) {
     Error("Could not open input file '%s' (error '%s')",
         filepath, av_make_error_string(error).c_str());
-    input_format_context = NULL;
+    input_format_context = nullptr;
     return error;
   }
 
   /** Get information on the input file (number of streams etc.). */
-  if ( (error = avformat_find_stream_info(input_format_context, NULL)) < 0 ) {
+  if ( (error = avformat_find_stream_info(input_format_context, nullptr)) < 0 ) {
     Error(
         "Could not open find stream info (error '%s')",
         av_make_error_string(error).c_str()
@@ -70,7 +101,7 @@ int FFmpeg_Input::Open(const char *filepath) {
 
     streams[i].frame_count = 0;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    streams[i].context = avcodec_alloc_context3(NULL);
+    streams[i].context = avcodec_alloc_context3(nullptr);
     avcodec_parameters_to_context(streams[i].context, input_format_context->streams[i]->codecpar);
 #else
     streams[i].context = input_format_context->streams[i]->codec;
@@ -84,7 +115,7 @@ int FFmpeg_Input::Open(const char *filepath) {
       Debug(1, "Using codec (%s) for stream %d", streams[i].codec->name, i);
     }
 
-    error = avcodec_open2(streams[i].context, streams[i].codec, NULL);
+    error = avcodec_open2(streams[i].context, streams[i].codec, nullptr);
     if ( error < 0 ) {
       Error("Could not open input codec (error '%s')",
           av_make_error_string(error).c_str());
@@ -92,6 +123,7 @@ int FFmpeg_Input::Open(const char *filepath) {
       avcodec_free_context(&streams[i].context);
 #endif
       avformat_close_input(&input_format_context);
+      input_format_context = nullptr;
       return error;
     }
   } // end foreach stream
@@ -127,8 +159,6 @@ int FFmpeg_Input::Close( ) {
 } // end int FFmpeg_Input::Close()
 
 AVFrame *FFmpeg_Input::get_frame(int stream_id) {
-  Debug(1, "Getting frame from stream %d", stream_id);
-
   int frameComplete = false;
   AVPacket packet;
   av_init_packet(&packet);
@@ -144,11 +174,11 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) {
           (ret == -110)
          ) {
         Info("av_read_frame returned %s.", av_make_error_string(ret).c_str());
-        return NULL;
+        return nullptr;
       }
       Error("Unable to read packet from stream %d: error %d \"%s\".",
           packet.stream_index, ret, av_make_error_string(ret).c_str());
-      return NULL;
+      return nullptr;
     }
     dumpPacket(input_format_context->streams[packet.stream_index], &packet, "Received packet");
 
@@ -165,13 +195,19 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) {
       } else {
         frame = zm_av_frame_alloc();
       }
-      ret = zm_receive_frame(context, frame, packet);
+      ret = zm_send_packet_receive_frame(context, frame, packet);
       if ( ret < 0 ) {
-        Error("Unable to decode frame at frame %d: %s, continuing",
-            streams[packet.stream_index].frame_count, av_make_error_string(ret).c_str());
+        Error("Unable to decode frame at frame %d: %d %s, continuing",
+            streams[packet.stream_index].frame_count, ret, av_make_error_string(ret).c_str());
         zm_av_packet_unref(&packet);
         av_frame_free(&frame);
         continue;
+			} else {
+        if ( is_video_stream(input_format_context->streams[packet.stream_index]) ) {
+          zm_dump_video_frame(frame, "resulting video frame");
+        } else {
+          zm_dump_frame(frame, "resulting frame");
+        }
       }
 
       frameComplete = 1;
@@ -180,7 +216,7 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) {
 
   } // end while !frameComplete
   return frame;
-} // end AVFrame *FFmpeg_Input::get_frame
+}  // end AVFrame *FFmpeg_Input::get_frame
 
 AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) {
   Debug(1, "Getting frame from stream %d at %f", stream_id, at);
@@ -197,36 +233,51 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) {
     ret = av_seek_frame(input_format_context, stream_id, seek_target, AVSEEK_FLAG_FRAME);
     if ( ret < 0 ) {
       Error("Unable to seek in stream");
-      return NULL;
+      return nullptr;
     }
     // Have to grab a frame to update our current frame to know where we are
     get_frame(stream_id);
-  } // end if ! frame
+  }  // end if ! frame
 
-  if ( frame->pts > seek_target ) {
+	if ( !frame ) {
+		Warning("Unable to get frame.");
+		return nullptr;
+	}
+
+  if ( 
+			(last_seek_request >= 0)
+			&&
+			(last_seek_request > seek_target ) 
+			&&
+			(frame->pts > seek_target)
+		 ) {
     zm_dump_frame(frame, "frame->pts > seek_target, seek backwards");
   // our frame must be beyond our seek target. so go backwards to before it
     if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, 
             AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_FRAME
             ) < 0 ) ) {
       Error("Unable to seek in stream");
-      return NULL;
+      return nullptr;
     }
     // Have to grab a frame to update our current frame to know where we are
     get_frame(stream_id);
     zm_dump_frame(frame, "frame->pts > seek_target, got");
   } // end if frame->pts > seek_target
 
+	last_seek_request = seek_target;
+
   // Seeking seems to typically seek to a keyframe, so then we have to decode until we get the frame we want.
-  if ( frame->pts <= seek_target  ) {
+  if ( frame->pts <= seek_target ) {
     zm_dump_frame(frame, "pts <= seek_target");
     while ( frame && (frame->pts < seek_target) ) {
-      if ( !get_frame(stream_id) ) 
+      if ( !get_frame(stream_id) ) {
+        Warning("Got no frame. returning nothing");
         return frame;
+      }
     }
+    zm_dump_frame(frame, "frame->pts <= seek_target, got");
     return frame;
   }
 
   return get_frame(stream_id);
-
-} // end AVFrame *FFmpeg_Input::get_frame( int stream_id, struct timeval at)
+}  // end AVFrame *FFmpeg_Input::get_frame( int stream_id, struct timeval at)
diff --git a/src/zm_ffmpeg_input.h b/src/zm_ffmpeg_input.h
index 2f524ac45..41dc03008 100644
--- a/src/zm_ffmpeg_input.h
+++ b/src/zm_ffmpeg_input.h
@@ -20,6 +20,7 @@ class FFmpeg_Input {
     ~FFmpeg_Input();
 
     int Open( const char *filename );
+    int Open( const AVStream *, const AVStream * );
     int Close();
     AVFrame *get_frame( int stream_id=-1 );
     AVFrame *get_frame( int stream_id, double at );
@@ -42,6 +43,7 @@ class FFmpeg_Input {
     int audio_stream_id;
     AVFormatContext *input_format_context;
     AVFrame *frame;
+		int64_t last_seek_request;
 };
 
 #endif
diff --git a/src/zm_fifo.cpp b/src/zm_fifo.cpp
index 0c0f836bd..53025f597 100644
--- a/src/zm_fifo.cpp
+++ b/src/zm_fifo.cpp
@@ -30,13 +30,13 @@
 #include "zm_fifo.h"
 #define RAW_BUFFER 512
 static bool zm_fifodbg_inited = false;
-FILE *zm_fifodbg_log_fd = 0;
+FILE *zm_fifodbg_log_fd = nullptr;
 char zm_fifodbg_log[PATH_MAX] = "";
 
 static bool zmFifoDbgOpen() {
   if ( zm_fifodbg_log_fd )
     fclose(zm_fifodbg_log_fd);
-  zm_fifodbg_log_fd = NULL;
+  zm_fifodbg_log_fd = nullptr;
   signal(SIGPIPE, SIG_IGN);
   FifoStream::fifo_create_if_missing(zm_fifodbg_log);
   int fd = open(zm_fifodbg_log, O_WRONLY|O_NONBLOCK|O_TRUNC);
@@ -48,7 +48,7 @@ static bool zmFifoDbgOpen() {
     return false;
   }
   zm_fifodbg_log_fd = fdopen(fd, "wb");
-  if ( zm_fifodbg_log_fd == NULL ) {
+  if ( zm_fifodbg_log_fd == nullptr ) {
     close(fd);
     return false;
   }
@@ -95,7 +95,7 @@ void zmFifoDbgOutput(
   int res = fwrite(dbg_string, dbg_ptr-dbg_string, 1, zm_fifodbg_log_fd);
   if ( res != 1 ) {
     fclose(zm_fifodbg_log_fd);
-    zm_fifodbg_log_fd = NULL;
+    zm_fifodbg_log_fd = nullptr;
   } else {
     fflush(zm_fifodbg_log_fd);
   }
@@ -249,7 +249,7 @@ void FifoStream::runStream() {
   }
 
   while ( !zm_terminate ) {
-    gettimeofday(&now, NULL);
+    gettimeofday(&now, nullptr);
     checkCommandQueue();
     if ( stream_type == MJPEG ) {
       if ( !sendMJEGFrames() )
diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp
index be26993d3..8ba71bcd1 100644
--- a/src/zm_file_camera.cpp
+++ b/src/zm_file_camera.cpp
@@ -1,31 +1,27 @@
 //
 // ZoneMinder File Camera Class Implementation, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // 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.
-// 
+//
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <sys/time.h>
-#include <syslog.h>
-#include <signal.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -45,8 +41,8 @@ FileCamera::FileCamera(
     int p_hue,
     int p_colour,
     bool p_capture,
-    bool p_record_audio
-    ) : Camera(
+    bool p_record_audio)
+  : Camera(
       p_id,
       FILE_SRC,
       p_width,
@@ -58,7 +54,7 @@ FileCamera::FileCamera(
       p_hue,
       p_colour,
       p_capture,
-      p_record_audio )
+      p_record_audio)
 {
   strncpy( path, p_path, sizeof(path)-1 );
   if ( capture ) {
@@ -74,8 +70,7 @@ FileCamera::~FileCamera() {
 
 void FileCamera::Initialise() {
   if ( !path[0] ) {
-    Error( "No path specified for file image" );
-    exit( -1 );
+    Fatal("No path specified for file image");
   }
 }
 
@@ -84,22 +79,25 @@ void FileCamera::Terminate() {
 
 int FileCamera::PreCapture() {
   struct stat statbuf;
-  if ( stat( path, &statbuf ) < 0 ) {
-    Error( "Can't stat %s: %s", path, strerror(errno) );
-    return( -1 );
+  if ( stat(path, &statbuf) < 0 ) {
+    Error("Can't stat %s: %s", path, strerror(errno));
+    return -1;
   }
+  bytes += statbuf.st_size;
 
-  // I think this is waiting for file change...
-  while ( (time(0) - statbuf.st_mtime) < 1 ) {
-    usleep( 100000 );
+  // This waits until 1 second has passed since it was modified. Effectively limiting fps to 60.
+  // Which is kinda bogus. If we were writing to this jpg constantly faster than we are monitoring it here
+  // we would never break out of this loop
+  while ( (time(nullptr) - statbuf.st_mtime) < 1 ) {
+    usleep(100000);
   }
-  return( 0 );
+  return 0;
 }
 
 int FileCamera::Capture( ZMPacket &zm_packet ) {
-  return zm_packet.image->ReadJpeg( path, colours, subpixelorder ) ? 1 : -1;
+  return zm_packet.image->ReadJpeg(path, colours, subpixelorder) ? 1 : -1;
 }
 
 int FileCamera::PostCapture() {
-  return( 0 );
+  return 0;
 }
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 6dc9afca9..4e4ef62f1 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -1,21 +1,21 @@
 //
 // ZoneMinder Image Class Implementation, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // 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.
-// 
+//
 #include "zm.h"
 #include "zm_font.h"
 #include "zm_bigfont.h"
@@ -48,10 +48,12 @@ static short *g_v_table;
 static short *g_u_table;
 static short *b_u_table;
 
-jpeg_compress_struct *Image::writejpg_ccinfo[101] = { 0 };
-jpeg_compress_struct *Image::encodejpg_ccinfo[101] = { 0 };
-jpeg_decompress_struct *Image::readjpg_dcinfo = 0;
-jpeg_decompress_struct *Image::decodejpg_dcinfo = 0;
+struct SwsContext *sws_convert_context = nullptr;
+
+jpeg_compress_struct *Image::writejpg_ccinfo[101] = { };
+jpeg_compress_struct *Image::encodejpg_ccinfo[101] = { };
+jpeg_decompress_struct *Image::readjpg_dcinfo = nullptr;
+jpeg_decompress_struct *Image::decodejpg_dcinfo = nullptr;
 struct zm_error_mgr Image::jpg_err;
 
 /* Pointer to blend function. */
@@ -106,6 +108,7 @@ Image::Image() {
   if ( !initialised )
     Initialise();
   width = 0;
+  linesize = 0;
   height = 0;
   pixels = 0;
   colours = 0;
@@ -119,14 +122,15 @@ Image::Image() {
   blend = fptr_blend;
 }
 
-Image::Image( const char *filename ) {
+Image::Image(const char *filename) {
   if ( !initialised )
     Initialise();
   width = 0;
+  linesize = 0;
   height = 0;
   pixels = 0;
   colours = 0;
-  subpixelorder = 0;  
+  subpixelorder = 0;
   size = 0;
   allocation = 0;
   buffer = 0;
@@ -137,16 +141,18 @@ Image::Image( const char *filename ) {
   update_function_pointers();
 }
 
-Image::Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer ) {
+Image::Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer, unsigned int p_padding) {
   if ( !initialised )
     Initialise();
   width = p_width;
   height = p_height;
   pixels = width*height;
   colours = p_colours;
+  linesize = p_width * p_colours;
+  padding = p_padding;
   subpixelorder = p_subpixelorder;
-  size = pixels*colours;
-  buffer = 0;
+  size = linesize*height + padding;
+  buffer = nullptr;
   holdbuffer = 0;
   if ( p_buffer ) {
     allocation = size;
@@ -160,21 +166,57 @@ Image::Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uin
   update_function_pointers();
 }
 
-Image::Image( const AVFrame *frame ) {
+Image::Image(int p_width, int p_linesize, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer, unsigned int p_padding) {
+  if ( !initialised )
+    Initialise();
+  width = p_width;
+  linesize = p_linesize;
+  height = p_height;
+  pixels = width*height;
+  colours = p_colours;
+  padding = p_padding;
+  subpixelorder = p_subpixelorder;
+  size = linesize*height + padding;
+  buffer = nullptr;
+  holdbuffer = 0;
+  if ( p_buffer ) {
+    allocation = size;
+    buffertype = ZM_BUFTYPE_DONTFREE;
+    buffer = p_buffer;
+  } else {
+    AllocImgBuffer(size);
+  }
+  text[0] = '\0';
+
+  update_function_pointers();
+}
+
+Image::Image(const AVFrame *frame) {
   text[0] = '\0';
   width = frame->width;
   height = frame->height;
   pixels = width*height;
+
+  // FIXME
   colours = ZM_COLOUR_RGB32;
   subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-  size = pixels*colours;
-  buffer = 0;
+
+  #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+  size = av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 32);
+  // av_image_get_linesize isn't aligned, so we have to do that.
+  linesize = FFALIGN(av_image_get_linesize(AV_PIX_FMT_RGBA, width, 0), 32);
+#else
+  linesize = FFALIGN(av_image_get_linesize(AV_PIX_FMT_RGBA, width, 0), 1);
+  size = avpicture_get_size(AV_PIX_FMT_RGBA, width, height);
+#endif
+
+  buffer = nullptr;
   holdbuffer = 0;
   AllocImgBuffer(size);
-  this->Assign( frame );
+  this->Assign(frame);
 }
 
-void Image::Assign( const AVFrame *frame ) {
+void Image::Assign(const AVFrame *frame) {
 /* Assume the dimensions etc are correct. FIXME */
 
   AVPixelFormat format = (AVPixelFormat)AVPixFormat();
@@ -182,48 +224,49 @@ void Image::Assign( const AVFrame *frame ) {
   AVFrame *dest_frame = zm_av_frame_alloc();
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   av_image_fill_arrays(dest_frame->data, dest_frame->linesize,
-      buffer, format, width, height, 1);
+      buffer, format, width, height, 32);
 #else
   avpicture_fill( (AVPicture *)dest_frame, buffer,
      format, width, height);
 #endif
 
 #if HAVE_LIBSWSCALE
-  struct SwsContext   *mConvertContext = sws_getContext(
+  sws_convert_context = sws_getCachedContext(
+      sws_convert_context,
       width,
       height,
       (AVPixelFormat)frame->format,
       width, height,
-      format, SWS_BICUBIC, NULL,
-      NULL, NULL);
-  if ( mConvertContext == NULL )
-    Fatal( "Unable to create conversion context" );
+      format, SWS_BICUBIC, nullptr,
+      nullptr, nullptr);
+  if ( sws_convert_context == nullptr )
+    Fatal("Unable to create conversion context");
 
-  if ( sws_scale(mConvertContext, frame->data, frame->linesize, 0, frame->height, dest_frame->data, dest_frame->linesize) < 0 )
-    Fatal("Unable to convert raw format %u to target format %u", frame->format, format);
+  if ( sws_scale(sws_convert_context, frame->data, frame->linesize, 0, frame->height,
+        dest_frame->data, dest_frame->linesize) < 0 )
+    Fatal("Unable to convert raw format %u to target format %u", frame->format, AV_PIX_FMT_RGBA);
 #else // HAVE_LIBSWSCALE
   Fatal("You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras");
 #endif // HAVE_LIBSWSCALE
-  av_frame_free( &dest_frame );
-  sws_freeContext(mConvertContext);
-  mConvertContext = NULL;
+  av_frame_free(&dest_frame);
   update_function_pointers();
-} // end Image::Image( const AVFrame *frame )
+}  // end Image::Image(const AVFrame *frame)
 
-Image::Image( const Image &p_image ) {
+Image::Image(const Image &p_image) {
   if ( !initialised )
     Initialise();
   width = p_image.width;
+  linesize = p_image.linesize;
   height = p_image.height;
   pixels = p_image.pixels;
   colours = p_image.colours;
   subpixelorder = p_image.subpixelorder;
   size = p_image.size; // allocation is set in AllocImgBuffer
-  buffer = 0;
+  buffer = nullptr;
   holdbuffer = 0;
   AllocImgBuffer(size);
   (*fptr_imgbufcpy)(buffer, p_image.buffer, size);
-  strncpy( text, p_image.text, sizeof(text) );
+  strncpy(text, p_image.text, sizeof(text));
   update_function_pointers();
 }
 
@@ -233,61 +276,57 @@ Image::~Image() {
 
 /* Should be called as part of program shutdown to free everything */
 void Image::Deinitialise() {
-  if ( initialised ) {
-    /*
-       delete[] y_table;
-       delete[] uv_table;
-       delete[] r_v_table;
-       delete[] g_v_table;
-       delete[] g_u_table;
-       delete[] b_u_table;
-     */
-    initialised = false;
-    if ( readjpg_dcinfo ) {
-      jpeg_destroy_decompress( readjpg_dcinfo );
-      delete readjpg_dcinfo;
-      readjpg_dcinfo = 0;
-    }
-    if ( decodejpg_dcinfo ) {
-      jpeg_destroy_decompress( decodejpg_dcinfo );
-      delete decodejpg_dcinfo;
-      decodejpg_dcinfo = 0;
-    }
-    for ( unsigned int quality=0; quality <= 100; quality += 1 ) {
-      if ( writejpg_ccinfo[quality] ) {
-        jpeg_destroy_compress( writejpg_ccinfo[quality] );
-        delete writejpg_ccinfo[quality];
-        writejpg_ccinfo[quality] = NULL;
-      }
-    } // end foreach quality
+  if ( !initialised ) return;
+  initialised = false;
+  if ( readjpg_dcinfo ) {
+    jpeg_destroy_decompress(readjpg_dcinfo);
+    delete readjpg_dcinfo;
+    readjpg_dcinfo = nullptr;
   }
-}
+  if ( decodejpg_dcinfo ) {
+    jpeg_destroy_decompress(decodejpg_dcinfo);
+    delete decodejpg_dcinfo;
+    decodejpg_dcinfo = nullptr;
+  }
+  for ( unsigned int quality=0; quality <= 100; quality += 1 ) {
+    if ( writejpg_ccinfo[quality] ) {
+      jpeg_destroy_compress(writejpg_ccinfo[quality]);
+      delete writejpg_ccinfo[quality];
+      writejpg_ccinfo[quality] = nullptr;
+    }
+  } // end foreach quality
+
+  if ( sws_convert_context ) {
+    sws_freeContext(sws_convert_context);
+    sws_convert_context = nullptr;
+  }
+}  // end void Image::Deinitialise()
 
 void Image::Initialise() {
   /* Assign the blend pointer to function */
   if ( config.fast_image_blends ) {
-    if ( config.cpu_extensions && sseversion >= 20 ) {
+    if ( config.cpu_extensions && sse_version >= 20 ) {
       fptr_blend = &sse2_fastblend; /* SSE2 fast blend */
-      Debug(4,"Blend: Using SSE2 fast blend function");
+      Debug(4, "Blend: Using SSE2 fast blend function");
     } else if ( config.cpu_extensions && neonversion >= 1 ) {
 #if defined(__aarch64__)
       fptr_blend = &neon64_armv8_fastblend;  /* ARM Neon (AArch64) fast blend */
-      Debug(4,"Blend: Using ARM Neon (AArch64) fast blend function");
+      Debug(4, "Blend: Using ARM Neon (AArch64) fast blend function");
 #elif defined(__arm__)
       fptr_blend = &neon32_armv7_fastblend;  /* ARM Neon (AArch32) fast blend */
-      Debug(4,"Blend: Using ARM Neon (AArch32) fast blend function");
+      Debug(4, "Blend: Using ARM Neon (AArch32) fast blend function");
 #else
       Panic("Bug: Non ARM platform but neon present");
 #endif
     } else {
       fptr_blend = &std_fastblend;  /* standard fast blend */
-      Debug(4,"Blend: Using fast blend function");
+      Debug(4, "Blend: Using fast blend function");
     }
   } else {
     fptr_blend = &std_blend;
-    Debug(4,"Blend: Using standard blend function");
+    Debug(4, "Blend: Using standard blend function");
   }
-  
+
   __attribute__((aligned(64))) uint8_t blend1[128] = {
     86,58,54,63,149,62,209,34,148,46,186,176,9,236,193,254,113,146,228,220,123,164,92,98,9,72,67,156,63,118,96,167,
     48,224,106,176,201,245,223,219,198,50,100,31,68,77,33,76,166,90,254,128,191,82,84,32,3,171,147,248,14,196,141,179,
@@ -312,7 +351,7 @@ void Image::Initialise() {
   (*fptr_blend)(blend1,blend2,blendres,128,12.0);
 
   /* Compare results with expected results */
-  for ( int i=0; i < 128; i ++ ) {
+  for ( int i=0; i < 128; i++ ) {
     if ( abs(blendexp[i] - blendres[i]) > 3 ) {
       Panic("Blend function failed self-test: Results differ from the expected results. Column %u Expected %u Got %u",i,blendexp[i],blendres[i]);
     }
@@ -323,22 +362,22 @@ void Image::Initialise() {
 
   /* Assign the delta functions */
   if ( config.cpu_extensions ) {
-    if ( sseversion >= 35 ) {
+    if ( sse_version >= 35 ) {
       /* SSSE3 available */
       fptr_delta8_rgba = &ssse3_delta8_rgba;
       fptr_delta8_bgra = &ssse3_delta8_bgra;
       fptr_delta8_argb = &ssse3_delta8_argb;
       fptr_delta8_abgr = &ssse3_delta8_abgr;
       fptr_delta8_gray8 = &sse2_delta8_gray8;
-      Debug(4,"Delta: Using SSSE3 delta functions");
-    } else if ( sseversion >= 20 ) {
+      Debug(4, "Delta: Using SSSE3 delta functions");
+    } else if ( sse_version >= 20 ) {
       /* SSE2 available */
       fptr_delta8_rgba = &sse2_delta8_rgba;
       fptr_delta8_bgra = &sse2_delta8_bgra;
       fptr_delta8_argb = &sse2_delta8_argb;
       fptr_delta8_abgr = &sse2_delta8_abgr;
       fptr_delta8_gray8 = &sse2_delta8_gray8;
-      Debug(4,"Delta: Using SSE2 delta functions");
+      Debug(4, "Delta: Using SSE2 delta functions");
     } else if ( neonversion >= 1 ) {
       /* ARM Neon available */
 #if defined(__aarch64__)
@@ -347,14 +386,14 @@ void Image::Initialise() {
       fptr_delta8_argb = &neon64_armv8_delta8_argb;
       fptr_delta8_abgr = &neon64_armv8_delta8_abgr;
       fptr_delta8_gray8 = &neon64_armv8_delta8_gray8;
-      Debug(4,"Delta: Using ARM Neon (AArch64) delta functions");
+      Debug(4, "Delta: Using ARM Neon (AArch64) delta functions");
 #elif defined(__arm__)
       fptr_delta8_rgba = &neon32_armv7_delta8_rgba;
       fptr_delta8_bgra = &neon32_armv7_delta8_bgra;
       fptr_delta8_argb = &neon32_armv7_delta8_argb;
       fptr_delta8_abgr = &neon32_armv7_delta8_abgr;
       fptr_delta8_gray8 = &neon32_armv7_delta8_gray8;
-      Debug(4,"Delta: Using ARM Neon (AArch32) delta functions");
+      Debug(4, "Delta: Using ARM Neon (AArch32) delta functions");
 #else
       Panic("Bug: Non ARM platform but neon present");
 #endif
@@ -412,7 +451,7 @@ void Image::Initialise() {
   }
 
   /* Run the delta8 RGBA function */
-  (*fptr_delta8_rgba)(delta8_1,delta8_2,delta8_rgba_res,32);
+  (*fptr_delta8_rgba)(delta8_1,delta8_2,delta8_rgba_res, 32);
 
   /* Compare results with expected results */
   for ( int i=0; i < 32; i++ ) {
@@ -421,7 +460,7 @@ void Image::Initialise() {
     }
   }
 
-  /* 
+  /*
      SSSE3 deinterlacing functions were removed because they were usually equal
      or slower than the standard code (compiled with -O2 or better)
      The function is too complicated to be vectorized efficiently on SSSE3
@@ -431,95 +470,64 @@ void Image::Initialise() {
   fptr_deinterlace_4field_argb = &std_deinterlace_4field_argb;
   fptr_deinterlace_4field_abgr = &std_deinterlace_4field_abgr;
   fptr_deinterlace_4field_gray8 = &std_deinterlace_4field_gray8;
-  Debug(4,"Deinterlace: Using standard functions");
+  Debug(4, "Deinterlace: Using standard functions");
 
 #if defined(__i386__) && !defined(__x86_64__)
   /* Use SSE2 aligned memory copy? */
-  if ( config.cpu_extensions && sseversion >= 20 ) {
+  if ( config.cpu_extensions && sse_version >= 20 ) {
     fptr_imgbufcpy = &sse2_aligned_memcpy;
-    Debug(4,"Image buffer copy: Using SSE2 aligned memcpy");
+    Debug(4, "Image buffer copy: Using SSE2 aligned memcpy");
   } else {
     fptr_imgbufcpy = &memcpy;
-    Debug(4,"Image buffer copy: Using standard memcpy");
+    Debug(4, "Image buffer copy: Using standard memcpy");
   }
 #else
   fptr_imgbufcpy = &memcpy;
-  Debug(4,"Image buffer copy: Using standard memcpy");
+  Debug(4, "Image buffer copy: Using standard memcpy");
 #endif
 
-  /* Code below relocated from zm_local_camera */
-  Debug( 3, "Setting up static colour tables" );
-
   y_table = y_table_global;
   uv_table = uv_table_global;
   r_v_table = r_v_table_global;
   g_v_table = g_v_table_global;
   g_u_table = g_u_table_global;
   b_u_table = b_u_table_global;
-  /*
-     y_table = new unsigned char[256];
-     for ( int i = 0; i <= 255; i++ )
-     {
-     unsigned char c = i;
-     if ( c <= 16 )
-     y_table[c] = 0;
-     else if ( c >= 235 )
-     y_table[c] = 255;
-     else
-     y_table[c] = (255*(c-16))/219;
-     }
-
-     uv_table = new signed char[256];
-     for ( int i = 0; i <= 255; i++ )
-     {
-     unsigned char c = i;
-     if ( c <= 16 )
-     uv_table[c] = -127;
-     else if ( c >= 240 )
-     uv_table[c] = 127;
-     else
-     uv_table[c] = (127*(c-128))/112;
-     }
-
-     r_v_table = new short[255];
-     g_v_table = new short[255];
-     g_u_table = new short[255];
-     b_u_table = new short[255];
-     for ( int i = 0; i < 255; i++ )
-     {
-     r_v_table[i] = (1402*(i-128))/1000;
-     g_u_table[i] = (344*(i-128))/1000;
-     g_v_table[i] = (714*(i-128))/1000;
-     b_u_table[i] = (1772*(i-128))/1000;
-     }
-   */
 
   initialised = true;
 }
 
 /* Requests a writeable buffer to the image. This is safer than buffer() because this way we can guarantee that a buffer of required size exists */
-uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder) {
+uint8_t* Image::WriteBuffer(
+    const unsigned int p_width,
+    const unsigned int p_height,
+    const unsigned int p_colours,
+    const unsigned int p_subpixelorder) {
 
-  if ( p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32 ) {
-    Error("WriteBuffer called with unexpected colours: %d",p_colours);
-    return NULL;
+  if ( p_colours != ZM_COLOUR_GRAY8
+      &&
+      p_colours != ZM_COLOUR_RGB24
+      &&
+      p_colours != ZM_COLOUR_RGB32 ) {
+    Error("WriteBuffer called with unexpected colours: %d", p_colours);
+    return nullptr;
   }
 
   if ( ! ( p_height > 0 && p_width > 0 ) ) {
     Error("WriteBuffer called with invalid width or height: %d %d", p_width, p_height);
-    return NULL;
+    return nullptr;
   }
 
   if ( p_width != width || p_height != height || p_colours != colours || p_subpixelorder != subpixelorder ) {
+
     unsigned int newsize = (p_width * p_height) * p_colours;
 
-    if ( buffer == NULL ) {
+    if ( buffer == nullptr ) {
       AllocImgBuffer(newsize);
     } else {
       if ( allocation < newsize ) {
         if ( holdbuffer ) {
           Error("Held buffer is undersized for requested buffer");
-          return NULL;
+          return nullptr;
         } else {
           /* Replace buffer with a bigger one */
           //DumpImgBuffer(); // Done in AllocImgBuffer too
@@ -531,23 +539,34 @@ uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_hei
     width = p_width;
     height = p_height;
     colours = p_colours;
+    linesize = p_width * p_colours;
     subpixelorder = p_subpixelorder;
     pixels = height*width;
     size = newsize;
-  } // end if need to re-alloc buffer
+  }  // end if need to re-alloc buffer
 
-  return buffer; 
+  return buffer;
 }
 
-/* Assign an existing buffer to the image instead of copying from a source buffer. The goal is to reduce the amount of memory copying and increase efficiency and buffer reusing. */
-void Image::AssignDirect( const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, uint8_t *new_buffer, const size_t buffer_size, const int p_buffertype) {
-  if ( new_buffer == NULL ) {
+/* Assign an existing buffer to the image instead of copying from a source buffer.
+   The goal is to reduce the amount of memory copying and increase efficiency and buffer reusing.
+*/
+void Image::AssignDirect(
+    const unsigned int p_width,
+    const unsigned int p_height,
+    const unsigned int p_colours,
+    const unsigned int p_subpixelorder,
+    uint8_t *new_buffer,
+    const size_t buffer_size,
+    const int p_buffertype) {
+
+  if ( new_buffer == nullptr ) {
     Error("Attempt to directly assign buffer from a NULL pointer");
     return;
   }
 
   if ( !p_height || !p_width ) {
-    Error("Attempt to directly assign buffer with invalid width or height: %d %d",p_width,p_height);
+    Error("Attempt to directly assign buffer with invalid width or height: %d %d", p_width, p_height);
     return;
   }
 
@@ -559,7 +578,8 @@ void Image::AssignDirect( const unsigned int p_width, const unsigned int p_heigh
   unsigned int new_buffer_size = ((p_width*p_height)*p_colours);
 
   if ( buffer_size < new_buffer_size ) {
-    Error("Attempt to directly assign buffer from an undersized buffer of size: %zu, needed %dx%d*%d colours = %zu",buffer_size, p_width, p_height, p_colours, new_buffer_size );
+    Error("Attempt to directly assign buffer from an undersized buffer of size: %zu, needed %dx%d*%d colours = %zu",
+        buffer_size, p_width, p_height, p_colours, new_buffer_size);
     return;
   }
 
@@ -571,13 +591,15 @@ void Image::AssignDirect( const unsigned int p_width, const unsigned int p_heigh
       width = p_width;
       height = p_height;
       colours = p_colours;
+      linesize = width * colours;
       subpixelorder = p_subpixelorder;
       pixels = height*width;
       size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
 
       /* Copy into the held buffer */
-      if ( new_buffer != buffer )
+      if ( new_buffer != buffer ) {
         (*fptr_imgbufcpy)(buffer, new_buffer, size);
+      }
 
       /* Free the new buffer */
       DumpBuffer(new_buffer, p_buffertype);
@@ -589,6 +611,7 @@ void Image::AssignDirect( const unsigned int p_width, const unsigned int p_heigh
     width = p_width;
     height = p_height;
     colours = p_colours;
+    linesize = width*colours;
     subpixelorder = p_subpixelorder;
     pixels = height*width;
     size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
@@ -597,30 +620,34 @@ void Image::AssignDirect( const unsigned int p_width, const unsigned int p_heigh
     buffertype = p_buffertype;
     buffer = new_buffer;
   }
-  update_function_pointers();
+}  // end void Image::AssignDirect
 
-}
-
-void Image::Assign(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, const uint8_t* new_buffer, const size_t buffer_size) {
+void Image::Assign(
+    const unsigned int p_width,
+    const unsigned int p_height,
+    const unsigned int p_colours,
+    const unsigned int p_subpixelorder,
+    const uint8_t* new_buffer,
+    const size_t buffer_size) {
   unsigned int new_size = (p_width * p_height) * p_colours;
 
-  if ( new_buffer == NULL ) {
+  if ( new_buffer == nullptr ) {
     Error("Attempt to assign buffer from a NULL pointer");
     return;
   }
 
   if ( buffer_size < new_size ) {
-    Error("Attempt to assign buffer from an undersized buffer of size: %zu",buffer_size);
+    Error("Attempt to assign buffer from an undersized buffer of size: %zu", buffer_size);
     return;
   }
 
   if ( !p_height || !p_width ) {
-    Error("Attempt to assign buffer with invalid width or height: %d %d",p_width,p_height);
+    Error("Attempt to assign buffer with invalid width or height: %d %d", p_width, p_height);
     return;
   }
 
   if ( p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32 ) {
-    Error("Attempt to assign buffer with unexpected colours per pixel: %d",p_colours);
+    Error("Attempt to assign buffer with unexpected colours per pixel: %d", p_colours);
     return;
   }
 
@@ -632,7 +659,7 @@ void Image::Assign(const unsigned int p_width, const unsigned int p_height, cons
         return;
       }
     } else {
-      if ( new_size > allocation || !buffer ) { 
+      if ( new_size > allocation || !buffer ) {
         DumpImgBuffer();
         AllocImgBuffer(new_size);
       }
@@ -649,23 +676,30 @@ void Image::Assign(const unsigned int p_width, const unsigned int p_height, cons
   if ( new_buffer != buffer )
     (*fptr_imgbufcpy)(buffer, new_buffer, size);
   update_function_pointers();
-
 }
 
-void Image::Assign( const Image &image ) {
-  unsigned int new_size = (image.width * image.height) * image.colours;
+void Image::Assign(const Image &image) {
+  unsigned int new_size = image.height * image.linesize;
 
-  if ( image.buffer == NULL ) {
+  if ( image.buffer == nullptr ) {
     Error("Attempt to assign image with an empty buffer");
     return;
   }
 
-  if ( image.colours != ZM_COLOUR_GRAY8 && image.colours != ZM_COLOUR_RGB24 && image.colours != ZM_COLOUR_RGB32 ) {
-    Error("Attempt to assign image with unexpected colours per pixel: %d",image.colours);
+  if ( image.colours != ZM_COLOUR_GRAY8
+      &&
+      image.colours != ZM_COLOUR_RGB24
+      &&
+      image.colours != ZM_COLOUR_RGB32 ) {
+    Error("Attempt to assign image with unexpected colours per pixel: %d", image.colours);
     return;
   }
 
-  if ( !buffer || image.width != width || image.height != height || image.colours != colours || image.subpixelorder != subpixelorder ) {
+  if ( !buffer
+      || image.width != width || image.height != height
+      || image.colours != colours || image.subpixelorder != subpixelorder
+      || image.linesize != linesize
+      ) {
 
     if ( holdbuffer && buffer ) {
       if ( new_size > allocation ) {
@@ -685,110 +719,108 @@ void Image::Assign( const Image &image ) {
     colours = image.colours;
     subpixelorder = image.subpixelorder;
     size = new_size;
+    linesize = image.linesize;
   }
 
   if ( image.buffer != buffer )
     (*fptr_imgbufcpy)(buffer, image.buffer, size);
 }
 
-Image *Image::HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits ) {
+Image *Image::HighlightEdges(
+    Rgb colour,
+    unsigned int p_colours,
+    unsigned int p_subpixelorder,
+    const Box *limits
+    ) {
   if ( colours != ZM_COLOUR_GRAY8 ) {
     Panic("Attempt to highlight image edges when colours = %d", colours);
   }
 
   /* Convert the colour's RGBA subpixel order into the image's subpixel order */
-  colour = rgb_convert(colour,p_subpixelorder);
+  colour = rgb_convert(colour, p_subpixelorder);
 
   /* Create a new image of the target format */
-  Image *high_image = new Image( width, height, p_colours, p_subpixelorder );
+  Image *high_image = new Image(width, height, p_colours, p_subpixelorder);
   uint8_t* high_buff = high_image->WriteBuffer(width, height, p_colours, p_subpixelorder);
 
   /* Set image to all black */
   high_image->Clear();
 
-  unsigned int lo_x = limits?limits->Lo().X():0;
-  unsigned int lo_y = limits?limits->Lo().Y():0;
-  unsigned int hi_x = limits?limits->Hi().X():width-1;
-  unsigned int hi_y = limits?limits->Hi().Y():height-1;
+  unsigned int lo_x = limits ? limits->Lo().X() : 0;
+  unsigned int lo_y = limits ? limits->Lo().Y() : 0;
+  unsigned int hi_x = limits ? limits->Hi().X() : width-1;
+  unsigned int hi_y = limits ? limits->Hi().Y() : height-1;
 
-  if ( p_colours == ZM_COLOUR_GRAY8 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
-      const uint8_t* p = buffer + (y * width) + lo_x;
-      uint8_t* phigh = high_buff + (y * width) + lo_x;
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ )
-      {
+  if ( p_colours == ZM_COLOUR_GRAY8 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
+      const uint8_t* p = buffer + (y * linesize) + lo_x;
+      uint8_t* phigh = high_buff + (y * linesize) + lo_x;
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ ) {
         bool edge = false;
-        if ( *p )
-        {
+        if ( *p ) {
+          edge = (x > 0 && !*(p-1)) || (x < (width-1) && !*(p+1)) || (y > 0 && !*(p-width)) || (y < (height-1) && !*(p+width));
+#if 0
           if ( !edge && x > 0 && !*(p-1) ) edge = true;
           if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
           if ( !edge && y > 0 && !*(p-width) ) edge = true;
           if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
+#endif
         }
-        if ( edge )
-        {
+        if ( edge ) {
           *phigh = colour;
         }
       }
     }
-  }
-  else if ( p_colours == ZM_COLOUR_RGB24 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
-      const uint8_t* p = buffer + (y * width) + lo_x;
-      uint8_t* phigh = high_buff + (((y * width) + lo_x) * 3);
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh += 3 )
-      {
+  } else if ( p_colours == ZM_COLOUR_RGB24 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
+      const uint8_t* p = buffer + (y * linesize) + lo_x;
+      uint8_t* phigh = high_buff + (((y * linesize) + lo_x) * 3);
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh += 3 ) {
         bool edge = false;
-        if ( *p )
-        {
+        if ( *p ) {
+          edge = (x > 0 && !*(p-1)) || (x < (width-1) && !*(p+1)) || (y > 0 && !*(p-width)) || (y < (height-1) && !*(p+width));
+#if 0
           if ( !edge && x > 0 && !*(p-1) ) edge = true;
           if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
           if ( !edge && y > 0 && !*(p-width) ) edge = true;
           if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
+#endif
         }
-        if ( edge )
-        {
+        if ( edge ) {
           RED_PTR_RGBA(phigh) = RED_VAL_RGBA(colour);
           GREEN_PTR_RGBA(phigh) = GREEN_VAL_RGBA(colour);
           BLUE_PTR_RGBA(phigh) = BLUE_VAL_RGBA(colour);
         }
       }
     }
-  }
-  else if ( p_colours == ZM_COLOUR_RGB32 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
-      const uint8_t* p = buffer + (y * width) + lo_x;
-      Rgb* phigh = (Rgb*)(high_buff + (((y * width) + lo_x) * 4));
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ )
-      {
+  } else if ( p_colours == ZM_COLOUR_RGB32 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
+      const uint8_t* p = buffer + (y * linesize) + lo_x;
+      Rgb* phigh = (Rgb*)(high_buff + (((y * linesize) + lo_x) * 4));
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ ) {
         bool edge = false;
-        if ( *p )
-        {
+        if ( *p ) {
+          edge = (x > 0 && !*(p-1)) || (x < (width-1) && !*(p+1)) || (y > 0 && !*(p-width)) || (y < (height-1) && !*(p+width));
+#if 0
           if ( !edge && x > 0 && !*(p-1) ) edge = true;
           if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
           if ( !edge && y > 0 && !*(p-width) ) edge = true;
           if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
+#endif
         }
-        if ( edge )
-        {
+        if ( edge ) {
           *phigh = colour;
         }
       }
     }
   }
 
-  return( high_image );
+  return high_image;
 }
 
-bool Image::ReadRaw( const char *filename ) {
+bool Image::ReadRaw(const char *filename) {
   FILE *infile;
-  if ( (infile = fopen( filename, "rb" )) == NULL ) {
+  if ( (infile = fopen(filename, "rb")) == nullptr ) {
     Error("Can't open %s: %s", filename, strerror(errno));
     return false;
   }
@@ -812,25 +844,25 @@ bool Image::ReadRaw( const char *filename ) {
     return false;
   }
 
-  fclose( infile );
+  fclose(infile);
 
   return true;
 }
 
-bool Image::WriteRaw( const char *filename ) const {
+bool Image::WriteRaw(const char *filename) const {
   FILE *outfile;
-  if ( (outfile = fopen( filename, "wb" )) == NULL ) {
-    Error( "Can't open %s: %s", filename, strerror(errno) );
+  if ( (outfile = fopen(filename, "wb")) == nullptr ) {
+    Error("Can't open %s: %s", filename, strerror(errno));
     return false;
   }
 
   if ( fwrite( buffer, size, 1, outfile ) != 1 ) {
-    Error( "Unable to write to '%s': %s", filename, strerror(errno) );
-    fclose( outfile );
+    Error("Unable to write to '%s': %s", filename, strerror(errno));
+    fclose(outfile);
     return false;
   }
 
-  fclose( outfile );
+  fclose(outfile);
 
   return true;
 }
@@ -848,7 +880,7 @@ bool Image::ReadJpeg(const char *filename, unsigned int p_colours, unsigned int
   }
 
   FILE *infile;
-  if ( (infile = fopen(filename, "rb")) == NULL ) {
+  if ( (infile = fopen(filename, "rb")) == nullptr ) {
     Error("Can't open %s: %s", filename, strerror(errno));
     return false;
   }
@@ -872,7 +904,7 @@ bool Image::ReadJpeg(const char *filename, unsigned int p_colours, unsigned int
 
   /* Check if the image has at least one huffman table defined. If not, use the standard ones */
   /* This is required for the MJPEG capture palette of USB devices */
-  if ( cinfo->dc_huff_tbl_ptrs[0] == NULL ) {
+  if ( cinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
     zm_use_std_huff_tables(cinfo);
   }
 
@@ -880,28 +912,25 @@ bool Image::ReadJpeg(const char *filename, unsigned int p_colours, unsigned int
   new_height = cinfo->image_height;
 
   if ( width != new_width || height != new_height ) {
-    Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
+    Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u", width, height, new_width, new_height);
   }
 
-  switch(p_colours) {
+  switch ( p_colours ) {
     case ZM_COLOUR_GRAY8:
-      {
         cinfo->out_color_space = JCS_GRAYSCALE;
         new_colours = ZM_COLOUR_GRAY8;
         new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
         break;
-      }
     case ZM_COLOUR_RGB32:
-      {
 #ifdef JCS_EXTENSIONS
         new_colours = ZM_COLOUR_RGB32;
-        if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
           cinfo->out_color_space = JCS_EXT_BGRX;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-        } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
           cinfo->out_color_space = JCS_EXT_XRGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-        } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
           cinfo->out_color_space = JCS_EXT_XBGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
         } else {
@@ -909,22 +938,20 @@ bool Image::ReadJpeg(const char *filename, unsigned int p_colours, unsigned int
           cinfo->out_color_space = JCS_EXT_RGBX;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
         }
-        break;    
+        break;
 #else
         Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
 #endif
-      }
     case ZM_COLOUR_RGB24:
     default:
-      {
         new_colours = ZM_COLOUR_RGB24;
-        if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS    
-          cinfo->out_color_space = JCS_EXT_BGR;  
+        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
+#ifdef JCS_EXTENSIONS
+          cinfo->out_color_space = JCS_EXT_BGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
-          Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");    
-          cinfo->out_color_space = JCS_RGB;  
+          Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
+          cinfo->out_color_space = JCS_RGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
 #endif
         } else {
@@ -940,153 +967,145 @@ cinfo->out_color_space = JCS_RGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
         }
         break;
-      }
-  }
+  }  // end switch p_colours
 
-  if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
+  if ( WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr ) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
-    jpeg_abort_decompress( cinfo );
-    fclose( infile );
-    return( false );
+    jpeg_abort_decompress(cinfo);
+    fclose(infile);
+    return false;
   }
 
-  jpeg_start_decompress( cinfo );
+  jpeg_start_decompress(cinfo);
 
-  JSAMPROW row_pointer;  /* pointer to a single row */
-  int row_stride = width * colours; /* physical row width in buffer */
-  while ( cinfo->output_scanline < cinfo->output_height )
-  {
-    row_pointer = &buffer[cinfo->output_scanline * row_stride];
-    jpeg_read_scanlines( cinfo, &row_pointer, 1 );
+  JSAMPROW row_pointer = buffer;
+  while ( cinfo->output_scanline < cinfo->output_height ) {
+    jpeg_read_scanlines(cinfo, &row_pointer, 1);
+    row_pointer += linesize;
   }
 
-  jpeg_finish_decompress( cinfo );
+  jpeg_finish_decompress(cinfo);
 
-  fclose( infile );
+  fclose(infile);
 
-  return( true );
+  return true;
 }
 
 // Multiple calling formats to permit inclusion (or not) of non blocking, quality_override and timestamp (exif), with suitable defaults.
 // Note quality=zero means default
 
 bool Image::WriteJpeg(const char *filename, int quality_override) const {
-  return Image::WriteJpeg(filename, quality_override, (timeval){0,0});
+  return Image::WriteJpeg(filename, quality_override, (timeval){0,0}, false);
 }
 bool Image::WriteJpeg(const char *filename) const {
-  return Image::WriteJpeg(filename, 0, (timeval){0,0});
+  return Image::WriteJpeg(filename, 0, (timeval){0,0}, false);
 }
 bool Image::WriteJpeg(const char *filename, bool on_blocking_abort) const {
   return Image::WriteJpeg(filename, 0, (timeval){0,0}, on_blocking_abort);
 }
 bool Image::WriteJpeg(const char *filename, struct timeval timestamp) const {
-  return Image::WriteJpeg(filename, 0, timestamp);
+  return Image::WriteJpeg(filename, 0, timestamp, false);
 }
 
 bool Image::WriteJpeg(const char *filename, int quality_override, struct timeval timestamp) const {
   return Image::WriteJpeg(filename, quality_override, timestamp, false);
 }
+
 bool Image::WriteJpeg(const char *filename, int quality_override, struct timeval timestamp, bool on_blocking_abort) const {
-  if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 ) {
+  if ( config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8) ) {
     Image temp_image(*this);
     temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
     return temp_image.WriteJpeg(filename, quality_override, timestamp, on_blocking_abort);
   }
-  int quality = quality_override?quality_override:config.jpeg_file_quality;
+  int quality = quality_override ? quality_override : config.jpeg_file_quality;
 
   struct jpeg_compress_struct *cinfo = writejpg_ccinfo[quality];
-  FILE *outfile =NULL;
+  FILE *outfile = nullptr;
   static int raw_fd = 0;
-  bool need_create_comp = false;
   raw_fd = 0;
 
   if ( !cinfo ) {
     cinfo = writejpg_ccinfo[quality] = new jpeg_compress_struct;
-    cinfo->err = jpeg_std_error( &jpg_err.pub );
-    jpeg_create_compress( cinfo );
-    need_create_comp=true;
+    cinfo->err = jpeg_std_error(&jpg_err.pub);
+    jpeg_create_compress(cinfo);
   }
-  if (! on_blocking_abort) {
-      jpg_err.pub.error_exit = zm_jpeg_error_exit;
-      jpg_err.pub.emit_message = zm_jpeg_emit_message;
+  if ( !on_blocking_abort ) {
+    jpg_err.pub.error_exit = zm_jpeg_error_exit;
+    jpg_err.pub.emit_message = zm_jpeg_emit_message;
   } else {
     jpg_err.pub.error_exit = zm_jpeg_error_silent;
     jpg_err.pub.emit_message = zm_jpeg_emit_silence;
-    if (setjmp( jpg_err.setjmp_buffer ) ) {
-      jpeg_abort_compress( cinfo );
-      Debug( 5, "Aborted a write mid-stream and %s and %d", (outfile == NULL) ? "closing file" : "file not opened", raw_fd );
-      if (raw_fd)
+    if ( setjmp(jpg_err.setjmp_buffer) ) {
+      jpeg_abort_compress(cinfo);
+      Debug(1, "Aborted a write mid-stream and %s and %d", (outfile == nullptr) ? "closing file" : "file not opened", raw_fd);
+      if ( raw_fd )
         close(raw_fd);
-      if (outfile)
-        fclose( outfile );
-      return ( false );
+      if ( outfile )
+        fclose(outfile);
+      return false;
     }
   }
-  if (need_create_comp)
-    jpeg_create_compress( cinfo );
 
-  if (! on_blocking_abort) {
-    if ( (outfile = fopen(filename, "wb")) == NULL ) {
-      Error( "Can't open %s for writing: %s", filename, strerror(errno) );
+  if ( !on_blocking_abort ) {
+    if ( (outfile = fopen(filename, "wb")) == nullptr ) {
+      Error("Can't open %s for writing: %s", filename, strerror(errno));
       return false;
     }
   } else {
-    raw_fd = open(filename,O_WRONLY|O_NONBLOCK|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-    if (raw_fd < 0)
-      return ( false );
-    outfile = fdopen(raw_fd,"wb");
-    if (outfile == NULL) {
+    raw_fd = open(filename, O_WRONLY|O_NONBLOCK|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+    if ( raw_fd < 0 )
+      return false;
+    outfile = fdopen(raw_fd, "wb");
+    if ( outfile == nullptr ) {
       close(raw_fd);
-      return( false );
+      return false;
     }
   }
 
-  jpeg_stdio_dest( cinfo, outfile );
+  jpeg_stdio_dest(cinfo, outfile);
 
   cinfo->image_width = width;   /* image width and height, in pixels */
   cinfo->image_height = height;
 
-  switch(colours) {
+  switch ( colours ) {
     case ZM_COLOUR_GRAY8:
-      {
         cinfo->input_components = 1;
         cinfo->in_color_space = JCS_GRAYSCALE;
         break;
-      }
     case ZM_COLOUR_RGB32:
-      {
 #ifdef JCS_EXTENSIONS
         cinfo->input_components = 4;
-        if ( subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
+        if ( subpixelorder == ZM_SUBPIX_ORDER_RGBA ) {
+          cinfo->in_color_space = JCS_EXT_RGBX;
+        } else if ( subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
           cinfo->in_color_space = JCS_EXT_BGRX;
         } else if ( subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
           cinfo->in_color_space = JCS_EXT_XRGB;
         } else if ( subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
           cinfo->in_color_space = JCS_EXT_XBGR;
         } else {
+          Warning("Unknwon subpixelorder %d", subpixelorder);
           /* Assume RGBA */
           cinfo->in_color_space = JCS_EXT_RGBX;
-        }  
+        }
+        break;
 #else
         Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
-        jpeg_abort_compress( cinfo );
+        jpeg_abort_compress(cinfo);
         fclose(outfile);
         return false;
 #endif
-        break;
-      }
     case ZM_COLOUR_RGB24:
     default:
-      {
         cinfo->input_components = 3;
         if ( subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS   
+#ifdef JCS_EXTENSIONS
           cinfo->in_color_space = JCS_EXT_BGR;
 #else
           Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
-          jpeg_abort_compress( cinfo );
+          jpeg_abort_compress(cinfo);
           fclose(outfile);
-          return false;                                          
+          return false;
 #endif
         } else {
           /* Assume RGB */
@@ -1100,16 +1119,15 @@ cinfo->out_color_space = JCS_RGB;
           cinfo->in_color_space = JCS_RGB;
         }
         break;
-      }
-  }
+  }  // end switch(colours)
 
-  jpeg_set_defaults( cinfo );
-  jpeg_set_quality( cinfo, quality, FALSE );
+  jpeg_set_defaults(cinfo);
+  jpeg_set_quality(cinfo, quality, FALSE);
   cinfo->dct_method = JDCT_FASTEST;
 
-  jpeg_start_compress( cinfo, TRUE );
+  jpeg_start_compress(cinfo, TRUE);
   if ( config.add_jpeg_comments && text[0] ) {
-    jpeg_write_marker( cinfo, JPEG_COM, (const JOCTET *)text, strlen(text) );
+    jpeg_write_marker(cinfo, JPEG_COM, (const JOCTET *)text, strlen(text));
   }
   // If we have a non-zero time (meaning a parameter was passed in), then form a simple exif segment with that time as DateTimeOriginal and SubsecTimeOriginal
   // No timestamp just leave off the exif section.
@@ -1133,30 +1151,30 @@ cinfo->out_color_space = JCS_RGB;
       0xff, 0x00 };
     memcpy(&exiftimes[EXIFTIMES_OFFSET], timebuf,EXIFTIMES_LEN);
     memcpy(&exiftimes[EXIFTIMES_MS_OFFSET], msbuf, EXIFTIMES_MS_LEN);
-    jpeg_write_marker( cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes) );
+    jpeg_write_marker(cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes));
   }
 
-  JSAMPROW row_pointer;  /* pointer to a single row */
-  int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
+  JSAMPROW row_pointer = buffer;  /* pointer to a single row */
   while ( cinfo->next_scanline < cinfo->image_height ) {
-    row_pointer = &buffer[cinfo->next_scanline * row_stride];
-    jpeg_write_scanlines( cinfo, &row_pointer, 1 );
+    jpeg_write_scanlines(cinfo, &row_pointer, 1);
+    row_pointer += linesize;
   }
-
   jpeg_finish_compress(cinfo);
-
   fclose(outfile);
 
   return true;
 }
 
-bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder)
+bool Image::DecodeJpeg(
+    const JOCTET *inbuffer,
+    int inbuffer_size,
+    unsigned int p_colours,
+    unsigned int p_subpixelorder)
 {
   unsigned int new_width, new_height, new_colours, new_subpixelorder;
   struct jpeg_decompress_struct *cinfo = decodejpg_dcinfo;
 
-  if ( !cinfo )
-  {
+  if ( !cinfo ) {
     cinfo = decodejpg_dcinfo = new jpeg_decompress_struct;
     cinfo->err = jpeg_std_error( &jpg_err.pub );
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
@@ -1164,25 +1182,24 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int
     jpeg_create_decompress( cinfo );
   }
 
-  if ( setjmp( jpg_err.setjmp_buffer ) )
-  {
-    jpeg_abort_decompress( cinfo );
-    return( false );
+  if ( setjmp(jpg_err.setjmp_buffer) ) {
+    jpeg_abort_decompress(cinfo);
+    return false;
   }
 
-  zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
+  zm_jpeg_mem_src(cinfo, inbuffer, inbuffer_size);
 
-  jpeg_read_header( cinfo, TRUE );
+  jpeg_read_header(cinfo, TRUE);
 
-  if ( cinfo->num_components != 1 && cinfo->num_components != 3 ) {
-    Error( "Unexpected colours when reading jpeg image: %d", colours );
-    jpeg_abort_decompress( cinfo );
-    return( false );
+  if ( (cinfo->num_components != 1) && (cinfo->num_components != 3) ) {
+    Error("Unexpected colours when reading jpeg image: %d", colours);
+    jpeg_abort_decompress(cinfo);
+    return false;
   }
 
   /* Check if the image has at least one huffman table defined. If not, use the standard ones */
   /* This is required for the MJPEG capture palette of USB devices */
-  if(cinfo->dc_huff_tbl_ptrs[0] == NULL) {
+  if ( cinfo->dc_huff_tbl_ptrs[0] == nullptr ) {
     zm_use_std_huff_tables(cinfo);
   }
 
@@ -1190,28 +1207,26 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int
   new_height = cinfo->image_height;
 
   if ( width != new_width || height != new_height ) {
-    Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
+    Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u",
+        width, height, new_width, new_height);
   }
 
-  switch(p_colours) {
+  switch (p_colours) {
     case ZM_COLOUR_GRAY8:
-      {
         cinfo->out_color_space = JCS_GRAYSCALE;
         new_colours = ZM_COLOUR_GRAY8;
         new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
         break;
-      }
     case ZM_COLOUR_RGB32:
-      {
 #ifdef JCS_EXTENSIONS
         new_colours = ZM_COLOUR_RGB32;
-        if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
           cinfo->out_color_space = JCS_EXT_BGRX;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-        } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
           cinfo->out_color_space = JCS_EXT_XRGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-        } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        } else if ( p_subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
           cinfo->out_color_space = JCS_EXT_XBGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
         } else {
@@ -1219,22 +1234,20 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int
           cinfo->out_color_space = JCS_EXT_RGBX;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
         }
-        break;    
+        break;
 #else
         Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
 #endif
-      }
     case ZM_COLOUR_RGB24:
     default:
-      {
         new_colours = ZM_COLOUR_RGB24;
-        if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS    
-          cinfo->out_color_space = JCS_EXT_BGR;  
+        if ( p_subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
+#ifdef JCS_EXTENSIONS
+          cinfo->out_color_space = JCS_EXT_BGR;
           new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
-          Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");    
-          cinfo->out_color_space = JCS_RGB;  
+          Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");
+          cinfo->out_color_space = JCS_RGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
 #endif
         } else {
@@ -1250,92 +1263,88 @@ cinfo->out_color_space = JCS_RGB;
           new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
         }
         break;
-      }
   } // end switch
 
-  if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
+  if ( WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == nullptr ) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
-    jpeg_abort_decompress( cinfo );
-    return( false );
+    jpeg_abort_decompress(cinfo);
+    return false;
   }
 
-  jpeg_start_decompress( cinfo );
+  jpeg_start_decompress(cinfo);
 
-  JSAMPROW row_pointer;  /* pointer to a single row */
-  int row_stride = width * colours; /* physical row width in buffer */
+  JSAMPROW row_pointer = buffer;  /* pointer to a single row */
   while ( cinfo->output_scanline < cinfo->output_height ) {
-    row_pointer = &buffer[cinfo->output_scanline * row_stride];
-    jpeg_read_scanlines( cinfo, &row_pointer, 1 );
+    jpeg_read_scanlines(cinfo, &row_pointer, 1);
+    row_pointer += linesize;
   }
 
-  jpeg_finish_decompress( cinfo );
+  jpeg_finish_decompress(cinfo);
 
   return true;
 }
 
-bool Image::EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override ) const {
-  if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 ) {
-    Image temp_image( *this );
-    temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
-    return( temp_image.EncodeJpeg( outbuffer, outbuffer_size, quality_override ) );
+bool Image::EncodeJpeg(JOCTET *outbuffer, int *outbuffer_size, int quality_override) const {
+  if ( config.colour_jpeg_files && (colours == ZM_COLOUR_GRAY8) ) {
+    Image temp_image(*this);
+    temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
+    return temp_image.EncodeJpeg(outbuffer, outbuffer_size, quality_override);
   }
 
-  int quality = quality_override?quality_override:config.jpeg_stream_quality;
+  int quality = quality_override ? quality_override : config.jpeg_stream_quality;
 
   struct jpeg_compress_struct *cinfo = encodejpg_ccinfo[quality];
 
   if ( !cinfo ) {
     cinfo = encodejpg_ccinfo[quality] = new jpeg_compress_struct;
-    cinfo->err = jpeg_std_error( &jpg_err.pub );
+    cinfo->err = jpeg_std_error(&jpg_err.pub);
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
     jpg_err.pub.emit_message = zm_jpeg_emit_message;
-    jpeg_create_compress( cinfo );
+    jpeg_create_compress(cinfo);
   }
 
-  zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
+  zm_jpeg_mem_dest(cinfo, outbuffer, outbuffer_size);
 
   cinfo->image_width = width;   /* image width and height, in pixels */
   cinfo->image_height = height;
 
-  switch(colours) {
+  switch ( colours ) {
     case ZM_COLOUR_GRAY8:
-      {
         cinfo->input_components = 1;
         cinfo->in_color_space = JCS_GRAYSCALE;
         break;
-      }
     case ZM_COLOUR_RGB32:
-      {
 #ifdef JCS_EXTENSIONS
         cinfo->input_components = 4;
-        if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        if ( subpixelorder == ZM_SUBPIX_ORDER_RGBA ) {
+          cinfo->in_color_space = JCS_EXT_RGBX;
+        } else if ( subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
           cinfo->in_color_space = JCS_EXT_BGRX;
-        } else if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        } else if ( subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
           cinfo->in_color_space = JCS_EXT_XRGB;
-        } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        } else if ( subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
           cinfo->in_color_space = JCS_EXT_XBGR;
         } else {
+          Warning("unknown subpixelorder %d", subpixelorder);
           /* Assume RGBA */
           cinfo->in_color_space = JCS_EXT_RGBX;
-        } 
+        }
+        break;
 #else
         Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
-        jpeg_abort_compress( cinfo );
-        return(false);
+        jpeg_abort_compress(cinfo);
+        return false;
 #endif
-        break;
-      }
     case ZM_COLOUR_RGB24:
     default:
-      {
         cinfo->input_components = 3;
-        if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS   
+        if ( subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
+#ifdef JCS_EXTENSIONS
           cinfo->in_color_space = JCS_EXT_BGR;
 #else
           Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
-          jpeg_abort_compress( cinfo );
-          return(false);                                          
+          jpeg_abort_compress(cinfo);
+          return false;
 #endif
         } else {
           /* Assume RGB */
@@ -1349,23 +1358,21 @@ cinfo->out_color_space = JCS_RGB;
           cinfo->in_color_space = JCS_RGB;
         }
         break;
-      }
   } // end switch
 
-  jpeg_set_defaults( cinfo );
-  jpeg_set_quality( cinfo, quality, FALSE );
+  jpeg_set_defaults(cinfo);
+  jpeg_set_quality(cinfo, quality, FALSE);
   cinfo->dct_method = JDCT_FASTEST;
 
-  jpeg_start_compress( cinfo, TRUE );
+  jpeg_start_compress(cinfo, TRUE);
 
-  JSAMPROW row_pointer;  /* pointer to a single row */
-  int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
+  JSAMPROW row_pointer = buffer;
   while ( cinfo->next_scanline < cinfo->image_height ) {
-    row_pointer = &buffer[cinfo->next_scanline * row_stride];
-    jpeg_write_scanlines( cinfo, &row_pointer, 1 );
+    jpeg_write_scanlines(cinfo, &row_pointer, 1);
+    row_pointer += linesize;
   }
 
-  jpeg_finish_compress( cinfo );
+  jpeg_finish_compress(cinfo);
 
   return true;
 }
@@ -1400,11 +1407,12 @@ bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsig
   unsigned int new_height = (hi_y-lo_y)+1;
 
   if ( lo_x > hi_x || lo_y > hi_y ) {
-    Error( "Invalid or reversed crop region %d,%d -> %d,%d", lo_x, lo_y, hi_x, hi_y );
-    return( false );
+    Error("Invalid or reversed crop region %d,%d -> %d,%d", lo_x, lo_y, hi_x, hi_y);
+    return false;
   }
   if ( hi_x > (width-1) || ( hi_y > (height-1) ) ) {
-    Error( "Attempting to crop outside image, %d,%d -> %d,%d not in %d,%d", lo_x, lo_y, hi_x, hi_y, width-1, height-1 );
+    Error("Attempting to crop outside image, %d,%d -> %d,%d not in %d,%d",
+        lo_x, lo_y, hi_x, hi_y, width-1, height-1);
     return false;
   }
 
@@ -1415,9 +1423,9 @@ bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsig
   unsigned int new_size = new_width*new_height*colours;
   uint8_t *new_buffer = AllocBuffer(new_size);
 
-  unsigned int new_stride = new_width*colours;
+  unsigned int new_stride = new_width * colours;
   for ( unsigned int y = lo_y, ny = 0; y <= hi_y; y++, ny++ ) {
-    unsigned char *pbuf = &buffer[((y*width)+lo_x)*colours];
+    unsigned char *pbuf = &buffer[((y*linesize)+lo_x)];
     unsigned char *pnbuf = &new_buffer[(ny*new_width)*colours];
     memcpy( pnbuf, pbuf, new_stride );
   }
@@ -1427,8 +1435,8 @@ bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsig
   return true;
 }
 
-bool Image::Crop( const Box &limits ) {
-  return Crop( limits.LoX(), limits.LoY(), limits.HiX(), limits.HiY() );
+bool Image::Crop(const Box &limits) {
+  return Crop(limits.LoX(), limits.LoY(), limits.HiX(), limits.HiY());
 }
 
 /* Far from complete */
@@ -1449,7 +1457,7 @@ void Image::Overlay( const Image &image ) {
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr ) {
+    while ( pdest < max_ptr ) {
       if ( *psrc ) {
         *pdest = *psrc;
       }
@@ -1465,7 +1473,7 @@ void Image::Overlay( const Image &image ) {
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr ) {
+    while ( pdest < max_ptr ) {
       if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) ) {
         RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
         GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
@@ -1476,16 +1484,16 @@ void Image::Overlay( const Image &image ) {
     }
 
     /* RGB32 ontop of grayscale - convert to same format first - complete */
-  } else if( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_RGB32 ) {
+  } else if ( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_RGB32 ) {
     Colourise(image.colours, image.subpixelorder);
 
     const Rgb* const max_ptr = (Rgb*)(buffer+size);
-    const Rgb* prsrc = (Rgb*)image.buffer; 
+    const Rgb* prsrc = (Rgb*)image.buffer;
     Rgb* prdest = (Rgb*)buffer;
 
     if ( subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
       /* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
-      while (prdest < max_ptr) {
+      while ( prdest < max_ptr) {
         if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) ) {
           *prdest = *prsrc;
         }
@@ -1494,7 +1502,7 @@ void Image::Overlay( const Image &image ) {
       }
     } else {
       /* ABGR\ARGB subpixel order - Alpha byte is first */
-      while (prdest < max_ptr) {
+      while ( prdest < max_ptr) {
         if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) ) {
           *prdest = *prsrc;
         }
@@ -1509,7 +1517,7 @@ void Image::Overlay( const Image &image ) {
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr ) {
+    while ( pdest < max_ptr ) {
       if ( *psrc ) {
         RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = *psrc;
       }
@@ -1523,7 +1531,7 @@ void Image::Overlay( const Image &image ) {
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr ) {
+    while ( pdest < max_ptr ) {
       if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) ) {
         RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
         GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
@@ -1531,7 +1539,7 @@ void Image::Overlay( const Image &image ) {
       }
       pdest += 3;
       psrc += 3;
-    } 
+    }
 
     /* RGB32 ontop of RGB24 - TO BE DONE */
   } else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_RGB32 ) {
@@ -1571,7 +1579,7 @@ void Image::Overlay( const Image &image ) {
   } else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_RGB32 ) {
     const Rgb* const max_ptr = (Rgb*)(buffer+size);
     Rgb* prdest = (Rgb*)buffer;
-    const Rgb* prsrc = (Rgb*)image.buffer; 
+    const Rgb* prsrc = (Rgb*)image.buffer;
 
     if ( image.subpixelorder == ZM_SUBPIX_ORDER_RGBA || image.subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
       /* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
@@ -1646,8 +1654,7 @@ void Image::Overlay( const Image &image, unsigned int x, unsigned int y ) {
   } else {
     Error("Overlay called with unexpected colours: %d", colours);
   }
-
-}
+}  // end void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
 
 void Image::Blend( const Image &image, int transparency ) {
 #ifdef ZM_IMAGE_PROFILING
@@ -1690,7 +1697,7 @@ void Image::Blend( const Image &image, int transparency ) {
   AssignDirect(width, height, colours, subpixelorder, new_buffer, size, ZM_BUFTYPE_ZM);
 }
 
-Image *Image::Merge( unsigned int n_images, Image *images[] ) {
+Image *Image::Merge(unsigned int n_images, Image *images[]) {
   if ( n_images == 1 ) return new Image(*images[0]);
 
   unsigned int width = images[0]->width;
@@ -1719,7 +1726,7 @@ Image *Image::Merge( unsigned int n_images, Image *images[] ) {
   return result;
 }
 
-Image *Image::Merge( unsigned int n_images, Image *images[], double weight ) {
+Image *Image::Merge(unsigned int n_images, Image *images[], double weight) {
   if ( n_images == 1 ) return new Image(*images[0]);
 
   unsigned int width = images[0]->width;
@@ -1732,7 +1739,7 @@ Image *Image::Merge( unsigned int n_images, Image *images[], double weight ) {
     }
   }
 
-  Image *result = new Image( *images[0] );
+  Image *result = new Image(*images[0]);
   unsigned int size = result->size;
   double factor = 1.0*weight;
   for ( unsigned int i = 1; i < n_images; i++ ) {
@@ -1761,7 +1768,7 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
     }
   }
 
-  Image *result = new Image( width, height, images[0]->colours, images[0]->subpixelorder );
+  Image *result = new Image(width, height, images[0]->colours, images[0]->subpixelorder);
   unsigned int size = result->size;
   for ( unsigned int c = 0; c < colours; c++ ) {
     unsigned int ref_colour_rgb = RGB_VAL(ref_colour,c);
@@ -1801,7 +1808,7 @@ void Image::Delta(const Image &image, Image* targetimage) const {
 
   uint8_t *pdiff = targetimage->WriteBuffer(width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE);
 
-  if ( pdiff == NULL ) {
+  if ( pdiff == nullptr ) {
     Panic("Failed requesting writeable buffer for storing the delta image");
   }
 
@@ -1809,7 +1816,7 @@ void Image::Delta(const Image &image, Image* targetimage) const {
   clock_gettime(CLOCK_THREAD_CPUTIME_ID,&start);
 #endif
 
-  switch (colours) {
+  switch ( colours ) {
     case ZM_COLOUR_RGB24:
       if ( subpixelorder == ZM_SUBPIX_ORDER_BGR ) {
         /* BGR subpixel order */
@@ -1873,7 +1880,7 @@ const Coord Image::centreCoord( const char *text ) const {
   }
   int x = (width - (max_line_len * ZM_CHAR_WIDTH) ) / 2;
   int y = (height - (line_no * LINE_HEIGHT) ) / 2;
-  return( Coord( x, y ) );
+  return Coord(x, y);
 }
 
 /* RGB32 compatible: complete */
@@ -1918,13 +1925,19 @@ void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour
 }
 
 /* RGB32 compatible: complete */
-void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int size, const Rgb fg_colour, const Rgb bg_colour )
-{
-  strncpy( text, p_text, sizeof(text)-1 );
+void Image::Annotate(
+    const char *p_text,
+    const Coord &coord,
+    const unsigned int size,
+    const Rgb fg_colour,
+    const Rgb bg_colour) {
+  Debug(1, "text %s", p_text);
+  strncpy(text, p_text, sizeof(text)-1);
+  Debug(1, "text %s", text);
 
   unsigned int index = 0;
   unsigned int line_no = 0;
-  unsigned int text_len = strlen( text );
+  unsigned int text_len = strlen(text);
   unsigned int line_len = 0;
   const char *line = text;
 
@@ -1943,10 +1956,10 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
   const bool bg_trans = (bg_colour == RGB_TRANSPARENT);
 
   int zm_text_bitmask = 0x80;
-  if (size == 2)
+  if ( size == 2 )
     zm_text_bitmask = 0x8000;
 
-  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) ) {
+  while ( (index < text_len) && (line_len = strcspn(line, "\n")) ) {
 
     unsigned int line_width = line_len * ZM_CHAR_WIDTH * size;
 
@@ -1982,10 +1995,19 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
         unsigned char *temp_ptr = ptr;
         for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
-          if (size == 2)
+          if ( size == 2 ) {
+            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          else
+          } else {
+            if ( (line[c] * ZM_CHAR_HEIGHT) + r > sizeof(fontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
+          }
           for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ ) {
             if ( f & (zm_text_bitmask >> i) ) {
               if ( !fg_trans )
@@ -2004,10 +2026,19 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
         unsigned char *temp_ptr = ptr;
         for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
-          if (size == 2)
+          if ( size == 2 ) {
+            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          else
+          } else {
+            if ( (line[c] * ZM_CHAR_HEIGHT) + r > sizeof(fontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
+          }
           for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr += colours ) {
             if ( f & (zm_text_bitmask >> i) ) {
               if ( !fg_trans ) {
@@ -2031,10 +2062,19 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
         Rgb* temp_ptr = (Rgb*)ptr;
         for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
-          if (size == 2)
+          if ( size == 2 ) {
+            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          else
+          } else {
+            if ( (line[c] * ZM_CHAR_HEIGHT) + r > sizeof(fontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
+          }
           for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ ) {
             if ( f & (zm_text_bitmask >> i) ) {
               if ( !fg_trans ) {
@@ -2045,10 +2085,10 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
             }
           }
         }
-      } 
+      }
 
     } else {
-      Panic("Annotate called with unexpected colours: %d",colours);
+      Error("Annotate called with unexpected colours: %d", colours);
       return;
     }
 
@@ -2063,13 +2103,14 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
 
 void Image::Timestamp( const char *label, const time_t when, const Coord &coord, const int size ) {
   char time_text[64];
-  strftime( time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime( &when ) );
+  strftime(time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime(&when));
   if ( label ) {
-    char text[64];
-    snprintf( text, sizeof(text), "%s - %s", label, time_text );
-    Annotate( text, coord, size );
+    // Assume label is max 64, + ' - ' + 64 chars of time_text
+    char text[132];
+    snprintf(text, sizeof(text), "%s - %s", label, time_text);
+    Annotate(text, coord, size);
   } else {
-    Annotate( time_text, coord, size );
+    Annotate(time_text, coord, size);
   }
 }
 
@@ -2098,7 +2139,7 @@ void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqs
         newpixel = (newpixel<<8) | subpixel;
         newpixel = (newpixel<<8) | subpixel;
         pdest[i] = (newpixel<<8);
-      }    
+      }
     } else {
       /* RGBA\BGRA subpixel order, alpha byte is last (mem+3) */
       for ( unsigned int i=0; i < pixels; i++ ) {
@@ -2137,8 +2178,8 @@ void Image::DeColourise() {
   subpixelorder = ZM_SUBPIX_ORDER_NONE;
   size = width * height;
 
-  if ( colours == ZM_COLOUR_RGB32 && config.cpu_extensions && sseversion >= 35 ) {
-    /* Use SSSE3 functions */  
+  if ( colours == ZM_COLOUR_RGB32 && config.cpu_extensions && sse_version >= 35 ) {
+    /* Use SSSE3 functions */
     switch (subpixelorder) {
       case ZM_SUBPIX_ORDER_BGRA:
         ssse3_convert_bgra_gray8(buffer,buffer,pixels);
@@ -2251,7 +2292,7 @@ void Image::Fill( Rgb colour, const Box *limits ) {
       Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
 
       for ( unsigned int x = lo_x; x <= (unsigned int)hi_x; x++, p++) {
-        /* Fast, copies the entire pixel in a single pass */ 
+        /* Fast, copies the entire pixel in a single pass */
         *p = colour;
       }
     }
@@ -2264,12 +2305,12 @@ void Image::Fill( Rgb colour, int density, const Box *limits ) {
   if ( density <= 1 )
     return Fill(colour,limits);
 
-  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32  ) ) {
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) ) {
     Panic("Attempt to fill image with unexpected colours %d", colours);
   }
 
   /* Convert the colour's RGBA subpixel order into the image's subpixel order */
-  colour = rgb_convert(colour,subpixelorder);
+  colour = rgb_convert(colour, subpixelorder);
 
   unsigned int lo_x = limits?limits->Lo().X():0;
   unsigned int lo_y = limits?limits->Lo().Y():0;
@@ -2304,7 +2345,7 @@ void Image::Fill( Rgb colour, int density, const Box *limits ) {
           *p = colour;
       }
     }
-  }  
+  }
 }
 
 /* RGB32 compatible: complete */
@@ -2331,9 +2372,7 @@ void Image::Outline( Rgb colour, const Polygon &polygon ) {
 
     double grad;
 
-    //Debug( 9, "dx: %.2lf, dy: %.2lf", dx, dy );
     if ( fabs(dx) <= fabs(dy) ) {
-      //Debug( 9, "dx <= dy" );
       if ( y1 != y2 )
         grad = dx/dy;
       else
@@ -2343,9 +2382,7 @@ void Image::Outline( Rgb colour, const Polygon &polygon ) {
       int y, yinc = (y1<y2)?1:-1;
       grad *= yinc;
       if ( colours == ZM_COLOUR_GRAY8 ) {
-        //Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2f", x1, x2, y1, y2, grad );
         for ( x = x1, y = y1; y != y2; y += yinc, x += grad ) {
-          //Debug( 9, "x:%.2f, y:%d", x, y );
           buffer[(y*width)+int(round(x))] = colour;
         }
       } else if ( colours == ZM_COLOUR_RGB24 ) {
@@ -2394,20 +2431,20 @@ void Image::Outline( Rgb colour, const Polygon &polygon ) {
 }
 
 /* RGB32 compatible: complete */
-void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
+void Image::Fill(Rgb colour, int density, const Polygon &polygon) {
   if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) ) {
-    Panic( "Attempt to fill image with unexpected colours %d", colours );
+    Panic("Attempt to fill image with unexpected colours %d", colours);
   }
 
   /* Convert the colour's RGBA subpixel order into the image's subpixel order */
-  colour = rgb_convert(colour,subpixelorder);
+  colour = rgb_convert(colour, subpixelorder);
 
   int n_coords = polygon.getNumCoords();
   int n_global_edges = 0;
   Edge global_edges[n_coords];
   for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ ) {
-    const Coord &p1 = polygon.getCoord( i );
-    const Coord &p2 = polygon.getCoord( j );
+    const Coord &p1 = polygon.getCoord(i);
+    const Coord &p2 = polygon.getCoord(j);
 
     int x1 = p1.X();
     int x2 = p2.X();
@@ -2432,7 +2469,8 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
 #ifndef ZM_DBG_OFF
   if ( logLevel() >= Logger::DEBUG9 ) {
     for ( int i = 0; i < n_global_edges; i++ ) {
-      Debug( 9, "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", i, global_edges[i].min_y, global_edges[i].max_y, global_edges[i].min_x, global_edges[i]._1_m );
+      Debug(9, "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f",
+          i, global_edges[i].min_y, global_edges[i].max_y, global_edges[i].min_x, global_edges[i]._1_m);
     }
   }
 #endif
@@ -2455,11 +2493,12 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
         break;
       }
     }
-    qsort( active_edges, n_active_edges, sizeof(*active_edges), Edge::CompareX );
+    qsort(active_edges, n_active_edges, sizeof(*active_edges), Edge::CompareX);
 #ifndef ZM_DBG_OFF
     if ( logLevel() >= Logger::DEBUG9 ) {
       for ( int i = 0; i < n_active_edges; i++ ) {
-        Debug( 9, "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", y, i, active_edges[i].min_y, active_edges[i].max_y, active_edges[i].min_x, active_edges[i]._1_m );
+        Debug(9, "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f",
+            y, i, active_edges[i].min_y, active_edges[i].max_y, active_edges[i].min_x, active_edges[i]._1_m );
       }
     }
 #endif
@@ -2479,7 +2518,7 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
         } else if ( colours == ZM_COLOUR_RGB24 ) {
           unsigned char *p = &buffer[colours*((y*width)+lo_x)];
           for ( int x = lo_x; x <= hi_x; x++, p += 3) {
-            if ( !(x%density) ) {  
+            if ( !(x%density) ) {
               RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
               GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
               BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
@@ -2500,7 +2539,7 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
     for ( int i = n_active_edges-1; i >= 0; i-- ) {
       if ( y >= active_edges[i].max_y ) {
         // Or >= as per sheets
-        Debug( 9, "Deleting active_edge" );
+        Debug(9, "Deleting active_edge");
         if ( i < (n_active_edges-1) ) {
           //memcpy( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
           memmove( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
@@ -2513,27 +2552,21 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
   } while ( n_global_edges || n_active_edges );
 }
 
-void Image::Fill( Rgb colour, const Polygon &polygon ) {
-  Fill( colour, 1, polygon );
+void Image::Fill(Rgb colour, const Polygon &polygon) {
+  Fill(colour, 1, polygon);
 }
 
-/* RGB32 compatible: complete */
-void Image::Rotate( int angle ) {
-
+void Image::Rotate(int angle) {
   angle %= 360;
 
-  if ( !angle ) {
+  if ( !angle || angle%90 ) {
     return;
   }
-  if ( angle%90 ) {
-    return;
-  }
-
   unsigned int new_height = height;
   unsigned int new_width = width;
   uint8_t* rotate_buffer = AllocBuffer(size);
 
-  switch( angle ) {
+  switch ( angle ) {
     case 90 :
       {
         new_height = width;
@@ -2552,17 +2585,17 @@ void Image::Rotate( int angle ) {
           }
         } else if ( colours == ZM_COLOUR_RGB32 ) {
           Rgb* s_rptr = (Rgb*)s_ptr;
-          for ( unsigned int i = new_width; i > 0; i-- ) {
+          for ( unsigned int i = new_width; i; i-- ) {
             Rgb* d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
-            for ( unsigned int j = new_height; j > 0; j-- ) {
+            for ( unsigned int j = new_height; j; j-- ) {
               *d_rptr = *s_rptr++;
               d_rptr += new_width;
             }
           }
         } else /* Assume RGB24 */ {
-          for ( unsigned int i = new_width; i > 0; i-- ) {
+          for ( unsigned int i = new_width; i; i-- ) {
             unsigned char *d_ptr = rotate_buffer+((i-1)*3);
-            for ( unsigned int j = new_height; j > 0; j-- ) {
+            for ( unsigned int j = new_height; j; j-- ) {
               *d_ptr = *s_ptr++;
               *(d_ptr+1) = *s_ptr++;
               *(d_ptr+2) = *s_ptr++;
@@ -2641,8 +2674,8 @@ void Image::Rotate( int angle ) {
       }
   }
 
-  AssignDirect( new_width, new_height, colours, subpixelorder, rotate_buffer, size, ZM_BUFTYPE_ZM);
-}
+  AssignDirect(new_width, new_height, colours, subpixelorder, rotate_buffer, size, ZM_BUFTYPE_ZM);
+}  // void Image::Rotate(int angle)
 
 /* RGB32 compatible: complete */
 void Image::Flip( bool leftright ) {
@@ -2685,26 +2718,25 @@ void Image::Flip( bool leftright ) {
         }
         s_ptr += line_bytes2;
       }
-    }    
+    }
   } else {
     // Vertical flip, top to bottom
     unsigned char *s_ptr = buffer+(height*line_bytes);
     unsigned char *d_ptr = flip_buffer;
 
-    while( s_ptr > buffer ) {
+    while ( s_ptr > buffer ) {
       s_ptr -= line_bytes;
-      memcpy( d_ptr, s_ptr, line_bytes );
+      memcpy(d_ptr, s_ptr, line_bytes);
       d_ptr += line_bytes;
     }
   }
 
-  AssignDirect( width, height, colours, subpixelorder, flip_buffer, size, ZM_BUFTYPE_ZM);
-
+  AssignDirect(width, height, colours, subpixelorder, flip_buffer, size, ZM_BUFTYPE_ZM);
 }
 
-void Image::Scale( unsigned int factor ) {
+void Image::Scale(unsigned int factor) {
   if ( !factor ) {
-    Error( "Bogus scale factor %d found", factor );
+    Error("Bogus scale factor %d found", factor);
     return;
   }
   if ( factor == ZM_SCALE_BASE ) {
@@ -2714,6 +2746,7 @@ void Image::Scale( unsigned int factor ) {
   unsigned int new_width = (width*factor)/ZM_SCALE_BASE;
   unsigned int new_height = (height*factor)/ZM_SCALE_BASE;
 
+  // Why larger than we need?
   size_t scale_buffer_size = (new_width+1) * (new_height+1) * colours;
 
   uint8_t* scale_buffer = AllocBuffer(scale_buffer_size);
@@ -2761,7 +2794,7 @@ void Image::Scale( unsigned int factor ) {
     unsigned int last_h_index = 0;
     unsigned int last_w_index = 0;
     unsigned int h_index;
-    for ( unsigned int y = 0; y < (unsigned int)height; y++ ) {
+    for ( unsigned int y = 0; y < height; y++ ) {
       h_count += factor;
       h_index = h_count/ZM_SCALE_BASE;
       if ( h_index > last_h_index ) {
@@ -2770,7 +2803,7 @@ void Image::Scale( unsigned int factor ) {
         last_w_index = 0;
 
         unsigned char *ps = &buffer[y*wc];
-        for ( unsigned int x = 0; x < (unsigned int)width; x++ ) {
+        for ( unsigned int x = 0; x < width; x++ ) {
           w_count += factor;
           w_index = w_count/ZM_SCALE_BASE;
 
@@ -2788,10 +2821,8 @@ void Image::Scale( unsigned int factor ) {
     }
     new_width = last_w_index;
     new_height = last_h_index;
-  }
-
-  AssignDirect( new_width, new_height, colours, subpixelorder, scale_buffer, scale_buffer_size, ZM_BUFTYPE_ZM);
-
+  }  // end foreach line
+  AssignDirect(new_width, new_height, colours, subpixelorder, scale_buffer, scale_buffer_size, ZM_BUFTYPE_ZM);
 }
 
 void Image::Deinterlace_Discard() {
@@ -2832,7 +2863,6 @@ void Image::Deinterlace_Discard() {
   } else {
     Error("Deinterlace called with unexpected colours: %d", colours);
   }
-
 }
 
 void Image::Deinterlace_Linear() {
@@ -2893,7 +2923,7 @@ void Image::Deinterlace_Linear() {
     for (unsigned int x = 0; x < (unsigned int)width; x++) {
       *pcurrent++ = *pabove++;
       *pcurrent++ = *pabove++;
-      *pcurrent++ = *pabove++;  
+      *pcurrent++ = *pabove++;
       *pcurrent++ = *pabove++;
     }
   } else {
@@ -3078,7 +3108,7 @@ void Image::Deinterlace_4Field(const Image* next_image, unsigned int threshold)
 __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
   static uint32_t divider = 0;
   static uint32_t clearmask = 0;
   static double current_blendpercent = 0.0;
@@ -3247,7 +3277,7 @@ void neon32_armv7_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* r
   __asm__ __volatile__ (
   "mov r12, %4\n\t"
   "vdup.8 q12, r12\n\t"
-  "neon32_armv7_fastblend_iter:\n\t"
+  "neon32_armv7_fastblend_iter%=:\n\t"
   "vldm %0!, {q0,q1,q2,q3}\n\t"
   "vldm %1!, {q4,q5,q6,q7}\n\t"
   "pld [%0, #256]\n\t"
@@ -3270,7 +3300,7 @@ void neon32_armv7_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* r
   "vadd.i8 q7, q7, q3\n\t"
   "vstm %2!, {q4,q5,q6,q7}\n\t"
   "subs %3, %3, #64\n\t"
-  "bne neon32_armv7_fastblend_iter\n\t"
+  "bne neon32_armv7_fastblend_iter%=\n\t"
   :
   : "r" (col1), "r" (col2), "r" (result), "r" (count), "r" (divider)
   : "%r12", "%q0", "%q1", "%q2", "%q3", "%q4", "%q5", "%q6", "%q7", "%q8", "%q9", "%q10", "%q11", "%q12", "cc", "memory"
@@ -3328,7 +3358,7 @@ __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const
   __asm__ __volatile__ (
   "mov x12, %4\n\t"
   "dup v28.16b, w12\n\t"
-  "neon64_armv8_fastblend_iter:\n\t"
+  "neon64_armv8_fastblend_iter%=:\n\t"
   "ldp q16, q17, [%0], #32\n\t"
   "ldp q18, q19, [%0], #32\n\t"
   "ldp q20, q21, [%1], #32\n\t"
@@ -3354,7 +3384,7 @@ __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const
   "stp q20, q21, [%2], #32\n\t"
   "stp q22, q23, [%2], #32\n\t"
   "subs %3, %3, #64\n\t"
-  "bne neon64_armv8_fastblend_iter\n\t"
+  "bne neon64_armv8_fastblend_iter%=\n\t"
   :
   : "r" (col1), "r" (col2), "r" (result), "r" (count), "r" (divider)
   : "%x12", "%v16", "%v17", "%v18", "%v19", "%v20", "%v21", "%v22", "%v23", "%v24", "%v25", "%v26", "%v27", "%v28", "cc", "memory"
@@ -3371,14 +3401,14 @@ __attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col
 
   while ( result < max_ptr ) {
     *result++ = (*col1++ * opacity) + (*col2++ * divide);
-  } 
+  }
 }
 
 /************************************************* DELTA FUNCTIONS *************************************************/
 
 /* Grayscale */
 __attribute__((noinline)) void fast_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-  /* Loop unrolling is used to work on 16 bytes (16 grayscale pixels) at a time */  
+  /* Loop unrolling is used to work on 16 bytes (16 grayscale pixels) at a time */
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -3402,7 +3432,7 @@ __attribute__((noinline)) void fast_delta8_gray8(const uint8_t* col1, const uint
     col1 += 16;
     col2 += 16;
     result += 16;
-  }  
+  }
 }
 
 __attribute__((noinline)) void std_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
@@ -3414,13 +3444,13 @@ __attribute__((noinline)) void std_delta8_gray8(const uint8_t* col1, const uint8
     col1 += 1;
     col2 += 1;
     result += 1;
-  }  
+  }
 }
 
 /* RGB24: RGB */
 __attribute__((noinline)) void fast_delta8_rgb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -3449,7 +3479,7 @@ __attribute__((noinline)) void fast_delta8_rgb(const uint8_t* col1, const uint8_
 
 __attribute__((noinline)) void std_delta8_rgb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while (result < max_ptr) {
@@ -3467,10 +3497,10 @@ __attribute__((noinline)) void std_delta8_rgb(const uint8_t* col1, const uint8_t
 /* RGB24: BGR */
 __attribute__((noinline)) void fast_delta8_bgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     b = abs(col1[0] - col2[0]);
     g = abs(col1[1] - col2[1]);
     r = abs(col1[2] - col2[2]);
@@ -3496,10 +3526,10 @@ __attribute__((noinline)) void fast_delta8_bgr(const uint8_t* col1, const uint8_
 
 __attribute__((noinline)) void std_delta8_bgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     b = abs(col1[0] - col2[0]);
     g = abs(col1[1] - col2[1]);
     r = abs(col1[2] - col2[2]);
@@ -3514,10 +3544,10 @@ __attribute__((noinline)) void std_delta8_bgr(const uint8_t* col1, const uint8_t
 /* RGB32: RGBA */
 __attribute__((noinline)) void fast_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     r = abs(col1[0] - col2[0]);
     g = abs(col1[1] - col2[1]);
     b = abs(col1[2] - col2[2]);
@@ -3543,10 +3573,10 @@ __attribute__((noinline)) void fast_delta8_rgba(const uint8_t* col1, const uint8
 
 __attribute__((noinline)) void std_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     r = abs(col1[0] - col2[0]);
     g = abs(col1[1] - col2[1]);
     b = abs(col1[2] - col2[2]);
@@ -3561,10 +3591,10 @@ __attribute__((noinline)) void std_delta8_rgba(const uint8_t* col1, const uint8_
 /* RGB32: BGRA */
 __attribute__((noinline)) void fast_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     b = abs(col1[0] - col2[0]);
     g = abs(col1[1] - col2[1]);
     r = abs(col1[2] - col2[2]);
@@ -3589,10 +3619,10 @@ __attribute__((noinline)) void fast_delta8_bgra(const uint8_t* col1, const uint8
 }
 __attribute__((noinline)) void std_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     b = abs(col1[0] - col2[0]);
     g = abs(col1[1] - col2[1]);
     r = abs(col1[2] - col2[2]);
@@ -3607,10 +3637,10 @@ __attribute__((noinline)) void std_delta8_bgra(const uint8_t* col1, const uint8_
 /* RGB32: ARGB */
 __attribute__((noinline)) void fast_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     r = abs(col1[1] - col2[1]);
     g = abs(col1[2] - col2[2]);
     b = abs(col1[3] - col2[3]);
@@ -3633,12 +3663,13 @@ __attribute__((noinline)) void fast_delta8_argb(const uint8_t* col1, const uint8
     result += 4;
   }
 }
+
 __attribute__((noinline)) void std_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     r = abs(col1[1] - col2[1]);
     g = abs(col1[2] - col2[2]);
     b = abs(col1[3] - col2[3]);
@@ -3653,10 +3684,10 @@ __attribute__((noinline)) void std_delta8_argb(const uint8_t* col1, const uint8_
 /* RGB32: ABGR */
 __attribute__((noinline)) void fast_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
   /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     b = abs(col1[1] - col2[1]);
     g = abs(col1[2] - col2[2]);
     r = abs(col1[3] - col2[3]);
@@ -3680,10 +3711,10 @@ __attribute__((noinline)) void fast_delta8_abgr(const uint8_t* col1, const uint8
   }
 }
 __attribute__((noinline)) void std_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-  int r,g,b;  
+  int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while (result < max_ptr) {
     b = abs(col1[1] - col2[1]);
     g = abs(col1[2] - col2[2]);
     r = abs(col1[3] - col2[3]);
@@ -3712,7 +3743,7 @@ void neon32_armv7_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t
   /* Q7(D14,D15) = col2+48 */
 
   __asm__ __volatile__ (
-  "neon32_armv7_delta8_gray8_iter:\n\t"
+  "neon32_armv7_delta8_gray8_iter%=:\n\t"
   "vldm %0!, {q0,q1,q2,q3}\n\t"
   "vldm %1!, {q4,q5,q6,q7}\n\t"
   "pld [%0, #512]\n\t"
@@ -3723,7 +3754,7 @@ void neon32_armv7_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t
   "vabd.u8 q3, q3, q7\n\t"
   "vstm %2!, {q0,q1,q2,q3}\n\t"
   "subs %3, %3, #64\n\t"
-  "bne neon32_armv7_delta8_gray8_iter\n\t"
+  "bne neon32_armv7_delta8_gray8_iter%=\n\t"
   :
   : "r" (col1), "r" (col2), "r" (result), "r" (count)
   : "%q0", "%q1", "%q2", "%q3", "%q4", "%q5", "%q6", "%q7", "cc", "memory"
@@ -3747,7 +3778,7 @@ __attribute__((noinline)) void neon64_armv8_delta8_gray8(const uint8_t* col1, co
   /* V23 = col2+48 */
 
   __asm__ __volatile__ (
-  "neon64_armv8_delta8_gray8_iter:\n\t"
+  "neon64_armv8_delta8_gray8_iter%=:\n\t"
   "ldp q16, q17, [%0], #32\n\t"
   "ldp q18, q19, [%0], #32\n\t"
   "ldp q20, q21, [%1], #32\n\t"
@@ -3761,7 +3792,7 @@ __attribute__((noinline)) void neon64_armv8_delta8_gray8(const uint8_t* col1, co
   "stp q16, q17, [%2], #32\n\t"
   "stp q18, q19, [%2], #32\n\t"
   "subs %3, %3, #64\n\t"
-  "bne neon64_armv8_delta8_gray8_iter\n\t"
+  "bne neon64_armv8_delta8_gray8_iter%=\n\t"
   :
   : "r" (col1), "r" (col2), "r" (result), "r" (count)
   : "%v16", "%v17", "%v18", "%v19", "%v20", "%v21", "%v22", "%v23", "cc", "memory"
@@ -3791,7 +3822,7 @@ void neon32_armv7_delta8_rgb32(const uint8_t* col1, const uint8_t* col2, uint8_t
   __asm__ __volatile__ (
   "mov r12, %4\n\t"
   "vdup.32 q8, r12\n\t"
-  "neon32_armv7_delta8_rgb32_iter:\n\t"
+  "neon32_armv7_delta8_rgb32_iter%=:\n\t"
   "vldm %0!, {q0,q1,q2,q3}\n\t"
   "vldm %1!, {q4,q5,q6,q7}\n\t"
   "pld [%0, #256]\n\t"
@@ -3818,7 +3849,7 @@ void neon32_armv7_delta8_rgb32(const uint8_t* col1, const uint8_t* col2, uint8_t
   "vpadd.i8 d3, d6, d6\n\t"
   "vst4.32 {d0[0],d1[0],d2[0],d3[0]}, [%2]!\n\t"
   "subs %3, %3, #16\n\t"
-  "bne neon32_armv7_delta8_rgb32_iter\n\t"
+  "bne neon32_armv7_delta8_rgb32_iter%=\n\t"
   :
   : "r" (col1), "r" (col2), "r" (result), "r" (count), "r" (multiplier)
   : "%r12", "%q0", "%q1", "%q2", "%q3", "%q4", "%q5", "%q6", "%q7", "%q8", "cc", "memory"
@@ -3845,7 +3876,7 @@ __attribute__((noinline)) void neon64_armv8_delta8_rgb32(const uint8_t* col1, co
   __asm__ __volatile__ (
   "mov x12, %4\n\t"
   "dup v24.4s, w12\n\t"
-  "neon64_armv8_delta8_rgb32_iter:\n\t"
+  "neon64_armv8_delta8_rgb32_iter%=:\n\t"
   "ldp q16, q17, [%0], #32\n\t"
   "ldp q18, q19, [%0], #32\n\t"
   "ldp q20, q21, [%1], #32\n\t"
@@ -3874,7 +3905,7 @@ __attribute__((noinline)) void neon64_armv8_delta8_rgb32(const uint8_t* col1, co
   "addp v19.16b, v19.16b, v19.16b\n\t"
   "st4 {v16.s, v17.s, v18.s, v19.s}[0], [%2], #16\n\t"
   "subs %3, %3, #16\n\t"
-  "bne neon64_armv8_delta8_rgb32_iter\n\t"
+  "bne neon64_armv8_delta8_rgb32_iter%=\n\t"
   :
   : "r" (col1), "r" (col2), "r" (result), "r" (count), "r" (multiplier)
   : "%x12", "%v16", "%v17", "%v18", "%v19", "%v20", "%v21", "%v22", "%v23", "%v24", "cc", "memory"
@@ -3929,7 +3960,7 @@ void neon64_armv8_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t*
 __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   __asm__ __volatile__ (
       "sub $0x10, %0\n\t"
@@ -3960,7 +3991,7 @@ void sse2_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result
 __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   __asm__ __volatile__ (
       "mov $0x1F1F1F1F, %%eax\n\t"
@@ -4018,7 +4049,7 @@ void sse2_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result,
 __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   __asm__ __volatile__ (
       "mov $0x1F1F1F1F, %%eax\n\t"
@@ -4076,7 +4107,7 @@ void sse2_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result,
 __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   __asm__ __volatile__ (
       "mov $0x1F1F1F1F, %%eax\n\t"
@@ -4135,7 +4166,7 @@ void sse2_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result,
 __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   __asm__ __volatile__ (
       "mov $0x1F1F1F1F, %%eax\n\t"
@@ -4194,7 +4225,7 @@ void sse2_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result,
 __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_delta8_rgb32(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, uint32_t multiplier) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   /* XMM0 - zero */
   /* XMM1 - col1 */
@@ -4264,7 +4295,7 @@ void ssse3_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result
 
 /* RGB24 to grayscale */
 __attribute__((noinline)) void fast_convert_rgb_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4290,7 +4321,7 @@ __attribute__((noinline)) void fast_convert_rgb_gray8(const uint8_t* col1, uint8
   }
 }
 __attribute__((noinline)) void std_convert_rgb_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4306,7 +4337,7 @@ __attribute__((noinline)) void std_convert_rgb_gray8(const uint8_t* col1, uint8_
 
 /* BGR24 to grayscale */
 __attribute__((noinline)) void fast_convert_bgr_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4332,7 +4363,7 @@ __attribute__((noinline)) void fast_convert_bgr_gray8(const uint8_t* col1, uint8
   }
 }
 __attribute__((noinline)) void std_convert_bgr_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4348,7 +4379,7 @@ __attribute__((noinline)) void std_convert_bgr_gray8(const uint8_t* col1, uint8_
 
 /* RGBA to grayscale */
 __attribute__((noinline)) void fast_convert_rgba_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4374,7 +4405,7 @@ __attribute__((noinline)) void fast_convert_rgba_gray8(const uint8_t* col1, uint
   }
 }
 __attribute__((noinline)) void std_convert_rgba_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4390,7 +4421,7 @@ __attribute__((noinline)) void std_convert_rgba_gray8(const uint8_t* col1, uint8
 
 /* BGRA to grayscale */
 __attribute__((noinline)) void fast_convert_bgra_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4417,7 +4448,7 @@ __attribute__((noinline)) void fast_convert_bgra_gray8(const uint8_t* col1, uint
 }
 
 __attribute__((noinline)) void std_convert_bgra_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4432,7 +4463,7 @@ __attribute__((noinline)) void std_convert_bgra_gray8(const uint8_t* col1, uint8
 }
 /* ARGB to grayscale */
 __attribute__((noinline)) void fast_convert_argb_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4458,7 +4489,7 @@ __attribute__((noinline)) void fast_convert_argb_gray8(const uint8_t* col1, uint
   }
 }
 __attribute__((noinline)) void std_convert_argb_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4474,7 +4505,7 @@ __attribute__((noinline)) void std_convert_argb_gray8(const uint8_t* col1, uint8
 
 /* ABGR to grayscale */
 __attribute__((noinline)) void fast_convert_abgr_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4500,7 +4531,7 @@ __attribute__((noinline)) void fast_convert_abgr_gray8(const uint8_t* col1, uint
   }
 }
 __attribute__((noinline)) void std_convert_abgr_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
+  unsigned int r,g,b;
   const uint8_t* const max_ptr = result + count;
 
   while(result < max_ptr) {
@@ -4558,7 +4589,7 @@ __attribute__((noinline)) void std_convert_yuyv_gray8(const uint8_t* col1, uint8
 __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_convert_rgb32_gray8(const uint8_t* col1, uint8_t* result, unsigned long count, uint32_t multiplier) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
 
   /* XMM0 - zero */
   /* XMM1 - col1 */
@@ -4620,7 +4651,7 @@ void ssse3_convert_abgr_gray8(const uint8_t* col1, uint8_t* result, unsigned lon
 __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
+#if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
   unsigned long i = 0;
 
   __attribute__((aligned(16))) static const uint8_t movemask1[16] = {0,2,4,6,8,10,12,14,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
@@ -4723,8 +4754,8 @@ __attribute__((noinline)) void zm_convert_yuyv_rgba(const uint8_t* col1, uint8_t
 
 /* RGB555 to RGB24 - relocated from zm_local_camera.cpp */
 __attribute__((noinline)) void zm_convert_rgb555_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
-  for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {  
+  unsigned int r,g,b;
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {
     b = ((*col1)<<3)&0xf8;
     g = (((*(col1+1))<<6)|((*col1)>>2))&0xf8;
     r = ((*(col1+1))<<1)&0xf8;
@@ -4736,8 +4767,8 @@ __attribute__((noinline)) void zm_convert_rgb555_rgb(const uint8_t* col1, uint8_
 
 /* RGB555 to RGBA - modified the one above */
 __attribute__((noinline)) void zm_convert_rgb555_rgba(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
-  for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {  
+  unsigned int r,g,b;
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {
     b = ((*col1)<<3)&0xf8;
     g = (((*(col1+1))<<6)|((*col1)>>2))&0xf8;
     r = ((*(col1+1))<<1)&0xf8;
@@ -4749,8 +4780,8 @@ __attribute__((noinline)) void zm_convert_rgb555_rgba(const uint8_t* col1, uint8
 
 /* RGB565 to RGB24 - relocated from zm_local_camera.cpp */
 __attribute__((noinline)) void zm_convert_rgb565_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
-  for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {  
+  unsigned int r,g,b;
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {
     b = ((*col1)<<3)&0xf8;
     g = (((*(col1+1))<<5)|((*col1)>>3))&0xfc;
     r = (*(col1+1))&0xf8;
@@ -4762,8 +4793,8 @@ __attribute__((noinline)) void zm_convert_rgb565_rgb(const uint8_t* col1, uint8_
 
 /* RGB565 to RGBA - modified the one above */
 __attribute__((noinline)) void zm_convert_rgb565_rgba(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;  
-  for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {  
+  unsigned int r,g,b;
+  for ( unsigned int i=0; i < count; i++, col1 += 2, result += 4 ) {
     b = ((*col1)<<3)&0xf8;
     g = (((*(col1+1))<<5)|((*col1)>>3))&0xfc;
     r = (*(col1+1))&0xf8;
diff --git a/src/zm_image.h b/src/zm_image.h
index 5fb151a29..7095a1b5a 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -57,7 +57,7 @@ extern imgbufcpy_fptr_t fptr_imgbufcpy;
 /* Should be called from Image class functions */
 inline static uint8_t* AllocBuffer(size_t p_bufsize) {
 	uint8_t* buffer = (uint8_t*)zm_mallocaligned(64, p_bufsize);
-	if ( buffer == NULL )
+	if ( buffer == nullptr )
 		Fatal("Memory allocation failed: %s", strerror(errno));
 	
 	return buffer;
@@ -122,8 +122,8 @@ protected:
 	};
 	
 	inline void DumpImgBuffer() {
-		DumpBuffer(buffer,buffertype);
-		buffer = NULL;
+		DumpBuffer(buffer, buffertype);
+		buffer = nullptr;
 		allocation = 0;
 	}
 	
@@ -153,9 +153,11 @@ protected:
 	static struct zm_error_mgr jpg_err;
 
 	unsigned int width;
+	unsigned int linesize;
 	unsigned int height;
 	unsigned int pixels;
 	unsigned int colours;
+  unsigned int padding;
 	unsigned int size;
 	unsigned int subpixelorder;
 	unsigned long allocation;
@@ -167,15 +169,18 @@ protected:
 
 public:
 	Image();
-	explicit Image( const char *filename );
-	Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0);
+	explicit Image(const char *filename);
+	Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0, unsigned int padding=0);
+	Image(int p_width, int p_linesize, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0, unsigned int padding=0);
 	explicit Image( const Image &p_image );
   explicit Image( const AVFrame *frame );
+
 	~Image();
 	static void Initialise();
 	static void Deinitialise();
 
 	inline unsigned int Width() const { return width; }
+	inline unsigned int LineSize() const { return linesize; }
 	inline unsigned int Height() const { return height; }
 	inline unsigned int Pixels() const { return pixels; }
 	inline unsigned int Colours() const { return colours; }
@@ -201,7 +206,7 @@ public:
 	
 	/* Internal buffer should not be modified from functions outside of this class */
 	inline const uint8_t* Buffer() const { return buffer; }
-	inline const uint8_t* Buffer( unsigned int x, unsigned int y= 0 ) const { return &buffer[colours*((y*width)+x)]; }
+	inline const uint8_t* Buffer( unsigned int x, unsigned int y= 0 ) const { return &buffer[(y*linesize)+x]; }
 	/* Request writeable buffer */
 	uint8_t* WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder);
   // Is only acceptable on a pre-allocated buffer
@@ -214,22 +219,35 @@ public:
     if ( !holdbuffer )
       DumpImgBuffer();
 
-    width = height = colours = size = pixels = subpixelorder = 0;
+    width = linesize = height = colours = size = pixels = subpixelorder = 0;
 	}
 	
-	void Assign( unsigned int p_width, unsigned int p_height, unsigned int p_colours, unsigned int p_subpixelorder, const uint8_t* new_buffer, const size_t buffer_size);
-	void Assign( const Image &image );
-  void Assign( const AVFrame *frame );
-	void AssignDirect( const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, uint8_t *new_buffer, const size_t buffer_size, const int p_buffertype);
+	void Assign(
+      unsigned int p_width,
+      unsigned int p_height,
+      unsigned int p_colours,
+      unsigned int p_subpixelorder,
+      const uint8_t* new_buffer,
+      const size_t buffer_size);
+	void Assign(const Image &image);
+  void Assign(const AVFrame *frame);
+	void AssignDirect(
+      const unsigned int p_width,
+      const unsigned int p_height,
+      const unsigned int p_colours,
+      const unsigned int p_subpixelorder,
+      uint8_t *new_buffer,
+      const size_t buffer_size,
+      const int p_buffertype);
 
-	inline void CopyBuffer( const Image &image ) {
+	inline void CopyBuffer(const Image &image) {
 		Assign(image);
 	}
-	inline Image &operator=( const Image &image ) {
+	inline Image &operator=(const Image &image) {
 		Assign(image);
 		return *this;
 	}
-	inline Image &operator=( const unsigned char *new_buffer ) {
+	inline Image &operator=(const unsigned char *new_buffer) {
 		(*fptr_imgbufcpy)(buffer, new_buffer, size);
 		return *this;
 	}
@@ -267,7 +285,7 @@ public:
 	//Image *Delta( const Image &image ) const;
 	void Delta( const Image &image, Image* targetimage) const;
 
-	const Coord centreCoord( const char *text ) const;
+	const Coord centreCoord(const char *p_text) const;
   void MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour=0x00222222 );
 	void Annotate( const char *p_text, const Coord &coord, const unsigned int size=1, const Rgb fg_colour=RGB_WHITE, const Rgb bg_colour=RGB_BLACK );
 	Image *HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits=0 );
diff --git a/src/zm_jpeg.cpp b/src/zm_jpeg.cpp
index 8e8899227..9865d4db4 100644
--- a/src/zm_jpeg.cpp
+++ b/src/zm_jpeg.cpp
@@ -192,7 +192,7 @@ void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_s
    * manager serially with the same JPEG object, because their private object
    * sizes may be different.  Caveat programmer.
    */
-  if ( cinfo->dest == NULL )
+  if ( cinfo->dest == nullptr )
   {
     /* first time for this JPEG object? */
     cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_destination_mgr));
@@ -369,7 +369,7 @@ void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuff
    * This makes it unsafe to use this manager and a different source
    * manager serially with the same JPEG object.  Caveat programmer.
    */
-  if ( cinfo->src == NULL )
+  if ( cinfo->src == nullptr )
   {
       /* first time for this JPEG object? */
     cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_source_mgr));
@@ -396,7 +396,7 @@ void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuff
   src->inbuffer = (JOCTET *)inbuffer;
   src->inbuffer_size = inbuffer_size;
   src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-  src->pub.next_input_byte = NULL; /* until buffer loaded */
+  src->pub.next_input_byte = nullptr; /* until buffer loaded */
 }
 
 void zm_use_std_huff_tables( j_decompress_ptr cinfo ) {
diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp
index a17b511c9..0edd206cd 100644
--- a/src/zm_libvlc_camera.cpp
+++ b/src/zm_libvlc_camera.cpp
@@ -17,12 +17,51 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */  
 
+#include <dlfcn.h>
 #include "zm.h"
 #include "zm_signal.h"
 #include "zm_libvlc_camera.h"
 
 #if HAVE_LIBVLC
+static void *libvlc_lib = nullptr;
+static void (*libvlc_media_player_release_f)(libvlc_media_player_t* ) = nullptr;
+static void (*libvlc_media_release_f)(libvlc_media_t* ) = nullptr;
+static void (*libvlc_release_f)(libvlc_instance_t* )	= nullptr;	
+static void (*libvlc_media_player_stop_f)(libvlc_media_player_t* ) = nullptr;
+static libvlc_instance_t* (*libvlc_new_f)(int, const char* const *) = nullptr;
+static void (*libvlc_log_set_f)(libvlc_instance_t*, libvlc_log_cb, void *) = nullptr;
+static libvlc_media_t* (*libvlc_media_new_location_f)(libvlc_instance_t*, const char*) = nullptr;
+static libvlc_media_player_t* (*libvlc_media_player_new_from_media_f)(libvlc_media_t*) = nullptr;
+static void (*libvlc_video_set_format_f)(libvlc_media_player_t*, const char*, unsigned, unsigned, unsigned) = nullptr;		
+static void (*libvlc_video_set_callbacks_f)(libvlc_media_player_t*, libvlc_video_lock_cb, libvlc_video_unlock_cb, libvlc_video_display_cb, void*) = nullptr;
+static int (*libvlc_media_player_play_f)(libvlc_media_player_t *) = nullptr;
+static const char* (*libvlc_errmsg_f)(void) = nullptr;
+static const char* (*libvlc_get_version_f)(void) = nullptr;	
 
+void bind_libvlc_symbols() {
+  if(libvlc_lib != nullptr) // Safe-check
+    return;
+  
+  libvlc_lib = dlopen("libvlc.so", RTLD_LAZY | RTLD_GLOBAL);
+  if(!libvlc_lib){
+    Error("Error loading libvlc: %s", dlerror());
+    return;
+  }
+
+  *(void**) (&libvlc_media_player_release_f) = dlsym(libvlc_lib, "libvlc_media_player_release");
+  *(void**) (&libvlc_media_release_f) = dlsym(libvlc_lib, "libvlc_media_release");
+  *(void**) (&libvlc_release_f) = dlsym(libvlc_lib, "libvlc_release");
+  *(void**) (&libvlc_media_player_stop_f) = dlsym(libvlc_lib, "libvlc_media_player_stop");
+  *(void**) (&libvlc_new_f) = dlsym(libvlc_lib, "libvlc_new");
+  *(void**) (&libvlc_log_set_f) = dlsym(libvlc_lib, "libvlc_log_set");
+  *(void**) (&libvlc_media_new_location_f) = dlsym(libvlc_lib, "libvlc_media_new_location");
+  *(void**) (&libvlc_media_player_new_from_media_f) = dlsym(libvlc_lib, "libvlc_media_player_new_from_media");
+  *(void**) (&libvlc_video_set_format_f) = dlsym(libvlc_lib, "libvlc_video_set_format");
+  *(void**) (&libvlc_video_set_callbacks_f) = dlsym(libvlc_lib, "libvlc_video_set_callbacks");
+  *(void**) (&libvlc_media_player_play_f) = dlsym(libvlc_lib, "libvlc_media_player_play");
+  *(void**) (&libvlc_errmsg_f) = dlsym(libvlc_lib, "libvlc_errmsg");
+  *(void**) (&libvlc_get_version_f) = dlsym(libvlc_lib, "libvlc_get_version");
+}
 // Do all the buffer checking work here to avoid unnecessary locking 
 void* LibvlcLockBuffer(void* opaque, void** planes) {
   LibvlcPrivateData* data = reinterpret_cast<LibvlcPrivateData*>(opaque);
@@ -33,7 +72,7 @@ void* LibvlcLockBuffer(void* opaque, void** planes) {
   data->prevBuffer = buffer;
 
   *planes = data->buffer;
-  return NULL;
+  return nullptr;
 }
 
 void LibvlcUnlockBuffer(void* opaque, void* picture, void *const *planes) {
@@ -90,12 +129,12 @@ LibvlcCamera::LibvlcCamera(
   mMethod(p_method),
   mOptions(p_options)
 {  
-  mLibvlcInstance = NULL;
-  mLibvlcMedia = NULL;
-  mLibvlcMediaPlayer = NULL;
-  mLibvlcData.buffer = NULL;
-  mLibvlcData.prevBuffer = NULL;
-  mOptArgV = NULL;
+  mLibvlcInstance = nullptr;
+  mLibvlcMedia = nullptr;
+  mLibvlcMediaPlayer = nullptr;
+  mLibvlcData.buffer = nullptr;
+  mLibvlcData.prevBuffer = nullptr;
+  mOptArgV = nullptr;
 
   /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
   if ( colours == ZM_COLOUR_RGB32 ) {
@@ -124,40 +163,42 @@ LibvlcCamera::~LibvlcCamera() {
   if ( capture ) {
     Terminate();
   }
-  if ( mLibvlcMediaPlayer != NULL ) {
-    libvlc_media_player_release(mLibvlcMediaPlayer);
-    mLibvlcMediaPlayer = NULL;
+  if ( mLibvlcMediaPlayer != nullptr ) {
+    (*libvlc_media_player_release_f)(mLibvlcMediaPlayer);
+    mLibvlcMediaPlayer = nullptr;
   }
-  if ( mLibvlcMedia != NULL ) {
-    libvlc_media_release(mLibvlcMedia);
-    mLibvlcMedia = NULL;
+  if ( mLibvlcMedia != nullptr ) {
+    (*libvlc_media_release_f)(mLibvlcMedia);
+    mLibvlcMedia = nullptr;
   }
-  if ( mLibvlcInstance != NULL ) {
-    libvlc_release(mLibvlcInstance);
-    mLibvlcInstance = NULL;
+  if ( mLibvlcInstance != nullptr ) {
+    (*libvlc_release_f)(mLibvlcInstance);
+    mLibvlcInstance = nullptr;
   }
-  if ( mOptArgV != NULL ) {
+  if ( mOptArgV != nullptr ) {
     delete[] mOptArgV;
   }
 }
 
 void LibvlcCamera::Initialise() {
+  bind_libvlc_symbols();
 }
 
 void LibvlcCamera::Terminate() {
-  libvlc_media_player_stop(mLibvlcMediaPlayer);
+  (*libvlc_media_player_stop_f)(mLibvlcMediaPlayer);
   if ( mLibvlcData.buffer ) {
     zm_freealigned(mLibvlcData.buffer);
-    mLibvlcData.buffer = NULL;
+    mLibvlcData.buffer = nullptr;
   }
+  
   if ( mLibvlcData.prevBuffer ) {
     zm_freealigned(mLibvlcData.prevBuffer);
-    mLibvlcData.prevBuffer = NULL;
+    mLibvlcData.prevBuffer = nullptr;
   }
 }
 
 int LibvlcCamera::PrimeCapture() {
-  Info("Priming capture from %s", mPath.c_str());
+  Debug(1, "Priming capture from %s, libvlc version %s", mPath.c_str(), (*libvlc_get_version_f)());
 
   StringVector opVect = split(Options(), ",");
 
@@ -181,28 +222,28 @@ int LibvlcCamera::PrimeCapture() {
     }
   }
 
-  mLibvlcInstance = libvlc_new(opVect.size(), (const char* const*)mOptArgV);
-  if ( mLibvlcInstance == NULL ) {
-    Error("Unable to create libvlc instance due to: %s", libvlc_errmsg());
+  mLibvlcInstance = (*libvlc_new_f)(opVect.size(), (const char* const*)mOptArgV);
+  if ( mLibvlcInstance == nullptr ) {
+    Error("Unable to create libvlc instance due to: %s", (*libvlc_errmsg_f)());
     return -1;
   }
-  libvlc_log_set(mLibvlcInstance, LibvlcCamera::log_callback, NULL);
+  (*libvlc_log_set_f)(mLibvlcInstance, LibvlcCamera::log_callback, nullptr);
 
 
-  mLibvlcMedia = libvlc_media_new_location(mLibvlcInstance, mPath.c_str());
-  if ( mLibvlcMedia == NULL ) {
-    Error("Unable to open input %s due to: %s", mPath.c_str(), libvlc_errmsg());
+  mLibvlcMedia = (*libvlc_media_new_location_f)(mLibvlcInstance, mPath.c_str());
+  if ( mLibvlcMedia == nullptr ) {
+    Error("Unable to open input %s due to: %s", mPath.c_str(), (*libvlc_errmsg_f)());
     return -1;
   }
 
-  mLibvlcMediaPlayer = libvlc_media_player_new_from_media(mLibvlcMedia);
-  if ( mLibvlcMediaPlayer == NULL ) {
-    Error("Unable to create player for %s due to: %s", mPath.c_str(), libvlc_errmsg());
+  mLibvlcMediaPlayer = (*libvlc_media_player_new_from_media_f)(mLibvlcMedia);
+  if ( mLibvlcMediaPlayer == nullptr ) {
+    Error("Unable to create player for %s due to: %s", mPath.c_str(), (*libvlc_errmsg_f)());
     return -1;
   }
 
-  libvlc_video_set_format(mLibvlcMediaPlayer, mTargetChroma.c_str(), width, height, width * mBpp);
-  libvlc_video_set_callbacks(mLibvlcMediaPlayer, &LibvlcLockBuffer, &LibvlcUnlockBuffer, NULL, &mLibvlcData);
+  (*libvlc_video_set_format_f)(mLibvlcMediaPlayer, mTargetChroma.c_str(), width, height, width * mBpp);
+  (*libvlc_video_set_callbacks_f)(mLibvlcMediaPlayer, &LibvlcLockBuffer, &LibvlcUnlockBuffer, nullptr, &mLibvlcData);
 
   mLibvlcData.bufferSize = width * height * mBpp;
   // Libvlc wants 32 byte alignment for images (should in theory do this for all image lines)
@@ -211,7 +252,7 @@ int LibvlcCamera::PrimeCapture() {
   
   mLibvlcData.newImage.setValueImmediate(false);
 
-  libvlc_media_player_play(mLibvlcMediaPlayer);
+  (*libvlc_media_player_play_f)(mLibvlcMediaPlayer);
 
   return 0;
 }
diff --git a/src/zm_libvnc_camera.cpp b/src/zm_libvnc_camera.cpp
new file mode 100644
index 000000000..315cc19dd
--- /dev/null
+++ b/src/zm_libvnc_camera.cpp
@@ -0,0 +1,197 @@
+#include <dlfcn.h>
+#include "zm.h"
+#include "zm_signal.h"
+#include "zm_libvnc_camera.h"
+#include "zm_swscale.h"
+
+#if HAVE_LIBVNC
+
+static int TAG_0;
+static int TAG_1;
+static int TAG_2;
+static void *libvnc_lib = nullptr;
+static void *(*rfbClientGetClientData_f)(rfbClient*, void*) = nullptr;
+static rfbClient *(*rfbGetClient_f)(int, int, int) = nullptr;
+static void (*rfbClientSetClientData_f)(rfbClient*, void*, void*) = nullptr;
+static rfbBool (*rfbInitClient_f)(rfbClient*, int*, char**) = nullptr;
+static void (*rfbClientCleanup_f)(rfbClient*) = nullptr;
+static int (*WaitForMessage_f)(rfbClient*, unsigned int) = nullptr;
+static rfbBool (*HandleRFBServerMessage_f)(rfbClient*) = nullptr;
+
+void bind_libvnc_symbols() {
+  if ( libvnc_lib != nullptr ) // Safe-check
+    return;
+  
+  libvnc_lib = dlopen("libvncclient.so", RTLD_LAZY | RTLD_GLOBAL);
+  if ( !libvnc_lib ) {
+    Error("Error loading libvncclient: %s", dlerror());
+    return;
+  }
+
+  *(void**) (&rfbClientGetClientData_f) = dlsym(libvnc_lib, "rfbClientGetClientData");
+  *(void**) (&rfbGetClient_f) = dlsym(libvnc_lib, "rfbGetClient");
+  *(void**) (&rfbClientSetClientData_f) = dlsym(libvnc_lib, "rfbClientSetClientData");
+  *(void**) (&rfbInitClient_f) = dlsym(libvnc_lib, "rfbInitClient");
+  *(void**) (&rfbClientCleanup_f) = dlsym(libvnc_lib, "rfbClientCleanup");
+  *(void**) (&WaitForMessage_f) = dlsym(libvnc_lib, "WaitForMessage");
+  *(void**) (&HandleRFBServerMessage_f) = dlsym(libvnc_lib, "HandleRFBServerMessage");
+}
+
+static void GotFrameBufferUpdateCallback(rfbClient *rfb, int x, int y, int w, int h){
+  VncPrivateData *data = (VncPrivateData *)(*rfbClientGetClientData_f)(rfb, &TAG_0);
+  data->buffer = rfb->frameBuffer;
+}
+
+static char* GetPasswordCallback(rfbClient* cl){
+  return strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_1));
+}
+
+static rfbCredential* GetCredentialsCallback(rfbClient* cl, int credentialType){
+  rfbCredential *c = (rfbCredential *)malloc(sizeof(rfbCredential));
+  if ( credentialType != rfbCredentialTypeUser ) {
+    free(c);
+    return nullptr;
+  }
+
+  c->userCredential.password = strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_1));
+  c->userCredential.username = strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_2));
+  return c;
+}
+
+VncCamera::VncCamera(
+    unsigned int p_monitor_id,
+    const std::string &host,
+    const std::string &port,
+    const std::string &user,
+    const std::string &pass,
+    int p_width,
+    int p_height,
+    int p_colours,
+    int p_brightness,
+    int p_contrast,
+    int p_hue,
+    int p_colour,
+    bool p_capture,
+    bool p_record_audio ) :
+    Camera(
+      p_monitor_id,
+      VNC_SRC,
+      p_width,
+      p_height,
+      p_colours,
+      ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours),
+      p_brightness,
+      p_contrast,
+      p_hue,
+      p_colour,
+      p_capture,
+      p_record_audio
+    ),
+  mHost(host),
+  mPort(port),
+  mUser(user),
+  mPass(pass)
+{
+  Debug(2, "Host:%s Port: %s User: %s Pass:%s", mHost.c_str(), mPort.c_str(), mUser.c_str(), mPass.c_str());
+  
+  if ( colours == ZM_COLOUR_RGB32 ) {
+    subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+    mImgPixFmt = AV_PIX_FMT_RGBA;
+    mBpp = 4;
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    subpixelorder = ZM_SUBPIX_ORDER_RGB;
+    mImgPixFmt = AV_PIX_FMT_RGB24;
+    mBpp = 3;
+  } else if ( colours == ZM_COLOUR_GRAY8 ) {
+    subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    mImgPixFmt = AV_PIX_FMT_GRAY8;
+    mBpp = 1;
+  } else {
+    Panic("Unexpected colours: %d", colours);
+  }
+
+  if ( capture )
+    Initialise();
+}
+
+
+VncCamera::~VncCamera() {
+  if ( capture )
+    Terminate();
+}
+
+void VncCamera::Initialise() {
+  Debug(2, "Initializing Client");
+  bind_libvnc_symbols();
+  mRfb = (*rfbGetClient_f)(8, 3, 4);
+  
+  (*rfbClientSetClientData_f)(mRfb, &TAG_0, &mVncData);
+  (*rfbClientSetClientData_f)(mRfb, &TAG_1, (void *)mPass.c_str());
+  (*rfbClientSetClientData_f)(mRfb, &TAG_2, (void *)mUser.c_str());
+
+  mRfb->GotFrameBufferUpdate = GotFrameBufferUpdateCallback;
+  mRfb->GetPassword = GetPasswordCallback;
+  mRfb->GetCredential = GetCredentialsCallback;
+
+  mRfb->programName = "Zoneminder VNC Monitor";
+  mRfb->serverHost = strdup(mHost.c_str());
+  mRfb->serverPort = atoi(mPort.c_str());
+  scale.init();
+}
+
+void VncCamera::Terminate() {
+  if ( mRfb->frameBuffer )
+    free(mRfb->frameBuffer);
+  (*rfbClientCleanup_f)(mRfb);
+  return;
+}
+
+int VncCamera::PrimeCapture() {
+  Debug(1, "Priming capture from %s", mHost.c_str());
+  if ( ! (*rfbInitClient_f)(mRfb, 0, nullptr) ) {
+    return -1; 
+  }
+  return 0;
+}
+
+int VncCamera::PreCapture() {
+  Debug(2, "PreCapture");
+  int rc = (*WaitForMessage_f)(mRfb, 500);
+  if ( rc < 0 ) {
+    return -1;
+  } else if ( !rc ) {
+    return rc;
+  }
+  rfbBool res = (*HandleRFBServerMessage_f)(mRfb);
+  return res == TRUE ? 1 : -1;
+}
+
+int VncCamera::Capture(Image &image) {
+  Debug(2, "Capturing");
+  uint8_t *directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
+  scale.Convert(
+      mVncData.buffer,
+      mRfb->si.framebufferHeight * mRfb->si.framebufferWidth * 4,
+      directbuffer,
+      width * height * mBpp,
+      AV_PIX_FMT_RGBA,
+      mImgPixFmt,
+      mRfb->si.framebufferWidth,
+      mRfb->si.framebufferHeight,
+      width,
+      height);
+  return 1;
+}
+
+int VncCamera::PostCapture() {
+  return 0;
+}
+
+int VncCamera::CaptureAndRecord(Image &image, timeval recording, char* event_directory) {
+  return 0;
+}
+
+int VncCamera::Close() {
+  return 0;
+}
+#endif
diff --git a/src/zm_libvnc_camera.h b/src/zm_libvnc_camera.h
new file mode 100644
index 000000000..250cfaa2e
--- /dev/null
+++ b/src/zm_libvnc_camera.h
@@ -0,0 +1,62 @@
+
+#ifndef ZN_LIBVNC_CAMERA_H
+#define ZN_LIBVNC_CAMERA_H
+
+#include "zm_buffer.h"
+#include "zm_camera.h"
+#include "zm_thread.h"
+#include "zm_swscale.h"
+
+#if HAVE_LIBVNC
+#include <rfb/rfbclient.h>
+// Used by vnc callbacks
+struct VncPrivateData
+{
+  uint8_t *buffer;
+  uint8_t width; 
+  uint8_t height;
+};
+
+class VncCamera : public Camera {
+protected:
+  rfbClient *mRfb;
+  VncPrivateData mVncData;
+  int mBpp;
+  SWScale scale;
+  AVPixelFormat mImgPixFmt;
+  std::string mHost;
+  std::string mPort;
+  std::string mUser;
+  std::string mPass;
+public:
+  VncCamera(
+      unsigned int p_monitor_id,
+      const std::string &host,
+      const std::string &port,
+      const std::string &user,
+      const std::string &pass,
+      int p_width,
+      int p_height,
+      int p_colours,
+      int p_brightness,
+      int p_contrast,
+      int p_hue,
+      int p_colour,
+      bool p_capture,
+      bool p_record_audio );
+    
+  ~VncCamera();
+
+  void Initialise();
+  void Terminate();
+  
+  int PreCapture();
+  int PrimeCapture();
+  int Capture( Image &image );
+  int PostCapture();
+  int CaptureAndRecord( Image &image, timeval recording, char* event_directory );
+  int Close();
+};
+
+#endif // HAVE_LIBVNC
+#endif // ZN_LIBVNC_CAMERA_H
diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp
index dddaf48b7..808b3e149 100644
--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@@ -55,7 +55,7 @@ static _AVPIXELFORMAT getFfPixFormatFromV4lPalette(int v4l_version, int palette)
      
 #if ZM_HAS_V4L2
   if ( v4l_version == 2 ) {
-    switch( palette ) {
+    switch ( palette ) {
 #if defined(V4L2_PIX_FMT_RGB444) && defined(AV_PIX_FMT_RGB444)
       case V4L2_PIX_FMT_RGB444 :
         pixFormat = AV_PIX_FMT_RGB444;
@@ -301,10 +301,10 @@ LocalCamera::V4L1Data LocalCamera::v4l1_data;
 #endif // ZM_HAS_V4L1
 
 #if HAVE_LIBSWSCALE
-AVFrame **LocalCamera::capturePictures = 0;
+AVFrame **LocalCamera::capturePictures = nullptr;
 #endif // HAVE_LIBSWSCALE
 
-LocalCamera *LocalCamera::last_camera = NULL;
+LocalCamera *LocalCamera::last_camera = nullptr;
 
 LocalCamera::LocalCamera(
   int p_id,
@@ -499,7 +499,7 @@ LocalCamera::LocalCamera(
           subpixelorder = ZM_SUBPIX_ORDER_NONE;
         } else if ( palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_GRAY8 ) {
           /* Fast YUYV->Grayscale conversion by extracting the Y channel */
-          if ( config.cpu_extensions && sseversion >= 35 ) {
+          if ( config.cpu_extensions && sse_version >= 35 ) {
             conversion_fptr = &ssse3_convert_yuyv_gray8;
             Debug(2,"Using SSSE3 YUYV->grayscale fast conversion");
           } else {
@@ -611,7 +611,7 @@ LocalCamera::LocalCamera(
           }
         } else if ( (palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_GRAY8 ) {
           /* Fast YUYV->Grayscale conversion by extracting the Y channel */
-          if ( config.cpu_extensions && sseversion >= 35 ) {
+          if ( config.cpu_extensions && sse_version >= 35 ) {
             conversion_fptr = &ssse3_convert_yuyv_gray8;
             Debug(2,"Using SSSE3 YUYV->grayscale fast conversion");
           } else {
@@ -668,14 +668,14 @@ LocalCamera::LocalCamera(
       Fatal("Image size mismatch. Required: %d Available: %u", pSize, imagesize);
     }
 
-    imgConversionContext = sws_getContext(width, height, capturePixFormat, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL);
+    imgConversionContext = sws_getContext(width, height, capturePixFormat, width, height, imagePixFormat, SWS_BICUBIC, nullptr, nullptr, nullptr);
 
     if ( !imgConversionContext ) {
       Fatal("Unable to initialise image scaling context");
     }
   } else {
-    tmpPicture = NULL;
-    imgConversionContext = NULL;
+    tmpPicture = nullptr;
+    imgConversionContext = nullptr;
   } // end if capture and conversion_tye == swscale
 #endif
     mVideoStreamId = 0;
@@ -691,7 +691,7 @@ LocalCamera::~LocalCamera() {
   /* Clean up swscale stuff */
   if ( capture && conversion_type == 1 ) {
     sws_freeContext(imgConversionContext);
-    imgConversionContext = NULL;
+    imgConversionContext = nullptr;
 
     av_frame_free(&tmpPicture);
   }
@@ -743,12 +743,12 @@ void LocalCamera::Initialise() {
 
     Debug(4,
         " v4l2_data.fmt.type = %08x\n"
-        " v4l2_data.fmt.fmt.pix.width = %08x\n"
-        " v4l2_data.fmt.fmt.pix.height = %08x\n"
+        " v4l2_data.fmt.fmt.pix.width = %d\n"
+        " v4l2_data.fmt.fmt.pix.height = %d\n"
         " v4l2_data.fmt.fmt.pix.pixelformat = %08x\n"
         " v4l2_data.fmt.fmt.pix.field = %08x\n"
-        " v4l2_data.fmt.fmt.pix.bytesperline = %08x\n"
-        " v4l2_data.fmt.fmt.pix.sizeimage = %08x\n"
+        " v4l2_data.fmt.fmt.pix.bytesperline = %d\n"
+        " v4l2_data.fmt.fmt.pix.sizeimage = %d\n"
         " v4l2_data.fmt.fmt.pix.colorspace = %08x\n"
         " v4l2_data.fmt.fmt.pix.priv = %08x\n"
         , v4l2_data.fmt.type
@@ -779,19 +779,19 @@ void LocalCamera::Initialise() {
       }
     } else {        
       if ( vidioctl(vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt) < 0 ) {
-        Fatal("Failed to set video format: %s", strerror(errno));
+        Error("Failed to set video format: %s", strerror(errno));
       }
     }
 
     /* Note VIDIOC_S_FMT may change width and height. */
     Debug(4,
         " v4l2_data.fmt.type = %08x\n"
-        " v4l2_data.fmt.fmt.pix.width = %08x\n"
-        " v4l2_data.fmt.fmt.pix.height = %08x\n"
+        " v4l2_data.fmt.fmt.pix.width = %d\n"
+        " v4l2_data.fmt.fmt.pix.height = %d\n"
         " v4l2_data.fmt.fmt.pix.pixelformat = %08x\n"
         " v4l2_data.fmt.fmt.pix.field = %08x\n"
-        " v4l2_data.fmt.fmt.pix.bytesperline = %08x\n"
-        " v4l2_data.fmt.fmt.pix.sizeimage = %08x\n"
+        " v4l2_data.fmt.fmt.pix.bytesperline = %d\n"
+        " v4l2_data.fmt.fmt.pix.sizeimage = %d\n"
         " v4l2_data.fmt.fmt.pix.colorspace = %08x\n"
         " v4l2_data.fmt.fmt.pix.priv = %08x\n"
         , v4l2_data.fmt.type
@@ -903,7 +903,7 @@ void LocalCamera::Initialise() {
         Fatal("Unable to query video buffer: %s", strerror(errno));
 
       v4l2_data.buffers[i].length = vid_buf.length;
-      v4l2_data.buffers[i].start = mmap(NULL, vid_buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, vid_fd, vid_buf.m.offset);
+      v4l2_data.buffers[i].start = mmap(nullptr, vid_buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, vid_fd, vid_buf.m.offset);
 
       if ( v4l2_data.buffers[i].start == MAP_FAILED )
         Fatal("Can't map video buffer %u (%u bytes) to memory: %s(%d)",
@@ -1278,56 +1278,62 @@ uint32_t LocalCamera::AutoSelectFormat(int p_colours) {
 #define capString(test,prefix,yesString,noString,capability) \
   (test) ? (prefix yesString " " capability "\n") : (prefix noString " " capability "\n")
 
-bool LocalCamera::GetCurrentSettings( const char *device, char *output, int version, bool verbose ) {
+bool LocalCamera::GetCurrentSettings(const char *device, char *output, int version, bool verbose) {
   output[0] = 0;
+  char *output_ptr = output;
 
   char queryDevice[PATH_MAX] = "";
   int devIndex = 0;
   do {
-    if ( device )
+    if ( device ) {
       strncpy(queryDevice, device, sizeof(queryDevice)-1);
-    else
+    } else {
       sprintf(queryDevice, "/dev/video%d", devIndex);
+    }
 
     if ( (vid_fd = open(queryDevice, O_RDWR)) <= 0 ) {
       if ( device ) {
         Error("Failed to open video device %s: %s", queryDevice, strerror(errno));
         if ( verbose )
-          sprintf(output+strlen(output), "Error, failed to open video device %s: %s\n",
+          output_ptr += sprintf(output_ptr, "Error, failed to open video device %s: %s\n",
               queryDevice, strerror(errno));
         else
-          sprintf(output+strlen(output), "error%d\n", errno);
+          output_ptr += sprintf(output_ptr, "error%d\n", errno);
         return false;
       } else {
         return true;
       }
     }
-    if ( verbose )
-      sprintf(output+strlen(output), "Video Device: %s\n", queryDevice);
-    else
-      sprintf(output+strlen(output), "d:%s|", queryDevice);
+    if ( verbose ) {
+      output_ptr += sprintf(output_ptr, "Video Device: %s\n", queryDevice);
+    } else {
+      output_ptr += sprintf(output_ptr, "d:%s|", queryDevice);
+    }
 
 #if ZM_HAS_V4L2
     if ( version == 2 ) {
       struct v4l2_capability vid_cap;
       if ( vidioctl(vid_fd, VIDIOC_QUERYCAP, &vid_cap) < 0 ) {
         Error("Failed to query video device: %s", strerror(errno));
-        if ( verbose )
-          sprintf(output, "Error, failed to query video capabilities %s: %s\n",
+        if ( verbose ) {
+          output_ptr += sprintf(output_ptr, "Error, failed to query video capabilities %s: %s\n",
               queryDevice, strerror(errno));
-        else
-          sprintf(output, "error%d\n", errno);
-        return false;
+        } else {
+          output_ptr += sprintf(output_ptr, "error%d\n", errno);
+        }
+        if ( device )
+          return false;
       }
 
       if ( verbose ) {
-        sprintf(output+strlen(output), "General Capabilities\n");
-        sprintf(output+strlen(output), "  Driver: %s\n", vid_cap.driver);
-        sprintf(output+strlen(output), "  Card: %s\n", vid_cap.card);
-        sprintf(output+strlen(output), "  Bus: %s\n", vid_cap.bus_info);
-        sprintf(output+strlen(output), "  Version: %u.%u.%u\n",
-            (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff);
-        sprintf(output+strlen(output), "  Type: 0x%x\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+        output_ptr += sprintf(output_ptr, "General Capabilities\n"
+            "  Driver: %s\n"
+            "  Card: %s\n"
+            "  Bus: %s\n"
+            "  Version: %u.%u.%u\n"
+            "  Type: 0x%x\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+            vid_cap.driver, vid_cap.card, vid_cap.bus_info,
+            (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff,
             vid_cap.capabilities,
             capString(vid_cap.capabilities&V4L2_CAP_VIDEO_CAPTURE,         "    ", "Supports", "Does not support", "video capture (X)"),
             capString(vid_cap.capabilities&V4L2_CAP_VIDEO_OUTPUT,          "    ", "Supports", "Does not support", "video output"),
@@ -1349,17 +1355,16 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
             capString(vid_cap.capabilities&V4L2_CAP_STREAMING,             "    ", "Supports", "Does not support", "streaming i/o (X)")
             );
       } else {
-        sprintf(output+strlen(output), "D:%s|", vid_cap.driver);
-        sprintf(output+strlen(output), "C:%s|", vid_cap.card);
-        sprintf(output+strlen(output), "B:%s|", vid_cap.bus_info);
-        sprintf(output+strlen(output), "V:%u.%u.%u|", (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff);
-        sprintf(output+strlen(output), "T:0x%x|", vid_cap.capabilities);
+        output_ptr += sprintf(output_ptr, "D:%s|C:%s|B:%s|V:%u.%u.%u|T:0x%x|"
+            , vid_cap.driver
+            , vid_cap.card
+            , vid_cap.bus_info
+            , (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff
+            , vid_cap.capabilities);
       }
 
-      if ( verbose )
-        sprintf(output+strlen(output), "    Standards:\n");
-      else
-        sprintf(output+strlen(output), "S:");
+      output_ptr += sprintf(output_ptr, verbose ? "    Standards:\n" : "S:");
+
       struct v4l2_standard standard;
       int standardIndex = 0;
       do {
@@ -1374,25 +1379,20 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           } else {
             Error("Failed to enumerate standard %d: %d %s", standard.index, errno, strerror(errno));
             if ( verbose )
-              sprintf(output, "Error, failed to enumerate standard %d: %d %s\n", standard.index, errno, strerror(errno));
+              output_ptr += sprintf(output_ptr, "Error, failed to enumerate standard %d: %d %s\n", standard.index, errno, strerror(errno));
             else
-              sprintf(output, "error%d\n", errno);
+              output_ptr += sprintf(output_ptr, "error%d\n", errno);
+            // Why return? Why not continue trying other things?
             return false;
           }
         }
-        if ( verbose )
-          sprintf(output+strlen(output), "      %s\n", standard.name);
-        else
-          sprintf(output+strlen(output), "%s/", standard.name);
+        output_ptr += sprintf(output_ptr, (verbose ? "      %s\n" : "%s/"), standard.name);
       } while ( standardIndex++ >= 0 );
 
-      if ( !verbose && output[strlen(output)-1] == '/')
-        output[strlen(output)-1] = '|';
+      if ( !verbose && (*(output_ptr-1) == '/') )
+        *(output_ptr-1) = '|';
 
-      if ( verbose )
-        sprintf(output+strlen(output), "  Formats:\n");
-      else
-        sprintf(output+strlen(output), "F:");
+      output_ptr += sprintf(output_ptr, verbose ? "  Formats:\n" : "F:");
       struct v4l2_fmtdesc format;
       int formatIndex = 0;
       do {
@@ -1407,15 +1407,15 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           } else {
             Error("Failed to enumerate format %d: %s", format.index, strerror(errno));
             if ( verbose )
-              sprintf(output, "Error, failed to enumerate format %d: %s\n", format.index, strerror(errno));
+              output_ptr += sprintf(output_ptr, "Error, failed to enumerate format %d: %s\n", format.index, strerror(errno));
             else
-              sprintf(output, "error%d\n", errno);
+              output_ptr += sprintf(output_ptr, "error%d\n", errno);
             return false;
           }
         }
         if ( verbose )
-          sprintf(
-              output+strlen(output),
+          output_ptr += sprintf(
+              output_ptr,
               "  %s (0x%02hhx%02hhx%02hhx%02hhx)\n",
               format.description,
               (format.pixelformat>>24)&0xff,
@@ -1423,8 +1423,8 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
               (format.pixelformat>>8)&0xff,
               format.pixelformat&0xff);
         else
-          sprintf(
-              output+strlen(output),
+          output_ptr += sprintf(
+              output_ptr,
               "0x%02hhx%02hhx%02hhx%02hhx/",
               (format.pixelformat>>24)&0xff,
               (format.pixelformat>>16)&0xff,
@@ -1433,24 +1433,24 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
       } while ( formatIndex++ >= 0 );
 
       if ( !verbose )
-        output[strlen(output)-1] = '|';
+        *(output_ptr-1) = '|';
       else 
-        sprintf(output+strlen(output), "Crop Capabilities\n");
+        output_ptr += sprintf(output_ptr, "Crop Capabilities\n");
 
       struct v4l2_cropcap cropcap;
       memset(&cropcap, 0, sizeof(cropcap));
       cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-      if ( vidioctl( vid_fd, VIDIOC_CROPCAP, &cropcap ) < 0 ) {
+      if ( vidioctl(vid_fd, VIDIOC_CROPCAP, &cropcap) < 0 ) {
         if ( errno != EINVAL ) {
           /* Failed querying crop capability, write error to the log and continue as if crop is not supported */
           Error("Failed to query crop capabilities: %s", strerror(errno));
         }
 
         if ( verbose ) {
-          sprintf(output+strlen(output), "  Cropping is not supported\n");
+          output_ptr += sprintf(output_ptr, "  Cropping is not supported\n");
         } else {
           /* Send fake crop bounds to not confuse things parsing this, such as monitor probe */
-          sprintf(output+strlen(output), "B:%dx%d|",0,0);
+          output_ptr += sprintf(output_ptr, "B:%dx%d|", 0, 0);
         }
       } else {
         struct v4l2_crop crop;
@@ -1464,19 +1464,23 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           }
 
           if ( verbose ) {
-            sprintf(output+strlen(output), "  Cropping is not supported\n");
+            output_ptr += sprintf(output_ptr, "  Cropping is not supported\n");
           } else {
             /* Send fake crop bounds to not confuse things parsing this, such as monitor probe */
-            sprintf(output+strlen(output), "B:%dx%d|",0,0); 
+            output_ptr += sprintf(output_ptr, "B:%dx%d|",0,0); 
           }
         } else {
           /* Cropping supported */
           if ( verbose ) {
-            sprintf(output+strlen(output), "  Bounds: %d x %d\n", cropcap.bounds.width, cropcap.bounds.height);
-            sprintf(output+strlen(output), "  Default: %d x %d\n", cropcap.defrect.width, cropcap.defrect.height);
-            sprintf(output+strlen(output), "  Current: %d x %d\n", crop.c.width, crop.c.height);
+            output_ptr += sprintf(output_ptr,
+                "  Bounds: %d x %d\n"
+                "  Default: %d x %d\n"
+                "  Current: %d x %d\n"
+                , cropcap.bounds.width, cropcap.bounds.height
+                , cropcap.defrect.width, cropcap.defrect.height
+                , crop.c.width, crop.c.height);
           } else {
-            sprintf(output+strlen(output), "B:%dx%d|", cropcap.bounds.width, cropcap.bounds.height);
+            output_ptr += sprintf(output_ptr, "B:%dx%d|", cropcap.bounds.width, cropcap.bounds.height);
           }
         }
       } /* Crop code */
@@ -1493,17 +1497,14 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           } 
           Error("Failed to enumerate input %d: %s", input.index, strerror(errno));
           if ( verbose )
-            sprintf(output, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno));
+            output_ptr += sprintf(output_ptr, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno));
           else
-            sprintf(output, "error%d\n", errno);
+            output_ptr += sprintf(output_ptr, "error%d\n", errno);
           return false;
         }
       } while ( inputIndex++ >= 0 );
 
-      if ( verbose )
-        sprintf(output+strlen(output), "Inputs: %d\n", inputIndex);
-      else
-        sprintf(output+strlen(output), "I:%d|", inputIndex);
+      output_ptr += sprintf(output_ptr, verbose?"Inputs: %d\n":"I:%d|", inputIndex);
 
       inputIndex = 0;
       do {
@@ -1517,65 +1518,84 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           }
           Error("Failed to enumerate input %d: %s", input.index, strerror(errno));
           if ( verbose )
-            sprintf(output, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno));
+            output_ptr += sprintf(output_ptr, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno));
           else
-            sprintf(output, "error%d\n", errno);
+            output_ptr += sprintf(output_ptr, "error%d\n", errno);
           return false;
         }
 
         if ( vidioctl(vid_fd, VIDIOC_S_INPUT, &input.index) < 0 ) {
           Error("Failed to set video input %d: %s", input.index, strerror(errno));
           if ( verbose )
-            sprintf(output, "Error, failed to switch to input %d: %s\n", input.index, strerror(errno));
+            output_ptr += sprintf(output_ptr, "Error, failed to switch to input %d: %s\n", input.index, strerror(errno));
           else
-            sprintf(output, "error%d\n", errno);
+            output_ptr += sprintf(output_ptr, "error%d\n", errno);
           return false;
         }
 
         if ( verbose ) {
-          sprintf( output+strlen(output), "  Input %d\n", input.index );
-          sprintf( output+strlen(output), "    Name: %s\n", input.name );
-          sprintf( output+strlen(output), "    Type: %s\n", input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
-          sprintf( output+strlen(output), "    Audioset: %08x\n", input.audioset );
-          sprintf( output+strlen(output), "    Standards: 0x%llx\n", input.std );
+          output_ptr += sprintf( output,
+              "  Input %d\n"
+              "    Name: %s\n"
+              "    Type: %s\n"
+              "    Audioset: %08x\n"
+              "    Standards: 0x%llx\n"
+              , input.index
+              , input.name
+              , input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown")
+              , input.audioset
+              , input.std );
         } else {
-          sprintf( output+strlen(output), "i%d:%s|", input.index, input.name );
-          sprintf( output+strlen(output), "i%dT:%s|", input.index, input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
-          sprintf( output+strlen(output), "i%dS:%llx|", input.index, input.std );
+          output_ptr += sprintf( output_ptr, "i%d:%s|i%dT:%s|i%dS:%llx|"
+              , input.index, input.name
+              , input.index, input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown")
+              , input.index, input.std);
         }
 
         if ( verbose ) {
-          sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_POWER, "Power ", "off", "on", " (X)" ) );
-          sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_SIGNAL, "Signal ", "not detected", "detected", " (X)" ) );
-          sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_COLOR, "Colour Signal ", "not detected", "detected", "" ) );
-          sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_H_LOCK, "Horizontal Lock ", "not detected", "detected", "" ) );
+          output_ptr += sprintf( output_ptr, "    %s    %s    %s    %s"
+              , capString(input.status&V4L2_IN_ST_NO_POWER, "Power ", "off", "on", " (X)")
+              , capString(input.status&V4L2_IN_ST_NO_SIGNAL, "Signal ", "not detected", "detected", " (X)")
+              , capString(input.status&V4L2_IN_ST_NO_COLOR, "Colour Signal ", "not detected", "detected", "")
+              , capString(input.status&V4L2_IN_ST_NO_H_LOCK, "Horizontal Lock ", "not detected", "detected", ""));
         } else {
-          sprintf( output+strlen(output), "i%dSP:%d|", input.index, (input.status&V4L2_IN_ST_NO_POWER)?0:1 );
-          sprintf( output+strlen(output), "i%dSS:%d|", input.index, (input.status&V4L2_IN_ST_NO_SIGNAL)?0:1 );
-          sprintf( output+strlen(output), "i%dSC:%d|", input.index, (input.status&V4L2_IN_ST_NO_COLOR)?0:1 );
-          sprintf( output+strlen(output), "i%dHP:%d|", input.index, (input.status&V4L2_IN_ST_NO_H_LOCK)?0:1 );
+          output_ptr += sprintf( output_ptr, "i%dSP:%d|i%dSS:%d|i%dSC:%d|i%dHP:%d|"
+              , input.index, (input.status&V4L2_IN_ST_NO_POWER)?0:1
+              , input.index, (input.status&V4L2_IN_ST_NO_SIGNAL)?0:1
+              , input.index, (input.status&V4L2_IN_ST_NO_COLOR)?0:1
+              , input.index, (input.status&V4L2_IN_ST_NO_H_LOCK)?0:1 );
         }
       } while ( inputIndex++ >= 0 );
       if ( !verbose )
-        output[strlen(output)-1] = '\n';
+        *(output_ptr-1) = '\n';
     }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
     if ( version == 1 ) {
       struct video_capability vid_cap;
-      memset( &vid_cap, 0, sizeof(video_capability) );
-      if ( ioctl( vid_fd, VIDIOCGCAP, &vid_cap ) < 0 ) {
-        Error( "Failed to get video capabilities: %s", strerror(errno) );
+      memset(&vid_cap, 0, sizeof(video_capability));
+      if ( ioctl(vid_fd, VIDIOCGCAP, &vid_cap) < 0 ) {
+        Error("Failed to get video capabilities: %s", strerror(errno));
         if ( verbose )
-          sprintf( output, "Error, failed to get video capabilities %s: %s\n", queryDevice, strerror(errno) );
+          output_ptr += sprintf(output_ptr,
+              "Error, failed to get video capabilities %s: %s\n",
+              queryDevice, strerror(errno));
         else
-          sprintf( output, "error%d\n", errno );
-        return( false );
+          output_ptr += sprintf(output_ptr, "error%d\n", errno);
+        return false;
       }
       if ( verbose ) {
-        sprintf( output+strlen(output), "Video Capabilities\n" );
-        sprintf( output+strlen(output), "  Name: %s\n", vid_cap.name );
-        sprintf( output+strlen(output), "  Type: %d\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s", vid_cap.type,
+        output_ptr += sprintf( output_ptr, "Video Capabilities\n" 
+            "  Name: %s\n"
+            "  Type: %d\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
+            "  Video Channels: %d\n"
+            "  Audio Channels: %d\n"
+            "  Maximum Width: %d\n"
+            "  Maximum Height: %d\n"
+            "  Minimum Width: %d\n"
+            "  Minimum Height: %d\n",
+            vid_cap.name,
+            vid_cap.type,
             (vid_cap.type&VID_TYPE_CAPTURE)?"    Can capture\n":"",
             (vid_cap.type&VID_TYPE_TUNER)?"    Can tune\n":"",
             (vid_cap.type&VID_TYPE_TELETEXT)?"    Does teletext\n":"",
@@ -1589,61 +1609,72 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
             (vid_cap.type&VID_TYPE_MPEG_DECODER)?"    Can decode MPEG streams\n":"",
             (vid_cap.type&VID_TYPE_MPEG_ENCODER)?"    Can encode MPEG streams\n":"",
             (vid_cap.type&VID_TYPE_MJPEG_DECODER)?"    Can decode MJPEG streams\n":"",
-            (vid_cap.type&VID_TYPE_MJPEG_ENCODER)?"    Can encode MJPEG streams\n":""
-            );
-        sprintf( output+strlen(output), "  Video Channels: %d\n", vid_cap.channels );
-        sprintf( output+strlen(output), "  Audio Channels: %d\n", vid_cap.audios );
-        sprintf( output+strlen(output), "  Maximum Width: %d\n", vid_cap.maxwidth );
-        sprintf( output+strlen(output), "  Maximum Height: %d\n", vid_cap.maxheight );
-        sprintf( output+strlen(output), "  Minimum Width: %d\n", vid_cap.minwidth );
-        sprintf( output+strlen(output), "  Minimum Height: %d\n", vid_cap.minheight );
+            (vid_cap.type&VID_TYPE_MJPEG_ENCODER)?"    Can encode MJPEG streams\n":"",
+            vid_cap.channels,
+            vid_cap.audios,
+            vid_cap.maxwidth,
+            vid_cap.maxheight,
+            vid_cap.minwidth,
+            vid_cap.minheight );
       } else {
-        sprintf( output+strlen(output), "N:%s|", vid_cap.name );
-        sprintf( output+strlen(output), "T:%d|", vid_cap.type );
-        sprintf( output+strlen(output), "nC:%d|", vid_cap.channels );
-        sprintf( output+strlen(output), "nA:%d|", vid_cap.audios );
-        sprintf( output+strlen(output), "mxW:%d|", vid_cap.maxwidth );
-        sprintf( output+strlen(output), "mxH:%d|", vid_cap.maxheight );
-        sprintf( output+strlen(output), "mnW:%d|", vid_cap.minwidth );
-        sprintf( output+strlen(output), "mnH:%d|", vid_cap.minheight );
+        output_ptr += sprintf(output_ptr, "N:%s|T:%d|nC:%d|nA:%d|mxW:%d|mxH:%d|mnW:%d|mnH:%d|"
+            , vid_cap.name
+            , vid_cap.type
+            , vid_cap.channels
+            , vid_cap.audios
+            , vid_cap.maxwidth
+            , vid_cap.maxheight
+            , vid_cap.minwidth
+            , vid_cap.minheight);
       }
 
       struct video_window vid_win;
-      memset( &vid_win, 0, sizeof(video_window) );
-      if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win ) < 0 ) {
-        Error( "Failed to get window attributes: %s", strerror(errno) );
+      memset(&vid_win, 0, sizeof(video_window));
+      if ( ioctl(vid_fd, VIDIOCGWIN, &vid_win) < 0 ) {
+        Error("Failed to get window attributes: %s", strerror(errno));
         if ( verbose )
-          sprintf( output, "Error, failed to get window attributes: %s\n", strerror(errno) );
+          output_ptr += sprintf(output_ptr, "Error, failed to get window attributes: %s\n", strerror(errno));
         else
-          sprintf( output, "error%d\n", errno );
+          output_ptr += sprintf(output_ptr, "error%d\n", errno);
         return false;
       }
       if ( verbose ) {
-        sprintf( output+strlen(output), "Window Attributes\n" );
-        sprintf( output+strlen(output), "  X Offset: %d\n", vid_win.x );
-        sprintf( output+strlen(output), "  Y Offset: %d\n", vid_win.y );
-        sprintf( output+strlen(output), "  Width: %d\n", vid_win.width );
-        sprintf( output+strlen(output), "  Height: %d\n", vid_win.height );
+        output_ptr += sprintf(output_ptr,
+            "Window Attributes\n"
+            "  X Offset: %d\n"
+            "  Y Offset: %d\n"
+            "  Width: %d\n"
+            "  Height: %d\n"
+            , vid_win.x
+            , vid_win.y
+            , vid_win.width
+            , vid_win.height );
       } else {
-        sprintf( output+strlen(output), "X:%d|", vid_win.x );
-        sprintf( output+strlen(output), "Y:%d|", vid_win.y );
-        sprintf( output+strlen(output), "W:%d|", vid_win.width );
-        sprintf( output+strlen(output), "H:%d|", vid_win.height );
+        output_ptr += sprintf(output_ptr, "X:%d|Y:%d|W:%d|H:%d|",
+         vid_win.height, vid_win.x, vid_win.y, vid_win.width);
       }
 
       struct video_picture vid_pic;
-      memset( &vid_pic, 0, sizeof(video_picture) );
-      if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic ) < 0 ) {
-        Error( "Failed to get picture attributes: %s", strerror(errno) );
+      memset(&vid_pic, 0, sizeof(video_picture));
+      if ( ioctl(vid_fd, VIDIOCGPICT, &vid_pic) < 0 ) {
+        Error("Failed to get picture attributes: %s", strerror(errno));
         if ( verbose )
-          sprintf( output, "Error, failed to get picture attributes: %s\n", strerror(errno) );
+          output_ptr += sprintf(output_ptr, "Error, failed to get picture attributes: %s\n", strerror(errno));
         else
-          sprintf( output, "error%d\n", errno );
+          output_ptr += sprintf(output_ptr, "error%d\n", errno);
         return false;
       }
       if ( verbose ) {
-        sprintf( output+strlen(output), "Picture Attributes\n" );
-        sprintf( output+strlen(output), "  Palette: %d - %s\n", vid_pic.palette, 
+        output_ptr += sprintf(output_ptr,
+            "Picture Attributes\n" 
+            "  Palette: %d - %s\n"
+            "  Colour Depth: %d\n"
+            "  Brightness: %d\n"
+            "  Hue: %d\n"
+            "  Colour :%d\n"
+            "  Contrast: %d\n"
+            "  Whiteness: %d\n"
+            , vid_pic.palette, 
             vid_pic.palette==VIDEO_PALETTE_GREY?"Linear greyscale":(
               vid_pic.palette==VIDEO_PALETTE_HI240?"High 240 cube (BT848)":(
                 vid_pic.palette==VIDEO_PALETTE_RGB565?"565 16 bit RGB":(
@@ -1662,66 +1693,77 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
                                           vid_pic.palette==VIDEO_PALETTE_YUV411P?"YUV 4:1:1 Planar":(
                                             vid_pic.palette==VIDEO_PALETTE_YUV420P?"YUV 4:2:0 Planar":(
                                               vid_pic.palette==VIDEO_PALETTE_YUV410P?"YUV 4:1:0 Planar":"Unknown"
-                                              ))))))))))))))))));
-        sprintf( output+strlen(output), "  Colour Depth: %d\n", vid_pic.depth );
-        sprintf( output+strlen(output), "  Brightness: %d\n", vid_pic.brightness );
-        sprintf( output+strlen(output), "  Hue: %d\n", vid_pic.hue );
-        sprintf( output+strlen(output), "  Colour :%d\n", vid_pic.colour );
-        sprintf( output+strlen(output), "  Contrast: %d\n", vid_pic.contrast );
-        sprintf( output+strlen(output), "  Whiteness: %d\n", vid_pic.whiteness );
+                                              ))))))))))))))))),
+            vid_pic.depth,
+            vid_pic.brightness,
+            vid_pic.hue,
+            vid_pic.colour,
+            vid_pic.contrast,
+            vid_pic.whiteness
+        );
       } else {
-        sprintf( output+strlen(output), "P:%d|", vid_pic.palette );
-        sprintf( output+strlen(output), "D:%d|", vid_pic.depth );
-        sprintf( output+strlen(output), "B:%d|", vid_pic.brightness );
-        sprintf( output+strlen(output), "h:%d|", vid_pic.hue );
-        sprintf( output+strlen(output), "Cl:%d|", vid_pic.colour );
-        sprintf( output+strlen(output), "Cn:%d|", vid_pic.contrast );
-        sprintf( output+strlen(output), "w:%d|", vid_pic.whiteness );
+        output_ptr += sprintf(output_ptr, "P:%d|D:%d|B:%d|h:%d|Cl:%d|Cn:%d|w:%d|",
+            vid_pic.palette,
+            vid_pic.depth,
+            vid_pic.brightness,
+            vid_pic.hue,
+            vid_pic.colour,
+            vid_pic.contrast,
+            vid_pic.whiteness
+            );
       }
 
       for ( int chan = 0; chan < vid_cap.channels; chan++ ) {
         struct video_channel vid_src;
-        memset( &vid_src, 0, sizeof(video_channel) );
+        memset(&vid_src, 0, sizeof(video_channel));
         vid_src.channel = chan;
-        if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src ) < 0 ) {
-          Error( "Failed to get channel %d attributes: %s", chan, strerror(errno) );
+        if ( ioctl(vid_fd, VIDIOCGCHAN, &vid_src) < 0 ) {
+          Error("Failed to get channel %d attributes: %s", chan, strerror(errno));
           if ( verbose )
-            sprintf( output, "Error, failed to get channel %d attributes: %s\n", chan, strerror(errno) );
+            output_ptr += sprintf(output_ptr, "Error, failed to get channel %d attributes: %s\n", chan, strerror(errno));
           else
-            sprintf( output, "error%d\n", errno );
+            output_ptr += sprintf(output_ptr, "error%d\n", errno);
           return false;
         }
         if ( verbose ) {
-          sprintf( output+strlen(output), "Channel %d Attributes\n", chan );
-          sprintf( output+strlen(output), "  Name: %s\n", vid_src.name );
-          sprintf( output+strlen(output), "  Channel: %d\n", vid_src.channel );
-          sprintf( output+strlen(output), "  Flags: %d\n%s%s", vid_src.flags,
-              (vid_src.flags&VIDEO_VC_TUNER)?"    Channel has a tuner\n":"",
-              (vid_src.flags&VIDEO_VC_AUDIO)?"    Channel has audio\n":""
-              );
-          sprintf( output+strlen(output), "  Type: %d - %s\n", vid_src.type,
+          output_ptr += sprintf(output_ptr,
+              "Channel %d Attributes\n"
+              "  Name: %s\n"
+              "  Channel: %d\n"
+              "  Flags: %d\n%s%s"
+          "  Type: %d - %s\n"
+          "  Format: %d - %s\n"
+              , chan 
+              , vid_src.name
+              , vid_src.channel
+              , vid_src.flags
+              , (vid_src.flags&VIDEO_VC_TUNER)?"    Channel has a tuner\n":""
+              , (vid_src.flags&VIDEO_VC_AUDIO)?"    Channel has audio\n":""
+              , vid_src.type,
               vid_src.type==VIDEO_TYPE_TV?"TV":(
                 vid_src.type==VIDEO_TYPE_CAMERA?"Camera":"Unknown"
-                ));
-          sprintf( output+strlen(output), "  Format: %d - %s\n", vid_src.norm,
+                )
+            , vid_src.norm,
               vid_src.norm==VIDEO_MODE_PAL?"PAL":(
                 vid_src.norm==VIDEO_MODE_NTSC?"NTSC":(
                   vid_src.norm==VIDEO_MODE_SECAM?"SECAM":(
                     vid_src.norm==VIDEO_MODE_AUTO?"AUTO":"Unknown"
                     ))));
         } else {
-          sprintf( output+strlen(output), "n%d:%s|", chan, vid_src.name );
-          sprintf( output+strlen(output), "C%d:%d|", chan, vid_src.channel );
-          sprintf( output+strlen(output), "Fl%d:%x|", chan, vid_src.flags );
-          sprintf( output+strlen(output), "T%d:%d|", chan, vid_src.type );
-          sprintf( output+strlen(output), "F%d:%d%s|", chan, vid_src.norm, chan==(vid_cap.channels-1)?"":"," );
+          output_ptr += sprintf(output_ptr, "n%d:%s|C%d:%d|Fl%d:%x|T%d:%d|F%d:%d%s|"
+              , chan, vid_src.name
+              , chan, vid_src.channel
+              , chan, vid_src.flags 
+              , chan, vid_src.type 
+              , chan, vid_src.norm, chan==(vid_cap.channels-1)?"":","
+              );
         }
       }
       if ( !verbose )
-        output[strlen(output)-1] = '\n';
+        *output_ptr = '\n';
     }
 #endif // ZM_HAS_V4L1
-    close( vid_fd );
+    close(vid_fd);
     if ( device )
       break;
   } while ( ++devIndex < 32 );
@@ -1956,7 +1998,7 @@ int LocalCamera::PrimeCapture() {
       if ( vidioctl(vid_fd, VIDIOC_QBUF, &vid_buf) < 0 )
         Fatal("Failed to queue buffer %d: %s", frame, strerror(errno));
     }
-    v4l2_data.bufptr = NULL;
+    v4l2_data.bufptr = nullptr;
 
     Debug(3, "Starting video stream");
     //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -1987,10 +2029,9 @@ int LocalCamera::PreCapture() {
   return 0;
 }
 
-int LocalCamera::Capture( ZMPacket &zm_packet ) {
-
+int LocalCamera::Capture(ZMPacket &zm_packet) {
   // We assume that the avpacket is allocated, and just needs to be filled
-  static uint8_t* buffer = NULL;
+  static uint8_t* buffer = nullptr;
   int buffer_bytesused = 0;
   int capture_frame = -1;
 
@@ -2092,7 +2133,7 @@ int LocalCamera::Capture( ZMPacket &zm_packet ) {
 
     /* Request a writeable buffer of the target image */
     uint8_t *directbuffer = zm_packet.image->WriteBuffer(width, height, colours, subpixelorder);
-    if ( directbuffer == NULL ) {
+    if ( directbuffer == nullptr ) {
       Error("Failed requesting writeable buffer for the captured image.");
       return -1;
     }
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index ec019f392..619cba115 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -39,7 +39,7 @@
 #include <cstdarg>
 
 bool Logger::smInitialised = false;
-Logger *Logger::smInstance = NULL;
+Logger *Logger::smInstance = nullptr;
 
 Logger::StringMap Logger::smCodes;
 Logger::IntMap Logger::smSyslogPriorities;
@@ -56,7 +56,7 @@ static void subtractTime( struct timeval * const tp1, struct timeval * const tp2
 }
 #endif
 
-void Logger::usrHandler( int sig ) {
+void Logger::usrHandler(int sig) {
   Logger *logger = fetch();
   if ( sig == SIGUSR1 )
     logger->level(logger->level()+1);
@@ -72,10 +72,10 @@ Logger::Logger() :
   mFileLevel(NOLOG),
   mSyslogLevel(NOLOG),
   mEffectiveLevel(NOLOG),
-  //mLogPath( staticConfig.PATH_LOGS.c_str() ),
-  //mLogFile( mLogPath+"/"+mId+".log" ),
   mDbConnected(false),
-  mLogFileFP(NULL),
+  mLogPath(staticConfig.PATH_LOGS.c_str()),
+  //mLogFile( mLogPath+"/"+mId+".log" ),
+  mLogFileFP(nullptr),
   mHasTerminal(false),
   mFlush(false) {
 
@@ -107,9 +107,11 @@ Logger::Logger() :
     smInitialised = true;
   }
 
-  if ( fileno(stderr) && isatty(fileno(stderr)) )
+  if ( fileno(stderr) && isatty(fileno(stderr)) ) {
     mHasTerminal = true;
-}
+    mTerminalLevel = WARNING;
+  }
+}  // End Logger::Logger
 
 Logger::~Logger() {
   terminate();
@@ -139,7 +141,8 @@ void Logger::initialise(const std::string &id, const Options &options) {
   } else if ( options.mLogFile.size() ) {
     tempLogFile = options.mLogFile;
   } else {
-    if ( options.mLogPath.size() ) {
+    // options.mLogPath defaults to '.' so only use it if we don't already have a path
+    if ( (!mLogPath.size()) || options.mLogPath != "." ) {
       mLogPath = options.mLogPath;
     }
     tempLogFile = mLogPath+"/"+mId+".log";
@@ -154,6 +157,7 @@ void Logger::initialise(const std::string &id, const Options &options) {
   if ( options.mTerminalLevel != NOOPT )
     tempTerminalLevel = options.mTerminalLevel;
 
+  // DEBUG1 == 1.  So >= DEBUG1, we set to DEBUG9?! Why?
   if ( options.mDatabaseLevel != NOOPT )
     tempDatabaseLevel = options.mDatabaseLevel;
   else
@@ -241,7 +245,7 @@ void Logger::initialise(const std::string &id, const Options &options) {
 
   mInitialised = true;
 
-  Debug(1, "LogOpts: level=%s/%s, screen=%s, database=%s, logfile=%s->%s, syslog=%s",
+  Debug(1, "LogOpts: level=%s effective=%s, screen=%s, database=%s, logfile=%s->%s, syslog=%s",
       smCodes[mLevel].c_str(),
       smCodes[mEffectiveLevel].c_str(),
       smCodes[mTerminalLevel].c_str(),
@@ -296,7 +300,7 @@ const std::string &Logger::id(const std::string &id) {
 
   size_t pos;
   // Remove whitespace
-  while ( (pos = tempId.find_first_of( " \t" )) != std::string::npos ) {
+  while ( (pos = tempId.find_first_of(" \t")) != std::string::npos ) {
     tempId.replace(pos, 1, "");
   }
   // Replace non-alphanum with underscore
@@ -340,7 +344,7 @@ Logger::Level Logger::level(Logger::Level level) {
   return mLevel;
 }
 
-Logger::Level Logger::terminalLevel( Logger::Level terminalLevel ) {
+Logger::Level Logger::terminalLevel(Logger::Level terminalLevel) {
   if ( terminalLevel > NOOPT ) {
     if ( !mHasTerminal )
       terminalLevel = NOLOG;
@@ -351,34 +355,35 @@ Logger::Level Logger::terminalLevel( Logger::Level terminalLevel ) {
   return mTerminalLevel;
 }
 
-Logger::Level Logger::databaseLevel( Logger::Level databaseLevel ) {
+Logger::Level Logger::databaseLevel(Logger::Level databaseLevel) {
   if ( databaseLevel > NOOPT ) {
     databaseLevel = limit(databaseLevel);
     if ( mDatabaseLevel != databaseLevel ) {
-      if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG ) {
-        zmDbConnect();
-      } // end if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG )
+      if ( (databaseLevel > NOLOG) && (mDatabaseLevel <= NOLOG) ) { // <= NOLOG would be NOOPT
+        if ( !zmDbConnect() ) {
+          databaseLevel = NOLOG;
+        }
+      }  // end if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG )
       mDatabaseLevel = databaseLevel;
-    } // end if ( mDatabaseLevel != databaseLevel )
-  } // end if ( databaseLevel > NOOPT )
+    }  // end if ( mDatabaseLevel != databaseLevel )
+  }  // end if ( databaseLevel > NOOPT )
 
   return mDatabaseLevel;
 }
 
-Logger::Level Logger::fileLevel( Logger::Level fileLevel ) {
+Logger::Level Logger::fileLevel(Logger::Level fileLevel) {
   if ( fileLevel > NOOPT ) {
     fileLevel = limit(fileLevel);
     // Always close, because we may have changed file names
     if ( mFileLevel > NOLOG )
 	    closeFile();
     mFileLevel = fileLevel;
-    if ( mFileLevel > NOLOG )
-	    openFile();
+    // Don't try to open it here because it will create the log file even if we never write to it.
   }
   return mFileLevel;
 }
 
-Logger::Level Logger::syslogLevel( Logger::Level syslogLevel ) {
+Logger::Level Logger::syslogLevel(Logger::Level syslogLevel) {
   if ( syslogLevel > NOOPT ) {
     syslogLevel = limit(syslogLevel);
     if ( mSyslogLevel != syslogLevel ) {
@@ -392,7 +397,7 @@ Logger::Level Logger::syslogLevel( Logger::Level syslogLevel ) {
   return mSyslogLevel;
 }
 
-void Logger::logFile( const std::string &logFile ) {
+void Logger::logFile(const std::string &logFile) {
   bool addLogPid = false;
   std::string tempLogFile = logFile;
   if ( tempLogFile[tempLogFile.length()-1] == '+' ) {
@@ -400,16 +405,16 @@ void Logger::logFile( const std::string &logFile ) {
     addLogPid = true;
   }
   if ( addLogPid )
-    mLogFile = stringtf( "%s.%05d", tempLogFile.c_str(), getpid() );
+    mLogFile = stringtf("%s.%05d", tempLogFile.c_str(), getpid());
   else
     mLogFile = tempLogFile;
 }
 
 void Logger::openFile() {
   if ( mLogFile.size() ) {
-   if ( (mLogFileFP = fopen(mLogFile.c_str() ,"a")) == (FILE *)NULL ) {
+   if ( (mLogFileFP = fopen(mLogFile.c_str(), "a")) == nullptr ) {
     mFileLevel = NOLOG;
-    Fatal( "fopen() for %s, error = %s", mLogFile.c_str(), strerror(errno) );
+    Error("fopen() for %s, error = %s", mLogFile.c_str(), strerror(errno));
    }
   } else {
     puts("Called Logger::openFile() without a filename");
@@ -418,29 +423,33 @@ void Logger::openFile() {
 
 void Logger::closeFile() {
   if ( mLogFileFP ) {
-    fflush( mLogFileFP );
-    if ( fclose( mLogFileFP ) < 0 ) {
-      Fatal( "fclose(), error = %s",strerror(errno) );
+    fflush(mLogFileFP);
+    if ( fclose(mLogFileFP) < 0 ) {
+      mLogFileFP = nullptr;
+      Error("fclose(), error = %s", strerror(errno));
     }
-    mLogFileFP = (FILE *)NULL;
+    mLogFileFP = nullptr;
   }
 }
 
 void Logger::closeDatabase() {
-  
+
 }
 
 void Logger::openSyslog() {
-  (void) openlog( mId.c_str(), LOG_PID|LOG_NDELAY, LOG_LOCAL1 );
+  (void) openlog(mId.c_str(), LOG_PID|LOG_NDELAY, LOG_LOCAL1);
 }
 
 void Logger::closeSyslog() {
   (void) closelog();
 }
 
-void Logger::logPrint( bool hex, const char * const filepath, const int line, const int level, const char *fstring, ... ) {
-  if ( level > mEffectiveLevel ) 
+void Logger::logPrint(bool hex, const char * const filepath, const int line, const int level, const char *fstring, ...) {
+  
+  if ( level > mEffectiveLevel ) {
     return;
+  }
+    
   log_mutex.lock();
   char            timeString[64];
   char            logString[8192];
@@ -454,7 +463,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
   if ( level < PANIC || level > DEBUG9 )
     Panic("Invalid logger level %d", level);
 
-  gettimeofday(&timeVal, NULL);
+  gettimeofday(&timeVal, nullptr);
 
 #if 0
   if ( logRuntime ) {
@@ -478,24 +487,24 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
   thr_self(&lwpid);
   tid = lwpid;
 
-  if (tid < 0 ) // Thread/Process id
+  if ( tid < 0 )  // Thread/Process id
 #else
-#ifdef HAVE_SYSCALL
-#ifdef __FreeBSD_kernel__
+  #ifdef HAVE_SYSCALL
+    #ifdef __FreeBSD_kernel__
     if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
 
-# else
+    # else
       // SOLARIS doesn't have SYS_gettid; don't assume
-#ifdef SYS_gettid
-      if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id
-#endif // SYS_gettid
+      #ifdef SYS_gettid
+    if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id
+      #endif // SYS_gettid
+    #endif
+  #endif // HAVE_SYSCALL
 #endif
-#endif // HAVE_SYSCALL
-#endif
-        tid = getpid(); // Process id
+    tid = getpid(); // Process id
 
   char *logPtr = logString;
-  logPtr += snprintf( logPtr, sizeof(logString), "%s %s[%d].%s-%s/%d [", 
+  logPtr += snprintf(logPtr, sizeof(logString), "%s %s[%d].%s-%s/%d [",
       timeString,
       mId.c_str(),
       tid,
@@ -519,40 +528,57 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
   }
   va_end(argPtr);
   char *syslogEnd = logPtr;
-  strncpy(logPtr, "]\n", sizeof(logString)-(logPtr-logString));   
+  strncpy(logPtr, "]\n", sizeof(logString)-(logPtr-logString));
 
   if ( level <= mTerminalLevel ) {
     puts(logString);
     fflush(stdout);
   }
   if ( level <= mFileLevel ) {
+    if ( !mLogFileFP ) {
+      log_mutex.unlock();
+      openFile();
+      log_mutex.lock();
+    }
     if ( mLogFileFP ) {
       fputs(logString, mLogFileFP);
       if ( mFlush )
         fflush(mLogFileFP);
     } else {
-      puts("Logging to file, but file not open\n");
+      puts("Logging to file, but failed to open it\n");
     }
+#if 0
+  } else {
+    printf("Not writing to log file because level %d %s <= mFileLevel %d %s\nstring: %s\n",
+        level, smCodes[level].c_str(), mFileLevel, smCodes[mFileLevel].c_str(), logString);
+#endif
   }
   *syslogEnd = '\0';
   if ( level <= mDatabaseLevel ) {
 
-    //if ( ! db_mutex.trylock() ) {
-    db_mutex.lock();
-    char escapedString[(strlen(syslogStart)*2)+1];
-    mysql_real_escape_string(&dbconn, escapedString, syslogStart, strlen(syslogStart));
-    char sql[ZM_SQL_MED_BUFSIZ];
-    snprintf(sql, sizeof(sql),
-        "INSERT INTO Logs "
-        "( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line )"
-        " VALUES "
-        "( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
-        timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line
-        );
-    if ( mysql_query(&dbconn, sql) ) {
+    if ( !db_mutex.trylock() ) {
+      char escapedString[(strlen(syslogStart)*2)+1];
+      mysql_real_escape_string(&dbconn, escapedString, syslogStart, strlen(syslogStart));
+
+      char sql[ZM_SQL_MED_BUFSIZ];
+      snprintf(sql, sizeof(sql),
+          "INSERT INTO `Logs` "
+          "( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` )"
+         " VALUES "
+         "( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
+         timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line
+         );
+      if ( mysql_query(&dbconn, sql) ) {
+        Level tempDatabaseLevel = mDatabaseLevel;
+        databaseLevel(NOLOG);
+        Error("Can't insert log entry: sql(%s) error(%s)", sql, mysql_error(&dbconn));
+        databaseLevel(tempDatabaseLevel);
+      }
+      db_mutex.unlock();
+    } else {
       Level tempDatabaseLevel = mDatabaseLevel;
       databaseLevel(NOLOG);
-      Error("Can't insert log entry: sql(%s) error(%s)", sql, mysql_error(&dbconn));
+      Error("Can't insert log entry: sql(%s) error(%s)", syslogStart, mysql_error(&dbconn));
       databaseLevel(tempDatabaseLevel);
     }
     db_mutex.unlock();
@@ -566,7 +592,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
   if ( level <= mSyslogLevel ) {
     int priority = smSyslogPriorities[level];
     //priority |= LOG_DAEMON;
-    syslog( priority, "%s [%s] [%s]", classString, mId.c_str(), syslogStart );
+    syslog(priority, "%s [%s] [%s]", classString, mId.c_str(), syslogStart);
   }
 
   free(filecopy);
@@ -579,20 +605,21 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
     exit(-1);
   }
   log_mutex.unlock();
-}
-
+}  // end logPrint
 
 void logInit(const char *name, const Logger::Options &options) {
-  if ( !Logger::smInstance )
-    Logger::smInstance = new Logger();
-  Logger::Options tempOptions = options;
-  tempOptions.mLogPath = staticConfig.PATH_LOGS;
-  Logger::smInstance->initialise(name, tempOptions);
+  if ( Logger::smInstance ) {
+    delete Logger::smInstance;
+    Logger::smInstance = nullptr;
+  }
+
+  Logger::smInstance = new Logger();
+  Logger::smInstance->initialise(name, options);
 }
 
 void logTerm() {
   if ( Logger::smInstance ) {
     delete Logger::smInstance;
-    Logger::smInstance = NULL;
+    Logger::smInstance = nullptr;
   }
 }
diff --git a/src/zm_logger.h b/src/zm_logger.h
index f65c5ec31..82144a1c9 100644
--- a/src/zm_logger.h
+++ b/src/zm_logger.h
@@ -36,12 +36,12 @@ class Logger {
 public:
   enum { 
     NOOPT=-6,
-    NOLOG,
-    PANIC,
-    FATAL,
-    ERROR,
-    WARNING,
-    INFO,
+    NOLOG, // -5
+    PANIC, // -4
+    FATAL, // -3
+    ERROR, // -2
+    WARNING, // -1
+    INFO, // 0
     DEBUG1,
     DEBUG2,
     DEBUG3,
@@ -68,14 +68,20 @@ public:
     std::string mLogPath;
     std::string mLogFile;
 
-  public:
-    Options( Level terminalLevel=NOOPT, Level databaseLevel=NOOPT, Level fileLevel=NOOPT, Level syslogLevel=NOOPT, const std::string &logPath=".", const std::string &logFile="" ) :
-      mTerminalLevel( terminalLevel ),
-      mDatabaseLevel( databaseLevel ),
-      mFileLevel( fileLevel ),
-      mSyslogLevel( syslogLevel ),
-      mLogPath( logPath ),
-      mLogFile( logFile )
+    Options(
+        Level terminalLevel=NOOPT,
+        Level databaseLevel=NOOPT,
+        Level fileLevel=NOOPT,
+        Level syslogLevel=NOOPT,
+        const std::string &logPath=".",
+        const std::string &logFile=""
+        ) :
+      mTerminalLevel(terminalLevel),
+      mDatabaseLevel(databaseLevel),
+      mFileLevel(fileLevel),
+      mSyslogLevel(syslogLevel),
+      mLogPath(logPath),
+      mLogFile(logFile)
     {
     }
   };
@@ -89,21 +95,21 @@ private:
   static StringMap smCodes;
   static IntMap smSyslogPriorities;
 
-private:
   bool mInitialised;
 
   std::string mId;
   std::string mIdRoot;
   std::string mIdArgs;
 
-  Level mLevel;       // Level that is currently in operation
+  Level mLevel;             // Level that is currently in operation
   Level mTerminalLevel;     // Maximum level output via terminal
-  Level mDatabaseLevel;   // Maximum level output via database
-  Level mFileLevel;     // Maximum level output via file
-  Level mSyslogLevel;   // Maximum level output via syslog
-  Level mEffectiveLevel;  // Level optimised to take account of maxima
+  Level mDatabaseLevel;     // Maximum level output via database
+  Level mFileLevel;         // Maximum level output via file
+  Level mSyslogLevel;       // Maximum level output via syslog
+  Level mEffectiveLevel;    // Level optimised to take account of maxima
 
   bool mDbConnected;
+
   std::string mLogPath;
   std::string mLogFile;
   FILE *mLogFileFP;
@@ -111,31 +117,10 @@ private:
   bool mHasTerminal;
   bool mFlush;
 
-private:
-  static void usrHandler(int sig);
-
-public:
-  friend void logInit(const char *name, const Options &options);
-  friend void logTerm();
-
-  static Logger *fetch() {
-    if ( !smInstance ) {
-      smInstance = new Logger();
-      Options options;
-      smInstance->initialise( "undef", options );
-    }
-    return smInstance;
-  }
-
 private:
   Logger();
   ~Logger();
 
-public:
-  void initialise(const std::string &id, const Options &options);
-  void terminate();
-
-private:
   int limit(int level) {
     if ( level > DEBUG9 )
       return DEBUG9;
@@ -150,14 +135,29 @@ private:
   char *getTargettedEnv(const std::string &name);
 
   void loadEnv();
+  static void usrHandler(int sig);
 
 public:
+  friend void logInit(const char *name, const Options &options);
+  friend void logTerm();
+
+  static Logger *fetch() {
+    if ( !smInstance ) {
+      smInstance = new Logger();
+      Options options;
+      smInstance->initialise("undef", options);
+    }
+    return smInstance;
+  }
+
+  void initialise(const std::string &id, const Options &options);
+  void terminate();
+
+  const std::string &id(const std::string &id);
   const std::string &id() const {
     return mId;
   }
 
-  const std::string &id(const std::string &id);
-
   Level level() const {
     return mLevel;
   }
diff --git a/src/zm_mem_utils.h b/src/zm_mem_utils.h
index 50809016c..6ef1bdac5 100644
--- a/src/zm_mem_utils.h
+++ b/src/zm_mem_utils.h
@@ -27,15 +27,15 @@ inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
   uint8_t* retptr;
 #if HAVE_POSIX_MEMALIGN
   if ( posix_memalign((void**)&retptr,reqalignment,reqsize) != 0 )
-    return NULL;
+    return nullptr;
   
   return retptr;
 #else
   uint8_t* alloc;
   retptr = (uint8_t*)malloc(reqsize+reqalignment+sizeof(void*));
   
-  if ( retptr == NULL )
-    return NULL;
+  if ( retptr == nullptr )
+    return nullptr;
   
   alloc = retptr + sizeof(void*);
   
@@ -58,32 +58,32 @@ inline void zm_freealigned(void* ptr) {
 #endif
 }
 
-inline char *mempbrk( register const char *s, const char *accept, size_t limit ) {
+inline char *mempbrk(const char *s, const char *accept, size_t limit) {
   if ( limit == 0 || !s || !accept || !*accept )
-    return 0;
+    return nullptr;
 
-  register unsigned int i,j;
-  size_t acc_len = strlen( accept );
+  unsigned int i,j;
+  size_t acc_len = strlen(accept);
 
   for ( i = 0; i < limit; s++, i++ ) {
     for ( j = 0; j < acc_len; j++ ) {
       if ( *s == accept[j] ) {
-        return( (char *)s );
+        return (char *)s;
       }
     }
   }
-  return( 0 );
+  return nullptr;
 }
 
-inline char *memstr( register const char *s, const char *n, size_t limit ) {
+inline char *memstr(const char *s, const char *n, size_t limit) {
   if ( limit == 0 || !s || !n )
-    return( 0 );
+    return nullptr;
 
   if ( !*n )
-    return( (char *)s );
+    return (char *)s;
 
-  register unsigned int i,j,k;
-  size_t n_len = strlen( n );
+  unsigned int i,j,k;
+  size_t n_len = strlen(n);
 
   for ( i = 0; i < limit; i++, s++ ) {
     if ( *s != *n )
@@ -92,23 +92,23 @@ inline char *memstr( register const char *s, const char *n, size_t limit ) {
     k = 1;
     while ( true ) {
       if ( k >= n_len )
-        return( (char *)s );
+        return (char *)s;
       if ( s[j++] != n[k++] )
         break;
     }
   }
-  return( 0 );
+  return nullptr;
 }
 
-inline size_t memspn( register const char *s, const char *accept, size_t limit ) {
+inline size_t memspn(const char *s, const char *accept, size_t limit) {
   if ( limit == 0 || !s || !accept || !*accept )
-    return( 0 );
+    return 0;
 
-  register unsigned int i,j;
-  size_t acc_len = strlen( accept );
+  unsigned int i,j;
+  size_t acc_len = strlen(accept);
 
   for ( i = 0; i < limit; s++, i++ ) {
-    register bool found = false;
+    bool found = false;
     for ( j = 0; j < acc_len; j++ ) {
       if ( *s == accept[j] ) {
         found = true;
@@ -116,30 +116,30 @@ inline size_t memspn( register const char *s, const char *accept, size_t limit )
       }
     }
     if ( !found ) {
-      return( i );
+      return i;
     }
   }
-  return( limit );
+  return limit;
 }
 
-inline size_t memcspn( register const char *s, const char *reject, size_t limit ) {
+inline size_t memcspn(const char *s, const char *reject, size_t limit) {
   if ( limit == 0 || !s || !reject )
-    return( 0 );
+    return 0;
 
   if ( !*reject )
-    return( limit );
+    return limit;
 
-  register unsigned int i,j;
+  unsigned int i,j;
   size_t rej_len = strlen( reject );
 
   for ( i = 0; i < limit; s++, i++ ) {
     for ( j = 0; j < rej_len; j++ ) {
       if ( *s == reject[j] ) {
-        return( i );
+        return i;
       }
     }
   }
-  return( limit );
+  return limit;
 }
 
 #endif // ZM_MEM_UTILS_H
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f876e02c7..13a27600f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -51,6 +51,9 @@
 #if HAVE_LIBCURL
 #include "zm_curl_camera.h"
 #endif // HAVE_LIBCURL
+#if HAVE_LIBVNC
+#include "zm_libvnc_camera.h"
+#endif // HAVE_LIBVNC
 
 #if ZM_MEM_MAPPED
 #include <sys/mman.h>
@@ -88,15 +91,16 @@ std::string CameraType_Strings[] = {
   "File",
   "Ffmpeg",
   "LibVLC",
-  "cURL",
   "NVSOCKET",
+  "CURL",
+  "VNC",
 };
 
-Monitor::MonitorLink::MonitorLink(int p_id, const char *p_name) :
+Monitor::MonitorLink::MonitorLink(unsigned int p_id, const char *p_name) :
   id(p_id),
-  shared_data(NULL),
-  trigger_data(NULL),
-  video_store_data(NULL)
+  shared_data(nullptr),
+  trigger_data(nullptr),
+  video_store_data(nullptr)
 {
   strncpy(name, p_name, sizeof(name)-1);
 
@@ -107,7 +111,7 @@ Monitor::MonitorLink::MonitorLink(int p_id, const char *p_name) :
   shm_id = 0;
 #endif // ZM_MEM_MAPPED
   mem_size = 0;
-  mem_ptr = 0;
+  mem_ptr = nullptr;
 
   last_event_id = 0;
   last_state = IDLE;
@@ -121,61 +125,61 @@ Monitor::MonitorLink::~MonitorLink() {
 }
 
 bool Monitor::MonitorLink::connect() {
-  if ( !last_connect_time || (time( 0 ) - last_connect_time) > 60 ) {
-    last_connect_time = time( 0 );
+  if ( !last_connect_time || (time(nullptr) - last_connect_time) > 60 ) {
+    last_connect_time = time(nullptr);
 
     mem_size = sizeof(SharedData) + sizeof(TriggerData);
 
-    Debug( 1, "link.mem.size=%d", mem_size );
+    Debug(1, "link.mem.size=%d", mem_size);
 #if ZM_MEM_MAPPED
-    map_fd = open( mem_file, O_RDWR, (mode_t)0600 );
+    map_fd = open(mem_file, O_RDWR, (mode_t)0600);
     if ( map_fd < 0 ) {
-      Debug( 3, "Can't open linked memory map file %s: %s", mem_file, strerror(errno) );
+      Debug(3, "Can't open linked memory map file %s: %s", mem_file, strerror(errno));
       disconnect();
-      return( false );
+      return false;
     }
     while ( map_fd <= 2 ) {
       int new_map_fd = dup(map_fd);
-      Warning( "Got one of the stdio fds for our mmap handle. map_fd was %d, new one is %d", map_fd, new_map_fd );
+      Warning("Got one of the stdio fds for our mmap handle. map_fd was %d, new one is %d", map_fd, new_map_fd);
       close(map_fd);
       map_fd = new_map_fd;
     }
 
     struct stat map_stat;
-    if ( fstat( map_fd, &map_stat ) < 0 ) {
-      Error( "Can't stat linked memory map file %s: %s", mem_file, strerror(errno) );
+    if ( fstat(map_fd, &map_stat) < 0 ) {
+      Error("Can't stat linked memory map file %s: %s", mem_file, strerror(errno));
       disconnect();
-      return( false );
+      return false;
     }
 
     if ( map_stat.st_size == 0 ) {
-      Error( "Linked memory map file %s is empty: %s", mem_file, strerror(errno) );
+      Error("Linked memory map file %s is empty: %s", mem_file, strerror(errno));
       disconnect();
-      return( false );
+      return false;
     } else if ( map_stat.st_size < mem_size ) {
-      Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
+      Error("Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size);
       disconnect();
-      return( false );
+      return false;
     }
 
-    mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
+    mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
     if ( mem_ptr == MAP_FAILED ) {
-      Error( "Can't map file %s (%d bytes) to memory: %s", mem_file, mem_size, strerror(errno) );
+      Error("Can't map file %s (%d bytes) to memory: %s", mem_file, mem_size, strerror(errno));
       disconnect();
-      return( false );
+      return false;
     }
 #else // ZM_MEM_MAPPED
     shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, 0700 );
     if ( shm_id < 0 ) {
-      Debug( 3, "Can't shmget link memory: %s", strerror(errno) );
+      Debug(3, "Can't shmget link memory: %s", strerror(errno );
       connected = false;
-      return( false );
+      return false;
     }
-    mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
+    mem_ptr = (unsigned char *)shmat(shm_id, 0, 0);
     if ( mem_ptr < (void *)0 ) {
-      Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
+      Debug(3, "Can't shmat link memory: %s", strerror(errno));
       connected = false;
-      return( false );
+      return false;
     }
 #endif // ZM_MEM_MAPPED
 
@@ -183,18 +187,18 @@ bool Monitor::MonitorLink::connect() {
     trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
 
     if ( !shared_data->valid ) {
-      Debug( 3, "Linked memory not initialised by capture daemon" );
+      Debug(3, "Linked memory not initialised by capture daemon");
       disconnect();
-      return( false );
+      return false;
     }
 
     last_state = shared_data->state;
     last_event_id = shared_data->last_event_id;
     connected = true;
 
-    return( true );
+    return true;
   }
-  return( false );
+  return false;
 } // end bool Monitor::MonitorLink::connect()
 
 bool Monitor::MonitorLink::disconnect() {
@@ -233,7 +237,7 @@ bool Monitor::MonitorLink::disconnect() {
 
 #endif // ZM_MEM_MAPPED
     mem_size = 0;
-    mem_ptr = 0;
+    mem_ptr = nullptr;
   }
   return( true );
 }
@@ -277,7 +281,7 @@ Monitor::Monitor()
   //pass
   //path
  //device 
- palette(0),
+  palette(0),
   channel(0),
   format(0),
 
@@ -288,6 +292,8 @@ Monitor::Monitor()
   orientation(ROTATE_0),
   deinterlacing(0),
   deinterlacing_value(0),
+  decoder_hwaccel_name(""),
+  decoder_hwaccel_device(""),
   videoRecording(0),
   rtsp_describe(0),
 
@@ -328,13 +334,13 @@ Monitor::Monitor()
   last_motion_score(0),
   camera(0),
   n_zones(0),
-  zones(NULL),
+  zones(nullptr),
   timestamps(0),
   images(0),
-  privacy_bitmask( NULL ),
-  event_delete_thread(NULL),
+  privacy_bitmask( nullptr ),
+  event_delete_thread(nullptr),
   n_linked_monitors(0),
-  linked_monitors(NULL)
+  linked_monitors(nullptr)
 {
 
   if ( strcmp(config.event_close_mode, "time") == 0 )
@@ -344,13 +350,13 @@ Monitor::Monitor()
   else
     event_close_mode = CLOSE_IDLE;
 
-  start_time = last_fps_time = time( 0 );
+  start_time = last_fps_time = time(0);
   event = 0;
   last_section_mod = 0;
 
   adaptive_skip = true;
 
-  videoStore = NULL;
+  videoStore = nullptr;
 } // Monitor::Monitor
 
 /*
@@ -410,6 +416,12 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
   alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
 
+  if ( analysis_fps > 0.0 ) {
+      uint64_t usec = round(1000000*pre_event_count/analysis_fps);
+      video_buffer_duration.tv_sec = usec/1000000;
+      video_buffer_duration.tv_usec = usec % 1000000;
+  }
+
   if ( dbrow[col] )
     strncpy(device, dbrow[col], sizeof(device)-1);
   else
@@ -545,6 +557,17 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
   last_signal = false;
 
   camera = NULL;
+  uint64_t image_size = width * height * colours;
+
+  if ( strcmp(config.event_close_mode, "time") == 0 )
+    event_close_mode = CLOSE_TIME;
+  else if ( strcmp(config.event_close_mode, "alarm") == 0 )
+    event_close_mode = CLOSE_ALARM;
+  else
+    event_close_mode = CLOSE_IDLE;
+
+  Debug(1, "monitor purpose=%d", purpose);
+
   mem_size = sizeof(SharedData)
        + sizeof(TriggerData)
        + sizeof(VideoStoreData) //Information to pass back to the capture process
@@ -556,9 +579,9 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
       sizeof(mem_size),
       sizeof(SharedData), sizeof(TriggerData), sizeof(VideoStoreData),
       (image_buffer_count*sizeof(struct timeval)),
-      image_buffer_count, camera->ImageSize(), (image_buffer_count*camera->ImageSize()),
+      image_buffer_count, image_size, (image_buffer_count*image_size),
      mem_size);
-  mem_ptr = NULL;
+  mem_ptr = nullptr;
 
   Zone **zones = 0;
   int n_zones = Zone::Load(this, zones);
@@ -567,22 +590,19 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
 
 // maybe unneeded
   // Should maybe store this for later use
-  char monitor_dir[PATH_MAX] = "";
-  snprintf(monitor_dir, sizeof(monitor_dir), "%s/%d", storage->Path(), id);
+  std::string monitor_dir = stringtf("%s/%d", storage->Path(), id);
   if ( purpose == CAPTURE ) {
-    if ( mkdir(monitor_dir, 0755) ) {
-      if ( errno != EEXIST ) {
-        Error("Can't mkdir %s: %s", monitor_dir, strerror(errno));
-      }
+    if ( mkdir(monitor_dir.c_str(), 0755) && ( errno != EEXIST ) ) {
+      Error("Can't mkdir %s: %s", monitor_dir.c_str(), strerror(errno));
     }
   } else if ( purpose == ANALYSIS ) {
     if ( config.record_diag_images ) {
-      diag_path_r = stringtf("%s/%d/diag-r.jpg", storage->Path(), id);
-      diag_path_d = stringtf("%s/%d/diag-d.jpg", storage->Path(), id);
+      diag_path_r = monitor_dir + "/diag-r.jpg";
+      diag_path_d = monitor_dir + "/diag-d.jpg";
     }
   }
 
-  //this0>delta_image( width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE ),
+  //this->delta_image( width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE ),
   //ref_image( width, height, p_camera->Colours(), p_camera->SubpixelOrder() ),
   Debug(1, "Loaded monitor %d(%s), %d zones", id, name, n_zones);
   getCamera();
@@ -657,7 +677,7 @@ Camera * Monitor::getCamera() {
     }
 #endif // HAVE_LIBAVFORMAT
     else {
-      Error( "Unexpected remote camera protocol '%s'", protocol.c_str() );
+      Error("Unexpected remote camera protocol '%s'", protocol.c_str());
     }
   } else if ( type == FILE ) {
     camera = new FileCamera(
@@ -781,7 +801,7 @@ Monitor *Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose) {
   if ( config.record_diag_images ) {
     diag_path_r = stringtf(config.record_diag_images_fifo ? "%s/%d/diagpipe-r.jpg" : "%s/%d/diag-r.jpg", storage->Path(), id);
     diag_path_d = stringtf(config.record_diag_images_fifo ? "%s/%d/diagpipe-d.jpg" : "%s/%d/diag-d.jpg", storage->Path(), id);
-    if (config.record_diag_images_fifo){
+    if ( config.record_diag_images_fifo ) {
       FifoStream::fifo_create_if_missing(diag_path_r.c_str());
       FifoStream::fifo_create_if_missing(diag_path_d.c_str());
     }
@@ -791,21 +811,24 @@ Monitor *Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose) {
   return monitor;
 } // end Monitor *Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose)
 
-
 bool Monitor::connect() {
-  Debug(3, "Connecting to monitor.  Purpose is %d", purpose );
+  Debug(3, "Connecting to monitor.  Purpose is %d", purpose);
 #if ZM_MEM_MAPPED
   snprintf(mem_file, sizeof(mem_file), "%s/zm.mmap.%d", staticConfig.PATH_MAP.c_str(), id);
   map_fd = open(mem_file, O_RDWR|O_CREAT, (mode_t)0600);
   if ( map_fd < 0 ) {
-    Fatal("Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno));
+    Error("Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno));
+    return false;
   } else {
     Debug(3, "Success opening mmap file at (%s)", mem_file);
   }
 
   struct stat map_stat;
-  if ( fstat(map_fd, &map_stat) < 0 )
-    Fatal("Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno));
+  if ( fstat(map_fd, &map_stat) < 0 ) {
+    Error("Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno));
+    close(map_fd);
+    return false;
+  }
 
   if ( map_stat.st_size != mem_size ) {
     if ( purpose == CAPTURE ) {
@@ -828,12 +851,12 @@ bool Monitor::connect() {
 
   Debug(3, "MMap file size is %ld", map_stat.st_size);
 #ifdef MAP_LOCKED
-  mem_ptr = (unsigned char *)mmap(NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0);
+  mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0);
   if ( mem_ptr == MAP_FAILED ) {
     if ( errno == EAGAIN ) {
       Debug(1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size);
 #endif
-      mem_ptr = (unsigned char *)mmap(NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
+      mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
       Debug(1, "Mapped file %s (%d bytes) to unlocked memory", mem_file, mem_size);
 #ifdef MAP_LOCKED
     } else {
@@ -843,8 +866,8 @@ bool Monitor::connect() {
 #endif
   if ( mem_ptr == MAP_FAILED )
     Fatal("Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno);
-  if ( mem_ptr == NULL ) {
-    Error("mmap gave a null address:");
+  if ( mem_ptr == nullptr ) {
+    Error("mmap gave a NULL address:");
   } else {
     Debug(3, "mmapped to %p", mem_ptr);
   }
@@ -877,7 +900,7 @@ bool Monitor::connect() {
   for ( int i = 0; i < image_buffer_count; i++ ) {
     image_buffer[i].image_index = i;
     image_buffer[i].timestamp = &(shared_timestamps[i]);
-    image_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]) );
+    image_buffer[i].image = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]));
     image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
   }
   if ( deinterlacing_value == 4 ) {
@@ -953,13 +976,13 @@ Monitor::~Monitor() {
       if ( event_delete_thread ) {
         event_delete_thread->join();
         delete event_delete_thread;
-        event_delete_thread = NULL;
+        event_delete_thread = nullptr;
       }
     }
     if ( event_delete_thread ) {
       event_delete_thread->join();
       delete event_delete_thread;
-      event_delete_thread = NULL;
+      event_delete_thread = nullptr;
     }
 
     if ( deinterlacing_value == 4 ) {
@@ -1060,9 +1083,9 @@ void Monitor::AddZones(int p_n_zones, Zone *p_zones[]) {
 void Monitor::AddPrivacyBitmask(Zone *p_zones[]) {
   if ( privacy_bitmask ) {
     delete[] privacy_bitmask;
-    privacy_bitmask = NULL;
+    privacy_bitmask = nullptr;
   }
-  Image *privacy_image = NULL;
+  Image *privacy_image = nullptr;
 
   for ( int i=0; i < n_zones; i++ ) {
     if ( p_zones[i]->IsPrivacy() ) {
@@ -1082,7 +1105,7 @@ Monitor::State Monitor::GetState() const {
   return (State)shared_data->state;
 }
 
-int Monitor::GetImage( int index, int scale ) {
+int Monitor::GetImage(int index, int scale) {
   if ( index < 0 || index > image_buffer_count ) {
     index = shared_data->last_write_index;
   }
@@ -1147,16 +1170,6 @@ unsigned int Monitor::GetLastWriteIndex() const {
 }
 
 uint64_t Monitor::GetLastEventId() const {
-#if 0
-  Debug(2, "mem_ptr(%x), size(%d) State(%d) last_read_index(%d) last_read_time(%d) last_event(%" PRIu64 ")",
-      mem_ptr,
-      shared_data->size,
-      shared_data->state,
-      shared_data->last_read_index,
-      shared_data->last_read_time,
-      shared_data->last_event_id
-      );
-#endif
   return shared_data->last_event_id;
 }
 
@@ -1269,7 +1282,7 @@ void Monitor::actionEnable() {
 
   db_mutex.lock();
   static char sql[ZM_SQL_SML_BUFSIZ];
-  snprintf(sql, sizeof(sql), "UPDATE Monitors SET Enabled = 1 WHERE Id = %d", id);
+  snprintf(sql, sizeof(sql), "UPDATE `Monitors` SET `Enabled` = 1 WHERE `Id` = %d", id);
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
   }
@@ -1280,7 +1293,7 @@ void Monitor::actionDisable() {
   shared_data->action |= RELOAD;
 
   static char sql[ZM_SQL_SML_BUFSIZ];
-  snprintf(sql, sizeof(sql), "update Monitors set Enabled = 0 where Id = %d", id);
+  snprintf(sql, sizeof(sql), "UPDATE `Monitors` SET `Enabled` = 0 WHERE `Id` = %d", id);
   db_mutex.lock();
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
@@ -1431,7 +1444,7 @@ void Monitor::DumpZoneImage(const char *zone_string) {
     }
   }
 
-  Image *zone_image = NULL;
+  Image *zone_image = nullptr;
   if ( ( (!staticConfig.SERVER_ID) || ( staticConfig.SERVER_ID == server_id ) ) && mem_ptr ) {
     Debug(3, "Trying to load from local zmc");
     int index = shared_data->last_write_index;
@@ -1450,7 +1463,7 @@ void Monitor::DumpZoneImage(const char *zone_string) {
       stream->setStreamStart(event_id, (unsigned int)1);
       zone_image = stream->getImage();
       delete stream;
-      stream = NULL;
+      stream = nullptr;
     } else {
       Error("Unable to load an event for monitor %d", id);
       return;
@@ -1581,7 +1594,8 @@ bool Monitor::CheckSignal(const Image *image) {
 
 void Monitor::CheckAction() {
   struct timeval now;
-  gettimeofday(&now, NULL);
+  gettimeofday(&now, nullptr);
+
   if ( shared_data->action ) {
     // Can there be more than 1 bit set in the action?  Shouldn't these be elseifs?
     if ( shared_data->action & RELOAD ) {
@@ -1616,7 +1630,7 @@ void Monitor::CheckAction() {
   if ( auto_resume_time && (now.tv_sec >= auto_resume_time) ) {
     Info("Auto resuming at count %d", image_count);
     shared_data->active = true;
-    ref_image = *(image_buffer[shared_data->last_write_index].image);
+    ref_image.Assign(*(image_buffer[shared_data->last_write_index].image));
     ready_count = image_count+(warmup_count/2);
     auto_resume_time = 0;
   }
@@ -1657,7 +1671,7 @@ bool Monitor::Analyse() {
   // last_read_index is the last analysis
 
   if ( !Enabled() ) {
-    Warning("Shouldn't be doing Analyze when not Enabled");
+    Warning("Shouldn't be doing Analyse when not Enabled");
     return false;
   }
 
@@ -1706,9 +1720,6 @@ bool Monitor::Analyse() {
           score += trigger_data->trigger_score;
           Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
           if ( !event ) {
-            // How could it have a length already?
-            //if ( cause.length() )
-            //cause += ", ";
             cause += trigger_data->trigger_cause;
           }
           Event::StringSet noteSet;
@@ -1717,6 +1728,7 @@ bool Monitor::Analyse() {
         } // end if trigger_on
 
         if ( signal_change ) {
+          Debug(1, "Signal change");
           const char *signalText;
           if ( !signal ) {
             signalText = "Lost";
@@ -1744,8 +1756,7 @@ bool Monitor::Analyse() {
           noteSetMap[SIGNAL_CAUSE] = noteSet;
           shared_data->state = state = IDLE;
           shared_data->active = signal;
-          ref_image = *snap_image;
-
+          ref_image.Assign(*snap_image);
         }// else 
 
         if ( signal ) {
@@ -1757,8 +1768,8 @@ bool Monitor::Analyse() {
               if ( snap->image ) {
 
                 // Get new score.
-                Debug(3,"before DetectMotion packet index is %d", snap->image_index);
-                motion_score = DetectMotion( *snap_image, zoneSet );
+                Debug(3, "before DetectMotion packet index is %d", snap->image_index);
+                motion_score = DetectMotion(*snap_image, zoneSet);
 
                 Debug(3, "After motion detection, last_motion_score(%d), new motion score(%d)", last_motion_score, motion_score);
               } else {
@@ -1801,6 +1812,7 @@ bool Monitor::Analyse() {
                   score += 50;
                 }
               } else {
+                Debug(1, "Linked monitor %d %d is not connected. Connecting.", i, linked_monitors[i]->Id());
                 linked_monitors[i]->connect();
               }
             } // end foreach linked_monitor
@@ -1812,10 +1824,10 @@ bool Monitor::Analyse() {
             // If doing record, check to see if we need to close the event or not.
 
             if ( event ) {
-              Debug(2,"Have event in mocard");
+              Debug(2, "Have event in mocord");
               if ( section_length
                   && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
-                  && ( ! ( timestamp->tv_sec % section_length ) ) 
+                  && ( (function == MOCORD && (event_close_mode != CLOSE_TIME)) || ! ( timestamp->tv_sec % section_length ) ) 
                  ) {
 
                 Info("%s: %03d - Closing event %" PRIu64 ", section end forced %d - %d = %d >= %d",
@@ -1863,20 +1875,20 @@ bool Monitor::Analyse() {
                   && (!event->AlarmFrames())
                   && (event_close_mode == CLOSE_ALARM)
                   && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= min_section_length )
+                  && ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1) )
                  ) {
                 Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
                     name, image_count, event->Id());
                 closeEvent();
               } else if ( event ) {
                 // This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
-                Debug(3, "pre-alarm-count in event %d, event frames %d, alarm frames %d event length %d >=? %d",
+                Debug(3, "pre-alarm-count in event %d, event frames %d, alarm frames %d event length %d >=? %d min",
                     Event::PreAlarmCount(), event->Frames(), event->AlarmFrames(), 
                     ( timestamp->tv_sec - video_store_data->recording.tv_sec ), min_section_length
                     );
               }
 
               if ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1) ) {
-                shared_data->state = state = ALARM;
                 // lets construct alarm cause. It will contain cause + names of zones alarmed
                 std::string alarm_cause = "";
                 for ( int i=0; i < n_zones; i++ ) {
@@ -1897,11 +1909,12 @@ bool Monitor::Analyse() {
                   //set up video store data
                   snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
                   video_store_data->recording = event->StartTime();
+                  shared_data->state = state = ALARM;
 
                   Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name, image_count, event->Id());
-
                 }
                 if ( alarm_frame_count ) {
+Debug(1, "alarm frame count so SavePreAlarmFrames");
                   event->SavePreAlarmFrames();
                 }
               } else if ( state != PREALARM ) {
@@ -1943,7 +1956,7 @@ bool Monitor::Analyse() {
           snap->score = score;
 
           if ( state == PREALARM || state == ALARM ) {
-            if ( config.create_analysis_images ) {
+            if ( savejpegs > 1 ) {
               bool got_anal_image = false;
               Image *anal_image = new Image( *snap_image );
               //alarm_image.Assign( *snap_image );
@@ -1992,7 +2005,7 @@ bool Monitor::Analyse() {
         } // end if signal
 
       } else {
-        Debug(3,"Not ready?");
+        Debug(3, "Not ready?");
         snap->unlock();
         return false;
       }
@@ -2015,14 +2028,15 @@ bool Monitor::Analyse() {
       // Only loop until we hit the analysis index
       while ( ( queued_packet = packetqueue->popPacket() ) ) {
         if ( snap == queued_packet ) {
-          Debug(2,"adding snap packet (%d) qp last_write_index(%d), written(%d)", queued_packet->image_index, last_write, written );
+          // We already have it locked
+          Debug(2, "adding snap packet (%d) qp last_write_index(%d), written(%d)", queued_packet->image_index, last_write, written );
           event->AddPacket(queued_packet);
           // Pop may have already incrememented it
           //packetqueue->increment_analysis_it();
           break;
         } else {
           queued_packet->lock();
-          Debug(2,"adding queued packet (%d) qp last_write_index(%d), written(%d)", queued_packet->image_index, last_write, written );
+          Debug(2, "adding queued packet (%d) qp last_write_index(%d), written(%d)", queued_packet->image_index, last_write, written );
           event->AddPacket(queued_packet);
           queued_packet->unlock();
         }
@@ -2035,6 +2049,7 @@ bool Monitor::Analyse() {
       } // end while write out queued_packets
       queued_packet = NULL;
     } else {
+      Debug(1, "Incrementing analysis_it beacuse no event");
       packetqueue->increment_analysis_it();
     }
 
@@ -2047,7 +2062,7 @@ bool Monitor::Analyse() {
   if ( packets_processed > 0 )
     return true;
   return false;
-} // end Monitor::Analyze
+} // end Monitor::Analyse
 
 void Monitor::Reload() {
   Debug(1, "Reloading monitor %s", name);
@@ -2071,10 +2086,10 @@ void Monitor::Reload() {
     ready_count = image_count+warmup_count;
 
     delete row;
-  } // end if row
+  }  // end if row
 
   ReloadZones();
-} // void Monitor::Reload()
+}  // end void Monitor::Reload()
 
 void Monitor::ReloadZones() {
   Debug(1, "Reloading zones for monitor %s", name);
@@ -2082,7 +2097,7 @@ void Monitor::ReloadZones() {
     delete zones[i];
   }
   delete[] zones;
-  zones = 0;
+  zones = nullptr;
   n_zones = Zone::Load(this, zones);
   //DumpZoneImage();
 } // end void Monitor::ReloadZones()
@@ -2094,7 +2109,7 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
       delete linked_monitors[i];
     }
     delete[] linked_monitors;
-    linked_monitors = 0;
+    linked_monitors = nullptr;
   }
 
   n_linked_monitors = 0;
@@ -2148,7 +2163,13 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
 
         db_mutex.lock();
         static char sql[ZM_SQL_SML_BUFSIZ];
-        snprintf(sql, sizeof(sql), "SELECT Id, Name FROM Monitors WHERE Id = %d AND Function != 'None' AND Function != 'Monitor' AND Enabled = 1", link_ids[i] );
+        snprintf(sql, sizeof(sql),
+            "SELECT `Id`, `Name` FROM `Monitors`"
+            "  WHERE `Id` = %d"
+            "   AND `Function` != 'None'"
+            "   AND `Function` != 'Monitor'"
+            "   AND `Enabled`=1",
+            link_ids[i]);
         if ( mysql_query(&dbconn, sql) ) {
 					db_mutex.unlock();
           Error("Can't run query: %s", mysql_error(&dbconn));
@@ -2206,44 +2227,44 @@ int Monitor::LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose)
 #if ZM_HAS_V4L
 int Monitor::LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose) {
 
-  std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'Local'";
+  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'Local'";
 
   if ( device[0] )
-    sql += " AND Device='" + std::string(device) + "'";
+    sql += " AND `Device`='" + std::string(device) + "'";
   if ( staticConfig.SERVER_ID )
-    sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
+    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
   return LoadMonitors(sql, monitors, purpose);
 } // end int Monitor::LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose)
 #endif // ZM_HAS_V4L
 
 int Monitor::LoadRemoteMonitors(const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose) {
-  std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'Remote'";
+  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'Remote'";
   if ( staticConfig.SERVER_ID )
-    sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
+    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
 
   if ( protocol )
-    sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path);
+    sql += stringtf(" AND `Protocol` = '%s' AND `Host` = '%s' AND `Port` = '%s' AND `Path` = '%s'", protocol, host, port, path);
   return LoadMonitors(sql, monitors, purpose);
 } // end int Monitor::LoadRemoteMonitors
 
 int Monitor::LoadFileMonitors(const char *file, Monitor **&monitors, Purpose purpose) {
-  std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'File'";
+  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'File'";
   if ( file[0] )
-    sql += " AND Path='" + std::string(file) + "'";
+    sql += " AND `Path`='" + std::string(file) + "'";
   if ( staticConfig.SERVER_ID ) {
-    sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
+    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
   }
   return LoadMonitors(sql, monitors, purpose);
 } // end int Monitor::LoadFileMonitors
 
 #if HAVE_LIBAVFORMAT
 int Monitor::LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose purpose) {
-  std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'Ffmpeg'";
+  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'Ffmpeg'";
   if ( file[0] )
-    sql += " AND Path = '" + std::string(file) + "'";
+    sql += " AND `Path` = '" + std::string(file) + "'";
 
   if ( staticConfig.SERVER_ID ) {
-    sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
+    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
   }
   return LoadMonitors(sql, monitors, purpose);
 } // end int Monitor::LoadFfmpegMonitors
@@ -2255,17 +2276,20 @@ int Monitor::LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose p
 int Monitor::Capture() {
   static int FirstCapture = 1; // Used in de-interlacing to indicate whether this is the even or odd image
 
-  unsigned int index = 0;
-  //image_count % image_buffer_count;
+  // I think was starting to work towards not using the buffer. So only ever use the first image.
+  // Let's not do this for now.
+  unsigned int index = image_count % image_buffer_count;
 
-  ZMPacket *packet = new ZMPacket();
-  packet->timestamp = image_buffer[index].timestamp;
-  packet->image_index = image_count;
+  ZMPacket *packet = &image_buffer[index];
+  //new ZMPacket();
+  //packet->timestamp = image_buffer[index].timestamp;
+  //packet->image_index = image_count;
 
   //&image_buffer[index];
   packet->lock();
   packet->reset();
   Image* capture_image = packet->image;
+  Debug(1, "capture image: %d x %d linesize: %d", capture_image->Width(), capture_image->Height(), capture_image->LineSize());
   int captureResult = 0;
 
   if ( deinterlacing_value == 4 ) {
@@ -2287,7 +2311,7 @@ int Monitor::Capture() {
     captureResult = camera->Capture(*packet);
     gettimeofday(packet->timestamp, NULL);
     if ( captureResult < 0 ) {
-      Debug(2,"failed capture");
+      Debug(2, "failed capture");
       // Unable to capture image for temporary reason
       // Fake a signal loss image
       Rgb signalcolor;
@@ -2309,8 +2333,8 @@ int Monitor::Capture() {
           packet->packet.stream_index, video_stream_id, packetqueue->video_packet_count, ( event ? 1 : 0 ) );
 
       if ( packet->packet.stream_index != video_stream_id ) {
-        Debug(2, "Have audio packet (%d) != videostream_id:(%d) q.vpktcount(%d) event?(%d) ",
-            packet->packet.stream_index, video_stream_id, packetqueue->video_packet_count, ( event ? 1 : 0 ) );
+//Debug(2, "Have audio packet (%d) != videostream_id:(%d) q.vpktcount(%d) event?(%d) ",
+ //           packet->packet.stream_index, video_stream_id, packetqueue->video_packet_count, ( event ? 1 : 0 ) );
         // Only queue if we have some video packets in there. Should push this logic into packetqueue
         //mutex.lock();
         if ( packetqueue->video_packet_count || event ) {
@@ -2321,13 +2345,12 @@ int Monitor::Capture() {
 #else
           packet->codec_type = camera->get_AudioStream()->codec->codec_type;
 #endif
-          Debug(2, "Queueing packet");
+          Debug(2, "Queueing audio packet");
           packetqueue->queuePacket(packet);
         }
         // Don't update last_write_index because that is used for live streaming
         //shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
         
-        //mutex.unlock();
         packet->unlock();
         return 1;
       }
@@ -2374,6 +2397,7 @@ int Monitor::Capture() {
       }
 
       if ( orientation != ROTATE_0 ) {
+        Debug(2, "Doing rotation");
         switch ( orientation ) {
           case ROTATE_0 :
             // No action required
@@ -2394,13 +2418,16 @@ int Monitor::Capture() {
         capture_image->MaskPrivacy(privacy_bitmask);
 
       if ( config.timestamp_on_capture ) {
+        Debug(1, "Timestamping");
         TimestampImage(capture_image, packet->timestamp);
       }
 
       shared_data->signal = signal_check_points ? CheckSignal(capture_image) : true;
+        Debug(1, "signal check points? %d", signal_check_points);
       shared_data->last_write_index = index;
       shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
       image_count++;
+      Debug(2, "Unlocking packet");
       packet->unlock();
 
       if ( fps_report_interval && ( !(image_count%fps_report_interval) || image_count == 5 ) ) {
@@ -2460,13 +2487,13 @@ int Monitor::Capture() {
   return captureResult;
 } // end Monitor::Capture
 
-void Monitor::TimestampImage( Image *ts_image, const struct timeval *ts_time ) const {
+void Monitor::TimestampImage(Image *ts_image, const struct timeval *ts_time) const {
   if ( !label_format[0] )
     return;
 
   // Expand the strftime macros first
   char label_time_text[256];
-  strftime( label_time_text, sizeof(label_time_text), label_format, localtime( &ts_time->tv_sec ) );
+  strftime(label_time_text, sizeof(label_time_text), label_format, localtime(&ts_time->tv_sec));
 
   char label_text[1024];
   const char *s_ptr = label_time_text;
@@ -2476,15 +2503,15 @@ void Monitor::TimestampImage( Image *ts_image, const struct timeval *ts_time ) c
       bool found_macro = false;
       switch ( *(s_ptr+1) ) {
         case 'N' :
-          d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name );
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name);
           found_macro = true;
           break;
         case 'Q' :
-          d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", trigger_data->trigger_showtext );
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", trigger_data->trigger_showtext);
           found_macro = true;
           break;
         case 'f' :
-          d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000 );
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000);
           found_macro = true;
           break;
       }
@@ -2496,7 +2523,9 @@ void Monitor::TimestampImage( Image *ts_image, const struct timeval *ts_time ) c
     *d_ptr++ = *s_ptr++;
   } // end while
   *d_ptr = '\0';
+  Debug(2, "annotating %s", label_text);
   ts_image->Annotate(label_text, label_coord, label_size);
+  Debug(2, "done annotating %s", label_text);
 } // end void Monitor::TimestampImage
 
 bool Monitor::closeEvent() {
@@ -2510,13 +2539,13 @@ bool Monitor::closeEvent() {
     }
     event_delete_thread = new std::thread([](Event *event) {
       Event * e = event;
-      event = NULL;
+      event = nullptr;
       delete e;
-      e = NULL;
+      e = nullptr;
       }, event);
 #else
   delete event;
-  event = NULL;
+  event = nullptr;
 #endif
   video_store_data->recording = (struct timeval){0};
   return true;
@@ -2758,7 +2787,7 @@ Monitor::Orientation Monitor::getOrientation() const { return orientation; }
 
 // Wait for camera to get an image, and then assign it as the base reference image. So this should be done as the first task in the analysis thread startup.
 void Monitor::get_ref_image() {
-  ZMPacket * snap;
+  ZMPacket *snap;
   while ( ( (!( snap = packetqueue->get_analysis_packet()))
     || ( snap->packet.stream_index != video_stream_id ) )
     && !zm_terminate) {
@@ -2770,7 +2799,7 @@ void Monitor::get_ref_image() {
     return;
 
   ref_image.Assign(width, height, camera->Colours(), camera->SubpixelOrder(), snap->image->Buffer(), camera->ImageSize());
-  Debug(2,"Have image about to unlock");
+  Debug(2, "Have ref image about to unlock");
   snap->unlock();
 }
 
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 0477a4c65..2ca6bba42 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -80,6 +80,7 @@ public:
     LIBVLC,
     CURL,
     NVSOCKET,
+    VNC,
   } CameraType;
 
   typedef enum {
@@ -92,6 +93,7 @@ public:
   } Orientation;
 
   typedef enum {
+    UNKNOWN=-1,
     IDLE,
     PREALARM,
     ALARM,
@@ -142,15 +144,23 @@ protected:
       time_t startup_time;			/* When the zmc process started.  zmwatch uses this to see how long the process has been running without getting any images */
       uint64_t extrapad1;
     };
-    union {                     /* +72  */
-      time_t last_write_time;
+    union {                     /* +72   */
+      time_t zmc_heartbeat_time;			/* Constantly updated by zmc.  Used to determine if the process is alive or hung or dead */
       uint64_t extrapad2;
     };
-    union {            /* +80   */
-      time_t last_read_time;
+    union {                     /* +80   */
+      time_t zma_heartbeat_time;			/* Constantly updated by zma.  Used to determine if the process is alive or hung or dead */
       uint64_t extrapad3;
     };
-    uint8_t control_state[256];  /* +88   */
+    union {                     /* +88  */
+      time_t last_write_time;
+      uint64_t extrapad4;
+    };
+    union {                     /* +96  */
+      time_t last_read_time;
+      uint64_t extrapad5;
+    };
+    uint8_t control_state[256];  /* +104   */
 
     char alarm_cause[256];
 
@@ -207,13 +217,13 @@ protected:
     uint64_t   last_event_id;
 
     public:
-      MonitorLink( int p_id, const char *p_name );
+      MonitorLink(unsigned int p_id, const char *p_name);
       ~MonitorLink();
 
-      inline int Id() const { return id; }
+      inline unsigned int Id() const { return id; }
       inline const char *Name() const { return name; }
 
-      inline bool isConnected() const { return connected; }
+      inline bool isConnected() const { return connected && shared_data->valid; }
       inline time_t getLastConnectTime() const { return last_connect_time; }
 
       bool connect();
@@ -257,10 +267,10 @@ protected:
   Orientation     orientation;        // Whether the image has to be rotated at all
   unsigned int    deinterlacing;
   unsigned int    deinterlacing_value;
-  bool            videoRecording;
-  bool rtsp_describe;
   std::string     decoder_hwaccel_name;
   std::string     decoder_hwaccel_device;
+  bool            videoRecording;
+  bool rtsp_describe;
 
   int savejpegs;
   int colours;
@@ -297,6 +307,7 @@ protected:
   int        frame_skip;        // How many frames to skip in continuous modes
   int        motion_frame_skip;      // How many frames to skip in motion detection
   double     analysis_fps_limit;     // Target framerate for video analysis
+  struct timeval video_buffer_duration; // How long a video segment to keep in buffer (set only if analysis fps != 0 )
   unsigned int  analysis_update_delay;  //  How long we wait before updating analysis parameters
   int        capture_delay;      // How long we wait between capture frames
   int        alarm_capture_delay;  // How long we wait between capture frames when in alarm state
@@ -383,7 +394,7 @@ protected:
 
 public:
   explicit Monitor();
-  explicit Monitor(int p_id);
+  explicit Monitor(unsigned int p_id);
 
   ~Monitor();
 
@@ -391,12 +402,13 @@ public:
   void AddPrivacyBitmask( Zone *p_zones[] );
 
   bool connect();
+
   inline int ShmValid() const {
-    return( shared_data->valid );
+    return shared_data && shared_data->valid;
   }
   Camera *getCamera();
 
-  inline int Id() const { return id; }
+  inline unsigned int Id() const { return id; }
   inline const char *Name() const { return name; }
   inline Storage *getStorage() {
     if ( ! storage ) {
@@ -452,7 +464,7 @@ public:
 
   int GetOptSaveJPEGs() const { return savejpegs; }
   VideoWriter GetOptVideoWriter() const { return videowriter; }
-  const std::vector<EncoderParameter_t>* GetOptEncoderParams() const { return &encoderparamsvec; }
+  //const std::vector<EncoderParameter_t>* GetEncoderParams() const { return &encoderparamsvec; }
   const std::string &GetEncoderOptions() const { return encoderparams; }
   const int OutputCodec() const { return output_codec; }
   const std::string &Encoder() const { return encoder; }
@@ -461,8 +473,12 @@ public:
   uint64_t GetVideoWriterEventId() const { return video_store_data->current_event; }
   void SetVideoWriterEventId( uint64_t p_event_id ) { video_store_data->current_event = p_event_id; }
 
+  struct timeval GetVideoWriterStartTime() const { return video_store_data->recording; }
+  void SetVideoWriterStartTime(struct timeval &t) { video_store_data->recording = t; }
+ 
   unsigned int GetPreEventCount() const { return pre_event_count; };
-    int GetImageBufferCount() const { return image_buffer_count; };
+  struct timeval GetVideoBufferDuration() const { return video_buffer_duration; };
+  int GetImageBufferCount() const { return image_buffer_count; };
   State GetState() const;
   int GetImage( int index=-1, int scale=100 );
   ZMPacket *getSnapshot( int index=-1 ) const;
@@ -541,6 +557,9 @@ public:
 #if HAVE_LIBAVCODEC
   //void StreamMpeg( const char *format, int scale=100, int maxfps=10, int bitrate=100000 );
 #endif // HAVE_LIBAVCODEC
+  double get_capture_fps( ) const {
+    return capture_fps;
+  }
 };
 
 #define MOD_ADD( var, delta, limit ) (((var)+(limit)+(delta))%(limit))
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 5c905e6bd..e586a0910 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -1,21 +1,21 @@
 //
 // ZoneMinder Monitor Class Implementation, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // 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.
-// 
+//
 
 #include "zm.h"
 #include "zm_db.h"
@@ -73,7 +73,7 @@ bool MonitorStream::checkSwapPath(const char *path, bool create_path) {
     return false;
   }
   return true;
-} // end bool MonitorStream::checkSwapPath( const char *path, bool create_path ) 
+} // end bool MonitorStream::checkSwapPath( const char *path, bool create_path )
 
 void MonitorStream::processCommand(const CmdMsg *msg) {
   Debug(2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0]);
@@ -251,21 +251,30 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   } status_data;
 
   status_data.id = monitor->Id();
-  status_data.fps = monitor->GetFPS();
-  status_data.state = monitor->shared_data->state;
-  if ( playback_buffer > 0 )
-    status_data.buffer_level = (MOD_ADD( (temp_write_index-temp_read_index), 0, temp_image_buffer_count )*100)/temp_image_buffer_count;
-  else
+  if ( ! monitor->ShmValid() ) {
+    status_data.fps = 0.0;
+    status_data.state = Monitor::UNKNOWN;
+    //status_data.enabled = monitor->shared_data->active;
+    status_data.enabled = false;
+    status_data.forced = false;
     status_data.buffer_level = 0;
+  } else {
+    status_data.fps = monitor->GetFPS();
+    status_data.state = monitor->shared_data->state;
+    //status_data.enabled = monitor->shared_data->active;
+    status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
+    status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
+    if ( playback_buffer > 0 )
+      status_data.buffer_level = (MOD_ADD( (temp_write_index-temp_read_index), 0, temp_image_buffer_count )*100)/temp_image_buffer_count;
+    else
+      status_data.buffer_level = 0;
+  }
   status_data.delayed = delayed;
   status_data.paused = paused;
   status_data.rate = replay_rate;
-  status_data.delay = TV_2_FLOAT( now ) - TV_2_FLOAT( last_frame_timestamp );
+  status_data.delay = TV_2_FLOAT(now) - TV_2_FLOAT(last_frame_timestamp);
   status_data.zoom = zoom;
-  //status_data.enabled = monitor->shared_data->active;
-  status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
-  status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
-  Debug(2, "Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d", 
+  Debug(2, "Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d",
     status_data.buffer_level,
     status_data.delayed,
     status_data.paused,
@@ -291,12 +300,13 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
 
   // quit after sending a status, if this was a quit request
   if ( (MsgCommand)msg->msg_data[0]==CMD_QUIT ) {
-    Debug(2,"Quitting");
-    exit(0);
+    zm_terminate = true;
+    Debug(2, "Quitting");
+    return;
   }
 
-  Debug(2,"Updating framerate");
-  updateFrameRate(monitor->GetFPS());
+  //Debug(2,"Updating framerate");
+  //updateFrameRate(monitor->GetFPS());
 } // end void MonitorStream::processCommand(const CmdMsg *msg)
 
 bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp) {
@@ -317,7 +327,7 @@ bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp) {
     int img_buffer_size = 0;
     static unsigned char img_buffer[ZM_MAX_IMAGE_SIZE];
 
-    FILE *fdj = NULL;
+    FILE *fdj = nullptr;
     if ( (fdj = fopen(filepath, "r")) ) {
       img_buffer_size = fread(img_buffer, 1, sizeof(img_buffer), fdj);
       fclose(fdj);
@@ -328,20 +338,23 @@ bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp) {
 
     // Calculate how long it takes to actually send the frame
     struct timeval frameStartTime;
-    gettimeofday(&frameStartTime, NULL);
-    
-    fputs("--ZoneMinderFrame\r\nContent-Type: image/jpeg\r\n\r\n", stdout );
-    fprintf(stdout, "Content-Length: %d\r\n", img_buffer_size);
-    if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
-      if ( ! zm_terminate )
+    gettimeofday(&frameStartTime, nullptr);
+
+    if (
+        (0 > fprintf(stdout, "Content-Length: %d\r\nX-Timestamp: %d.%06d\r\n\r\n",
+                     img_buffer_size, (int)timestamp->tv_sec, (int)timestamp->tv_usec))
+        ||
+        (fwrite(img_buffer, img_buffer_size, 1, stdout) != 1)
+       ) {
+      if ( !zm_terminate )
         Warning("Unable to send stream frame: %s", strerror(errno));
       return false;
     }
-    fputs("\r\n\r\n", stdout);
+    fputs("\r\n", stdout);
     fflush(stdout);
 
     struct timeval frameEndTime;
-    gettimeofday(&frameEndTime, NULL);
+    gettimeofday(&frameEndTime, nullptr);
 
     int frameSendTime = tvDiffMsec(frameStartTime, frameEndTime);
     if ( frameSendTime > 1000/maxfps ) {
@@ -361,6 +374,7 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) {
   if ( !config.timestamp_on_capture && timestamp )
     monitor->TimestampImage(send_image, timestamp);
 
+  fputs("--" BOUNDARY "\r\n", stdout);
 #if HAVE_LIBAVCODEC
   if ( type == STREAM_MPEG ) {
     if ( !vid_stream ) {
@@ -384,10 +398,9 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) {
 
     // Calculate how long it takes to actually send the frame
     struct timeval frameStartTime;
-    gettimeofday(&frameStartTime, NULL);
-    
-    fputs("--ZoneMinderFrame\r\n", stdout);
-    switch( type ) {
+    gettimeofday(&frameStartTime, nullptr);
+
+    switch ( type ) {
       case STREAM_JPEG :
         send_image->EncodeJpeg(img_buffer, &img_buffer_size);
         fputs("Content-Type: image/jpeg\r\n", stdout);
@@ -399,32 +412,36 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) {
         break;
       case STREAM_ZIP :
 #if HAVE_ZLIB_H
-        fputs("Content-Type: image/x-rgbz\r\n",stdout);
+        fputs("Content-Type: image/x-rgbz\r\n", stdout);
         unsigned long zip_buffer_size;
         send_image->Zip(img_buffer, &zip_buffer_size);
         img_buffer_size = zip_buffer_size;
 #else
-          Error("zlib is required for zipped images. Falling back to raw image");
-          type = STREAM_RAW;
+        Error("zlib is required for zipped images. Falling back to raw image");
+        type = STREAM_RAW;
 #endif // HAVE_ZLIB_H
         break;
       default :
         Error("Unexpected frame type %d", type);
         return false;
     }
-    fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size);
-    if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
-      if ( !zm_terminate ){ 
+    if (
+        ( 0 > fprintf(stdout, "Content-Length: %d\r\nX-Timestamp: %d.%06d\r\n\r\n",
+                      img_buffer_size, (int)timestamp->tv_sec, (int)timestamp->tv_usec) )
+        ||
+        (fwrite(img_buffer, img_buffer_size, 1, stdout) != 1)
+       ) {
+      if ( !zm_terminate ) {
         // If the pipe was closed, we will get signalled SIGPIPE to exit, which will set zm_terminate
         Warning("Unable to send stream frame: %s", strerror(errno));
       }
       return false;
     }
-    fputs("\r\n\r\n", stdout);
+    fputs("\r\n", stdout);
     fflush(stdout);
 
     struct timeval frameEndTime;
-    gettimeofday(&frameEndTime, NULL);
+    gettimeofday(&frameEndTime, nullptr);
 
     int frameSendTime = tvDiffMsec(frameStartTime, frameEndTime);
     if ( frameSendTime > 1000/maxfps ) {
@@ -432,7 +449,7 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) {
       Warning("Frame send time %d msec too slow, throttling maxfps to %.2f",
           frameSendTime, maxfps);
     }
-  }
+  }  // Not mpeg
   last_frame_sent = TV_2_FLOAT(now);
   return true;
 } // end bool MonitorStream::sendFrame( Image *image, struct timeval *timestamp )
@@ -446,25 +463,32 @@ void MonitorStream::runStream() {
 
   openComms();
 
+  if ( type == STREAM_JPEG )
+    fputs("Content-Type: multipart/x-mixed-replace; boundary=" BOUNDARY "\r\n\r\n", stdout);
+
   if ( !checkInitialised() ) {
     Error("Not initialized");
-    return;
+    while ( !(loadMonitor(monitor_id) || zm_terminate) ) {
+      sendTextFrame("Not connected");
+      if ( connkey )
+        checkCommandQueue();
+      sleep(1);
+    }
+    if ( zm_terminate )
+      return;
   }
 
   updateFrameRate(monitor->GetFPS());
 
-  if ( type == STREAM_JPEG )
-    fputs("Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n", stdout);
-
   // point to end which is theoretically not a valid value because all indexes are % image_buffer_count
-  unsigned int last_read_index = monitor->image_buffer_count; 
+  unsigned int last_read_index = monitor->image_buffer_count;
 
   time_t stream_start_time;
   time(&stream_start_time);
 
   frame_count = 0;
 
-  temp_image_buffer = 0;
+  temp_image_buffer = nullptr;
   temp_image_buffer_count = playback_buffer;
   temp_read_index = temp_image_buffer_count;
   temp_write_index = temp_image_buffer_count;
@@ -475,18 +499,17 @@ void MonitorStream::runStream() {
   bool buffered_playback = false;
 
   // Last image and timestamp when paused, will be resent occasionally to prevent timeout
-  Image *paused_image = NULL;
+  Image *paused_image = nullptr;
   struct timeval paused_timestamp;
 
-  // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id
-  const int max_swap_len_suffix = 15; 
-
-  int swap_path_length = staticConfig.PATH_SWAP.length() + 1; // +1 for NULL terminator
-  int subfolder1_length = snprintf(NULL, 0, "/zmswap-m%d", monitor->Id()) + 1;
-  int subfolder2_length = snprintf(NULL, 0, "/zmswap-q%06d", connkey) + 1;
-  int total_swap_path_length = swap_path_length + subfolder1_length + subfolder2_length;
-
   if ( connkey && ( playback_buffer > 0 ) ) {
+    // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id
+    const int max_swap_len_suffix = 15;
+
+    int swap_path_length = staticConfig.PATH_SWAP.length() + 1; // +1 for NULL terminator
+    int subfolder1_length = snprintf(nullptr, 0, "/zmswap-m%d", monitor->Id()) + 1;
+    int subfolder2_length = snprintf(nullptr, 0, "/zmswap-q%06d", connkey) + 1;
+    int total_swap_path_length = swap_path_length + subfolder1_length + subfolder2_length;
 
     if ( total_swap_path_length + max_swap_len_suffix > PATH_MAX ) {
       Error("Swap Path is too long. %d > %d ", total_swap_path_length+max_swap_len_suffix, PATH_MAX);
@@ -521,7 +544,6 @@ void MonitorStream::runStream() {
     Debug(2, "Not using playback_buffer");
   } // end if connkey  & playback_buffer
 
-  float max_secs_since_last_sent_frame = 10.0; //should be > keep alive amount (5 secs)
   // if MaxFPS < 0 as in 1/60 = 0.017 then we won't get another frame for 60 sec.
   double capture_fps = monitor->GetFPS();
   double capture_max_fps = monitor->GetCaptureMaxFPS();
@@ -529,15 +551,6 @@ void MonitorStream::runStream() {
     Debug(1, "Using %.3f for fps instead of current fps %.3f", capture_max_fps, capture_fps);
     capture_fps = capture_max_fps;
   }
-  
-  if ( capture_fps < 1 ) {
-    max_secs_since_last_sent_frame = 10/capture_fps;
-    Debug(1, "Adjusting max_secs_since_last_sent_frame to %.2f from current fps %.2f",
-        max_secs_since_last_sent_frame, monitor->GetFPS());
-  } else {
-    Debug(1, "Not Adjusting max_secs_since_last_sent_frame to %.2f from current fps %.2f",
-        max_secs_since_last_sent_frame, monitor->GetFPS());
-  }
 
   while ( !zm_terminate ) {
     bool got_command = false;
@@ -552,7 +565,7 @@ void MonitorStream::runStream() {
       break;
     }
 
-    gettimeofday(&now, NULL);
+    gettimeofday(&now, nullptr);
 
     bool was_paused = paused;
     if ( connkey ) {
@@ -566,7 +579,7 @@ void MonitorStream::runStream() {
         touch(sock_path_lock);
         last_comm_update = now;
       }
-    } // end if connkey
+    }  // end if connkey
 
     if ( paused ) {
       if ( !was_paused ) {
@@ -578,7 +591,7 @@ void MonitorStream::runStream() {
     } else if ( paused_image ) {
       Debug(1, "Clearing paused_image");
       delete paused_image;
-      paused_image = NULL;
+      paused_image = nullptr;
     }
 
     if ( buffered_playback && delayed ) {
@@ -593,7 +606,7 @@ void MonitorStream::runStream() {
       } else {
         if ( !paused ) {
           int temp_index = MOD_ADD(temp_read_index, 0, temp_image_buffer_count);
-          //Debug( 3, "tri: %d, ti: %d", temp_read_index, temp_index );
+          // Debug( 3, "tri: %d, ti: %d", temp_read_index, temp_index );
           SwapImage *swap_image = &temp_image_buffer[temp_index];
 
           if ( !swap_image->valid ) {
@@ -601,51 +614,61 @@ void MonitorStream::runStream() {
             delayed = true;
             temp_read_index = MOD_ADD(temp_read_index, (replay_rate>=0?-1:1), temp_image_buffer_count);
           } else {
-            //Debug( 3, "siT: %f, lfT: %f", TV_2_FLOAT( swap_image->timestamp ), TV_2_FLOAT( last_frame_timestamp ) );
-            double expected_delta_time = ((TV_2_FLOAT( swap_image->timestamp ) - TV_2_FLOAT( last_frame_timestamp )) * ZM_RATE_BASE)/replay_rate;
-            double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
+            // Debug( 3, "siT: %f, lfT: %f", TV_2_FLOAT( swap_image->timestamp ), TV_2_FLOAT( last_frame_timestamp ) );
+            double expected_delta_time = ((TV_2_FLOAT(swap_image->timestamp) - TV_2_FLOAT(last_frame_timestamp)) * ZM_RATE_BASE)/replay_rate;
+            double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
 
-            //Debug( 3, "eDT: %.3lf, aDT: %.3f, lFS:%.3f, NOW:%.3f", expected_delta_time, actual_delta_time, last_frame_sent, TV_2_FLOAT( now ) );
+            // Debug( 3, "eDT: %.3lf, aDT: %.3f, lFS:%.3f, NOW:%.3f", expected_delta_time, actual_delta_time, last_frame_sent, TV_2_FLOAT( now ) );
             // If the next frame is due
             if ( actual_delta_time > expected_delta_time ) {
-              //Debug( 2, "eDT: %.3lf, aDT: %.3f", expected_delta_time, actual_delta_time );
+              // Debug( 2, "eDT: %.3lf, aDT: %.3f", expected_delta_time, actual_delta_time );
               if ( temp_index%frame_mod == 0 ) {
-                Debug( 2, "Sending delayed frame %d", temp_index );
+                Debug(2, "Sending delayed frame %d", temp_index);
                 // Send the next frame
-                if ( ! sendFrame(temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp) )
+                if ( ! sendFrame(temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp) ) {
                   zm_terminate = true;
+                }
                 memcpy(&last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp));
-                //frame_sent = true;
+                // frame_sent = true;
               }
               temp_read_index = MOD_ADD(temp_read_index, (replay_rate>0?1:-1), temp_image_buffer_count);
             }
           }
         } else if ( step != 0 ) {
-          temp_read_index = MOD_ADD( temp_read_index, (step>0?1:-1), temp_image_buffer_count );
+          temp_read_index = MOD_ADD(temp_read_index, (step>0?1:-1), temp_image_buffer_count);
 
           SwapImage *swap_image = &temp_image_buffer[temp_read_index];
 
           // Send the next frame
-          if ( !sendFrame( temp_image_buffer[temp_read_index].file_name, &temp_image_buffer[temp_read_index].timestamp ) )
+          if ( !sendFrame(
+                temp_image_buffer[temp_read_index].file_name,
+                &temp_image_buffer[temp_read_index].timestamp
+                ) ) {
             zm_terminate = true;
-          memcpy( &last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp) );
-          //frame_sent = true;
+          }
+          memcpy(
+              &last_frame_timestamp,
+              &(swap_image->timestamp),
+              sizeof(last_frame_timestamp)
+              );
+          // frame_sent = true;
           step = 0;
         } else {
           //paused?
           int temp_index = MOD_ADD(temp_read_index, 0, temp_image_buffer_count);
 
-          double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
-          if ( got_command || actual_delta_time > 5 ) {
+          double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
+          if ( got_command || (actual_delta_time > 5) ) {
             // Send keepalive
             Debug(2, "Sending keepalive frame %d", temp_index);
             // Send the next frame
-            if ( !sendFrame( temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp ) )
+            if ( !sendFrame(temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp) ) {
               zm_terminate = true;
-            //frame_sent = true;
+            }
+            // frame_sent = true;
           }
-        } // end if (!paused) or step or paused
-      } // end if have exceeded buffer or not
+        }  // end if (!paused) or step or paused
+      }  // end if have exceeded buffer or not
 
       if ( temp_read_index == temp_write_index ) {
         // Go back to live viewing
@@ -656,18 +679,16 @@ void MonitorStream::runStream() {
         delayed = false;
         replay_rate = ZM_RATE_BASE;
       }
-    } // end if ( buffered_playback && delayed )
+    }  // end if ( buffered_playback && delayed )
 
+    if ( last_read_index != monitor->shared_data->last_write_index ) {
       // have a new image to send
       int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary
-          ZMPacket *snap = &monitor->image_buffer[index];
-    if ( tvCmp(last_frame_time, *(snap->timestamp)) ) {
-
-      last_read_index = monitor->shared_data->last_write_index;
-      Debug(2, "index: %d: frame_mod: %d frame count: %d paused(%d) delayed(%d)",
-          index, frame_mod, frame_count, paused, delayed );
       if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) ) {
         if ( !paused && !delayed ) {
+          last_read_index = monitor->shared_data->last_write_index;
+          Debug(2, "Sending frame index: %d: frame_mod: %d frame count: %d paused(%d) delayed(%d)",
+              index, frame_mod, frame_count, paused, delayed);
           // Send the next frame
           //
           ZMPacket *snap = &monitor->image_buffer[index];
@@ -681,23 +702,44 @@ void MonitorStream::runStream() {
           // Perhaps we should use NOW instead. 
           last_frame_timestamp = *timestamp;
           //frame_sent = true;
+          //
+          if ( frame_count == 0 ) {
+            // Chrome will not display the first frame until it receives another.
+            // Firefox is fine.  So just send the first frame twice.
+            if ( !sendFrame(snap->image, snap->timestamp) ) {
+              Debug(2, "sendFrame failed, quiting.");
+              zm_terminate = true;
+            }
+          }
 
           temp_read_index = temp_write_index;
         } else {
-          Debug(2, "Paused %d, delayed %d", paused, delayed);
-          double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
-          if ( actual_delta_time > 5 ) {
-            if ( paused_image ) {
-              // Send keepalive
-              Debug(2, "Sending keepalive frame because delta time %.2f > 5", actual_delta_time);
-              // Send the next frame
-              if ( !sendFrame(paused_image, &paused_timestamp) )
-                zm_terminate = true;
-            } else {
-              Debug(2, "Would have sent keepalive frame, but had no paused_image ");
-            }
+          if ( delayed && !buffered_playback ) {
+            Debug(2, "Can't delay when not buffering.");
+            delayed = false;
           }
-        }
+          if ( last_zoom != zoom ) {
+            Debug(2, "Sending 2 frames because change in zoom %d ?= %d", last_zoom, zoom);
+            if ( !sendFrame(paused_image, &paused_timestamp) )
+              zm_terminate = true;
+            if ( !sendFrame(paused_image, &paused_timestamp) )
+              zm_terminate = true;
+          } else {
+            double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
+            if ( actual_delta_time > 5 ) {
+              if ( paused_image ) {
+                // Send keepalive
+                Debug(2, "Sending keepalive frame because delta time %.2f > 5",
+                    actual_delta_time);
+                // Send the next frame
+                if ( !sendFrame(paused_image, &paused_timestamp) )
+                  zm_terminate = true;
+              } else {
+                Debug(2, "Would have sent keepalive frame, but had no paused_image");
+              }
+            } // end if actual_delta_time > 5
+          } // end if change in zoom
+        } // end if paused or not
       } // end if should send frame
 
       if ( buffered_playback && !paused ) {
@@ -706,7 +748,12 @@ void MonitorStream::runStream() {
             int temp_index = temp_write_index%temp_image_buffer_count;
             Debug(2, "Storing frame %d", temp_index);
             if ( !temp_image_buffer[temp_index].valid ) {
-              snprintf( temp_image_buffer[temp_index].file_name, sizeof(temp_image_buffer[0].file_name), "%s/zmswap-i%05d.jpg", swap_path.c_str(), temp_index );
+              snprintf(
+                  temp_image_buffer[temp_index].file_name,
+                  sizeof(temp_image_buffer[0].file_name),
+                  "%s/zmswap-i%05d.jpg",
+                  swap_path.c_str(),
+                  temp_index);
               temp_image_buffer[temp_index].valid = true;
             }
             temp_image_buffer[temp_index].timestamp = monitor->shared_timestamps[index];
@@ -714,31 +761,31 @@ void MonitorStream::runStream() {
             temp_write_index = MOD_ADD( temp_write_index, 1, temp_image_buffer_count );
             if ( temp_write_index == temp_read_index ) {
               // Go back to live viewing
-              Warning( "Exceeded temporary buffer, resuming live play" );
+              Warning("Exceeded temporary buffer, resuming live play");
               paused = false;
               delayed = false;
               replay_rate = ZM_RATE_BASE;
             }
           } else {
-            Warning( "Unable to store frame as timestamp invalid" );
+            Warning("Unable to store frame as timestamp invalid");
           }
         } else {
-          Warning( "Unable to store frame as shared memory invalid" );
+          Warning("Unable to store frame as shared memory invalid");
         }
       } // end if buffered playback
       frame_count++;
     } else {
       Debug(3, "Waiting for capture last_write_index=%u", monitor->shared_data->last_write_index);
-    } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index ) 
+    } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
 
     unsigned long sleep_time = (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2)));
-    Debug(3, "Sleeping for (%d)", sleep_time);
-
     if ( sleep_time > MAX_SLEEP_USEC ) {
       // Shouldn't sleep for long because we need to check command queue, etc.
       sleep_time = MAX_SLEEP_USEC;
+      Debug(3, "Sleeping for MAX_SLEEP_USEC %dus", sleep_time);
+    } else {
+      Debug(3, "Sleeping for %dus", sleep_time);
     }
-    Debug(3, "Sleeping for %dus", sleep_time);
     usleep(sleep_time);
     if ( ttl ) {
       if ( (now.tv_sec - stream_start_time) > ttl ) {
@@ -746,19 +793,11 @@ void MonitorStream::runStream() {
         break;
       }
     }
-    if ( ! last_frame_sent ) {
+    if ( !last_frame_sent ) {
       // If we didn't capture above, because frame_mod was bad? Then last_frame_sent will not have a value.
       last_frame_sent = now.tv_sec;
-      Warning("no last_frame_sent.  Shouldn't happen. frame_mod was (%d) frame_count (%d) ",
+      Warning("no last_frame_sent.  Shouldn't happen. frame_mod was (%d) frame_count (%d)",
           frame_mod, frame_count);
-    } else if (
-        (!paused)
-        &&
-        ( (TV_2_FLOAT(now) - last_frame_sent) > max_secs_since_last_sent_frame )
-        ) {
-      Error("Terminating, last frame sent time %f secs more than maximum of %f",
-          TV_2_FLOAT(now) - last_frame_sent, max_secs_since_last_sent_frame);
-      break;
     }
   } // end while
 
@@ -790,9 +829,9 @@ void MonitorStream::runStream() {
           }
         }
       }
-      globfree( &pglob );
+      globfree(&pglob);
       if ( rmdir(swap_path.c_str()) < 0 ) {
-        Error( "Can't rmdir '%s': %s", swap_path.c_str(), strerror(errno) );
+        Error("Can't rmdir '%s': %s", swap_path.c_str(), strerror(errno));
       }
     } // end if checking for swap_path
   } // end if buffered_playback
@@ -800,7 +839,7 @@ void MonitorStream::runStream() {
   closeComms();
 } // end MonitorStream::runStream
 
-void MonitorStream::SingleImage( int scale ) {
+void MonitorStream::SingleImage(int scale) {
   int img_buffer_size = 0;
   static JOCTET img_buffer[ZM_MAX_IMAGE_SIZE];
   Image scaled_image;
@@ -808,42 +847,45 @@ void MonitorStream::SingleImage( int scale ) {
   Image *snap_image = snap->image;
 
   if ( scale != ZM_SCALE_BASE ) {
-    scaled_image.Assign( *snap_image );
-    scaled_image.Scale( scale );
+    scaled_image.Assign(*snap_image);
+    scaled_image.Scale(scale);
     snap_image = &scaled_image;
   }
   if ( !config.timestamp_on_capture ) {
-    monitor->TimestampImage( snap_image, snap->timestamp );
+    monitor->TimestampImage(snap_image, snap->timestamp);
   }
-  snap_image->EncodeJpeg( img_buffer, &img_buffer_size );
-  
-  fprintf( stdout, "Content-Length: %d\r\n", img_buffer_size );
-  fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
-  fwrite( img_buffer, img_buffer_size, 1, stdout );
+  snap_image->EncodeJpeg(img_buffer, &img_buffer_size);
+
+  fprintf(stdout,
+      "Content-Length: %d\r\n"
+      "Content-Type: image/jpeg\r\n\r\n",
+      img_buffer_size);
+  fwrite(img_buffer, img_buffer_size, 1, stdout);
 }
 
-void MonitorStream::SingleImageRaw( int scale ) {
+void MonitorStream::SingleImageRaw(int scale) {
   Image scaled_image;
   ZMPacket *snap = monitor->getSnapshot();
   Image *snap_image = snap->image;
 
   if ( scale != ZM_SCALE_BASE ) {
-    scaled_image.Assign( *snap_image );
-    scaled_image.Scale( scale );
+    scaled_image.Assign(*snap_image);
+    scaled_image.Scale(scale);
     snap_image = &scaled_image;
   }
   if ( !config.timestamp_on_capture ) {
-    monitor->TimestampImage( snap_image, snap->timestamp );
+    monitor->TimestampImage(snap_image, snap->timestamp);
   }
-  
-  fprintf( stdout, "Content-Length: %d\r\n", snap_image->Size() );
-  fprintf( stdout, "Content-Type: image/x-rgb\r\n\r\n" );
-  fwrite( snap_image->Buffer(), snap_image->Size(), 1, stdout );
+
+  fprintf(stdout,
+      "Content-Length: %d\r\n"
+      "Content-Type: image/x-rgb\r\n\r\n",
+      snap_image->Size());
+  fwrite(snap_image->Buffer(), snap_image->Size(), 1, stdout);
 }
 
-
 #ifdef HAVE_ZLIB_H
-void MonitorStream::SingleImageZip( int scale ) {
+void MonitorStream::SingleImageZip(int scale) {
   unsigned long img_buffer_size = 0;
   static Bytef img_buffer[ZM_MAX_IMAGE_SIZE];
   Image scaled_image;
@@ -852,17 +894,19 @@ void MonitorStream::SingleImageZip( int scale ) {
   Image *snap_image = snap->image;
 
   if ( scale != ZM_SCALE_BASE ) {
-    scaled_image.Assign( *snap_image );
-    scaled_image.Scale( scale );
+    scaled_image.Assign(*snap_image);
+    scaled_image.Scale(scale);
     snap_image = &scaled_image;
   }
   if ( !config.timestamp_on_capture ) {
-    monitor->TimestampImage( snap_image, snap->timestamp );
+    monitor->TimestampImage(snap_image, snap->timestamp);
   }
-  snap_image->Zip( img_buffer, &img_buffer_size );
-  
-  fprintf( stdout, "Content-Length: %ld\r\n", img_buffer_size );
-  fprintf( stdout, "Content-Type: image/x-rgbz\r\n\r\n" );
-  fwrite( img_buffer, img_buffer_size, 1, stdout );
+  snap_image->Zip(img_buffer, &img_buffer_size);
+
+  fprintf(stdout,
+      "Content-Length: %ld\r\n"
+      "Content-Type: image/x-rgbz\r\n\r\n",
+      img_buffer_size);
+  fwrite(img_buffer, img_buffer_size, 1, stdout);
 }
 #endif // HAVE_ZLIB_H
diff --git a/src/zm_monitorstream.h b/src/zm_monitorstream.h
index e120331af..24655b636 100644
--- a/src/zm_monitorstream.h
+++ b/src/zm_monitorstream.h
@@ -44,34 +44,32 @@ class MonitorStream : public StreamBase {
     time_t ttl;
     int playback_buffer;
     bool delayed;
-
     int frame_count;
 
   protected:
-    bool checkSwapPath( const char *path, bool create_path );
-
-    bool sendFrame( const char *filepath, struct timeval *timestamp );
-    bool sendFrame( Image *image, struct timeval *timestamp );
-    void processCommand( const CmdMsg *msg );
-    void SingleImage( int scale=100 );
-    void SingleImageRaw( int scale=100 );
+    bool checkSwapPath(const char *path, bool create_path);
+    bool sendFrame(const char *filepath, struct timeval *timestamp);
+    bool sendFrame(Image *image, struct timeval *timestamp);
+    void processCommand(const CmdMsg *msg);
+    void SingleImage(int scale=100);
+    void SingleImageRaw(int scale=100);
 #ifdef HAVE_ZLIB_H
-    void SingleImageZip( int scale=100 );
+    void SingleImageZip(int scale=100);
 #endif
 
   public:
     MonitorStream() : 
-      temp_image_buffer(NULL), temp_image_buffer_count(0), temp_read_index(0), temp_write_index(0),
+      temp_image_buffer(nullptr), temp_image_buffer_count(0), temp_read_index(0), temp_write_index(0),
       ttl(0), playback_buffer(0), delayed(false), frame_count(0) {
     }
-    void setStreamBuffer( int p_playback_buffer ) {
+    void setStreamBuffer(int p_playback_buffer) {
       playback_buffer = p_playback_buffer;
     }
-    void setStreamTTL( time_t p_ttl ) {
+    void setStreamTTL(time_t p_ttl) {
       ttl = p_ttl;
     }
-    bool setStreamStart( int monitor_id ) {
-      return loadMonitor( monitor_id );
+    bool setStreamStart(int monitor_id) {
+      return loadMonitor(monitor_id);
     }
     void runStream();
 };
diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index d8a26242f..225cdaa5e 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -40,81 +40,72 @@ VideoStream::MimeData VideoStream::mime_data[] = {
 };
 
 void VideoStream::Initialise( ) {
-	if ( logDebugging() ) {
-    av_log_set_level( AV_LOG_DEBUG );
-  } else {
-    av_log_set_level( AV_LOG_QUIET );
-  }
-
-	av_register_all( );
-#if LIBAVFORMAT_VERSION_CHECK(53, 13, 0, 19, 0)
-	avformat_network_init();
-#endif
+  FFMPEGInit();
 	initialised = true;
 }
 
 void VideoStream::SetupFormat( ) {
 	/* allocate the output media context */
-	ofc = NULL;
+	ofc = nullptr;
 #if (LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 2, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-	avformat_alloc_output_context2( &ofc, NULL, format, filename );
+	avformat_alloc_output_context2(&ofc, nullptr, format, filename);
 #else
-	AVFormatContext *s= avformat_alloc_context();
-	if(!s) {
-		Fatal( "avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc) );
+	AVFormatContext *s = avformat_alloc_context();
+	if ( !s ) {
+		Fatal("avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc));
     return;
 	}
 
 	AVOutputFormat *oformat;
-	if (format) {
+	if ( format ) {
 #if LIBAVFORMAT_VERSION_CHECK(52, 45, 0, 45, 0)
-		oformat = av_guess_format(format, NULL, NULL);
+		oformat = av_guess_format(format, nullptr, nullptr);
 #else
-		oformat = guess_format(format, NULL, NULL);
+		oformat = guess_format(format, nullptr, nullptr);
 #endif
-		if (!oformat) {
-			Fatal( "Requested output format '%s' is not a suitable output format", format );
+		if ( !oformat ) {
+			Fatal("Requested output format '%s' is not a suitable output format", format);
 		}
 	} else {
 #if LIBAVFORMAT_VERSION_CHECK(52, 45, 0, 45, 0)
-		oformat = av_guess_format(NULL, filename, NULL);
+		oformat = av_guess_format(nullptr, filename, nullptr);
 #else
-		oformat = guess_format(NULL, filename, NULL);
+		oformat = guess_format(nullptr, filename, nullptr);
 #endif
-		if (!oformat) {
-			Fatal( "Unable to find a suitable output format for '%s'", format );
+		if ( !oformat ) {
+			Fatal("Unable to find a suitable output format for '%s'", format);
 		}
 	}
 	s->oformat = oformat;
 	
-	if (s->oformat->priv_data_size > 0) {
+	if ( s->oformat->priv_data_size > 0 ) {
 		s->priv_data = av_mallocz(s->oformat->priv_data_size);
 		if ( !(s->priv_data) ) {
-			Fatal( "Could not allocate private data for output format." );
+			Fatal("Could not allocate private data for output format.");
 		}
 #if LIBAVFORMAT_VERSION_CHECK(52, 92, 0, 92, 0)
-		if (s->oformat->priv_class) {
+		if ( s->oformat->priv_class ) {
 			*(const AVClass**)s->priv_data = s->oformat->priv_class;
 			av_opt_set_defaults(s->priv_data);
 		}
 #endif
 	} else {
-    Debug(1,"No allocating priv_data");
-		s->priv_data = NULL;
+    Debug(1, "No allocating priv_data");
+		s->priv_data = nullptr;
 	}
 	
 	if ( filename ) {
-		snprintf( s->filename, sizeof(s->filename), "%s", filename );
+		snprintf(s->filename, sizeof(s->filename), "%s", filename);
 	}
 	
 	ofc = s;
 #endif
 	if ( !ofc ) {
-		Fatal( "avformat_alloc_..._context failed: %d", ofc );
+		Fatal("avformat_alloc_..._context failed: %d", ofc);
 	}
 
 	of = ofc->oformat;
-	Debug( 1, "Using output format: %s (%s)", of->name, of->long_name );
+	Debug(1, "Using output format: %s (%s)", of->name, of->long_name);
 }
 
 void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate ) {
@@ -130,13 +121,13 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 	    }
 	    break;
 	  case ZM_COLOUR_RGB32:
-	    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+	    if ( subpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
 	      /* ARGB subpixel order */
 	      pf = AV_PIX_FMT_ARGB;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+	    } else if ( subpixelorder == ZM_SUBPIX_ORDER_ABGR ) {
 	      /* ABGR subpixel order */
 	      pf = AV_PIX_FMT_ABGR;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+	    } else if ( subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
 	      /* BGRA subpixel order */
 	      pf = AV_PIX_FMT_BGRA;
 	    } else {
@@ -152,7 +143,7 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 	    break;
 	}
 
-	if ( strcmp( "rtp", of->name ) == 0 ) {
+	if ( strcmp("rtp", of->name) == 0 ) {
 		// RTP must have a packet_size.
 		// Not sure what this value should be really...
 		ofc->packet_size = width*height;
@@ -169,33 +160,33 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
     AVCodec *a = avcodec_find_encoder_by_name(codec_name);
     if ( a ) {
       codec_id = a->id;
-      Debug( 1, "Using codec \"%s\"", codec_name );
+      Debug(1, "Using codec \"%s\"", codec_name);
     } else {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-      Debug( 1, "Could not find codec \"%s\". Using default \"%s\"", codec_name, avcodec_get_name( codec_id ) );
+      Debug(1, "Could not find codec \"%s\". Using default \"%s\"", codec_name, avcodec_get_name(codec_id));
 #else
-      Debug( 1, "Could not find codec \"%s\". Using default \"%d\"", codec_name, codec_id );
+      Debug(1, "Could not find codec \"%s\". Using default \"%d\"", codec_name, codec_id);
 #endif
     }
 	}
 
 	/* add the video streams using the default format codecs
 	   and initialize the codecs */
-	ost = NULL;
+	ost = nullptr;
 	if ( codec_id != AV_CODEC_ID_NONE ) {
-		codec = avcodec_find_encoder( codec_id );
+		codec = avcodec_find_encoder(codec_id);
 		if ( !codec ) {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-			Fatal( "Could not find encoder for '%s'", avcodec_get_name( codec_id ) );
+			Fatal("Could not find encoder for '%s'", avcodec_get_name(codec_id));
 #else
-			Fatal( "Could not find encoder for '%d'", codec_id );
+			Fatal("Could not find encoder for '%d'", codec_id);
 #endif
 		}
 
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-		Debug( 1, "Found encoder for '%s'", avcodec_get_name( codec_id ) );
+		Debug(1, "Found encoder for '%s'", avcodec_get_name(codec_id));
 #else
-		Debug( 1, "Found encoder for '%d'", codec_id );
+		Debug(1, "Found encoder for '%d'", codec_id);
 #endif
 
 #if LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
@@ -213,7 +204,7 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     
-    codec_context = avcodec_alloc_context3(NULL);
+    codec_context = avcodec_alloc_context3(nullptr);
     //avcodec_parameters_to_context(codec_context, ost->codecpar);
 #else
 		codec_context = ost->codec;
@@ -305,7 +296,7 @@ bool VideoStream::OpenStream( ) {
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
 		if ( (ret = avcodec_open(codec_context, codec)) < 0 )
 #else
-		if ( (ret = avcodec_open2(codec_context, codec, 0)) < 0 )
+		if ( (ret = avcodec_open2(codec_context, codec, nullptr)) < 0 )
 #endif
 		{
 			Error("Could not open codec. Error code %d \"%s\"", ret, av_err2str(ret));
@@ -347,7 +338,7 @@ bool VideoStream::OpenStream( ) {
     /* if the output format is not identical to the input format, then a temporary
        picture is needed too. It is then converted to the required
        output format */
-    tmp_opicture = NULL;
+    tmp_opicture = nullptr;
     if ( codec_context->pix_fmt != pf ) {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
 			tmp_opicture = av_frame_alloc( );
@@ -383,7 +374,7 @@ bool VideoStream::OpenStream( ) {
   /* open the output file, if needed */
   if ( !(of->flags & AVFMT_NOFILE) ) {
 #if LIBAVFORMAT_VERSION_CHECK(53, 15, 0, 21, 0)
-		ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL );
+		ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, nullptr, nullptr );
 #elif LIBAVFORMAT_VERSION_CHECK(52, 102, 0, 102, 0)
 		ret = avio_open( &ofc->pb, filename, AVIO_FLAG_WRITE );
 #else
@@ -400,7 +391,7 @@ bool VideoStream::OpenStream( ) {
     return false;
 	}
 
-	video_outbuf = NULL;
+	video_outbuf = nullptr;
 #if LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
   if (codec_context->codec_type == AVMEDIA_TYPE_VIDEO &&
       codec_context->codec_id == AV_CODEC_ID_RAWVIDEO) {
@@ -412,7 +403,7 @@ bool VideoStream::OpenStream( ) {
 		// TODO: Make buffer dynamic.
 		video_outbuf_size = 4000000;
 		video_outbuf = (uint8_t *)malloc( video_outbuf_size );
-		if ( video_outbuf == NULL ) {
+		if ( video_outbuf == nullptr ) {
 			Fatal("Unable to malloc memory for outbuf");
 		}
 	}
@@ -426,7 +417,7 @@ bool VideoStream::OpenStream( ) {
 #if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
   ret = av_write_header(ofc);
 #else
-  ret = avformat_write_header(ofc, NULL);
+  ret = avformat_write_header(ofc, nullptr);
 #endif
 
   if ( ret < 0 ) {
@@ -439,16 +430,16 @@ bool VideoStream::OpenStream( ) {
 VideoStream::VideoStream( const char *in_filename, const char *in_format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height ) :
 		filename(in_filename),
 		format(in_format),
-    opicture(NULL),
-    tmp_opicture(NULL),
-    video_outbuf(NULL),
+    opicture(nullptr),
+    tmp_opicture(nullptr),
+    video_outbuf(nullptr),
     video_outbuf_size(0),
 		last_pts( -1 ),
 		streaming_thread(0),
 		do_streaming(true),
     add_timestamp(false),
     timestamp(0),
-		buffer_copy(NULL),
+		buffer_copy(nullptr),
 		buffer_copy_lock(new pthread_mutex_t),
 		buffer_copy_size(0),
 		buffer_copy_used(0),
@@ -463,15 +454,15 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
 		codec_and_format = new char[length+1];;
 		strcpy( codec_and_format, format );
 		format = codec_and_format;
-		codec_name = NULL;
+		codec_name = nullptr;
 		char *f = strchr(codec_and_format, '/');
-		if (f != NULL) {
+		if (f != nullptr) {
 			*f = 0;
 			codec_name = f+1;
 		}
 	}
 
-  codec_context = NULL;
+  codec_context = nullptr;
 	SetupFormat( );
 	SetupCodec( colours, subpixelorder, width, height, bitrate, frame_rate );
 	SetParameters( );
@@ -483,7 +474,7 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
   packet_index = 0;
 	
 	// Initialize mutex used by streaming thread.
-	if ( pthread_mutex_init( buffer_copy_lock, NULL ) != 0 ) {
+	if ( pthread_mutex_init( buffer_copy_lock, nullptr ) != 0 ) {
 		Fatal("pthread_mutex_init failed");
 	}
 
@@ -503,7 +494,7 @@ VideoStream::~VideoStream( ) {
 		pthread_join(streaming_thread, &thread_exit_code);
 	}
 	
-	if ( buffer_copy != NULL ) {
+	if ( buffer_copy != nullptr ) {
 		av_free( buffer_copy );
 	}
     
@@ -591,7 +582,7 @@ double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool _a
 		Debug( 1, "Starting streaming thread" );
 		
 		// Start a thread for streaming encoded video.
-		if (pthread_create( &streaming_thread, NULL, StreamingThreadCallback, (void*) this) != 0){
+		if (pthread_create( &streaming_thread, nullptr, StreamingThreadCallback, (void*) this) != 0){
 			// Log a fatal error and exit the process.
 			Fatal( "VideoStream failed to create streaming thread." );
 		}
@@ -606,12 +597,12 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 
 	if ( codec_context->pix_fmt != pf ) {
 #ifdef HAVE_LIBSWSCALE
-	static struct SwsContext *img_convert_ctx = 0;
+	static struct SwsContext *img_convert_ctx = nullptr;
 #endif // HAVE_LIBSWSCALE
 		memcpy( tmp_opicture->data[0], buffer, buffer_size );
 #ifdef HAVE_LIBSWSCALE
 		if ( !img_convert_ctx ) {
-			img_convert_ctx = sws_getCachedContext( NULL, codec_context->width, codec_context->height, pf, codec_context->width, codec_context->height, codec_context->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
+			img_convert_ctx = sws_getCachedContext( nullptr, codec_context->width, codec_context->height, pf, codec_context->width, codec_context->height, codec_context->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr );
 			if ( !img_convert_ctx )
 				Panic( "Unable to initialise image scaling context" );
 		}
@@ -668,7 +659,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 #else
 		int out_size = avcodec_encode_video( codec_context, video_outbuf, video_outbuf_size, opicture_ptr );
 		got_packet = out_size > 0 ? 1 : 0;
-		pkt->data = got_packet ? video_outbuf : NULL;
+		pkt->data = got_packet ? video_outbuf : nullptr;
 		pkt->size = got_packet ? out_size : 0;
 #endif
 #endif
@@ -714,7 +705,7 @@ void *VideoStream::StreamingThreadCallback(void *ctx){
 	
 	Debug( 1, "StreamingThreadCallback started" );
 	
-  if (ctx == NULL) return NULL;
+  if (ctx == nullptr) return nullptr;
 
   VideoStream* videoStream = reinterpret_cast<VideoStream*>(ctx);
 
@@ -774,7 +765,7 @@ void *VideoStream::StreamingThreadCallback(void *ctx){
 		frame_count++;
 	}
 	
-	return 0;
+	return nullptr;
 }
 
 #endif // HAVE_LIBAVCODEC
diff --git a/src/zm_packet.cpp b/src/zm_packet.cpp
index a49ab06e2..7656c0236 100644
--- a/src/zm_packet.cpp
+++ b/src/zm_packet.cpp
@@ -24,36 +24,36 @@
 
 using namespace std;
 
-ZMPacket::ZMPacket( ) {
+ZMPacket::ZMPacket() {
   keyframe = 0;
   // frame from decoded packet, to be used in generating image
-  in_frame = NULL;
-  out_frame = NULL;
-  image = NULL;
-  buffer = NULL;
+  in_frame = nullptr;
+  out_frame = nullptr;
+  image = nullptr;
+  buffer = nullptr;
   av_init_packet(&packet);
   packet.size = 0; // So we can detect whether it has been filled.
-  timestamp = NULL;
-  analysis_image = NULL;
+  timestamp = nullptr;
+  analysis_image = nullptr;
   image_index = -1;
   score = -1;
   codec_imgsize = 0;
 }
 
-ZMPacket::ZMPacket( ZMPacket &p ) {
+ZMPacket::ZMPacket(ZMPacket &p) {
   keyframe = 0;
   // frame from decoded packet, to be used in generating image
-  in_frame = NULL;
-  out_frame = NULL;
-  image = NULL;
-  buffer = NULL;
+  in_frame = nullptr;
+  out_frame = nullptr;
+  image = nullptr;
+  buffer = nullptr;
   av_init_packet(&packet);
   if ( zm_av_packet_ref(&packet, &p.packet) < 0 ) {
     Error("error refing packet");
   }
   timestamp = new struct timeval;
   *timestamp = *p.timestamp;
-  analysis_image = NULL;
+  analysis_image = nullptr;
   image_index = -1;
   score = -1;
 }
@@ -73,11 +73,11 @@ ZMPacket::~ZMPacket() {
   }
   if ( analysis_image ) {
     delete analysis_image;
-    analysis_image = NULL;
+    analysis_image = nullptr;
   }
   // We assume the image was allocated elsewhere, so we just unref it.
-  image = NULL;
-  timestamp = NULL;
+  image = nullptr;
+  timestamp = nullptr;
 }
 
 void ZMPacket::reset() {
@@ -98,7 +98,7 @@ void ZMPacket::reset() {
   }
   if ( analysis_image ) {
     delete analysis_image;
-    analysis_image = NULL;
+    analysis_image = nullptr;
   }
 #if 0
   if ( (! image) && timestamp ) {
@@ -176,12 +176,12 @@ int ZMPacket::decode( AVCodecContext *ctx ) {
 Image *ZMPacket::get_image(Image *i) {
   if ( !in_frame ) {
     Error("Can't get image without frame.. maybe need to decode first");
-    return NULL;
+    return nullptr;
   }
   if ( !image ) {
     if ( !i ) {
       Error("Need a pre-allocated image buffer");
-      return NULL;
+      return nullptr;
     } 
     image = i;
   }
@@ -199,7 +199,7 @@ AVPacket *ZMPacket::set_packet(AVPacket *p) {
     Error("error refing packet");
   }
   //dumpPacket(&packet, "zmpacket:");
-  gettimeofday(timestamp, NULL);
+  gettimeofday(timestamp, nullptr);
   keyframe = p->flags & AV_PKT_FLAG_KEY;
   return &packet;
 }
@@ -209,7 +209,7 @@ AVFrame *ZMPacket::get_out_frame( const AVCodecContext *ctx ) {
     out_frame = zm_av_frame_alloc();
     if ( !out_frame ) {
       Error("Unable to allocate a frame");
-      return NULL;
+      return nullptr;
     }
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
     codec_imgsize = av_image_get_buffer_size(
diff --git a/src/zm_packet.h b/src/zm_packet.h
index 1f0dbf704..a2e914bd7 100644
--- a/src/zm_packet.h
+++ b/src/zm_packet.h
@@ -67,7 +67,10 @@ class ZMPacket {
       mutex.lock();
       Debug(2,"packet %d locked", this->image_index);
     };
-    void unlock() { Debug(2,"packet %d unlocked", this->image_index);mutex.unlock(); };
+    void unlock() {
+      Debug(2,"packet %d unlocked", this->image_index);
+      mutex.unlock();
+    };
     AVFrame *get_out_frame( const AVCodecContext *ctx );
     int get_codec_imgsize() { return codec_imgsize; };
 };
diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index f51850dfb..25e218eb0 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -41,9 +41,9 @@ zm_packetqueue::zm_packetqueue( int video_image_count, int p_video_stream_id, in
 zm_packetqueue::~zm_packetqueue() {
   clearQueue();
   delete[] packet_counts;
-  packet_counts = NULL;
+  packet_counts = nullptr;
   delete condition;
-  condition = NULL;
+  condition = nullptr;
 }
 
 /* Enqueues the given packet.  Will maintain the analysis_it pointer and image packet counts.
@@ -51,46 +51,10 @@ zm_packetqueue::~zm_packetqueue() {
  * Thus it will ensure that the same packet never gets queued twice.
  */
 
-bool zm_packetqueue::queuePacket( ZMPacket* zm_packet ) {
+bool zm_packetqueue::queuePacket(ZMPacket* zm_packet) {
   Debug(4, "packetqueue queuepacket, first_video_packet_index is %d", first_video_packet_index);
   mutex.lock();
 
-#if 0
-  if ( zm_packet->image_index != -1 ) {
-    // It's a video packet
-
-    // If we can never queue the same packet, then they can never go past
-    if ( zm_packet->image_index == first_video_packet_index ) {
-      Debug(2, "queuing packet that is already on the queue(%d)", zm_packet->image_index);
-      while ( pktQueue.size() ) {
-        mutex.unlock();
-        ZMPacket *p = popPacket();
-        Debug(2,"Front packet index: %d", p->image_index);
-        mutex.lock();
-
-        if ( p->codec_type != AVMEDIA_TYPE_VIDEO ) {
-          Debug(2, "Deleting audio frame(%d)", p->image_index);
-          delete p;
-          p = NULL;
-        }
-        Debug(2,"pktQueue.size(%d)", pktQueue.size());
-        if ( p->image_index == zm_packet->image_index )
-          break;
-      } // end while there are packets at the head of the queue that are not this one
-
-      if ( analysis_it == pktQueue.end() ) {
-        // Analsys_it should only point to end when queue is empty
-        Debug(2,"pointing analysis_it to begining");
-        analysis_it = pktQueue.begin();
-      }
-    } 
-    if ( first_video_packet_index == -1 ) {
-      // Initialize the first_video_packet indicator
-      first_video_packet_index = zm_packet->image_index;
-    } // end if
-    video_packet_count += 1;
-  } // end if queuing a video packet
-#endif
   if ( zm_packet->packet.stream_index == video_stream_id ) {
     video_packet_count += 1;
   }
@@ -114,18 +78,20 @@ bool zm_packetqueue::queuePacket( ZMPacket* zm_packet ) {
   // We signal on every packet because someday we may analyze sound
   Debug(2,"Signalling");
   condition->signal();
+  Debug(2," after Signalling");
   mutex.unlock();
+  Debug(2," after unlock");
 
 	return true;
 } // end bool zm_packetqueue::queuePacket(ZMPacket* zm_packet)
 
 ZMPacket* zm_packetqueue::popPacket( ) {
 	if ( pktQueue.empty() ) {
-		return NULL;
+		return nullptr;
 	}
-  Debug(2,"Mutex locking");
+  Debug(2, "poPacket Mutex locking");
   mutex.lock();
-  Debug(2,"Have Mutex lock");
+  Debug(2, "Have Mutex lock");
 
 	ZMPacket *packet = pktQueue.front();
   if ( *analysis_it == packet )
@@ -136,7 +102,7 @@ ZMPacket* zm_packetqueue::popPacket( ) {
     video_packet_count -= 1;
     if ( video_packet_count ) {
       // There is another video packet, so it must be the next one
-      Debug(2,"Incrementing first video packet index was (%d)", first_video_packet_index);
+      Debug(2, "Incrementing first video packet index was (%d)", first_video_packet_index);
       first_video_packet_index += 1;
       first_video_packet_index %= max_video_packet_count;
     } else {
@@ -148,7 +114,7 @@ ZMPacket* zm_packetqueue::popPacket( ) {
 
   // Should we lock the packet?
 	return packet;
-}
+} // popPacket
 
 unsigned int zm_packetqueue::clearQueue(unsigned int frames_to_keep, int stream_id) {
   
@@ -165,7 +131,7 @@ unsigned int zm_packetqueue::clearQueue(unsigned int frames_to_keep, int stream_
   int packets_to_delete = pktQueue.size();
 
   std::list<ZMPacket *>::reverse_iterator it;
-  ZMPacket *packet = NULL;
+  ZMPacket *packet = nullptr;
 
   for ( it = pktQueue.rbegin(); frames_to_keep && (it != pktQueue.rend()); ++it ) {
     ZMPacket *zm_packet = *it;
@@ -235,7 +201,7 @@ unsigned int zm_packetqueue::clearQueue(unsigned int frames_to_keep, int stream_
       delete_count += 1;
     } // while our iterator is not the first packet
   } // end if have packet_delete_count 
-  packet = NULL; // tidy up for valgrind
+  packet = nullptr; // tidy up for valgrind
   Debug(3, "Deleted %d packets, %d remaining", delete_count, pktQueue.size());
 
 #if 0
@@ -254,7 +220,7 @@ unsigned int zm_packetqueue::clearQueue(unsigned int frames_to_keep, int stream_
 
 void zm_packetqueue::clearQueue() {
   mutex.lock();
-  ZMPacket *packet = NULL;
+  ZMPacket *packet = nullptr;
   int delete_count = 0;
 	while ( !pktQueue.empty() ) {
     packet = pktQueue.front();
@@ -271,6 +237,73 @@ void zm_packetqueue::clearQueue() {
   mutex.unlock();
 }
 
+// clear queue keeping only specified duration of video -- return number of pkts removed
+unsigned int zm_packetqueue::clearQueue(struct timeval *duration, int streamId) {
+
+  if ( pktQueue.empty() ) {
+    return 0;
+  }
+  struct timeval keep_from;
+  std::list<ZMPacket *>::reverse_iterator it;
+  it = pktQueue.rbegin();
+
+  struct timeval *t = (*it)->timestamp;
+  timersub(t, duration, &keep_from);
+  ++it;
+
+  Debug(3, "Looking for frame before queue keep time with  stream id (%d), queue has %d packets",
+        streamId, pktQueue.size());
+  for ( ; it != pktQueue.rend(); ++it) {
+    ZMPacket *zm_packet = *it;
+    AVPacket *av_packet = &(zm_packet->packet);
+    if (av_packet->stream_index == streamId
+        && timercmp( zm_packet->timestamp, &keep_from, <= )) {
+        Debug(3, "Found frame before keep time with stream index %d at %d.%d",
+                 av_packet->stream_index,
+                 zm_packet->timestamp->tv_sec,
+                 zm_packet->timestamp->tv_usec);
+        break;
+    }
+  }
+
+  if (it == pktQueue.rend()) {
+    Debug(1, "Didn't find a frame before queue preserve time. keeping all");
+    return 0;
+  }
+
+  Debug(3, "Looking for keyframe");
+  for ( ; it != pktQueue.rend(); ++it) {
+    ZMPacket *zm_packet = *it;
+    AVPacket *av_packet = &(zm_packet->packet);
+    if (av_packet->flags & AV_PKT_FLAG_KEY
+        && av_packet->stream_index == streamId) {
+      Debug(3, "Found keyframe before start with stream index %d at %d.%d",
+               av_packet->stream_index,
+               zm_packet->timestamp->tv_sec,
+               zm_packet->timestamp->tv_usec );
+      break;
+    }
+  }
+  if ( it == pktQueue.rend() ) {
+    Debug(1, "Didn't find a keyframe before event starttime. keeping all" );
+    return 0;
+  }
+
+  unsigned int deleted_frames = 0;
+  ZMPacket *zm_packet = nullptr;
+  while (distance(it, pktQueue.rend()) > 1) {
+    zm_packet = pktQueue.front();
+    pktQueue.pop_front();
+    packet_counts[zm_packet->packet.stream_index] -= 1;
+    delete zm_packet;
+    deleted_frames += 1;
+  }
+  zm_packet = nullptr;
+  Debug(3, "Deleted %d frames", deleted_frames);
+
+  return deleted_frames;
+}
+
 unsigned int zm_packetqueue::size() {
   return pktQueue.size();
 }
@@ -295,9 +328,9 @@ ZMPacket *zm_packetqueue::get_analysis_packet() {
 //Debug(2, "Distance from head: (%d)", std::distance( pktQueue.begin(), analysis_it ) );
   //Debug(2, "Distance from end: (%d)", std::distance( analysis_it, pktQueue.end() ) );
   ZMPacket *p = *analysis_it;
-  Debug(2,"analysis_packet image_index: %d, about to lock packet", p->image_index);
+  Debug(2, "get_analysis_packet image_index: %d, about to lock packet", p->image_index);
   p->lock();
-  Debug(2, "Locked packet, unlocking mutex");
+  Debug(2, "Locked packet, unlocking packetqueue mutex");
   mutex.unlock();
 
   return p;
diff --git a/src/zm_packetqueue.h b/src/zm_packetqueue.h
index f108913c6..c168d06a2 100644
--- a/src/zm_packetqueue.h
+++ b/src/zm_packetqueue.h
@@ -54,6 +54,7 @@ class zm_packetqueue {
     bool popVideoPacket(ZMPacket* packet);
     bool popAudioPacket(ZMPacket* packet);
     unsigned int clearQueue(unsigned int video_frames_to_keep, int stream_id);
+    unsigned int clearQueue(struct timeval *duration, int streamid);
     void clearQueue();
     void dumpQueue();
     unsigned int size();
diff --git a/src/zm_poly.cpp b/src/zm_poly.cpp
index 13a21e7e0..35319d6af 100644
--- a/src/zm_poly.cpp
+++ b/src/zm_poly.cpp
@@ -26,11 +26,9 @@
 #include <cmath>
 #endif
 
-void Polygon::calcArea()
-{
+void Polygon::calcArea() {
   double float_area = 0.0L;
-  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-  {
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ ) {
     double trap_area = ((coords[i].X()-coords[j].X())*((coords[i].Y()+coords[j].Y())))/2.0L;
     float_area += trap_area;
     //printf( "%.2f (%.2f)\n", float_area, trap_area );
@@ -38,13 +36,11 @@ void Polygon::calcArea()
   area = (int)round(fabs(float_area));
 }
 
-void Polygon::calcCentre()
-{
+void Polygon::calcCentre() {
   if ( !area && n_coords )
     calcArea();
   double float_x = 0.0L, float_y = 0.0L;
-  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-  {
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ ) {
     float_x += ((coords[i].Y()-coords[j].Y())*((coords[i].X()*2)+(coords[i].X()*coords[j].X())+(coords[j].X()*2)));
     float_y += ((coords[j].X()-coords[i].X())*((coords[i].Y()*2)+(coords[i].Y()*coords[j].Y())+(coords[j].Y()*2)));
   }
@@ -54,16 +50,14 @@ void Polygon::calcCentre()
   centre = Coord( (int)round(float_x), (int)round(float_y) );
 }
 
-Polygon::Polygon( int p_n_coords, const Coord *p_coords ) : n_coords( p_n_coords )
-{
+Polygon::Polygon(int p_n_coords, const Coord *p_coords) : n_coords( p_n_coords ) {
   coords = new Coord[n_coords];
 
   int min_x = -1;
   int max_x = -1;
   int min_y = -1;
   int max_y = -1;
-  for( int i = 0; i < n_coords; i++ )
-  {
+  for ( int i = 0; i < n_coords; i++ ) {
     coords[i] = p_coords[i];
     if ( min_x == -1 || coords[i].X() < min_x )
       min_x = coords[i].X();
@@ -79,38 +73,36 @@ Polygon::Polygon( int p_n_coords, const Coord *p_coords ) : n_coords( p_n_coords
   calcCentre();
 }
 
-Polygon::Polygon( const Polygon &p_polygon ) : n_coords( p_polygon.n_coords ), extent( p_polygon.extent ), area( p_polygon.area ), centre( p_polygon.centre )
+Polygon::Polygon( const Polygon &p_polygon ) :
+  n_coords(p_polygon.n_coords),
+  extent(p_polygon.extent),
+  area(p_polygon.area),
+  centre(p_polygon.centre)
 {
   coords = new Coord[n_coords];
-  for( int i = 0; i < n_coords; i++ )
-  {
+  for( int i = 0; i < n_coords; i++ ) {
     coords[i] = p_polygon.coords[i];
   }
 }
 
-Polygon &Polygon::operator=( const Polygon &p_polygon )
-{
-  if ( n_coords < p_polygon.n_coords )
-  {
+Polygon &Polygon::operator=( const Polygon &p_polygon ) {
+  if ( n_coords < p_polygon.n_coords ) {
     delete[] coords;
     coords = new Coord[p_polygon.n_coords];
   }
   n_coords = p_polygon.n_coords;
-  for( int i = 0; i < n_coords; i++ )
-  {
+  for ( int i = 0; i < n_coords; i++ ) {
     coords[i] = p_polygon.coords[i];
   }
   extent = p_polygon.extent;
   area = p_polygon.area;
   centre = p_polygon.centre;
-  return( *this );
+  return *this ;
 }
 
-bool Polygon::isInside( const Coord &coord ) const
-{
+bool Polygon::isInside( const Coord &coord ) const {
   bool inside = false;
-  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-  {
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ ) {
     if ( (((coords[i].Y() <= coord.Y()) && (coord.Y() < coords[j].Y()) )
     || ((coords[j].Y() <= coord.Y()) && (coord.Y() < coords[i].Y())))
     && (coord.X() < (coords[j].X() - coords[i].X()) * (coord.Y() - coords[i].Y()) / (coords[j].Y() - coords[i].Y()) + coords[i].X()))
@@ -118,5 +110,5 @@ bool Polygon::isInside( const Coord &coord ) const
       inside = !inside;
     }
   }
-  return( inside );
+  return inside;
 }
diff --git a/src/zm_poly.h b/src/zm_poly.h
index 0fcf34a6e..53eafcf84 100644
--- a/src/zm_poly.h
+++ b/src/zm_poly.h
@@ -41,13 +41,13 @@ protected:
     static int CompareYX( const void *p1, const void *p2 ) {
         const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
       if ( e1->min_y == e2->min_y )
-        return( int(e1->min_x - e2->min_x) );
+        return int(e1->min_x - e2->min_x);
       else
-        return( int(e1->min_y - e2->min_y) );
+        return int(e1->min_y - e2->min_y);
     }
     static int CompareX( const void *p1, const void *p2 ) {
       const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
-      return( int(e1->min_x - e2->min_x) );
+      return int(e1->min_x - e2->min_x);
     }
   };
 
@@ -61,7 +61,7 @@ protected:
       min_x = 0;
       max_x = 0;
       n_edges = 0;
-      edges = 0;
+      edges = nullptr;
     }
     ~Slice() {
       delete edges;
@@ -83,32 +83,32 @@ protected:
   void calcCentre();
 
 public:
-  inline Polygon() : n_coords( 0 ), coords( 0 ), area( 0 ), edges(0), slices(0) {
+  inline Polygon() : n_coords(0), coords(nullptr), area(0), edges(nullptr), slices(nullptr) {
   }
-  Polygon( int p_n_coords, const Coord *p_coords );
-  Polygon( const Polygon &p_polygon );
+  Polygon(int p_n_coords, const Coord *p_coords);
+  Polygon(const Polygon &p_polygon);
   ~Polygon() {
     delete[] coords;
   }
 
   Polygon &operator=( const Polygon &p_polygon );
 
-  inline int getNumCoords() const { return( n_coords ); }
+  inline int getNumCoords() const { return n_coords; }
   inline const Coord &getCoord( int index ) const {
-    return( coords[index] );
+    return coords[index];
   }
 
-  inline const Box &Extent() const { return( extent ); }
-  inline int LoX() const { return( extent.LoX() ); }
-  inline int HiX() const { return( extent.HiX() ); }
-  inline int LoY() const { return( extent.LoY() ); }
-  inline int HiY() const { return( extent.HiY() ); }
-  inline int Width() const { return( extent.Width() ); }
-  inline int Height() const { return( extent.Height() ); }
+  inline const Box &Extent() const { return extent; }
+  inline int LoX() const { return extent.LoX(); }
+  inline int HiX() const { return extent.HiX(); }
+  inline int LoY() const { return extent.LoY(); }
+  inline int HiY() const { return extent.HiY(); }
+  inline int Width() const { return extent.Width(); }
+  inline int Height() const { return extent.Height(); }
 
-  inline int Area() const { return( area ); }
+  inline int Area() const { return area; }
   inline const Coord &Centre() const {
-    return( centre );
+    return centre;
   }
   bool isInside( const Coord &coord ) const;
 };
diff --git a/src/zm_regexp.cpp b/src/zm_regexp.cpp
index 90c000028..fa3bc2de7 100644
--- a/src/zm_regexp.cpp
+++ b/src/zm_regexp.cpp
@@ -24,7 +24,7 @@
 
 #if HAVE_LIBPCRE
 
-RegExpr::RegExpr( const char *pattern, int flags, int p_max_matches ) : max_matches( p_max_matches ), match_buffers( 0 ), match_lengths( 0 ), match_valid( 0 )
+RegExpr::RegExpr( const char *pattern, int flags, int p_max_matches ) : max_matches( p_max_matches ), match_buffers( nullptr ), match_lengths( nullptr ), match_valid( nullptr )
 {
   const char *errstr;
   int erroffset = 0;
@@ -50,7 +50,7 @@ RegExpr::RegExpr( const char *pattern, int flags, int p_max_matches ) : max_matc
     match_valid = new bool[max_matches];
     memset( match_valid, 0, sizeof(*match_valid)*max_matches );
   } else {
-    match_vectors = NULL;
+    match_vectors = nullptr;
   }
   match_string = "";
   n_matches = 0;
diff --git a/src/zm_remote_camera.cpp b/src/zm_remote_camera.cpp
index d80532d54..dce4daf5c 100644
--- a/src/zm_remote_camera.cpp
+++ b/src/zm_remote_camera.cpp
@@ -44,20 +44,20 @@ RemoteCamera::RemoteCamera(
     path( p_path ),
     hp( 0 ),
     mNeedAuth(false),
-    mAuthenticator(NULL)
+    mAuthenticator(nullptr)
 {
     if ( path[0] != '/' )
         path = '/'+path;
 }
 
 RemoteCamera::~RemoteCamera() {
-  if ( hp != NULL ) {
+  if ( hp != nullptr ) {
     freeaddrinfo(hp);
-    hp = NULL;
+    hp = nullptr;
   }
 	if ( mAuthenticator ) {
 		delete mAuthenticator;
-		mAuthenticator = NULL;
+		mAuthenticator = nullptr;
 	}
 }
 
@@ -99,9 +99,9 @@ void RemoteCamera::Initialise() {
   if ( ret != 0 ) {
     Fatal( "Can't getaddrinfo(%s port %s): %s", host.c_str(), port.c_str(), gai_strerror(ret) );
   }
-  struct addrinfo *p = NULL;
+  struct addrinfo *p = nullptr;
   int addr_count = 0;
-  for ( p = hp; p != NULL; p = p->ai_next ) {
+  for ( p = hp; p != nullptr; p = p->ai_next ) {
     addr_count++;
   }
   Debug(1, "%d addresses returned", addr_count);
diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp
index 1e7946478..c016965d8 100644
--- a/src/zm_remote_camera_http.cpp
+++ b/src/zm_remote_camera_http.cpp
@@ -36,11 +36,11 @@
 #endif
 
 #if HAVE_LIBPCRE
-static RegExpr *header_expr = 0;
-static RegExpr *status_expr = 0;
-static RegExpr *connection_expr = 0;
-static RegExpr *content_length_expr = 0;
-static RegExpr *content_type_expr = 0;
+static RegExpr *header_expr = nullptr;
+static RegExpr *status_expr = nullptr;
+static RegExpr *connection_expr = nullptr;
+static RegExpr *content_length_expr = nullptr;
+static RegExpr *content_type_expr = nullptr;
 #endif
 
 RemoteCameraHttp::RemoteCameraHttp(
@@ -141,9 +141,9 @@ void RemoteCameraHttp::Initialise() {
 } // end void RemoteCameraHttp::Initialise()
 
 int RemoteCameraHttp::Connect() {
-  struct addrinfo *p = NULL;
+  struct addrinfo *p = nullptr;
 
-  for ( p = hp; p != NULL; p = p->ai_next ) {
+  for ( p = hp; p != nullptr; p = p->ai_next ) {
     sd = socket( p->ai_family, p->ai_socktype, p->ai_protocol );
     if ( sd < 0 ) {
       Warning("Can't create socket: %s", strerror(errno) );
@@ -166,7 +166,7 @@ int RemoteCameraHttp::Connect() {
     break;
   }
 
-  if ( p == NULL ) {
+  if ( p == nullptr ) {
     Error("Unable to connect to the remote camera, aborting");
     return -1;
   }
@@ -208,7 +208,7 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
 
   struct timeval temp_timeout = timeout;
 
-  int n_found = select(sd+1, &rfds, NULL, NULL, &temp_timeout);
+  int n_found = select(sd+1, &rfds, nullptr, nullptr, &temp_timeout);
   if( n_found == 0 ) {
     Debug( 1, "Select timed out timeout was %d secs %d usecs", temp_timeout.tv_sec, temp_timeout.tv_usec );
     int error = 0;
@@ -235,7 +235,7 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
   } else {
     if ( ioctl( sd, FIONREAD, &total_bytes_to_read ) < 0 ) {
       Error( "Can't ioctl(): %s", strerror(errno) );
-      return( -1 );
+      return -1;
     }
 
     if ( total_bytes_to_read == 0 ) {
@@ -243,20 +243,20 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
         int error = 0;
         socklen_t len = sizeof (error);
         int retval = getsockopt( sd, SOL_SOCKET, SO_ERROR, &error, &len );
-        if(retval != 0 ) {
+        if ( retval != 0 ) {
           Debug( 1, "error getting socket error code %s", strerror(retval) );
         }
-        if (error != 0) {
+        if ( error != 0 ) {
           return -1;
         }
         // Case where we are grabbing a single jpg, but no content-length was given, so the expectation is that we read until close.
-		    return( 0 );
+		    return 0;
       }
       // If socket is closed locally, then select will fail, but if it is closed remotely
       // then we have an exception on our socket.. but no data.
-      Debug( 3, "Socket closed remotely" );
+      Debug(3, "Socket closed remotely");
       //Disconnect(); // Disconnect is done outside of ReadData now.
-      return( -1 );
+      return -1;
     }
 
     // There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily.
@@ -293,20 +293,32 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
   return total_bytes_read;
 }
 
+int RemoteCameraHttp::GetData() {
+	time_t start_time = time(nullptr);
+	int buffer_len = 0;
+	while ( !( buffer_len = ReadData(buffer) ) ) {
+			if ( zm_terminate ||  ( start_time - time(nullptr) < ZM_WATCH_MAX_DELAY ))
+				return -1;
+		Debug(4, "Timeout waiting for REGEXP HEADER");
+		usleep(100000);
+	}
+	return buffer_len;
+}
+
 int RemoteCameraHttp::GetResponse() {
   int buffer_len;
 #if HAVE_LIBPCRE
   if ( method == REGEXP ) {
-    const char *header = 0;
+    const char *header = nullptr;
     int header_len = 0;
-    const char *http_version = 0;
+    const char *http_version = nullptr;
     int status_code = 0;
-    const char *status_mesg = 0;
+    const char *status_mesg = nullptr;
     const char *connection_type = "";
     int content_length = 0;
     const char *content_type = "";
     const char *content_boundary = "";
-    const char *subheader = 0;
+    const char *subheader = nullptr;
     int subheader_len = 0;
     //int subcontent_length = 0;
     //const char *subcontent_type = "";
@@ -315,9 +327,7 @@ int RemoteCameraHttp::GetResponse() {
       switch( state ) {
         case HEADER :
           {
-            while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) {
-							Debug(4, "Timeout waiting for REGEXP HEADER");
-            }
+						buffer_len = GetData();
             if ( buffer_len < 0 ) {
               Error("Unable to read header data");
               return -1;
@@ -425,9 +435,9 @@ int RemoteCameraHttp::GetResponse() {
           }
         case SUBHEADER :
           {
-            static RegExpr *subheader_expr = 0;
-            static RegExpr *subcontent_length_expr = 0;
-            static RegExpr *subcontent_type_expr = 0;
+            static RegExpr *subheader_expr = nullptr;
+            static RegExpr *subcontent_length_expr = nullptr;
+            static RegExpr *subcontent_type_expr = nullptr;
 
             if ( !subheader_expr ) {
               char subheader_pattern[256] = "";
@@ -457,9 +467,7 @@ int RemoteCameraHttp::GetResponse() {
               state = CONTENT;
             } else {
               Debug( 3, "Unable to extract subheader from stream, retrying" );
-              while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) {
-								Debug(4, "Timeout waiting to extract subheader");
-              }
+							buffer_len = GetData();
               if ( buffer_len < 0 ) {
                 Error( "Unable to extract subheader data" );
                 return( -1 );
@@ -491,7 +499,7 @@ int RemoteCameraHttp::GetResponse() {
             if ( content_length ) {
               while ( ((long)buffer.size() < content_length ) && ! zm_terminate ) {
                 Debug(3, "Need more data buffer %d < content length %d", buffer.size(), content_length );
-								int bytes_read = ReadData( buffer );
+								int bytes_read = GetData();
 
                 if ( bytes_read < 0 ) {
                   Error( "Unable to read content" );
@@ -502,9 +510,7 @@ int RemoteCameraHttp::GetResponse() {
               Debug( 3, "Got end of image by length, content-length = %d", content_length );
             } else {
               while ( !content_length ) {
-                while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) {
-                  Debug(4, "Timeout waiting for content");
-                }
+								buffer_len = GetData();
                 if ( buffer_len < 0 ) {
                   Error( "Unable to read content" );
                   return( -1 );
@@ -582,8 +588,8 @@ int RemoteCameraHttp::GetResponse() {
     static char *content_type_header;
     static char *boundary_header;
     static char *authenticate_header;
-    static char subcontent_length_header[32];
-    static char subcontent_type_header[64];
+    static char subcontent_length_header[33];
+    static char subcontent_type_header[65];
 
     static char http_version[16];
     static char status_code[16];
@@ -599,11 +605,11 @@ int RemoteCameraHttp::GetResponse() {
         case HEADER :
           {
             n_headers = 0;
-            http_header = 0;
-            connection_header = 0;
-            content_length_header = 0;
-            content_type_header = 0;
-            authenticate_header = 0;
+            http_header = nullptr;
+            connection_header = nullptr;
+            content_length_header = nullptr;
+            content_type_header = nullptr;
+            authenticate_header = nullptr;
 
             http_version[0] = '\0';
             status_code [0]= '\0';
@@ -616,16 +622,14 @@ int RemoteCameraHttp::GetResponse() {
           }
         case HEADERCONT :
           {
-            while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) {
-								Debug(1, "Timeout waiting for HEADERCONT");
-            }
+						buffer_len = GetData();
             if ( buffer_len < 0 ) {
               Error("Unable to read header");
               return -1;
             }
 						bytes += buffer_len;
 
-            char *crlf = 0;
+            char *crlf = nullptr;
             char *header_ptr = (char *)buffer;
             int header_len = buffer.size();
             bool all_headers = false;
@@ -830,7 +834,7 @@ int RemoteCameraHttp::GetResponse() {
           }
         case SUBHEADERCONT :
           {
-            char *crlf = 0;
+            char *crlf = nullptr;
             char *subheader_ptr = (char *)buffer;
             int subheader_len = buffer.size();
             bool all_headers = false;
@@ -856,25 +860,37 @@ int RemoteCameraHttp::GetResponse() {
                 }
               }
 
-              Debug( 6, "%d: %s", subheader_len, subheader_ptr );
+              Debug(6, "%d: %s", subheader_len, subheader_ptr);
 
-              if ( (crlf = mempbrk( subheader_ptr, "\r\n", subheader_len )) ) {
+              if ( (crlf = mempbrk(subheader_ptr, "\r\n", subheader_len)) ) {
                 //subheaders[n_subheaders++] = subheader_ptr;
                 n_subheaders++;
 
-                if ( !boundary_header && (strncasecmp( subheader_ptr, content_boundary, content_boundary_len ) == 0) ) {
+                if ( !boundary_header && (strncasecmp(subheader_ptr, content_boundary, content_boundary_len) == 0) ) {
                   boundary_header = subheader_ptr;
-                  Debug( 4, "Got boundary subheader '%s'", subheader_ptr );
-                } else if ( !subcontent_length_header[0] && (strncasecmp( subheader_ptr, content_length_match, content_length_match_len) == 0) ) {
-                  strncpy( subcontent_length_header, subheader_ptr+content_length_match_len, sizeof(subcontent_length_header) );
-                  *(subcontent_length_header+strcspn( subcontent_length_header, "\r\n" )) = '\0';
-                  Debug( 4, "Got content length subheader '%s'", subcontent_length_header );
+                  Debug(4, "Got boundary subheader '%s'", subheader_ptr);
+                } else if (
+                    !subcontent_length_header[0]
+                    &&
+                    (strncasecmp(subheader_ptr, content_length_match, content_length_match_len) == 0)
+                    ) {
+                  strncpy(
+                      subcontent_length_header,
+                      subheader_ptr+content_length_match_len,
+                      sizeof(subcontent_length_header)-1
+                      );
+                  *(subcontent_length_header+strcspn(subcontent_length_header, "\r\n")) = '\0';
+                  Debug(4, "Got content length subheader '%s'", subcontent_length_header);
                 } else if ( !subcontent_type_header[0] && (strncasecmp( subheader_ptr, content_type_match, content_type_match_len) == 0) ) {
-                  strncpy( subcontent_type_header, subheader_ptr+content_type_match_len, sizeof(subcontent_type_header) );
-                  *(subcontent_type_header+strcspn( subcontent_type_header, "\r\n" )) = '\0';
-                  Debug( 4, "Got content type subheader '%s'", subcontent_type_header );
+                  strncpy(
+                      subcontent_type_header,
+                      subheader_ptr+content_type_match_len,
+                      sizeof(subcontent_type_header)-1
+                      );
+                  *(subcontent_type_header+strcspn(subcontent_type_header, "\r\n")) = '\0';
+                  Debug(4, "Got content type subheader '%s'", subcontent_type_header);
                 } else {
-                  Debug( 6, "Got ignored subheader '%s' found", subheader_ptr );
+                  Debug(6, "Got ignored subheader '%s' found", subheader_ptr);
                 }
                 subheader_ptr = crlf;
                 subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
@@ -903,9 +919,7 @@ int RemoteCameraHttp::GetResponse() {
               state = CONTENT;
             } else {
               Debug( 3, "Unable to extract subheader from stream, retrying" );
-              while ( !( buffer_len = ReadData(buffer) ) &&!zm_terminate ) {
-								Debug(1, "Timeout waiting to extra subheader non regexp");
-              }
+							buffer_len = GetData();
               if ( buffer_len < 0 ) {
                 Error( "Unable to read subheader" );
                 return( -1 );
@@ -945,7 +959,7 @@ int RemoteCameraHttp::GetResponse() {
             if ( content_length ) {
               while ( ( (long)buffer.size() < content_length ) && ! zm_terminate ) {
 								Debug(4, "getting more data");
-                int bytes_read = ReadData(buffer);
+								int bytes_read = GetData();
                 if ( bytes_read < 0 ) {
                   Error("Unable to read content");
                   return -1;
@@ -958,8 +972,7 @@ int RemoteCameraHttp::GetResponse() {
               while ( !content_length && !zm_terminate ) {
 								Debug(4, "!content_length, ReadData");
                 buffer_len = ReadData( buffer );
-                if ( buffer_len < 0 )
-                {
+                if ( buffer_len < 0 ) {
                   Error( "Unable to read content" );
                   return( -1 );
                 }
@@ -1020,11 +1033,22 @@ int RemoteCameraHttp::GetResponse() {
   return( 0 );
 } // end RemoteCameraHttp::GetResponse
 
+int RemoteCameraHttp::PrimeCapture() {
+  if ( sd < 0 ) {
+    Connect();
+    if ( sd < 0 ) {
+      return -1;
+    }
+    mode = SINGLE_IMAGE;
+    buffer.clear();
+  }
+  return 0;
+}
+
 int RemoteCameraHttp::PreCapture() {
   if ( sd < 0 ) {
     Connect();
     if ( sd < 0 ) {
-      Error("Unable to connect to camera");
       return -1;
     }
     mode = SINGLE_IMAGE;
@@ -1032,13 +1056,13 @@ int RemoteCameraHttp::PreCapture() {
   }
   if ( mode == SINGLE_IMAGE ) {
     if ( SendRequest() < 0 ) {
-      Error( "Unable to send request" );
+      Error("Unable to send request");
       Disconnect();
-      return( -1 );
+      return -1;
     }
   }
-  return( 0 );
-} // end int RemoteCameraHttp::PreCapture()
+  return 0;
+}  // end int RemoteCameraHttp::PreCapture()
 
 int RemoteCameraHttp::Capture( ZMPacket &packet ) {
   int content_length = GetResponse();
diff --git a/src/zm_remote_camera_http.h b/src/zm_remote_camera_http.h
index b4f9ebe3a..34193cb33 100644
--- a/src/zm_remote_camera_http.h
+++ b/src/zm_remote_camera_http.h
@@ -68,7 +68,9 @@ public:
   int Disconnect();
   int SendRequest();
   int ReadData( Buffer &buffer, unsigned int bytes_expected=0 );
+	int GetData();
   int GetResponse();
+  int PrimeCapture();
   int PreCapture();
   int Capture( ZMPacket &p );
   int PostCapture();
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index 1044a7c9b..26b0cac41 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -58,24 +58,24 @@ RemoteCameraRtsp::RemoteCameraRtsp(
   else if ( p_method == "rtpRtspHttp" )
     method = RtspThread::RTP_RTSP_HTTP;
   else
-    Fatal( "Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), monitor_id );
+    Fatal("Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), monitor_id);
 
   if ( capture ) {
     Initialise();
   }
   
-  mFormatContext = NULL;
+  mFormatContext = nullptr;
   mVideoStreamId = -1;
   mAudioStreamId = -1;
-  mCodecContext = NULL;
-  mCodec = NULL;
-  mRawFrame = NULL;
-  mFrame = NULL;
+  mCodecContext = nullptr;
+  mCodec = nullptr;
+  mRawFrame = nullptr;
+  mFrame = nullptr;
   frameCount = 0;
   startTime=0;
   
 #if HAVE_LIBSWSCALE
-  mConvertContext = NULL;
+  mConvertContext = nullptr;
 #endif
   /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
   if ( colours == ZM_COLOUR_RGB32 ) {
@@ -88,24 +88,24 @@ RemoteCameraRtsp::RemoteCameraRtsp(
     subpixelorder = ZM_SUBPIX_ORDER_NONE;
     imagePixFormat = AV_PIX_FMT_GRAY8;
   } else {
-    Panic("Unexpected colours: %d",colours);
+    Panic("Unexpected colours: %d", colours);
   }
 } // end RemoteCameraRtsp::RemoteCameraRtsp(...)
 
 RemoteCameraRtsp::~RemoteCameraRtsp() {
-  av_frame_free( &mFrame );
-  av_frame_free( &mRawFrame );
+  av_frame_free(&mFrame);
+  av_frame_free(&mRawFrame);
   
 #if HAVE_LIBSWSCALE
   if ( mConvertContext ) {
-    sws_freeContext( mConvertContext );
-    mConvertContext = NULL;
+    sws_freeContext(mConvertContext);
+    mConvertContext = nullptr;
   }
 #endif
 
   if ( mCodecContext ) {
-     avcodec_close( mCodecContext );
-     mCodecContext = NULL; // Freed by avformat_free_context in the destructor of RtspThread class
+     avcodec_close(mCodecContext);
+     mCodecContext = nullptr; // Freed by avformat_free_context in the destructor of RtspThread class
   }
 
   if ( capture ) {
@@ -120,14 +120,9 @@ void RemoteCameraRtsp::Initialise() {
 
   // This allocates a buffer able to hold a raw fframe, which is a little artbitrary.  Might be nice to get some
   // decent data on how large a buffer is really needed.  I think in ffmpeg there are now some functions to do that.
-  buffer.size( max_size );
+  buffer.size(max_size);
 
-  if ( logDebugging() )
-    av_log_set_level( AV_LOG_DEBUG ); 
-  else
-    av_log_set_level( AV_LOG_QUIET ); 
-
-  av_register_all();
+  FFMPEGInit();
 
   Connect();
 }
@@ -137,11 +132,11 @@ void RemoteCameraRtsp::Terminate() {
 }
 
 int RemoteCameraRtsp::Connect() {
-  rtspThread = new RtspThread( monitor_id, method, protocol, host, port, path, auth, rtsp_describe );
+  rtspThread = new RtspThread(monitor_id, method, protocol, host, port, path, auth, rtsp_describe);
 
   rtspThread->start();
 
-  return( 0 );
+  return 0;
 }
 
 int RemoteCameraRtsp::Disconnect() {
@@ -149,20 +144,22 @@ int RemoteCameraRtsp::Disconnect() {
     rtspThread->stop();
     rtspThread->join();
     delete rtspThread;
-    rtspThread = 0;
+    rtspThread = nullptr;
   }
-  return( 0 );
+  return 0;
 }
 
 int RemoteCameraRtsp::PrimeCapture() {
-  Debug( 2, "Waiting for sources" );
-  for ( int i = 0; i < 100 && !rtspThread->hasSources(); i++ ) {
-    usleep( 100000 );
+  Debug(2, "Waiting for sources");
+  for ( int i = 0; (i < 100) && !rtspThread->hasSources(); i++ ) {
+    usleep(100000);
+  }
+  if ( !rtspThread->hasSources() ) {
+    Error("No RTSP sources");
+    return -1;
   }
-  if ( !rtspThread->hasSources() )
-    Fatal( "No RTSP sources" );
 
-  Debug( 2, "Got sources" );
+  Debug(2, "Got sources");
 
   mFormatContext = rtspThread->getFormatContext();
 
@@ -173,44 +170,28 @@ int RemoteCameraRtsp::PrimeCapture() {
   
   // Find the first video stream. 
   for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  AVCodecParameters *codec_context = mFormatContext->streams[i]->codecpar;
-#else
-  AVCodecContext *codec_context = mFormatContext->streams[i]->codec;
-#endif
-#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-    if ( codec_context->codec_type == AVMEDIA_TYPE_VIDEO )
-#else
-    if ( codec_context->codec_type == CODEC_TYPE_VIDEO )
-#endif
-    {
+    if ( is_video_stream(mFormatContext->streams[i]) ) {
       if ( mVideoStreamId == -1 ) {
         mVideoStreamId = i;
         continue;
       } else {
-        Debug(2, "Have another video stream." );
+        Debug(2, "Have another video stream.");
       }
-    } else
-#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-    if ( codec_context->codec_type == AVMEDIA_TYPE_AUDIO )
-#else
-    if ( codec_context->codec_type == CODEC_TYPE_AUDIO )
-#endif
-    {
+    } else if ( is_audio_stream(mFormatContext->streams[i]) ) {
       if ( mAudioStreamId == -1 ) {
         mAudioStreamId = i;
       } else {
-        Debug(2, "Have another audio stream." );
+        Debug(2, "Have another audio stream.");
       }
     } else {
-      Debug(1, "Have unknown codec type in stream %d : %d", i, mFormatContext->streams[i]->codec->codec_type);
+      Debug(1, "Have unknown codec type in stream %d", i);
     }
   } // end foreach stream
 
   if ( mVideoStreamId == -1 )
-    Fatal( "Unable to locate video stream" );
+    Fatal("Unable to locate video stream");
   if ( mAudioStreamId == -1 )
-    Debug( 3, "Unable to locate audio stream" );
+    Debug(3, "Unable to locate audio stream");
 
   // Get a pointer to the codec context for the video stream
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -221,43 +202,35 @@ int RemoteCameraRtsp::PrimeCapture() {
 #endif
 
   // Find the decoder for the video stream
-  mCodec = avcodec_find_decoder( mCodecContext->codec_id );
-  if ( mCodec == NULL )
-    Panic( "Unable to locate codec %d decoder", mCodecContext->codec_id );
+  mCodec = avcodec_find_decoder(mCodecContext->codec_id);
+  if ( mCodec == nullptr )
+    Panic("Unable to locate codec %d decoder", mCodecContext->codec_id);
 
   // Open codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-  if ( avcodec_open( mCodecContext, mCodec ) < 0 )
+  if ( avcodec_open(mCodecContext, mCodec) < 0 )
 #else
-  if ( avcodec_open2( mCodecContext, mCodec, 0 ) < 0 )
+  if ( avcodec_open2(mCodecContext, mCodec, 0) < 0 )
 #endif
-    Panic( "Can't open codec" );
+    Panic("Can't open codec");
 
   // Allocate space for the native video frame
-#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-  mRawFrame = av_frame_alloc();
-#else
-  mRawFrame = avcodec_alloc_frame();
-#endif
+  mRawFrame = zm_av_frame_alloc();
 
   // Allocate space for the converted video frame
-#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-  mFrame = av_frame_alloc();
-#else
-  mFrame = avcodec_alloc_frame();
-#endif
+  mFrame = zm_av_frame_alloc();
 
-  if ( mRawFrame == NULL || mFrame == NULL )
-    Fatal( "Unable to allocate frame(s)");
+  if ( mRawFrame == nullptr || mFrame == nullptr )
+    Fatal("Unable to allocate frame(s)");
 
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  int pSize = av_image_get_buffer_size( imagePixFormat, width, height, 1 );
+  int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
 #else
-  int pSize = avpicture_get_size( imagePixFormat, width, height );
+  int pSize = avpicture_get_size(imagePixFormat, width, height);
 #endif
 
   if ( (unsigned int)pSize != imagesize ) {
-    Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
+    Fatal("Image size mismatch. Required: %d Available: %d", pSize, imagesize);
   }
 
 #if HAVE_LIBSWSCALE
@@ -282,17 +255,17 @@ int RemoteCameraRtsp::PrimeCapture() {
 #endif // HAVE_LIBSWSCALE
 */
 
-  return( 0 );
+  return 0;
 }
 
 int RemoteCameraRtsp::PreCapture() {
   if ( !rtspThread->isRunning() )
-    return( -1 );
+    return -1;
   if ( !rtspThread->hasSources() ) {
-    Error( "Cannot precapture, no RTP sources" );
-    return( -1 );
+    Error("Cannot precapture, no RTP sources");
+    return -1;
   }
-  return( 0 );
+  return 0;
 }
 
 int RemoteCameraRtsp::Capture( ZMPacket &zm_packet ) {
@@ -302,7 +275,7 @@ int RemoteCameraRtsp::Capture( ZMPacket &zm_packet ) {
   
   /* Request a writeable buffer of the target image */
   directbuffer = zm_packet.image->WriteBuffer(width, height, colours, subpixelorder);
-  if ( directbuffer == NULL ) {
+  if ( directbuffer == nullptr ) {
     Error("Failed requesting writeable buffer for the captured image.");
     return -1;
   }
@@ -312,10 +285,9 @@ int RemoteCameraRtsp::Capture( ZMPacket &zm_packet ) {
     if ( !rtspThread->isRunning() )
       return -1;
 
-    if ( rtspThread->getFrame( buffer ) ) {
-      Debug( 3, "Read frame %d bytes", buffer.size() );
-      Debug( 4, "Address %p", buffer.head() );
-      Hexdump( 4, buffer.head(), 16 );
+    if ( rtspThread->getFrame(buffer) ) {
+      Debug(3, "Read frame %d bytes", buffer.size());
+      Hexdump(4, buffer.head(), 16);
 
       if ( !buffer.size() )
         return -1;
@@ -336,44 +308,61 @@ int RemoteCameraRtsp::Capture( ZMPacket &zm_packet ) {
         // IDR
           buffer += lastSps;
           buffer += lastPps;
+        } else {
+          Debug(2, "Unknown nalType %d", nalType);
         }
       } else {
         Debug(3, "Not an h264 packet");
       }
 
-        // Don't need to do this... as zmPacket does it.
+      // Don't need to do this... as zmPacket does it.
       //av_init_packet( &packet );
 
-      while ( !frameComplete && buffer.size() > 0 ) {
+      while ( (!frameComplete) && (buffer.size() > 0) ) {
         packet->data = buffer.head();
         packet->size = buffer.size();
+        bytes += packet->size;
 
         // So I think this is the magic decode step. Result is a raw image?
-#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-        int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, packet );
-#else
-        int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet->data, packet->size );
-#endif
+        int len = zm_send_packet_receive_frame(mCodecContext, mRawFrame, *packet);
         if ( len < 0 ) {
-          Error( "Error while decoding frame %d", frameCount );
-          Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
+          Error("Error while decoding frame %d", frameCount);
+          Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
           buffer.clear();
           continue;
         }
-        Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
+        frameComplete = true;
+        Debug(2, "Frame: %d - %d/%d", frameCount, len, buffer.size());
         buffer -= len;
       }
       // At this point, we either have a frame or ran out of buffer. What happens if we run out of buffer?
       if ( frameComplete ) {
-        Debug( 3, "Got frame %d", frameCount );
-            
-        avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height );
+          
     #if HAVE_LIBSWSCALE
-        if ( mConvertContext == NULL ) {
-          if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
-            Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
+        if ( mConvertContext == nullptr ) {
+          mConvertContext = sws_getContext(
+              mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt,
+              width, height, imagePixFormat, SWS_BICUBIC, nullptr, nullptr, nullptr);
+
+          if ( mConvertContext == nullptr )
+            Fatal("Unable to create conversion context");
+
+          if (
+              ((unsigned int)mRawFrame->width != width)
+              ||
+              ((unsigned int)mRawFrame->height != height)
+             ) {
+            Warning("Monitor dimensions are %dx%d but camera is sending %dx%d",
+                width, height, mRawFrame->width, mRawFrame->height);
+          }
         }
-    #endif
+      
+        if ( sws_scale(mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize) < 0 )
+          Fatal("Unable to convert raw format %u to target format %u at frame %d",
+              mCodecContext->pix_fmt, imagePixFormat, frameCount );
+    #else // HAVE_LIBSWSCALE
+        Fatal("You must compile ffmpeg with the --enable-swscale option to use RTSP cameras");
+    #endif // HAVE_LIBSWSCALE
       
         frameCount++;
       } /* frame complete */
diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp
index bc6725c5d..2ffc0c404 100644
--- a/src/zm_rtp_ctrl.cpp
+++ b/src/zm_rtp_ctrl.cpp
@@ -272,12 +272,12 @@ int RtpCtrlThread::run() {
 
   unsigned char buffer[ZM_NETWORK_BUFSIZ];
 
-  time_t  last_receive = time(NULL);
+  time_t  last_receive = time(nullptr);
   bool  timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
 
   while ( !mStop && select.wait() >= 0 ) {
 
-    time_t now = time(NULL);
+    time_t now = time(nullptr);
     Select::CommsList readable = select.getReadable();
     if ( readable.size() == 0 ) {
       if ( ! timeout ) {
@@ -300,7 +300,7 @@ int RtpCtrlThread::run() {
       }
     } else {
       timeout = false;
-      last_receive = time(NULL);
+      last_receive = time(nullptr);
     }
     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter ) {
       if ( UdpInetSocket *socket = dynamic_cast<UdpInetSocket *>(*iter) ) {
diff --git a/src/zm_rtp_data.cpp b/src/zm_rtp_data.cpp
index 4fbf0cd04..de7c732d3 100644
--- a/src/zm_rtp_data.cpp
+++ b/src/zm_rtp_data.cpp
@@ -27,98 +27,81 @@
 
 #include <arpa/inet.h>
 
-RtpDataThread::RtpDataThread( RtspThread &rtspThread, RtpSource &rtpSource ) : mRtspThread( rtspThread ), mRtpSource( rtpSource ), mStop( false )
+RtpDataThread::RtpDataThread(RtspThread &rtspThread, RtpSource &rtpSource) :
+  mRtspThread(rtspThread), mRtpSource(rtpSource), mStop(false)
 {
 }
 
-bool RtpDataThread::recvPacket( const unsigned char *packet, size_t packetLen )
-{
+bool RtpDataThread::recvPacket(const unsigned char *packet, size_t packetLen) {
   const RtpDataHeader *rtpHeader;
   rtpHeader = (RtpDataHeader *)packet;
 
-  //printf( "D: " );
-  //for ( int i = 0; i < 32; i++ )
-    //printf( "%02x ", (unsigned char)packet[i] );
-  //printf( "\n" );
-
-  Debug( 5, "Ver: %d", rtpHeader->version );
-  Debug( 5, "P: %d", rtpHeader->p );
-  Debug( 5, "Pt: %d", rtpHeader->pt );
-  Debug( 5, "Mk: %d", rtpHeader->m );
-  Debug( 5, "Seq: %d", ntohs(rtpHeader->seqN) );
-  Debug( 5, "T/S: %x", ntohl(rtpHeader->timestampN) );
-  Debug( 5, "SSRC: %x", ntohl(rtpHeader->ssrcN) );
+  Debug(5, "Ver: %d P: %d Pt: %d Mk: %d Seq: %d T/S: %x SSRC: %x",
+      rtpHeader->version,
+      rtpHeader->p,
+      rtpHeader->pt,
+      rtpHeader->m,
+      ntohs(rtpHeader->seqN),
+      ntohl(rtpHeader->timestampN),
+      ntohl(rtpHeader->ssrcN));
 
   //unsigned short seq = ntohs(rtpHeader->seqN);
   unsigned long ssrc = ntohl(rtpHeader->ssrcN);
 
-  if ( mRtpSource.getSsrc() && (ssrc != mRtpSource.getSsrc()) )
-  {
-     Warning( "Discarding packet for unrecognised ssrc %lx", ssrc );
-     return( false );
+  if ( mRtpSource.getSsrc() && (ssrc != mRtpSource.getSsrc()) ) {
+     Warning("Discarding packet for unrecognised ssrc %lx", ssrc);
+     return false;
   }
 
-  return( mRtpSource.handlePacket( packet, packetLen ) );
+  return mRtpSource.handlePacket(packet, packetLen);
 }
 
-int RtpDataThread::run()
-{
-  Debug( 2, "Starting data thread %d on port %d", mRtpSource.getSsrc(), mRtpSource.getLocalDataPort() );
+int RtpDataThread::run() {
+  Debug(2, "Starting data thread %d on port %d",
+      mRtpSource.getSsrc(), mRtpSource.getLocalDataPort());
 
   SockAddrInet localAddr;
   UdpInetServer rtpDataSocket;
   if ( mRtpSource.getLocalHost() != "" ) {
-    if ( !rtpDataSocket.bind( mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort() ) )
-      Fatal( "Failed to bind RTP server" );
-    Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort() );
-  }
-  else
-  {
-    if ( !rtpDataSocket.bind( mRtspThread.getAddressFamily() == AF_INET6 ? "::" : "0.0.0.0", mRtpSource.getLocalDataPort() ) )
-      Fatal( "Failed to bind RTP server" );
-    Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort() );
+    if ( !rtpDataSocket.bind(mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort()) )
+      Fatal("Failed to bind RTP server");
+  } else {
+    if ( !rtpDataSocket.bind(
+          mRtspThread.getAddressFamily() == AF_INET6 ? "::" : "0.0.0.0",
+          mRtpSource.getLocalDataPort() ) )
+      Fatal("Failed to bind RTP server");
   }
+  Debug(3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort());
 
-  Select select( 3 );
-  select.addReader( &rtpDataSocket );
+  Select select(3);
+  select.addReader(&rtpDataSocket);
 
   unsigned char buffer[ZM_NETWORK_BUFSIZ];
-  while ( !mStop && select.wait() >= 0 )
-  {
-     if ( mStop )
-      break;
+  while ( !zm_terminate && !mStop && (select.wait() >= 0) ) {
      Select::CommsList readable = select.getReadable();
-     if ( readable.size() == 0 )
-     {
-       Error( "RTP timed out" );
+     if ( readable.size() == 0 ) {
+       Error("RTP timed out");
        mStop = true;
        break;
      }
-     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter )
-     {
-       if ( UdpInetServer *socket = dynamic_cast<UdpInetServer *>(*iter) )
-       {
-         int nBytes = socket->recv( buffer, sizeof(buffer) );
-         Debug( 4, "Got %d bytes on sd %d", nBytes, socket->getReadDesc() );
-         if ( nBytes )
-         {
-            recvPacket( buffer, nBytes );
-         }
-         else
-         {
+     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter ) {
+       if ( UdpInetServer *socket = dynamic_cast<UdpInetServer *>(*iter) ) {
+         int nBytes = socket->recv(buffer, sizeof(buffer));
+         Debug(4, "Got %d bytes on sd %d", nBytes, socket->getReadDesc());
+         if ( nBytes ) {
+           recvPacket(buffer, nBytes);
+         } else {
           mStop = true;
           break;
          }
+       } else {
+         Panic("Barfed");
        }
-       else
-       {
-         Panic( "Barfed" );
-       }
-     }
+     }  // end foreach commsList
   }
   rtpDataSocket.close();
   mRtspThread.stop();
-  return( 0 );
+  return 0;
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtp_source.cpp b/src/zm_rtp_source.cpp
index 02e8ed0c5..0ac963947 100644
--- a/src/zm_rtp_source.cpp
+++ b/src/zm_rtp_source.cpp
@@ -37,25 +37,25 @@ RtpSource::RtpSource(
     uint32_t rtpClock,
     uint32_t rtpTime,
     _AVCODECID codecId ) :
-  mId( id ),
-  mSsrc( ssrc ),
-  mLocalHost( localHost ),
-  mRemoteHost( remoteHost ),
-  mRtpClock( rtpClock ),
-  mCodecId( codecId ),
-  mFrame( 65536 ),
-  mFrameCount( 0 ),
-  mFrameGood( true ),
-  mFrameReady( false ),
-  mFrameProcessed( false )
+  mId(id),
+  mSsrc(ssrc),
+  mLocalHost(localHost),
+  mRemoteHost(remoteHost),
+  mRtpClock(rtpClock),
+  mCodecId(codecId),
+  mFrame(65536),
+  mFrameCount(0),
+  mFrameGood(true),
+  mFrameReady(false),
+  mFrameProcessed(false)
 {
   char hostname[256] = "";
-  gethostname( hostname, sizeof(hostname) );
+  gethostname(hostname, sizeof(hostname));
 
-  mCname = stringtf( "zm-%d@%s", mId, hostname );
-  Debug( 3, "RTP CName = %s", mCname.c_str() );
+  mCname = stringtf("zm-%d@%s", mId, hostname);
+  Debug(3, "RTP CName = %s", mCname.c_str());
 
-  init( seq );
+  init(seq);
   mMaxSeq = seq - 1;
   mProbation = MIN_SEQUENTIAL;
 
@@ -79,7 +79,7 @@ RtpSource::RtpSource(
     Warning("The device is using a codec (%d) that may not be supported. Do not be surprised if things don't work.", mCodecId);
 }
 
-void RtpSource::init( uint16_t seq ) {
+void RtpSource::init(uint16_t seq) {
   Debug(3, "Initialising sequence");
   mBaseSeq = seq;
   mMaxSeq = seq;
@@ -93,36 +93,36 @@ void RtpSource::init( uint16_t seq ) {
   mTransit = 0;
 }
 
-bool RtpSource::updateSeq( uint16_t seq ) {
+bool RtpSource::updateSeq(uint16_t seq) {
   uint16_t uDelta = seq - mMaxSeq;
 
   // Source is not valid until MIN_SEQUENTIAL packets with
   // sequential sequence numbers have been received.
-  Debug( 5, "Seq: %d", seq );
+  Debug(5, "Seq: %d", seq);
 
   if ( mProbation) {
     // packet is in sequence
-    if ( seq == mMaxSeq + 1) {
-      Debug( 3, "Sequence in probation %d, in sequence", mProbation );
+    if ( seq == mMaxSeq + 1 ) {
+      Debug(3, "Sequence in probation %d, in sequence", mProbation);
       mProbation--;
       mMaxSeq = seq;
       if ( mProbation == 0 ) {
-        init( seq );
+        init(seq);
         mReceivedPackets++;
-        return( true );
+        return true;
       }
     } else {
-      Warning( "Sequence in probation %d, out of sequence", mProbation );
+      Warning("Sequence in probation %d, out of sequence", mProbation);
       mProbation = MIN_SEQUENTIAL - 1;
       mMaxSeq = seq;
-      return( false );
+      return false;
     }
-    return( true );
+    return true;
   } else if ( uDelta < MAX_DROPOUT ) {
     if ( uDelta == 1 ) {
-      Debug( 4, "Packet in sequence, gap %d", uDelta );
+      Debug(4, "Packet in sequence, gap %d", uDelta);
     } else {
-      Warning( "Packet in sequence, gap %d", uDelta );
+      Warning("Packet in sequence, gap %d", uDelta);
     }
 
     // in order, with permissible gap
@@ -132,22 +132,22 @@ bool RtpSource::updateSeq( uint16_t seq ) {
     }
     mMaxSeq = seq;
   } else if ( uDelta <= RTP_SEQ_MOD - MAX_MISORDER ) {
-    Warning( "Packet out of sequence, gap %d", uDelta );
+    Warning("Packet out of sequence, gap %d", uDelta);
     // the sequence number made a very large jump
     if ( seq == mBadSeq ) {
-      Debug( 3, "Restarting sequence" );
+      Debug(3, "Restarting sequence");
       // Two sequential packets -- assume that the other side
       // restarted without telling us so just re-sync
       // (i.e., pretend this was the first packet).
-      init( seq );
+      init(seq);
     } else {
       mBadSeq = (seq + 1) & (RTP_SEQ_MOD-1);
-      return( false );
+      return false;
     }
   } else {
-    Warning( "Packet duplicate or reordered, gap %d", uDelta );
+    Warning("Packet duplicate or reordered, gap %d", uDelta);
     // duplicate or reordered packet
-    return( false );
+    return false;
   }
   mReceivedPackets++;
   return( uDelta==1?true:false );
@@ -155,17 +155,22 @@ bool RtpSource::updateSeq( uint16_t seq ) {
 
 void RtpSource::updateJitter( const RtpDataHeader *header ) {
   if ( mRtpFactor > 0 ) {
-    Debug( 5, "Delta rtp = %.6f", tvDiffSec( mBaseTimeReal ) );
-    uint32_t localTimeRtp = mBaseTimeRtp + uint32_t( tvDiffSec( mBaseTimeReal ) * mRtpFactor );
-    Debug( 5, "Local RTP time = %x", localTimeRtp );
-    Debug( 5, "Packet RTP time = %x", ntohl(header->timestampN) );
+    uint32_t localTimeRtp = mBaseTimeRtp + uint32_t(tvDiffSec(mBaseTimeReal) * mRtpFactor);
     uint32_t packetTransit = localTimeRtp - ntohl(header->timestampN);
-    Debug( 5, "Packet transit RTP time = %x", packetTransit );
+
+    Debug(5, "Delta rtp = %.6f\n"
+        "Local RTP time = %x",
+        "Packet RTP time = %x",
+        "Packet transit RTP time = %x",
+        tvDiffSec(mBaseTimeReal),
+        localTimeRtp,
+        ntohl(header->timestampN),
+        packetTransit);
 
     if ( mTransit > 0 ) {
       // Jitter
       int d = packetTransit - mTransit;
-      Debug( 5, "Jitter D = %d", d );
+      Debug(5, "Jitter D = %d", d);
       if ( d < 0 )
         d = -d;
       //mJitter += (1./16.) * ((double)d - mJitter);
@@ -175,32 +180,33 @@ void RtpSource::updateJitter( const RtpDataHeader *header ) {
   } else {
     mJitter = 0;
   }
-  Debug( 5, "RTP Jitter: %d", mJitter );
+  Debug(5, "RTP Jitter: %d", mJitter);
 }
 
-void RtpSource::updateRtcpData( uint32_t ntpTimeSecs, uint32_t ntpTimeFrac, uint32_t rtpTime ) {
-  struct timeval ntpTime = tvMake( ntpTimeSecs, suseconds_t((USEC_PER_SEC*(ntpTimeFrac>>16))/(1<<16)) );
+void RtpSource::updateRtcpData(
+    uint32_t ntpTimeSecs,
+    uint32_t ntpTimeFrac,
+    uint32_t rtpTime) {
+  struct timeval ntpTime = tvMake(ntpTimeSecs, suseconds_t((USEC_PER_SEC*(ntpTimeFrac>>16))/(1<<16)));
 
-  Debug( 5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
+  Debug(5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime);
 
   if ( mBaseTimeNtp.tv_sec == 0 ) {
     mBaseTimeReal = tvNow();
     mBaseTimeNtp = ntpTime;
     mBaseTimeRtp = rtpTime;
   } else if ( !mRtpClock ) {
-    Debug( 5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x", mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime );
-    Debug( 5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
+    Debug(5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x"
+        "ntpTime: %ld.%06ld, rtpTime: %x",
+        mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime,
+        ntpTime.tv_sec, ntpTime.tv_usec, rtpTime);
 
     double diffNtpTime = tvDiffSec( mBaseTimeNtp, ntpTime );
     uint32_t diffRtpTime = rtpTime - mBaseTimeRtp;
-
-    //Debug( 5, "Real-diff: %.6f", diffRealTime );
-    Debug( 5, "NTP-diff: %.6f", diffNtpTime );
-    Debug( 5, "RTP-diff: %d", diffRtpTime );
-
     mRtpFactor = (uint32_t)(diffRtpTime / diffNtpTime);
 
-    Debug( 5, "RTPfactor: %d", mRtpFactor );
+    Debug( 5, "NTP-diff: %.6f RTP-diff: %d RTPfactor: %d",
+        diffNtpTime, diffRtpTime, mRtpFactor);
   }
   mLastSrTimeNtpSecs = ntpTimeSecs;
   mLastSrTimeNtpFrac = ntpTimeFrac;
@@ -211,31 +217,37 @@ void RtpSource::updateRtcpData( uint32_t ntpTimeSecs, uint32_t ntpTimeFrac, uint
 void RtpSource::updateRtcpStats() {
   uint32_t extendedMax = mCycles + mMaxSeq;
   mExpectedPackets = extendedMax - mBaseSeq + 1;
-
-  Debug( 5, "Expected packets = %d", mExpectedPackets );
-
   // The number of packets lost is defined to be the number of packets
   // expected less the number of packets actually received:
   mLostPackets = mExpectedPackets - mReceivedPackets;
-  Debug( 5, "Lost packets = %d", mLostPackets );
-
   uint32_t expectedInterval = mExpectedPackets - mExpectedPrior;
-  Debug( 5, "Expected interval = %d", expectedInterval );
   mExpectedPrior = mExpectedPackets;
   uint32_t receivedInterval = mReceivedPackets - mReceivedPrior;
-  Debug( 5, "Received interval = %d", receivedInterval );
   mReceivedPrior = mReceivedPackets;
   uint32_t lostInterval = expectedInterval - receivedInterval;
-  Debug( 5, "Lost interval = %d", lostInterval );
 
   if ( expectedInterval == 0 || lostInterval <= 0 )
     mLostFraction = 0;
   else
     mLostFraction = (lostInterval << 8) / expectedInterval;
-  Debug( 5, "Lost fraction = %d", mLostFraction );
+
+  Debug(5,
+      "Expected packets = %d\n",
+      "Lost packets = %d\n",
+      "Expected interval = %d\n",
+      "Received interval = %d\n",
+      "Lost interval = %d\n",
+      "Lost fraction = %d\n",
+
+      mExpectedPackets,
+      mLostPackets,
+      expectedInterval,
+      receivedInterval,
+      lostInterval,
+      mLostFraction);
 }
 
-bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen ) {
+bool RtpSource::handlePacket(const unsigned char *packet, size_t packetLen) {
   const RtpDataHeader *rtpHeader;
   rtpHeader = (RtpDataHeader *)packet;
   int rtpHeaderSize = 12 + rtpHeader->cc * 4;
@@ -248,15 +260,15 @@ bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen ) {
   //  that there is no marker bit by changing the number of bits in the payload type field.
   bool thisM = rtpHeader->m || h264FragmentEnd;
 
-  if ( updateSeq( ntohs(rtpHeader->seqN) ) ) {
-    Hexdump( 4, packet+rtpHeaderSize, 16 );
+  if ( updateSeq(ntohs(rtpHeader->seqN)) ) {
+    Hexdump(4, packet+rtpHeaderSize, 16);
 
     if ( mFrameGood ) {
       int extraHeader = 0;
 
       if ( mCodecId == AV_CODEC_ID_H264 ) {
         int nalType = (packet[rtpHeaderSize] & 0x1f);
-        Debug( 3, "Have H264 frame: nal type is %d", nalType );
+        Debug(3, "Have H264 frame: nal type is %d", nalType);
 
         switch (nalType) {
           case 24: // STAP-A
@@ -281,45 +293,46 @@ bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen ) {
               extraHeader = 2;
               break;
           default: 
-              Debug(3, "Unhandled nalType %d", nalType );
+              Debug(3, "Unhandled nalType %d", nalType);
         }
 
         // Append NAL frame start code
         if ( !mFrame.size() )
-          mFrame.append( "\x0\x0\x1", 3 );
+          mFrame.append("\x0\x0\x1", 3);
       } // end if H264
-      mFrame.append( packet+rtpHeaderSize+extraHeader, packetLen-rtpHeaderSize-extraHeader ); 
+      mFrame.append(packet+rtpHeaderSize+extraHeader,
+          packetLen-rtpHeaderSize-extraHeader); 
     } else {
-      Debug( 3, "NOT H264 frame: type is %d", mCodecId );
+      Debug(3, "NOT H264 frame: type is %d", mCodecId);
     }
 
-    Hexdump( 4, mFrame.head(), 16 );
+    Hexdump(4, mFrame.head(), 16);
 
     if ( thisM ) {
       if ( mFrameGood ) {
-        Debug( 3, "Got new frame %d, %d bytes", mFrameCount, mFrame.size() );
+        Debug(3, "Got new frame %d, %d bytes", mFrameCount, mFrame.size());
 
-        mFrameProcessed.setValueImmediate( false );
-        mFrameReady.updateValueSignal( true );
+        mFrameProcessed.setValueImmediate(false);
+        mFrameReady.updateValueSignal(true);
         if ( !mFrameProcessed.getValueImmediate() ) {
           // What is the point of this for loop? Is it just me, or will it call getUpdatedValue once or twice? Could it not be better written as
           // if ( ! mFrameProcessed.getUpdatedValue( 1 ) && mFrameProcessed.getUpdatedValue( 1 ) ) return false;
 
           for ( int count = 0; !mFrameProcessed.getUpdatedValue( 1 ); count++ )
-            if( count > 1 )
-              return( false );
+            if ( count > 1 )
+              return false;
         }
         mFrameCount++;
       } else {
-        Warning( "Discarding incomplete frame %d, %d bytes", mFrameCount, mFrame.size() );
+        Warning("Discarding incomplete frame %d, %d bytes", mFrameCount, mFrame.size());
       }
       mFrame.clear();
     }
   } else {
     if ( mFrame.size() ) {
-      Warning( "Discarding partial frame %d, %d bytes", mFrameCount, mFrame.size() );
+      Warning("Discarding partial frame %d, %d bytes", mFrameCount, mFrame.size());
     } else {
-      Warning( "Discarding frame %d", mFrameCount );
+      Warning("Discarding frame %d", mFrameCount);
     }
     mFrameGood = false;
     mFrame.clear();
@@ -330,23 +343,23 @@ bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen ) {
   } else
     prevM = false;
 
-  updateJitter( rtpHeader );
+  updateJitter(rtpHeader);
 
   return true;
 }
 
-bool RtpSource::getFrame( Buffer &buffer ) {
-  Debug( 3, "Getting frame" );
+bool RtpSource::getFrame(Buffer &buffer) {
   if ( !mFrameReady.getValueImmediate() ) {
+    Debug(3, "Getting frame but not ready");
     // Allow for a couple of spurious returns
-    for ( int count = 0; !mFrameReady.getUpdatedValue( 1 ); count++ )
+    for ( int count = 0; !mFrameReady.getUpdatedValue(1); count++ )
       if ( count > 1 )
-        return( false );
+        return false;
   }
   buffer = mFrame;
-  mFrameReady.setValueImmediate( false );
-  mFrameProcessed.updateValueSignal( true );
-  Debug( 4, "Copied %d bytes", buffer.size() );
+  mFrameReady.setValueImmediate(false);
+  mFrameProcessed.updateValueSignal(true);
+  Debug(4, "Copied %d bytes", buffer.size());
   return true;
 }
 
diff --git a/src/zm_rtp_source.h b/src/zm_rtp_source.h
index b53fb975b..f91ba20f7 100644
--- a/src/zm_rtp_source.h
+++ b/src/zm_rtp_source.h
@@ -94,7 +94,7 @@ private:
   ThreadData<bool> mFrameProcessed;
 
 private:
-  void init( uint16_t seq );
+  void init(uint16_t seq);
 
 public:
   RtpSource( int id, const std::string &localHost, int localPortBase, const std::string &remoteHost, int remotePortBase, uint32_t ssrc, uint16_t seq, uint32_t rtpClock, uint32_t rtpTime, _AVCODECID codecId );
diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index 5e2858e4f..53452bb94 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -34,17 +34,17 @@
 
 int RtspThread::smMinDataPort = 0;
 int RtspThread::smMaxDataPort = 0;
-RtspThread::PortSet  RtspThread::smAssignedPorts;
+RtspThread::PortSet RtspThread::smAssignedPorts;
 
-bool RtspThread::sendCommand( std::string message ) {
+bool RtspThread::sendCommand(std::string message) {
   if ( mNeedAuth ) {
-    StringVector parts = split( message, " " );
-    if (parts.size() > 1)
+    StringVector parts = split(message, " ");
+    if ( parts.size() > 1 )
       message += mAuthenticator->getAuthHeader(parts[0], parts[1]);
   }
-  message += stringtf( "User-Agent: ZoneMinder/%s\r\n", ZM_VERSION );
-  message += stringtf( "CSeq: %d\r\n\r\n", ++mSeq );
-  Debug( 2, "Sending RTSP message: %s", message.c_str() );
+  message += stringtf("User-Agent: ZoneMinder/%s\r\n", ZM_VERSION);
+  message += stringtf("CSeq: %d\r\n\r\n", ++mSeq);
+  Debug(2, "Sending RTSP message: %s", message.c_str());
   if ( mMethod == RTP_RTSP_HTTP ) {
     message = base64Encode(message);
     Debug(2, "Sending encoded RTSP message: %s", message.c_str());
@@ -61,8 +61,8 @@ bool RtspThread::sendCommand( std::string message ) {
   return true;
 }
 
-bool RtspThread::recvResponse( std::string &response ) {
-  if ( mRtspSocket.recv( response ) < 0 )
+bool RtspThread::recvResponse(std::string &response) {
+  if ( mRtspSocket.recv(response) < 0 )
     Error("Recv failed; %s", strerror(errno));
   Debug(2, "Received RTSP response: %s (%zd bytes)", response.c_str(), response.size());
   float respVer = 0;
@@ -74,12 +74,12 @@ bool RtspThread::recvResponse( std::string &response ) {
     } else {
       Error("Response parse failure, %zd bytes follow", response.size());
       if ( response.size() )
-        Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
+        Hexdump(Logger::ERROR, response.data(), min(response.size(),16));
     }
     return false;
   }
   if ( respCode == 401 ) {
-    Debug( 2, "Got 401 access denied response code, check WWW-Authenticate header and retry");
+    Debug(2, "Got 401 access denied response code, check WWW-Authenticate header and retry");
     mAuthenticator->checkAuthResponse(response);
     mNeedAuth = true;
     return false;
@@ -88,24 +88,24 @@ bool RtspThread::recvResponse( std::string &response ) {
     return false;
   }
   return true;
-} // end RtspThread::recResponse
+}  // end RtspThread::recvResponse
 
 int RtspThread::requestPorts() {
   if ( !smMinDataPort ) {
     char sql[ZM_SQL_SML_BUFSIZ];
     //FIXME Why not load specifically by Id?  This will get ineffeicient with a lot of monitors
-    strncpy( sql, "select Id from Monitors where Function != 'None' and Type = 'Remote' and Protocol = 'rtsp' and Method = 'rtpUni' order by Id asc", sizeof(sql) );
-    if ( mysql_query( &dbconn, sql ) ) {
-      Error( "Can't run query: %s", mysql_error( &dbconn ) );
-      exit( mysql_errno( &dbconn ) );
+    strncpy(sql, "SELECT `Id` FROM `Monitors` WHERE `Function` != 'None' AND `Type` = 'Remote' AND `Protocol` = 'rtsp' AND `Method` = 'rtpUni' ORDER BY `Id` ASC", sizeof(sql));
+    if ( mysql_query(&dbconn, sql) ) {
+      Error("Can't run query: %s", mysql_error(&dbconn));
+      exit(mysql_errno(&dbconn));
     }
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
+    MYSQL_RES *result = mysql_store_result(&dbconn);
     if ( !result ) {
-      Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-      exit( mysql_errno( &dbconn ) );
+      Error("Can't use query result: %s", mysql_error(&dbconn));
+      exit(mysql_errno(&dbconn));
     }
-    int nMonitors = mysql_num_rows( result );
+    int nMonitors = mysql_num_rows(result);
     int position = 0;
     if ( nMonitors ) {
       for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
@@ -124,7 +124,7 @@ int RtspThread::requestPorts() {
     int portRange = int(((config.max_rtp_port-config.min_rtp_port)+1)/nMonitors);
     smMinDataPort = config.min_rtp_port + (position * portRange);
     smMaxDataPort = smMinDataPort + portRange - 1;
-    Debug( 2, "Assigned RTP port range is %d-%d", smMinDataPort, smMaxDataPort );
+    Debug(2, "Assigned RTP port range is %d-%d", smMinDataPort, smMaxDataPort);
   }
   for ( int i = smMinDataPort; i <= smMaxDataPort; i++ ) {
     PortSet::const_iterator iter = smAssignedPorts.find(i);
@@ -137,7 +137,7 @@ int RtspThread::requestPorts() {
   return -1;
 }
 
-void RtspThread::releasePorts( int port ) {
+void RtspThread::releasePorts(int port) {
   if ( port > 0 )
     smAssignedPorts.erase(port);
 }
@@ -151,21 +151,21 @@ RtspThread::RtspThread(
     const std::string &path,
     const std::string &auth,
     bool rtsp_describe) :
-  mId( id ),
-  mMethod( method ),
-  mProtocol( protocol ),
-  mHost( host ),
-  mPort( port ),
-  mPath( path ),
-  mRtspDescribe( rtsp_describe ),
-  mSessDesc( 0 ),
-  mFormatContext( 0 ),
-  mSeq( 0 ),
-  mSession( 0 ),
-  mSsrc( 0 ),
-  mDist( UNDEFINED ),
-  mRtpTime( 0 ),
-  mStop( false )
+  mId(id),
+  mMethod(method),
+  mProtocol(protocol),
+  mHost(host),
+  mPort(port),
+  mPath(path),
+  mRtspDescribe(rtsp_describe),
+  mSessDesc(0),
+  mFormatContext(0),
+  mSeq(0),
+  mSession(0),
+  mSsrc(0),
+  mDist(UNDEFINED),
+  mRtpTime(0),
+  mStop(false)
 {
   mUrl = mProtocol+"://"+mHost+":"+mPort;
   if ( !mPath.empty() ) {
@@ -177,14 +177,15 @@ RtspThread::RtspThread(
 
   mSsrc = rand();
 
-  Debug(2, "RTSP Local SSRC is %x", mSsrc);
+  Debug(2, "RTSP Local SSRC is %x, url is %s", mSsrc, mUrl.c_str());
 
   if ( mMethod == RTP_RTSP_HTTP )
     mHttpSession = stringtf("%d", rand());
   
   mNeedAuth = false;
-  StringVector parts = split(auth,":");
-  if (parts.size() > 1) 
+  StringVector parts = split(auth, ":");
+  Debug(2, "# of auth parts %d", parts.size());
+  if ( parts.size() > 1 ) 
     mAuthenticator = new zm::Authenticator(parts[0], parts[1]);
   else
     mAuthenticator = new zm::Authenticator(parts[0], "");
@@ -193,27 +194,28 @@ RtspThread::RtspThread(
 RtspThread::~RtspThread() {
   if ( mFormatContext ) {
 #if LIBAVFORMAT_VERSION_CHECK(52, 96, 0, 96, 0)
-    avformat_free_context( mFormatContext );
+    avformat_free_context(mFormatContext);
 #else
-    av_free_format_context( mFormatContext );
+    av_free_format_context(mFormatContext);
 #endif
-    mFormatContext = NULL;
+    mFormatContext = nullptr;
   }
   if ( mSessDesc ) {
     delete mSessDesc;
-    mSessDesc = NULL;
+    mSessDesc = nullptr;
   }
   delete mAuthenticator;
+  mAuthenticator = nullptr;
 }
 
 int RtspThread::run() {
   std::string message;
   std::string response;
 
-  response.reserve( ZM_NETWORK_BUFSIZ );
+  response.reserve(ZM_NETWORK_BUFSIZ);
 
-  if ( !mRtspSocket.connect( mHost.c_str(), mPort.c_str() ) )
-    Fatal( "Unable to connect RTSP socket" );
+  if ( !mRtspSocket.connect(mHost.c_str(), mPort.c_str()) )
+    Fatal("Unable to connect RTSP socket");
   //Select select( 0.25 );
   //select.addReader( &mRtspSocket );
   //while ( select.wait() )
@@ -221,7 +223,6 @@ int RtspThread::run() {
     //mRtspSocket.recv( response );
     //Debug( 4, "Drained %d bytes from RTSP socket", response.size() );
   //}
-
   
   bool authTried = false; 
   if ( mMethod == RTP_RTSP_HTTP ) {
@@ -245,14 +246,13 @@ int RtspThread::run() {
         message += mAuthenticator->getAuthHeader("GET", mPath);
         authTried = true;
       }
-      message += "Accept: application/x-rtsp-tunnelled\r\n";
-      message += "\r\n";
-      Debug( 2, "Sending HTTP message: %s", message.c_str() );
-      if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() ) {
+      message += "Accept: application/x-rtsp-tunnelled\r\n\r\n";
+      Debug(2, "Sending HTTP message: %s", message.c_str());
+      if ( mRtspSocket.send(message.c_str(), message.size()) != (int)message.length() ) {
         Error("Unable to send message '%s': %s", message.c_str(), strerror(errno));
         return -1;
       }
-      if ( mRtspSocket.recv( response ) < 0 ) {
+      if ( mRtspSocket.recv(response) < 0 ) {
         Error("Recv failed; %s", strerror(errno));
         return -1;
       }
@@ -260,13 +260,13 @@ int RtspThread::run() {
       Debug(2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size());
       float respVer = 0;
       respCode = -1;
-      if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 ) {
+      if ( sscanf(response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText) != 3 ) {
         if ( isalnum(response[0]) ) {
-          Error( "Response parse failure in '%s'", response.c_str() );
+          Error("Response parse failure in '%s'", response.c_str());
         } else {
-          Error( "Response parse failure, %zd bytes follow", response.size() );
+          Error("Response parse failure, %zd bytes follow", response.size());
           if ( response.size() )
-            Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
+            Hexdump(Logger::ERROR, response.data(), min(response.size(),16));
         }
         return -1;
       }
@@ -296,25 +296,25 @@ int RtspThread::run() {
     message += "Content-Length: 32767\r\n";
     message += "Content-Type: application/x-rtsp-tunnelled\r\n";
     message += "\r\n";
-    Debug( 2, "Sending HTTP message: %s", message.c_str() );
-    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() ) {
-      Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
-      return( -1 );
+    Debug(2, "Sending HTTP message: %s", message.c_str());
+    if ( mRtspSocket2.send(message.c_str(), message.size()) != (int)message.length() ) {
+      Error("Unable to send message '%s': %s", message.c_str(), strerror(errno));
+      return -1;
     }
-  }
+  }  // end if ( mMethod == RTP_RTSP_HTTP )
 
   std::string localHost = "";
   int localPorts[2] = { 0, 0 };
 
   // Request supported RTSP commands by the server
   message = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
-  if ( !sendCommand( message ) )
+  if ( !sendCommand(message) )
     return -1;
 
   // A negative return here may indicate auth failure, but we will have setup the auth mechanisms so we need to retry.
   if ( !recvResponse(response) ) {
     if ( mNeedAuth ) {
-      Debug( 2, "Resending OPTIONS due to possible auth requirement" );
+      Debug(2, "Resending OPTIONS due to possible auth requirement");
       if ( !sendCommand(message) )
         return -1;
       if ( !recvResponse(response) )
@@ -338,11 +338,11 @@ int RtspThread::run() {
   message = "DESCRIBE "+mUrl+" RTSP/1.0\r\n";
   bool res;
   do {
-    if (mNeedAuth)
+    if ( mNeedAuth )
       authTried = true;
     sendCommand(message);
-    // FIXME WHy sleep 1?
-    sleep(1);
+    // FIXME Why sleep 1?
+    usleep(10000);
     res = recvResponse(response);
     if ( !res && respCode==401 )
       mNeedAuth = true;
@@ -387,7 +387,7 @@ int RtspThread::run() {
   if ( !mAuth.empty() )
     authUrl.insert( authUrl.find( "://" )+3, mAuth+"@" );
 
-  if ( av_open_input_file( &mFormatContext, authUrl.c_str(), NULL, 0, NULL ) != 0 )
+  if ( av_open_input_file( &mFormatContext, authUrl.c_str(), nullptr, 0, nullptr ) != 0 )
   {
     Error( "Unable to open input '%s'", authUrl.c_str() );
     return( -1 );
@@ -499,26 +499,26 @@ int RtspThread::run() {
       method = "RTP/UNICAST";
       StringVector subparts = split( parts[i], "=" );
       StringVector ports = split( subparts[1], "-" );
-      remotePorts[0] = strtol( ports[0].c_str(), NULL, 10 );
-      remotePorts[1] = strtol( ports[1].c_str(), NULL, 10 );
+      remotePorts[0] = strtol( ports[0].c_str(), nullptr, 10 );
+      remotePorts[1] = strtol( ports[1].c_str(), nullptr, 10 );
     } else if ( startsWith( parts[i], "interleaved=" ) ) {
       method = "RTP/RTSP";
       StringVector subparts = split( parts[i], "=" );
       StringVector channels = split( subparts[1], "-" );
-      remoteChannels[0] = strtol( channels[0].c_str(), NULL, 10 );
-      remoteChannels[1] = strtol( channels[1].c_str(), NULL, 10 );
+      remoteChannels[0] = strtol( channels[0].c_str(), nullptr, 10 );
+      remoteChannels[1] = strtol( channels[1].c_str(), nullptr, 10 );
     } else if ( startsWith( parts[i], "port=" ) ) {
       method = "RTP/MULTICAST";
       StringVector subparts = split( parts[i], "=" );
       StringVector ports = split( subparts[1], "-" );
-      localPorts[0] = strtol( ports[0].c_str(), NULL, 10 );
-      localPorts[1] = strtol( ports[1].c_str(), NULL, 10 );
+      localPorts[0] = strtol( ports[0].c_str(), nullptr, 10 );
+      localPorts[1] = strtol( ports[1].c_str(), nullptr, 10 );
     } else if ( startsWith( parts[i], "destination=" ) ) {
       StringVector subparts = split( parts[i], "=" );
       localHost = subparts[1];
     } else if ( startsWith( parts[i], "ssrc=" ) ) {
       StringVector subparts = split( parts[i], "=" );
-      ssrc = strtoll( subparts[1].c_str(), NULL, 16 );
+      ssrc = strtoll( subparts[1].c_str(), nullptr, 16 );
     }
   }
 
@@ -568,10 +568,10 @@ int RtspThread::run() {
         for ( size_t j = 0; j < parts.size(); j++ ) {
           if ( startsWith( parts[j], "seq=" ) ) {
             StringVector subparts = split( parts[j], "=" );
-            seq = strtol( subparts[1].c_str(), NULL, 10 );
+            seq = strtol( subparts[1].c_str(), nullptr, 10 );
           } else if ( startsWith( parts[j], "rtptime=" ) ) {
             StringVector subparts = split( parts[j], "=" );
-            rtpTime = strtol( subparts[1].c_str(), NULL, 10 );
+            rtpTime = strtol( subparts[1].c_str(), nullptr, 10 );
           }
         }
       break;
@@ -582,7 +582,7 @@ int RtspThread::run() {
   Debug( 2, "RTSP Seq is %d", seq );
   Debug( 2, "RTSP Rtptime is %ld", rtpTime );
 
-  time_t lastKeepalive = time(NULL);
+  time_t lastKeepalive = time(nullptr);
   time_t now;
   message = "GET_PARAMETER "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
 
@@ -598,9 +598,10 @@ int RtspThread::run() {
       rtpCtrlThread.start();
 
       while( !mStop ) {
-        now = time(NULL);
+        now = time(nullptr);
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
+        Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d",
+            sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
         if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) ) {
           if ( !sendCommand( message ) )
             return( -1 );
@@ -678,22 +679,21 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
               break;
             }
             if ( channel == remoteChannels[0] ) {
-              Debug( 4, "Got %d bytes on data channel %d, packet length is %d", buffer.size(), channel, len );
-              Hexdump( 4, (char *)buffer, 16 );
-              rtpDataThread.recvPacket( buffer+4, len );
-              Debug( 4, "Received" );
+              Debug(4, "Got %d bytes on data channel %d, packet length is %d", buffer.size(), channel, len);
+              Hexdump(4, (char *)buffer, 16);
+              rtpDataThread.recvPacket(buffer+4, len);
             } else if ( channel == remoteChannels[1] ) {
 //              len = ntohs( *((unsigned short *)(buffer+2)) );
 //              Debug( 4, "Got %d bytes on control channel %d", nBytes, channel );
-              Debug( 4, "Got %d bytes on control channel %d, packet length is %d", buffer.size(), channel, len );
-              Hexdump( 4, (char *)buffer, 16 );
-              rtpCtrlThread.recvPackets( buffer+4, len );
+              Debug(4, "Got %d bytes on control channel %d, packet length is %d", buffer.size(), channel, len);
+              Hexdump(4, (char *)buffer, 16);
+              rtpCtrlThread.recvPackets(buffer+4, len);
             } else {
-              Error( "Unexpected channel selector %d in RTSP interleaved data", buffer[1] );
+              Error("Unexpected channel selector %d in RTSP interleaved data", buffer[1]);
               buffer.clear();
               break;
             }
-            buffer.consume( len+4 );
+            buffer.consume(len+4);
             nBytes -= len+4;
           } else {
             if ( keepaliveResponse.compare( 0, keepaliveResponse.size(), (char *)buffer, keepaliveResponse.size() ) == 0 ) {
@@ -721,7 +721,7 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
         }
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
         // FIXME: Is this really necessary when using tcp ?
-        now = time(NULL);
+        now = time(nullptr);
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
 Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
         if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
@@ -761,10 +761,10 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
 
       while ( !mStop ) {
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-        if ( sendKeepalive && (timeout > 0) && ((time(NULL)-lastKeepalive) > (timeout-5)) ) {
+        if ( sendKeepalive && (timeout > 0) && ((time(nullptr)-lastKeepalive) > (timeout-5)) ) {
           if ( !sendCommand( message ) )
             return -1;
-          lastKeepalive = time(NULL);
+          lastKeepalive = time(nullptr);
         }
         usleep(100000);
       }
diff --git a/src/zm_rtsp_auth.cpp b/src/zm_rtsp_auth.cpp
index 81aa13c27..5cd05063c 100644
--- a/src/zm_rtsp_auth.cpp
+++ b/src/zm_rtsp_auth.cpp
@@ -56,21 +56,20 @@ void Authenticator::reset() {
   fAuthMethod = AUTH_UNDEFINED;
 }
 
-void Authenticator::authHandleHeader(std::string headerData) 
-{
+void Authenticator::authHandleHeader(std::string headerData) {
   const char* basic_match = "Basic ";
   const char* digest_match = "Digest ";
   size_t digest_match_len = strlen(digest_match);
   
   // Check if basic auth
-  if ( strncasecmp(headerData.c_str(),basic_match,strlen(basic_match)) == 0 ) {
+  if ( strncasecmp(headerData.c_str(), basic_match, strlen(basic_match)) == 0 ) {
     fAuthMethod = AUTH_BASIC;
     Debug(2, "Set authMethod to Basic");
   } 
   // Check if digest auth
-  else if (strncasecmp( headerData.c_str(),digest_match,digest_match_len ) == 0) {
+  else if ( strncasecmp(headerData.c_str(), digest_match, digest_match_len) == 0) {
     fAuthMethod = AUTH_DIGEST;
-    Debug( 2, "Set authMethod to Digest");
+    Debug(2, "Set authMethod to Digest");
     StringVector subparts = split(headerData.substr(digest_match_len, headerData.length() - digest_match_len), ",");
     // subparts are key="value"
     for ( size_t i = 0; i < subparts.size(); i++ ) {
@@ -92,7 +91,7 @@ void Authenticator::authHandleHeader(std::string headerData)
     Debug(2, "Auth data completed. User: %s, realm: %s, nonce: %s, qop: %s",
 				username().c_str(), fRealm.c_str(), fNonce.c_str(), fQop.c_str());
   }
-}
+}  // end void Authenticator::authHandleHeader(std::string headerData)
 
 std::string Authenticator::quote( const std::string &src ) {
   return replaceAll(replaceAll(src, "\\", "\\\\"), "\"", "\\\"");
@@ -100,13 +99,13 @@ std::string Authenticator::quote( const std::string &src ) {
 
 std::string Authenticator::getAuthHeader(std::string method, std::string uri) {
   std::string result = "Authorization: ";
-  if (fAuthMethod == AUTH_BASIC) {
-    result += "Basic " + base64Encode( username() + ":" + password() );
-  } else if (fAuthMethod == AUTH_DIGEST) {
+  if ( fAuthMethod == AUTH_BASIC ) {
+    result += "Basic " + base64Encode(username() + ":" + password());
+  } else if ( fAuthMethod == AUTH_DIGEST ) {
     result += std::string("Digest ") + 
           "username=\"" + quote(username()) + "\", realm=\"" + quote(realm()) + "\", " +
           "nonce=\"" + quote(nonce()) + "\", uri=\"" + quote(uri) + "\"";
-    if ( ! fQop.empty() ) {
+    if ( !fQop.empty() ) {
       result += ", qop=" + fQop;
       result += ", nc=" + stringtf("%08x",nc);
       result += ", cnonce=\"" + fCnonce + "\"";
@@ -144,7 +143,7 @@ std::string Authenticator::computeDigestResponse(std::string &method, std::strin
 #if HAVE_DECL_MD5
   MD5((unsigned char*)ha1Data.c_str(), ha1Data.length(), md5buf);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-  gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), ha1Data.length() };
+  gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), (unsigned int)ha1Data.length() };
   gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha1, md5buf, &md5len );
 #endif
   for ( unsigned int j = 0; j < md5len; j++ ) {
@@ -159,7 +158,7 @@ std::string Authenticator::computeDigestResponse(std::string &method, std::strin
 #if HAVE_DECL_MD5
   MD5((unsigned char*)ha2Data.c_str(), ha2Data.length(), md5buf );
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-  gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), ha2Data.length() };
+  gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), (unsigned int)ha2Data.length() };
   gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha2, md5buf, &md5len );
 #endif
   for ( unsigned int j = 0; j < md5len; j++ ) {
@@ -180,7 +179,7 @@ std::string Authenticator::computeDigestResponse(std::string &method, std::strin
 #if HAVE_DECL_MD5
   MD5((unsigned char*)digestData.c_str(), digestData.length(), md5buf);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-  gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), digestData.length() };
+  gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), (unsigned int)digestData.length() };
   gnutls_fingerprint( GNUTLS_DIG_MD5, &md5datadigest, md5buf, &md5len );
 #endif
   for ( unsigned int j = 0; j < md5len; j++ ) {
@@ -203,21 +202,21 @@ void Authenticator::checkAuthResponse(std::string &response) {
 
   for ( size_t i = 0; i < lines.size(); i++ ) {
     // stop at end of headers
-    if (lines[i].length()==0)
+    if ( lines[i].length() == 0 )
       break;
 
-    if (strncasecmp(lines[i].c_str(),authenticate_match,authenticate_match_len) == 0) {
+    if ( strncasecmp(lines[i].c_str(), authenticate_match, authenticate_match_len) == 0 ) {
       authLine = lines[i];
-      Debug( 2, "Found auth line at %d", i);
-      break;
+      Debug(2, "Found auth line at %d:", i);
+      //break;
     }
   }
-  if (!authLine.empty()) {
-    Debug( 2, "Analyze auth line %s", authLine.c_str());
-    authHandleHeader( trimSpaces(authLine.substr(authenticate_match_len,authLine.length()-authenticate_match_len)) );
+  if ( !authLine.empty() ) {
+    Debug(2, "Analyze auth line %s", authLine.c_str());
+    authHandleHeader(trimSpaces(authLine.substr(authenticate_match_len, authLine.length()-authenticate_match_len)));
   } else {
-    Debug( 2, "Didn't find auth line in %s", authLine.c_str());
+    Debug(2, "Didn't find auth line in %s", authLine.c_str());
   }
-}
+}  // end void Authenticator::checkAuthResponse(std::string &response)
 
 } // namespace zm
diff --git a/src/zm_rtsp_auth.h b/src/zm_rtsp_auth.h
index 34056eee6..8e65746de 100644
--- a/src/zm_rtsp_auth.h
+++ b/src/zm_rtsp_auth.h
@@ -19,9 +19,6 @@
 #ifndef ZM_RTSP_AUTH_H
 #define ZM_RTSP_AUTH_H
 
-#if HAVE_GNUTLS_OPENSSL_H
-#include <gnutls/openssl.h>
-#endif
 #if HAVE_GNUTLS_GNUTLS_H
 #include <gnutls/gnutls.h>
 #endif
diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp
index c7bf1b578..de48e169d 100644
--- a/src/zm_sdp.cpp
+++ b/src/zm_sdp.cpp
@@ -152,16 +152,16 @@ SessionDescriptor::MediaDescriptor::MediaDescriptor(
   mWidth( 0 ),
   mHeight( 0 ),
   mSprops( "" ),
-  mConnInfo( 0 )
+  mConnInfo( nullptr )
 {
 }
 
 SessionDescriptor::SessionDescriptor( const std::string &url, const std::string &sdp ) : 
   mUrl( url ),
-  mConnInfo( 0 ),
-  mBandInfo( 0 )
+  mConnInfo( nullptr ),
+  mBandInfo( nullptr )
 {
-  MediaDescriptor *currMedia = 0;
+  MediaDescriptor *currMedia = nullptr;
 
   StringVector lines = split( sdp, "\r\n" );
   for ( StringVector::const_iterator iter = lines.begin(); iter != lines.end(); ++iter ) {
@@ -344,12 +344,12 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
 #if !LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
     AVStream *stream = av_new_stream(formatContext, i);
 #else
-    AVStream *stream = avformat_new_stream(formatContext, NULL);
+    AVStream *stream = avformat_new_stream(formatContext, nullptr);
     stream->id = i;
 #endif
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    AVCodecContext *codec_context = avcodec_alloc_context3(NULL);
+    AVCodecContext *codec_context = avcodec_alloc_context3(nullptr);
     avcodec_parameters_to_context(codec_context, stream->codecpar);
     stream->codec = codec_context;
 #else
@@ -376,6 +376,9 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
 #endif
     else
       Warning("Unknown media_type %s", type.c_str());
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      stream->codecpar->codec_type = codec_context->codec_type;
+#endif
 
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
     std::string codec_name;
@@ -431,7 +434,7 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
     if ( codec_context->codec_id == AV_CODEC_ID_H264 && mediaDesc->getSprops().size()) {
       uint8_t start_sequence[]= { 0, 0, 1 };
       codec_context->extradata_size= 0;
-      codec_context->extradata= NULL;
+      codec_context->extradata= nullptr;
       char pvalue[1024], *value = pvalue;
     
       strcpy(pvalue, mediaDesc->getSprops().c_str());
diff --git a/src/zm_sdp.h b/src/zm_sdp.h
index ae7cd67a2..403c8a740 100644
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@@ -211,7 +211,7 @@ public:
   MediaDescriptor *getStream( int index )
   {
     if ( index < 0 || (unsigned int)index >= mMediaList.size() )
-      return( 0 );
+      return nullptr;
     return( mMediaList[index] );
   }
 
diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
index 2f892d693..593a94833 100644
--- a/src/zm_sendfile.h
+++ b/src/zm_sendfile.h
@@ -11,7 +11,7 @@ int zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
   int err;
 
   err = sendfile(out_fd, in_fd, offset, size);
-  if (err < 0)
+  if ( err < 0 )
     return -errno;
 
   return err;
@@ -22,7 +22,7 @@ int zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
 #include <sys/uio.h>
 int zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
   int err;
-  err = sendfile(in_fd, out_fd, *offset, size, NULL, &size, 0);
+  err = sendfile(in_fd, out_fd, *offset, size, nullptr, &size, 0);
   if (err && errno != EAGAIN)
     return -errno;
 
diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
index e13bfdc9c..81012c07e 100644
--- a/src/zm_signal.cpp
+++ b/src/zm_signal.cpp
@@ -53,8 +53,8 @@ RETSIGTYPE zm_die_handler(int signal)
 #if (defined(__i386__) || defined(__x86_64__))
 	// Get more information if available
   #if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
-	void *ip = 0;
-	void *cr2 = 0;
+	void *ip = nullptr;
+	void *cr2 = nullptr;
 	if (info && context) {
 
 		Debug(1,
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 6e883a024..05236c3ba 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -33,18 +33,31 @@ StreamBase::~StreamBase() {
 #if HAVE_LIBAVCODEC
   if ( vid_stream ) {
     delete vid_stream;
-    vid_stream = NULL;
+    vid_stream = nullptr;
   }
 #endif
   closeComms();
+  if ( monitor ) {
+    delete monitor;
+    monitor = NULL;
+  }
 }
 
-bool StreamBase::loadMonitor(int monitor_id) {
+bool StreamBase::loadMonitor(int p_monitor_id) {
+  monitor_id = p_monitor_id;
+  if ( monitor )
+    delete monitor;
+
   if ( !(monitor = Monitor::Load(monitor_id, false, Monitor::QUERY)) ) {
     Error("Unable to load monitor id %d for streaming", monitor_id);
     return false;
   }
-  if ( ! monitor->connect() ) {
+  if ( monitor->GetFunction() == Monitor::NONE ) {
+    Error("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
+    return false;
+  }
+
+  if ( !monitor->connect() ) {
     Error("Unable to connect to monitor id %d for streaming", monitor_id);
     return false;
   }
@@ -54,7 +67,15 @@ bool StreamBase::loadMonitor(int monitor_id) {
 
 bool StreamBase::checkInitialised() {
   if ( !monitor ) {
-    Fatal("Cannot stream, not initialised");
+    Error("Cannot stream, not initialised");
+    return false;
+  }
+  if ( monitor->GetFunction() == Monitor::NONE ) {
+    Error("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
+    return false;
+  }
+  if ( !monitor->ShmValid() ) {
+    Error("Monitor shm is not connected");
     return false;
   }
   return true;
@@ -109,16 +130,7 @@ bool StreamBase::checkCommandQueue() {
   return false;
 }
 
-Image *StreamBase::prepareImage( Image *image ) {
-  static int last_scale = 0;
-  static int last_zoom = 0;
-  static int last_x = 0;
-  static int last_y = 0;
-
-  if ( !last_scale )
-    last_scale = scale;
-  if ( !last_zoom )
-    last_zoom = zoom;
+Image *StreamBase::prepareImage(Image *image) {
 
   // Do not bother to scale zoomed in images, just crop them and let the browser scale
   // Works in FF2 but breaks FF3 which doesn't like image sizes changing in mid stream.
@@ -128,50 +140,51 @@ Image *StreamBase::prepareImage( Image *image ) {
 
   int mag = (scale * zoom) / ZM_SCALE_BASE;
   int act_mag = optimisedScaling?(mag > ZM_SCALE_BASE?ZM_SCALE_BASE:mag):mag;
-  Debug( 3, "Scaling by %d, zooming by %d = magnifying by %d(%d)", scale, zoom, mag, act_mag );
 
   int last_mag = (last_scale * last_zoom) / ZM_SCALE_BASE;
   int last_act_mag = last_mag > ZM_SCALE_BASE?ZM_SCALE_BASE:last_mag;
-  Debug( 3, "Last scaling by %d, zooming by %d = magnifying by %d(%d)", last_scale, last_zoom, last_mag, last_act_mag );
-
   int base_image_width = image->Width(), base_image_height = image->Height();
-  Debug( 3, "Base image width = %d, height = %d", base_image_width, base_image_height );
-
   int virt_image_width = (base_image_width * mag) / ZM_SCALE_BASE, virt_image_height = (base_image_height * mag) / ZM_SCALE_BASE;
-  Debug( 3, "Virtual image width = %d, height = %d", virt_image_width, virt_image_height );
-
   int last_virt_image_width = (base_image_width * last_mag) / ZM_SCALE_BASE, last_virt_image_height = (base_image_height * last_mag) / ZM_SCALE_BASE;
-  Debug( 3, "Last virtual image width = %d, height = %d", last_virt_image_width, last_virt_image_height );
-
   int act_image_width = (base_image_width * act_mag ) / ZM_SCALE_BASE, act_image_height = (base_image_height * act_mag ) / ZM_SCALE_BASE;
-  Debug( 3, "Actual image width = %d, height = %d", act_image_width, act_image_height );
-
   int last_act_image_width = (base_image_width * last_act_mag ) / ZM_SCALE_BASE, last_act_image_height = (base_image_height * last_act_mag ) / ZM_SCALE_BASE;
-  Debug( 3, "Last actual image width = %d, height = %d", last_act_image_width, last_act_image_height );
-
   int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE;
-  Debug( 3, "Display image width = %d, height = %d", disp_image_width, disp_image_height );
-
   int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE;
-  Debug( 3, "Last display image width = %d, height = %d", last_disp_image_width, last_disp_image_height );
-
   int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag;
-  Debug( 3, "Send image width = %d, height = %d", send_image_width, send_image_height );
-
   int last_send_image_width = (last_disp_image_width * last_act_mag ) / last_mag, last_send_image_height = (last_disp_image_height * last_act_mag ) / last_mag;
-  Debug( 3, "Last send image width = %d, height = %d", last_send_image_width, last_send_image_height );
 
-  if ( mag != ZM_SCALE_BASE ) {
-    if ( act_mag != ZM_SCALE_BASE ) {
-      Debug(3, "Magnifying by %d", mag);
-      if ( !image_copied ) {
-        static Image copy_image;
-        copy_image.Assign(*image);
-        image = &copy_image;
-        image_copied = true;
-      }
-      image->Scale(mag);
-    }
+  Debug(3,
+      "Scaling by %d, zooming by %d = magnifying by %d(%d)\n"
+      "Last scaling by %d, zooming by %d = magnifying by %d(%d)\n"
+      "Base image width = %d, height = %d\n"
+      "Virtual image width = %d, height = %d\n"
+      "Last virtual image width = %d, height = %d\n"
+      "Actual image width = %d, height = %d\n"
+      "Last actual image width = %d, height = %d\n"
+      "Display image width = %d, height = %d\n"
+      "Last display image width = %d, height = %d\n"
+      "Send image width = %d, height = %d\n"
+      "Last send image width = %d, height = %d\n",
+      scale, zoom, mag, act_mag,
+      last_scale, last_zoom, last_mag, last_act_mag,
+      base_image_width, base_image_height,
+      virt_image_width, virt_image_height,
+      last_virt_image_width, last_virt_image_height,
+      act_image_width, act_image_height,
+      last_act_image_width, last_act_image_height,
+      disp_image_width, disp_image_height,
+      last_disp_image_width, last_disp_image_height,
+      send_image_width, send_image_height,
+      last_send_image_width, last_send_image_height
+      );
+
+  if ( ( mag != ZM_SCALE_BASE ) && (act_mag != ZM_SCALE_BASE) ) {
+    Debug(3, "Magnifying by %d", mag);
+    static Image copy_image;
+    copy_image.Assign(*image);
+    image = &copy_image;
+    image_copied = true;
+    image->Scale(mag);
   }
 
   Debug(3, "Real image width = %d, height = %d", image->Width(), image->Height());
@@ -180,26 +193,22 @@ Image *StreamBase::prepareImage( Image *image ) {
     static Box last_crop;
 
     if ( mag != last_mag || x != last_x || y != last_y ) {
-      Debug( 3, "Got click at %d,%d x %d", x, y, mag );
-
-      //if ( !last_mag )
-        //last_mag = mag;
+      Debug(3, "Got click at %d,%d x %d", x, y, mag);
 
       if ( !(last_disp_image_width < last_virt_image_width || last_disp_image_height < last_virt_image_height) )
         last_crop = Box();
 
-      Debug( 3, "Recalculating crop" );
       // Recalculate crop parameters, as %ges
       int click_x = (last_crop.LoX() * 100 ) / last_act_image_width; // Initial crop offset from last image
       click_x += ( x * 100 ) / last_virt_image_width;
       int click_y = (last_crop.LoY() * 100 ) / last_act_image_height; // Initial crop offset from last image
       click_y += ( y * 100 ) / last_virt_image_height;
-      Debug( 3, "Got adjusted click at %d%%,%d%%", click_x, click_y );
+      Debug(3, "Got adjusted click at %d%%,%d%%", click_x, click_y);
 
       // Convert the click locations to the current image pixels
       click_x = ( click_x * act_image_width ) / 100;
       click_y = ( click_y * act_image_height ) / 100;
-      Debug( 3, "Got readjusted click at %d,%d", click_x, click_y );
+      Debug(3, "Got readjusted click at %d,%d", click_x, click_y);
 
       int lo_x = click_x - (send_image_width/2);
       if ( lo_x < 0 )
@@ -218,8 +227,9 @@ Image *StreamBase::prepareImage( Image *image ) {
         lo_y = hi_y - (send_image_height - 1);
       }
       last_crop = Box( lo_x, lo_y, hi_x, hi_y );
-    }
-    Debug( 3, "Cropping to %d,%d -> %d,%d", last_crop.LoX(), last_crop.LoY(), last_crop.HiX(), last_crop.HiY() );
+    }  // end if ( mag != last_mag || x != last_x || y != last_y )
+
+    Debug(3, "Cropping to %d,%d -> %d,%d", last_crop.LoX(), last_crop.LoY(), last_crop.HiX(), last_crop.HiY());
     if ( !image_copied ) {
       static Image copy_image;
       copy_image.Assign(*image);
@@ -227,14 +237,15 @@ Image *StreamBase::prepareImage( Image *image ) {
       image_copied = true;
     }
     image->Crop(last_crop);
-  }
+  }  // end if difference in image vs displayed dimensions
+
   last_scale = scale;
   last_zoom = zoom;
   last_x = x;
   last_y = y;
 
   return image;
-}
+}  // end Image *StreamBase::prepareImage(Image *image)
 
 bool StreamBase::sendTextFrame(const char *frame_text) {
   Debug(2, "Sending %dx%d * %d text frame '%s'",
@@ -253,7 +264,7 @@ bool StreamBase::sendTextFrame(const char *frame_text) {
       fprintf(stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType());
       vid_stream->OpenStream();
     }
-    /* double pts = */ vid_stream->EncodeFrame( image.Buffer(), image.Size() );
+    /* double pts = */ vid_stream->EncodeFrame(image.Buffer(), image.Size());
   } else
 #endif // HAVE_LIBAVCODEC
   {
@@ -262,13 +273,13 @@ bool StreamBase::sendTextFrame(const char *frame_text) {
 
     image.EncodeJpeg(buffer, &n_bytes);
 
-    fputs("--ZoneMinderFrame\r\nContent-Type: image/jpeg\r\n", stdout);
+    fputs("--" BOUNDARY "\r\nContent-Type: image/jpeg\r\n", stdout);
     fprintf(stdout, "Content-Length: %d\r\n\r\n", n_bytes);
     if ( fwrite(buffer, n_bytes, 1, stdout) != 1 ) {
       Error("Unable to send stream text frame: %s", strerror(errno));
       return false;
     }
-    fputs("\r\n\r\n",stdout);
+    fputs("\r\n\r\n", stdout);
     fflush(stdout);
   }
   last_frame_sent = TV_2_FLOAT(now);
@@ -353,10 +364,10 @@ void StreamBase::openComms() {
     }
 
     snprintf(rem_sock_path, sizeof(rem_sock_path), "%s/zms-%06dw.sock", staticConfig.PATH_SOCKS.c_str(), connkey);
-    strncpy(rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path)-1);
+    strncpy(rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path));
     rem_addr.sun_family = AF_UNIX;
 
-    gettimeofday(&last_comm_update, NULL);
+    gettimeofday(&last_comm_update, nullptr);
   } // end if connKey > 0
   Debug(3, "comms open at %s", loc_sock_path);
 } // end void StreamBase::openComms()
diff --git a/src/zm_stream.h b/src/zm_stream.h
index 4f4f144a3..d906b2de6 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -29,6 +29,7 @@
 class Monitor;
 
 #define TV_2_FLOAT( tv ) ( double((tv).tv_sec) + (double((tv).tv_usec) / 1000000.0) )
+#define BOUNDARY "ZoneMinderFrame"
 
 class StreamBase {
 public:
@@ -36,6 +37,7 @@ public:
 
 protected:
   static const int MAX_STREAM_DELAY = 5; // Seconds
+  static const int MAX_SLEEP_USEC = 500000; // .5 Seconds
 
   static const StreamType DEFAULT_TYPE = STREAM_JPEG;
   enum { DEFAULT_RATE=ZM_RATE_BASE };
@@ -59,28 +61,30 @@ protected:
   typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUIT, CMD_QUERY=99 } MsgCommand;
 
 protected:
+  int monitor_id;
   Monitor *monitor;
 
   StreamType type;
   const char *format;
   int replay_rate;
   int scale;
+  int last_scale;
   int zoom;
+  int last_zoom;
   double maxfps;
   int bitrate;
+  unsigned short last_x, last_y;
   unsigned short x, y;
-
-protected:
+  bool send_analysis;
+  bool send_objdetect;
   int connkey;
   int sd;
-  char loc_sock_path[PATH_MAX];
+  char loc_sock_path[108];
   struct sockaddr_un loc_addr;
-  char rem_sock_path[PATH_MAX];
+  char rem_sock_path[108];
   struct sockaddr_un rem_addr;
-  char sock_path_lock[PATH_MAX];
+  char sock_path_lock[108];
   int lock_fd;
-
-protected:
   bool paused;
   int step;
 
@@ -101,39 +105,44 @@ protected:
   CmdMsg msg;
 
 protected:
-  bool loadMonitor( int monitor_id );
+  bool loadMonitor(int monitor_id);
   bool checkInitialised();
-  void updateFrameRate( double fps );
-  Image *prepareImage( Image *image );
-  bool sendTextFrame( const char *text );
+  void updateFrameRate(double fps);
+  Image *prepareImage(Image *image);
+  bool sendTextFrame(const char *text);
   bool checkCommandQueue();
-  virtual void processCommand( const CmdMsg *msg )=0;
+  virtual void processCommand(const CmdMsg *msg)=0;
 
 public:
-  StreamBase() {
-    monitor = 0;
-
-    type = DEFAULT_TYPE;
-    format = "";
-    replay_rate = DEFAULT_RATE;
-    scale = DEFAULT_SCALE;
-    zoom = DEFAULT_ZOOM;
-    maxfps = DEFAULT_MAXFPS;
-    bitrate = DEFAULT_BITRATE;
-
-    paused = false;
-    step = 0;
-    x = 0;
-    y = 0;
-
-    connkey = 0;
-    sd = -1;
-    lock_fd = 0;
-    memset( &loc_sock_path, 0, sizeof(loc_sock_path) );
-    memset( &loc_addr, 0, sizeof(loc_addr) );
-    memset( &rem_sock_path, 0, sizeof(rem_sock_path) );
-    memset( &rem_addr, 0, sizeof(rem_addr) );
-    memset( &sock_path_lock, 0, sizeof(sock_path_lock) );
+  StreamBase(): 
+    monitor_id(0),
+    monitor(0),
+    type(DEFAULT_TYPE),
+    format(""),
+    replay_rate(DEFAULT_RATE),
+    scale(DEFAULT_SCALE),
+    last_scale(DEFAULT_SCALE),
+    zoom(DEFAULT_ZOOM),
+    last_zoom(DEFAULT_ZOOM),
+    maxfps(DEFAULT_MAXFPS),
+    bitrate(DEFAULT_BITRATE),
+    last_x(0),
+    last_y(0),
+    x(0),
+    y(0),
+    send_analysis(false),
+    send_objdetect(false),
+    connkey(0),
+    sd(-1),
+    lock_fd(0),
+    paused(false),
+    step(0)
+    {
+    memset(&loc_sock_path, 0, sizeof(loc_sock_path));
+    memset(&loc_addr, 0, sizeof(loc_addr));
+    memset(&rem_sock_path, 0, sizeof(rem_sock_path));
+    memset(&rem_addr, 0, sizeof(rem_addr));
+    memset(&sock_path_lock, 0, sizeof(sock_path_lock));
 
     base_fps = 0.0;
     effective_fps = 0.0;
@@ -148,28 +157,35 @@ public:
   }
   virtual ~StreamBase();
 
-  void setStreamType( StreamType p_type ) {
+  void setStreamType(StreamType p_type) {
     type = p_type;
+#if ! HAVE_ZLIB_H
+    if ( type == STREAM_ZIP ) {
+      Error("zlib is required for zipped images. Falling back to raw image");
+      type = STREAM_RAW;
+    }
+#endif
+
   }
-  void setStreamFormat( const char *p_format ) {
+  void setStreamFormat(const char *p_format) {
     format = p_format;
   }
-  void setStreamScale( int p_scale ) {
+  void setStreamScale(int p_scale) {
     scale = p_scale;
-    if ( ! scale )
+    if ( !scale )
       scale = DEFAULT_SCALE;
   }
-  void setStreamReplayRate( int p_rate ) {
-    Debug(2,"Setting replay_rate %d", p_rate);
+  void setStreamReplayRate(int p_rate) {
+    Debug(2, "Setting replay_rate %d", p_rate);
     replay_rate = p_rate;
   }
-  void setStreamMaxFPS( double p_maxfps ) {
+  void setStreamMaxFPS(double p_maxfps) {
     maxfps = p_maxfps;
   }
-  void setStreamBitrate( int p_bitrate ) {
+  void setStreamBitrate(int p_bitrate) {
     bitrate = p_bitrate;
   }
-  void setStreamQueue( int p_connkey ) {
+  void setStreamQueue(int p_connkey) {
     connkey = p_connkey;
   }
   virtual void openComms();
diff --git a/src/zm_swscale.cpp b/src/zm_swscale.cpp
index ae3a9662d..90a1b0412 100644
--- a/src/zm_swscale.cpp
+++ b/src/zm_swscale.cpp
@@ -24,7 +24,7 @@
 #include "zm_swscale.h"
 
 #if HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
-SWScale::SWScale() : gotdefaults(false), swscale_ctx(NULL), input_avframe(NULL), output_avframe(NULL) {
+SWScale::SWScale() : gotdefaults(false), swscale_ctx(nullptr), input_avframe(nullptr), output_avframe(nullptr) {
   Debug(4,"SWScale object created");
 
 }
@@ -36,7 +36,7 @@ bool SWScale::init() {
 #else
   input_avframe = avcodec_alloc_frame();
 #endif
-  if ( input_avframe == NULL ) {
+  if ( input_avframe == nullptr ) {
     Error("Failed allocating AVFrame for the input");
     return false;
   }
@@ -47,7 +47,7 @@ bool SWScale::init() {
 #else
   output_avframe = avcodec_alloc_frame();
 #endif
-  if ( output_avframe == NULL ) {
+  if ( output_avframe == nullptr ) {
     Error("Failed allocating AVFrame for the output");
     return false;
   }
@@ -65,7 +65,7 @@ SWScale::~SWScale() {
 
   if ( swscale_ctx ) {
     sws_freeContext(swscale_ctx);
-    swscale_ctx = NULL;
+    swscale_ctx = nullptr;
   }
 
   Debug(4,"SWScale object destroyed");
@@ -134,10 +134,12 @@ int SWScale::Convert(
     enum _AVPIXELFORMAT in_pf,
     enum _AVPIXELFORMAT out_pf,
     unsigned int width,
-    unsigned int height
+    unsigned int height,
+    unsigned int new_width,
+    unsigned int new_height
     ) {
   /* Parameter checking */
-  if(in_buffer == NULL || out_buffer == NULL) {
+  if(in_buffer == nullptr || out_buffer == nullptr) {
     Error("NULL Input or output buffer");
     return -1;
   }
@@ -145,7 +147,7 @@ int SWScale::Convert(
   //    Error("Invalid input or output pixel formats");
   //    return -2;
   //  }
-  if (!width || !height) {
+  if (!width || !height || !new_height || !new_width) {
     Error("Invalid width or height");
     return -3;
   }
@@ -180,7 +182,7 @@ int SWScale::Convert(
 
   /* Check the buffer sizes */
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  size_t insize = av_image_get_buffer_size(in_pf, width, height,1);
+  size_t insize = av_image_get_buffer_size(in_pf, width, height, 1);
 #else
   size_t insize = avpicture_get_size(in_pf, width, height);
 #endif
@@ -189,9 +191,9 @@ int SWScale::Convert(
     return -4;
   }
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  size_t outsize = av_image_get_buffer_size(out_pf, width, height,1);
+  size_t outsize = av_image_get_buffer_size(out_pf, new_width, new_height, 1);
 #else
-  size_t outsize = avpicture_get_size(out_pf, width, height);
+  size_t outsize = avpicture_get_size(out_pf, new_width, new_height);
 #endif
 
   if ( outsize < out_buffer_size ) {
@@ -200,8 +202,8 @@ int SWScale::Convert(
   }
 
   /* Get the context */
-  swscale_ctx = sws_getCachedContext( swscale_ctx, width, height, in_pf, width, height, out_pf, SWS_FAST_BILINEAR, NULL, NULL, NULL );
-  if ( swscale_ctx == NULL ) {
+  swscale_ctx = sws_getCachedContext( swscale_ctx, width, height, in_pf, new_width, new_height, out_pf, SWS_FAST_BILINEAR, nullptr, nullptr, nullptr );
+  if ( swscale_ctx == nullptr ) {
     Error("Failed getting swscale context");
     return -6;
   }
@@ -219,10 +221,10 @@ int SWScale::Convert(
   }
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   if (av_image_fill_arrays(output_avframe->data, output_avframe->linesize,
-                           out_buffer, out_pf, width, height, 1) <= 0) {
+                           out_buffer, out_pf, new_width, new_height, 1) <= 0) {
 #else
-  if (avpicture_fill((AVPicture*) output_avframe, out_buffer, out_pf, width,
-                     height) <= 0) {
+  if (avpicture_fill((AVPicture*) output_avframe, out_buffer, out_pf, new_width,
+                     new_height) <= 0) {
 #endif
     Error("Failed filling output frame with output buffer");
     return -8;
@@ -237,6 +239,10 @@ int SWScale::Convert(
   return 0;
 }
 
+int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
+  return Convert(in_buffer, in_buffer_size, out_buffer, out_buffer_size, in_pf, out_pf, width, height, width, height);
+}
+
 int SWScale::Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
   if ( img->Width() != width ) {
     Error("Source image width differs. Source: %d Output: %d",img->Width(), width);
diff --git a/src/zm_swscale.h b/src/zm_swscale.h
index 4b4226ddb..f55f7e759 100644
--- a/src/zm_swscale.h
+++ b/src/zm_swscale.h
@@ -10,14 +10,15 @@ class SWScale {
   public:
     SWScale();
     ~SWScale();
-    bool  init();
+    bool init();
     int SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
     int ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size);
     int ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size);
     int Convert( AVFrame *in_frame, AVFrame *out_frame );
     int Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
     int Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
-
+    int Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height, unsigned int new_width, unsigned int new_height);
+    
   protected:
     bool gotdefaults;
     struct SwsContext* swscale_ctx;
diff --git a/src/zm_thread.cpp b/src/zm_thread.cpp
index 64d07f104..60a282c18 100644
--- a/src/zm_thread.cpp
+++ b/src/zm_thread.cpp
@@ -30,7 +30,7 @@
 struct timespec getTimeout( int secs ) {
   struct timespec timeout;
   struct timeval temp_timeout;
-  gettimeofday(&temp_timeout, 0);
+  gettimeofday(&temp_timeout, nullptr);
   timeout.tv_sec = temp_timeout.tv_sec + secs;
   timeout.tv_nsec = temp_timeout.tv_usec*1000;
   return timeout;
@@ -39,7 +39,7 @@ struct timespec getTimeout( int secs ) {
 struct timespec getTimeout( double secs ) {
   struct timespec timeout;
   struct timeval temp_timeout;
-  gettimeofday( &temp_timeout, 0 );
+  gettimeofday( &temp_timeout, nullptr );
   timeout.tv_sec = temp_timeout.tv_sec + int(secs);
   timeout.tv_nsec = temp_timeout.tv_usec += (long int)(1000000000.0*(secs-int(secs)));
   if ( timeout.tv_nsec > 1000000000 ) {
@@ -50,7 +50,7 @@ struct timespec getTimeout( double secs ) {
 }
 
 Mutex::Mutex() {
-  if ( pthread_mutex_init(&mMutex, NULL) < 0 )
+  if ( pthread_mutex_init(&mMutex, nullptr) < 0 )
     Error("Unable to create pthread mutex: %s", strerror(errno));
 }
 
@@ -107,8 +107,8 @@ RecursiveMutex::RecursiveMutex() {
 }
 
 Condition::Condition( Mutex &mutex ) : mMutex( mutex ) {
-  if ( pthread_cond_init( &mCondition, NULL ) < 0 )
-    Fatal( "Unable to create pthread condition: %s", strerror(errno) );
+  if ( pthread_cond_init(&mCondition, nullptr) < 0 )
+    throw ThreadException(stringtf("Unable to create pthread condition: %s", strerror(errno)));
 }
 
 Condition::~Condition() {
@@ -118,25 +118,32 @@ Condition::~Condition() {
 
 void Condition::wait() {
   // Locking done outside of this function
-  if ( pthread_cond_wait( &mCondition, mMutex.getMutex() ) < 0 )
-    throw ThreadException( stringtf( "Unable to wait pthread condition: %s", strerror(errno) ) );
+  if ( pthread_cond_wait(&mCondition, mMutex.getMutex()) < 0 )
+    throw ThreadException(stringtf("Unable to wait pthread condition: %s", strerror(errno)));
 }
 
-bool Condition::wait( int secs ) {
+bool Condition::wait(int secs) {
   // Locking done outside of this function
-  Debug( 8, "Waiting for %d seconds", secs );
-  struct timespec timeout = getTimeout( secs );
-  if ( pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0 && errno != ETIMEDOUT )
-    throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
-  return( errno != ETIMEDOUT );
+  Debug(8, "Waiting for %d seconds", secs);
+  struct timespec timeout = getTimeout(secs);
+  if (
+      ( pthread_cond_timedwait(&mCondition, mMutex.getMutex(), &timeout) < 0 )
+      &&
+     ( errno != ETIMEDOUT ) 
+     )
+    throw ThreadException(stringtf("Unable to timedwait pthread condition: %s", strerror(errno)));
+  return errno != ETIMEDOUT;
 }
 
 bool Condition::wait( double secs ) {
   // Locking done outside of this function
   struct timespec timeout = getTimeout( secs );
-  if ( pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0 && errno != ETIMEDOUT )
+  if (
+      (pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0)
+      &&
+      (errno != ETIMEDOUT) )
     throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
-  return( errno != ETIMEDOUT );
+  return errno != ETIMEDOUT;
 }
 
 void Condition::signal() {
@@ -179,11 +186,11 @@ template <class T> const T ThreadData<T>::getUpdatedValue(double secs) const {
   mMutex.lock();
   mChanged = false;
   //do {
-    mCondition.wait( secs );
+    mCondition.wait(secs);
   //} while ( !mChanged );
   const T valueCopy = mValue;
   mMutex.unlock();
-  Debug(9, "Got value update, %p", this );
+  Debug(9, "Got value update, %p", this);
   return valueCopy;
 }
 
diff --git a/src/zm_thread.h b/src/zm_thread.h
index 8cdfb892c..3f3e8c6b9 100644
--- a/src/zm_thread.h
+++ b/src/zm_thread.h
@@ -57,7 +57,9 @@ private:
   pthread_t pid() { return( pthread_self() ); }
 #endif
 public:
-  explicit ThreadException( const std::string &message ) : Exception( stringtf("(%d) ", (long int)pid())+message ) {
+  explicit ThreadException(const std::string &message) :
+    Exception(stringtf("(%d) ", (long int)pid())+message)
+  {
   }
 };
 
@@ -169,38 +171,36 @@ private:
   mutable Condition mCondition;
 
 public:
-  __attribute__((used)) ThreadData() : mValue(0), mCondition( mMutex ) {
+  __attribute__((used)) ThreadData() :
+    mValue(0), mCondition(mMutex)
+  {
     mChanged = false;
   }
-  explicit __attribute__((used)) ThreadData( T value ) : mValue( value ), mCondition( mMutex ) {
+  explicit __attribute__((used)) ThreadData(T value) :
+    mValue(value), mCondition(mMutex) {
     mChanged = false;
   }
-  //~ThreadData() {}
 
-  __attribute__((used)) operator T() const
-  {
-    return( getValue() );
+  __attribute__((used)) operator T() const {
+    return getValue();
   }
-  __attribute__((used)) const T operator=( const T value )
-  {
-    return( setValue( value ) );
+  __attribute__((used)) const T operator=( const T value ) {
+    return setValue(value);
   }
 
-  __attribute__((used)) const T getValueImmediate() const
-  {
-    return( mValue );
+  __attribute__((used)) const T getValueImmediate() const {
+    return mValue;
   }
-  __attribute__((used)) T setValueImmediate( const T value )
-  {
-    return( mValue = value );
+  __attribute__((used)) T setValueImmediate( const T value ) {
+    return mValue = value;
   }
   __attribute__((used)) const T getValue() const;
   __attribute__((used)) T setValue( const T value );
   __attribute__((used)) const T getUpdatedValue() const;
-  __attribute__((used)) const T getUpdatedValue( double secs ) const;
-  __attribute__((used)) const T getUpdatedValue( int secs ) const;
-  __attribute__((used)) void updateValueSignal( const T value );
-  __attribute__((used)) void updateValueBroadcast( const T value );
+  __attribute__((used)) const T getUpdatedValue(double secs) const;
+  __attribute__((used)) const T getUpdatedValue(int secs) const;
+  __attribute__((used)) void updateValueSignal(const T value);
+  __attribute__((used)) void updateValueBroadcast(const T value);
 };
 
 class Thread {
diff --git a/src/zm_time.h b/src/zm_time.h
index a9af32777..0f7dbc794 100644
--- a/src/zm_time.h
+++ b/src/zm_time.h
@@ -86,7 +86,7 @@ inline int tvDiffUsec( struct timeval first, struct timeval last )
 inline int tvDiffUsec( struct timeval first )
 {
   struct timeval now;
-  gettimeofday( &now, NULL );
+  gettimeofday( &now, nullptr );
   return( tvDiffUsec( first, now ) );
 }
 
@@ -98,7 +98,7 @@ inline int tvDiffMsec( struct timeval first, struct timeval last )
 inline int tvDiffMsec( struct timeval first )
 {
   struct timeval now;
-  gettimeofday( &now, NULL );
+  gettimeofday( &now, nullptr );
   return( tvDiffMsec( first, now ) );
 }
 
@@ -110,7 +110,7 @@ inline double tvDiffSec( struct timeval first, struct timeval last )
 inline double tvDiffSec( struct timeval first )
 {
   struct timeval now;
-  gettimeofday( &now, NULL );
+  gettimeofday( &now, nullptr );
   return( tvDiffSec( first, now ) );
 }
 
@@ -146,7 +146,7 @@ inline int tvEq( struct timeval t1, struct timeval t2 )
 inline struct timeval tvNow( void )
 {
   struct timeval t;
-  gettimeofday( &t, NULL );
+  gettimeofday( &t, nullptr );
   return( t );
 }
 
diff --git a/src/zm_user.cpp b/src/zm_user.cpp
index fc23f519a..9a20aefaa 100644
--- a/src/zm_user.cpp
+++ b/src/zm_user.cpp
@@ -1,21 +1,21 @@
 /*
  * ZoneMinder regular expression class implementation, $Date$, $Revision$
  * Copyright (C) 2001-2008 Philip Coombes
- * 
+ *
  * 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.
-*/ 
+*/
 
 #include "zm.h"
 #include "zm_db.h"
@@ -26,7 +26,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <utility>
 
+#if HAVE_GNUTLS_GNUTLS_H
+#include <gnutls/gnutls.h>
+#endif
+
+#if HAVE_GCRYPT_H
+#include <gcrypt.h>
+#elif HAVE_LIBCRYPTO
+#include <openssl/md5.h>
+#endif  // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
 
 #include "zm_utils.h"
 #include "zm_crypt.h"
@@ -38,22 +48,22 @@ User::User() {
   stream = events = control = monitors = system = PERM_NONE;
 }
 
-User::User( MYSQL_ROW &dbrow ) {
+User::User(const MYSQL_ROW &dbrow) {
   int index = 0;
-  id = atoi( dbrow[index++] );
-  strncpy( username, dbrow[index++], sizeof(username)-1 );
-  strncpy( password, dbrow[index++], sizeof(password)-1 );
-  enabled = (bool)atoi( dbrow[index++] );
-  stream = (Permission)atoi( dbrow[index++] );
-  events = (Permission)atoi( dbrow[index++] );
-  control = (Permission)atoi( dbrow[index++] );
-  monitors = (Permission)atoi( dbrow[index++] );
-  system = (Permission)atoi( dbrow[index++] );
+  id = atoi(dbrow[index++]);
+  strncpy(username, dbrow[index++], sizeof(username)-1);
+  strncpy(password, dbrow[index++], sizeof(password)-1);
+  enabled = static_cast<bool>(atoi(dbrow[index++]));
+  stream = (Permission)atoi(dbrow[index++]);
+  events = (Permission)atoi(dbrow[index++]);
+  control = (Permission)atoi(dbrow[index++]);
+  monitors = (Permission)atoi(dbrow[index++]);
+  system = (Permission)atoi(dbrow[index++]);
   char *monitor_ids_str = dbrow[index++];
   if ( monitor_ids_str && *monitor_ids_str ) {
     StringVector ids = split(monitor_ids_str, ",");
-    for( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
-      monitor_ids.push_back( atoi( (*i).c_str()) );
+    for ( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
+      monitor_ids.push_back(atoi((*i).c_str()));
     }
   }
 }
@@ -62,10 +72,10 @@ User::~User() {
   monitor_ids.clear();
 }
 
-void User::Copy( const User &u ) {
-  id=u.id;
-  strncpy( username, u.username, sizeof(username)-1 );
-  strncpy( password, u.password, sizeof(password)-1 );
+void User::Copy(const User &u) {
+  id = u.id;
+  strncpy(username, u.username, sizeof(username));
+  strncpy(password, u.password, sizeof(password));
   enabled = u.enabled;
   stream = u.stream;
   events = u.events;
@@ -75,11 +85,12 @@ void User::Copy( const User &u ) {
   monitor_ids = u.monitor_ids;
 }
 
-bool User::canAccess( int monitor_id ) {
+bool User::canAccess(int monitor_id) {
   if ( monitor_ids.empty() )
     return true;
-  
-  for ( std::vector<int>::iterator i = monitor_ids.begin(); i != monitor_ids.end(); ++i ) {
+
+  for ( std::vector<int>::iterator i = monitor_ids.begin();
+      i != monitor_ids.end(); ++i ) {
     if ( *i == monitor_id ) {
       return true;
     }
@@ -89,23 +100,27 @@ bool User::canAccess( int monitor_id ) {
 
 // Function to load a user from username and password
 // Please note that in auth relay mode = none, password is NULL
-User *zmLoadUser( const char *username, const char *password ) {
+User *zmLoadUser(const char *username, const char *password) {
   char sql[ZM_SQL_MED_BUFSIZ] = "";
   int username_length = strlen(username);
   char *safer_username = new char[(username_length * 2) + 1];
 
-  // According to docs, size of safer_whatever must be 2*length+1 due to unicode conversions + null terminator.
-  mysql_real_escape_string(&dbconn, safer_username, username, username_length );
-
+  // According to docs, size of safer_whatever must be 2*length+1
+  // due to unicode conversions + null terminator.
+  mysql_real_escape_string(&dbconn, safer_username, username, username_length);
 
   snprintf(sql, sizeof(sql),
-      "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`"
-      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", safer_username );
-
+      "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+      " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+      " `MonitorIds`"
+      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
+      safer_username);
+  delete[] safer_username;
+  safer_username = nullptr;
 
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn)); 
+    exit(mysql_errno(&dbconn));
   }
 
   MYSQL_RES *result = mysql_store_result(&dbconn);
@@ -113,166 +128,159 @@ User *zmLoadUser( const char *username, const char *password ) {
     Error("Can't use query result: %s", mysql_error(&dbconn));
     exit(mysql_errno(&dbconn));
   }
-  int n_users = mysql_num_rows(result);
 
-  if ( n_users != 1 ) {
+  if ( mysql_num_rows(result) == 1 ) {
+    MYSQL_ROW dbrow = mysql_fetch_row(result);
+    User *user = new User(dbrow);
     mysql_free_result(result);
-    Warning("Unable to authenticate user %s", username);
-    return NULL;
-  }
 
-  MYSQL_ROW dbrow = mysql_fetch_row(result);
+    if ( 
+        (! password )  // relay type must be none
+        ||
+        verifyPassword(username, password, user->getPassword()) ) {
+      Info("Authenticated user '%s'", user->getUsername());
+      return user;
+    } 
+  }  // end if 1 result from db
+  mysql_free_result(result);
 
-  User *user = new User(dbrow);
- 
-  if (verifyPassword(username, password, user->getPassword())) {
-    Info("Authenticated user '%s'", user->getUsername());
-    mysql_free_result(result);
-    delete safer_username;
-    return user;
-  }
-  else {
-    Warning("Unable to authenticate user %s", username);
-    mysql_free_result(result);
-    return NULL;
-  }
-  
-}
+  Warning("Unable to authenticate user %s", username);
+  return nullptr;
+}  // end User *zmLoadUser(const char *username, const char *password)
 
-User *zmLoadTokenUser (std::string jwt_token_str, bool use_remote_addr ) {
+User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr) {
   std::string key = config.auth_hash_secret;
   std::string remote_addr = "";
-  
-  if (use_remote_addr) {
-    remote_addr = std::string(getenv( "REMOTE_ADDR" ));
+
+  if ( use_remote_addr ) {
+    remote_addr = std::string(getenv("REMOTE_ADDR"));
     if ( remote_addr == "" ) {
-      Warning( "Can't determine remote address, using null" );
+      Warning("Can't determine remote address, using null");
       remote_addr = "";
     }
     key += remote_addr;
   }
 
-  Debug (1,"Inside zmLoadTokenUser, formed key=%s", key.c_str());
+  Debug(1, "Inside zmLoadTokenUser, formed key=%s", key.c_str());
 
   std::pair<std::string, unsigned int> ans = verifyToken(jwt_token_str, key);
   std::string username = ans.first;
   unsigned int iat = ans.second;
-  Debug (1,"retrieved user '%s' from token", username.c_str());
+  Debug(1, "retrieved user '%s' from token", username.c_str());
 
-  if (username != "") {
-    char sql[ZM_SQL_MED_BUFSIZ] = "";
-    snprintf(sql, sizeof(sql),
-      "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
-      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str() );
+  if ( username == "" ) {
+    return nullptr;
+  }
 
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't run query: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn)); 
-    }
+  char sql[ZM_SQL_MED_BUFSIZ] = "";
+  snprintf(sql, sizeof(sql),
+    "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0,"
+    " `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
+    " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str());
 
-    MYSQL_RES *result = mysql_store_result(&dbconn);
-    if ( !result ) {
-      Error("Can't use query result: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn));
-    }
-    int n_users = mysql_num_rows(result);
+  if ( mysql_query(&dbconn, sql) ) {
+    Error("Can't run query: %s", mysql_error(&dbconn));
+    return nullptr;
+  }
 
-    if ( n_users != 1 ) {
-      mysql_free_result(result);
-      Error("Unable to authenticate user '%s'", username.c_str());
-      return NULL;
-    }
+  MYSQL_RES *result = mysql_store_result(&dbconn);
+  if ( !result ) {
+    Error("Can't use query result: %s", mysql_error(&dbconn));
+    return nullptr;
+  }
 
-    MYSQL_ROW dbrow = mysql_fetch_row(result);
-    User *user = new User(dbrow);
-    unsigned int stored_iat =  strtoul(dbrow[10], NULL,0 );
-
-    if (stored_iat > iat ) { // admin revoked tokens
-      mysql_free_result(result);
-      Error("Token was revoked for '%s'", username.c_str());
-      return NULL;
-    }
-
-    Debug (1,"Got stored expiry time of %u",stored_iat);
-    Debug (1,"Authenticated user '%s' via token", username.c_str());
+  int n_users = mysql_num_rows(result);
+  if ( n_users != 1 ) {
     mysql_free_result(result);
-    return user;
-
-  }
-  else {
-    return NULL;
+    Error("Unable to authenticate user '%s'", username.c_str());
+    return nullptr;
   }
 
-}
+  MYSQL_ROW dbrow = mysql_fetch_row(result);
+  User *user = new User(dbrow);
+  unsigned int stored_iat = strtoul(dbrow[10], nullptr, 0);
+
+  if ( stored_iat > iat ) { // admin revoked tokens
+    mysql_free_result(result);
+    Error("Token was revoked for '%s'", username.c_str());
+    return nullptr;
+  }
+
+  Debug(1, "Authenticated user '%s' via token with last revoke time: %u",
+      username.c_str(), stored_iat);
+  mysql_free_result(result);
+  return user;
+}  // User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr)
  
 // Function to validate an authentication string
-User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) {
+User *zmLoadAuthUser(const char *auth, bool use_remote_addr) {
 #if HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
 #ifdef HAVE_GCRYPT_H
   // Special initialisation for libgcrypt
-  if ( !gcry_check_version( GCRYPT_VERSION ) ) {
-    Fatal( "Unable to initialise libgcrypt" );
+  if ( !gcry_check_version(GCRYPT_VERSION) ) {
+    Fatal("Unable to initialise libgcrypt");
   }
-  gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
-  gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
-#endif // HAVE_GCRYPT_H
+  gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+  gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif  // HAVE_GCRYPT_H
 
   const char *remote_addr = "";
   if ( use_remote_addr ) {
-    remote_addr = getenv( "REMOTE_ADDR" );
+    remote_addr = getenv("REMOTE_ADDR");
     if ( !remote_addr ) {
-      Warning( "Can't determine remote address, using null" );
+      Warning("Can't determine remote address, using null");
       remote_addr = "";
     }
   }
 
-  Debug( 1, "Attempting to authenticate user from auth string '%s', remote addr(%s)", auth, remote_addr );
+  Debug(1, "Attempting to authenticate user from auth string '%s', remote addr(%s)", auth, remote_addr);
   char sql[ZM_SQL_SML_BUFSIZ] = "";
-  snprintf( sql, sizeof(sql), "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds` FROM `Users` WHERE `Enabled` = 1" );
+  snprintf(sql, sizeof(sql),
+      "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+      " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+      " `MonitorIds` FROM `Users` WHERE `Enabled` = 1");
 
-  if ( mysql_query( &dbconn, sql ) ) {
-    Error( "Can't run query: %s", mysql_error( &dbconn ) );
-    exit( mysql_errno( &dbconn ) );
+  if ( mysql_query(&dbconn, sql) ) {
+    Error("Can't run query: %s", mysql_error(&dbconn));
+    exit(mysql_errno(&dbconn));
   }
 
-  MYSQL_RES *result = mysql_store_result( &dbconn );
+  MYSQL_RES *result = mysql_store_result(&dbconn);
   if ( !result ) {
-    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-    exit( mysql_errno( &dbconn ) );
+    Error("Can't use query result: %s", mysql_error(&dbconn));
+    return nullptr;
   }
-  int n_users = mysql_num_rows( result );
-
+  int n_users = mysql_num_rows(result);
   if ( n_users < 1 ) {
-    mysql_free_result( result );
-    Warning( "Unable to authenticate user" );
-    return( 0 );
+    mysql_free_result(result);
+    Warning("Unable to authenticate user");
+    return nullptr;
   }
 
   // getting the time is expensive, so only do it once.
-  time_t now = time( 0 );
+  time_t now = time(nullptr);
   unsigned int hours = config.auth_hash_ttl;
-
-  if ( ! hours ) {
+  if ( !hours ) {
     Warning("No value set for ZM_AUTH_HASH_TTL. Defaulting to 2.");
     hours = 2;
   } else {
-    Debug( 1, "AUTH_HASH_TTL is %d, time is %d", hours, now );
+    Debug(1, "AUTH_HASH_TTL is %d, time is %d", hours, now);
   }
+  char auth_key[512] = "";
+  char auth_md5[32+1] = "";
+  size_t md5len = 16;
+  unsigned char md5sum[md5len];
 
-  while( MYSQL_ROW dbrow = mysql_fetch_row( result ) ) {
+  const char * hex = "0123456789abcdef";
+  while ( MYSQL_ROW dbrow = mysql_fetch_row(result) ) {
     const char *user = dbrow[1];
     const char *pass = dbrow[2];
 
-    char auth_key[512] = "";
-    char auth_md5[32+1] = "";
-    size_t md5len = 16;
-    unsigned char md5sum[md5len];
+    time_t our_now = now;
+    for ( unsigned int i = 0; i < hours; i++, our_now -= 3600 ) {
+      struct tm *now_tm = localtime(&our_now);
 
-    time_t now_copy = now;
-    for ( unsigned int i = 0; i < hours; i++, now_copy -= 3600 ) {
-      struct tm *now_tm = localtime(&now_copy);
-
-      snprintf( auth_key, sizeof(auth_key), "%s%s%s%s%d%d%d%d", 
+      snprintf(auth_key, sizeof(auth_key)-1, "%s%s%s%s%d%d%d%d",
         config.auth_hash_secret,
         user,
         pass,
@@ -280,50 +288,57 @@ User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) {
         now_tm->tm_hour,
         now_tm->tm_mday,
         now_tm->tm_mon,
-        now_tm->tm_year
-      );
+        now_tm->tm_year);
 
 #if HAVE_DECL_MD5
-      MD5( (unsigned char *)auth_key, strlen(auth_key), md5sum );
+      MD5((unsigned char *)auth_key, strlen(auth_key), md5sum);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-      gnutls_datum_t md5data = { (unsigned char *)auth_key, strlen(auth_key) };
-      gnutls_fingerprint( GNUTLS_DIG_MD5, &md5data, md5sum, &md5len );
+      gnutls_datum_t md5data = { (unsigned char *)auth_key, (unsigned int)strlen(auth_key) };
+      gnutls_fingerprint(GNUTLS_DIG_MD5, &md5data, md5sum, &md5len);
 #endif
-      auth_md5[0] = '\0';
+      unsigned char *md5sum_ptr = md5sum;
+      char *auth_md5_ptr = auth_md5;
+
       for ( unsigned int j = 0; j < md5len; j++ ) {
-        sprintf( &auth_md5[2*j], "%02x", md5sum[j] );
+        *auth_md5_ptr++ = hex[(*md5sum_ptr>>4)&0xf];
+        *auth_md5_ptr++ = hex[(*md5sum_ptr++)&0xf];
       }
-      Debug( 1, "Checking auth_key '%s' -> auth_md5 '%s' == '%s'", auth_key, auth_md5, auth );
+      *auth_md5_ptr = 0;
 
-      if ( !strcmp( auth, auth_md5 ) ) {
+      Debug(1, "Checking auth_key '%s' -> auth_md5 '%s' == '%s'",
+          auth_key, auth_md5, auth);
+
+      if ( !strcmp(auth, auth_md5) ) {
         // We have a match
-        User *user = new User( dbrow );
-        Debug(1, "Authenticated user '%s'", user->getUsername() );
-        mysql_free_result( result );
+        User *user = new User(dbrow);
+        Debug(1, "Authenticated user '%s'", user->getUsername());
+        mysql_free_result(result);
         return user;
+      } else {
+        Debug(1, "No match for %s", auth);
       }
-    } // end foreach hours
-  } // end foreach user
-  Debug(1, "No match for %s", auth );
-  mysql_free_result( result );
-#else // HAVE_DECL_MD5
-  Error( "You need to build with gnutls or openssl installed to use hash based authentication" );
-#endif // HAVE_DECL_MD5
-  Debug(1, "No user found for auth_key %s", auth );
-  return 0;
-}
+    }  // end foreach hour
+  }  // end foreach user
+  mysql_free_result(result);
+#else  // HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
+  Error("You need to build with gnutls or openssl to use hash based auth");
+#endif  // HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
+  Debug(1, "No user found for auth_key %s", auth);
+  return nullptr;
+}  // end User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
 
-//Function to check Username length
-bool checkUser ( const char *username) {
-  if ( ! username )
+// Function to check Username length
+bool checkUser(const char *username) {
+  if ( !username )
     return false;
   if ( strlen(username) > 32 )
     return false;
 
   return true;
 }
-//Function to check password length
-bool checkPass (const char *password) {
+
+// Function to check password length
+bool checkPass(const char *password) {
   if ( !password )
     return false;
   if ( strlen(password) > 64 )
diff --git a/src/zm_user.h b/src/zm_user.h
index 04842b318..42fe07554 100644
--- a/src/zm_user.h
+++ b/src/zm_user.h
@@ -23,25 +23,14 @@
 #ifndef ZM_USER_H
 #define ZM_USER_H
 
-#if HAVE_GNUTLS_OPENSSL_H
-#include <gnutls/openssl.h>
-#endif
-#if HAVE_GNUTLS_GNUTLS_H
-#include <gnutls/gnutls.h>
-#endif
-
-#if HAVE_GCRYPT_H
-#include <gcrypt.h>
-#elif HAVE_LIBCRYPTO
-#include <openssl/md5.h>
-#endif // HAVE_L || HAVE_LIBCRYPTO
-
+#include <string>
 #include <vector>
-class User {
-public:
-  typedef enum { PERM_NONE=1, PERM_VIEW, PERM_EDIT } Permission;
 
-protected:
+class User {
+ public:
+  typedef enum { PERM_NONE = 1, PERM_VIEW, PERM_EDIT } Permission;
+
+ protected:
   int id;
   char username[32+1];
   char password[64+1];
@@ -53,32 +42,32 @@ protected:
   Permission system;
   std::vector<int> monitor_ids;
 
-public:
+ public:
   User();
-  explicit User( MYSQL_ROW &dbrow );
+  explicit User(const MYSQL_ROW &dbrow);
   ~User();
-  User( User &u ) { Copy(u); }
-  void Copy( const User &u );
+  User(User &u) { Copy(u); }
+  void Copy(const User &u);
   User& operator=(const User &u) {
     Copy(u); return *this;
   }
 
   const int  Id() const { return id; }
-  const char *getUsername() const { return( username ); }
-  const char *getPassword() const { return( password ); }
-  bool isEnabled() const { return( enabled ); }
-  Permission getStream() const { return( stream ); }
-  Permission getEvents() const { return( events ); }
-  Permission getControl() const { return( control ); }
-  Permission getMonitors() const { return( monitors ); }
-  Permission getSystem() const { return( system ); }
-  bool canAccess( int monitor_id );
+  const char *getUsername() const { return username; }
+  const char *getPassword() const { return password; }
+  bool isEnabled() const { return enabled; }
+  Permission getStream() const { return stream; }
+  Permission getEvents() const { return events; }
+  Permission getControl() const { return control; }
+  Permission getMonitors() const { return monitors; }
+  Permission getSystem() const { return system; }
+  bool canAccess(int monitor_id);
 };
 
-User *zmLoadUser( const char *username, const char *password=0 );
-User *zmLoadAuthUser( const char *auth, bool use_remote_addr );
-User *zmLoadTokenUser( std::string jwt, bool use_remote_addr);
-bool checkUser ( const char *username);
-bool checkPass (const char *password);
+User *zmLoadUser(const char *username, const char *password=0);
+User *zmLoadAuthUser(const char *auth, bool use_remote_addr);
+User *zmLoadTokenUser(std::string jwt, bool use_remote_addr);
+bool checkUser(const char *username);
+bool checkPass(const char *password);
 
 #endif // ZM_USER_H
diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index 8bfaa5286..67fcc0669 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -22,6 +22,7 @@
 #include "zm_utils.h"
 
 #include <string.h>
+#include <algorithm>
 #include <stdio.h>
 #include <stdarg.h>
 #include <fcntl.h> /* Definition of AT_* constants */
@@ -34,7 +35,7 @@
 #include <curl/curl.h>
 #endif
 
-unsigned int sseversion = 0;
+unsigned int sse_version = 0;
 unsigned int neonversion = 0;
 
 std::string trimSet(std::string str, std::string trimset) {
@@ -43,12 +44,9 @@ std::string trimSet(std::string str, std::string trimset) {
   size_t endpos = str.find_last_not_of(trimset); // Find the first character position from reverse af
  
   // if all spaces or empty return an empty string
-  if(( std::string::npos == startpos ) || ( std::string::npos == endpos))
-  {
+  if ( ( std::string::npos == startpos ) || ( std::string::npos == endpos ) )
     return std::string("");
-  }
-  else
-    return str.substr( startpos, endpos-startpos+1 );
+  return str.substr(startpos, endpos-startpos+1);
 }
 
 std::string trimSpaces(const std::string &str) {
@@ -56,48 +54,46 @@ std::string trimSpaces(const std::string &str) {
 }
 
 std::string replaceAll(std::string str, std::string from, std::string to) {
-  if(from.empty())
+  if ( from.empty() )
     return str;
   size_t start_pos = 0;
-  while((start_pos = str.find(from, start_pos)) != std::string::npos) {
+  while ( (start_pos = str.find(from, start_pos)) != std::string::npos ) {
     str.replace(start_pos, from.length(), to);
     start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
   }
   return str;
 }
 
-const std::string stringtf( const char *format, ... )
-{
+const std::string stringtf( const char *format, ... ) {
   va_list ap;
   char tempBuffer[8192];
   std::string tempString;
 
-  va_start(ap, format );
-  vsnprintf( tempBuffer, sizeof(tempBuffer), format , ap );
+  va_start(ap, format);
+  vsnprintf(tempBuffer, sizeof(tempBuffer), format , ap);
   va_end(ap);
 
   tempString = tempBuffer;
 
-  return( tempString );
+  return tempString;
 }
 
-const std::string stringtf( const std::string format, ... )
-{
+const std::string stringtf(const std::string format, ...) {
   va_list ap;
   char tempBuffer[8192];
   std::string tempString;
 
-  va_start(ap, format );
-  vsnprintf( tempBuffer, sizeof(tempBuffer), format.c_str() , ap );
+  va_start(ap, format);
+  vsnprintf(tempBuffer, sizeof(tempBuffer), format.c_str(), ap);
   va_end(ap);
 
   tempString = tempBuffer;
 
-  return( tempString );
+  return tempString;
 }
 
 bool startsWith(const std::string &haystack, const std::string &needle) {
-  return( haystack.substr(0, needle.length()) == needle );
+  return ( haystack.substr(0, needle.length()) == needle );
 }
 
 std::vector<std::string> split(const std::string &s, char delim) {
@@ -154,8 +150,7 @@ const std::string join(const StringVector &v, const char * delim=",") {
 const std::string base64Encode(const std::string &inString) {
   static char base64_table[64] = { '\0' };
 
-  if ( !base64_table[0] )
-  {
+  if ( !base64_table[0] ) {
     int i = 0;
     for ( char c = 'A'; c <= 'Z'; c++ )
       base64_table[i++] = c;
@@ -168,59 +163,52 @@ const std::string base64Encode(const std::string &inString) {
   }
 
   std::string outString;
-  outString.reserve( 2 * inString.size() );
+  outString.reserve(2 * inString.size());
 
   const char *inPtr = inString.c_str();
-  while( *inPtr )
-  {
+  while ( *inPtr ) {
     unsigned char selection = *inPtr >> 2;
     unsigned char remainder = (*inPtr++ & 0x03) << 4;
     outString += base64_table[selection];
 
-    if ( *inPtr )
-    {
+    if ( *inPtr ) {
       selection = remainder | (*inPtr >> 4);
       remainder = (*inPtr++ & 0x0f) << 2;
       outString += base64_table[selection];
     
-      if ( *inPtr )
-      {
+      if ( *inPtr ) {
         selection = remainder | (*inPtr >> 6);
         outString += base64_table[selection];
         selection = (*inPtr++ & 0x3f);
         outString += base64_table[selection];
-      }
-      else
-      {
+      } else {
         outString += base64_table[remainder];
         outString += '=';
       }
-    }
-    else
-    {
+    } else {
       outString += base64_table[remainder];
       outString += '=';
       outString += '=';
     }
   }
-  return( outString );
+  return outString;
 }
 
 int split(const char* string, const char delim, std::vector<std::string>& items) {
-  if(string == NULL)
+  if ( string == nullptr )
     return -1;
 
-  if(string[0] == 0)
+  if ( string[0] == 0 )
     return -2;
 
   std::string str(string);
   
-  while(true) {
+  while ( true ) {
     size_t pos = str.find(delim);
     items.push_back(str.substr(0, pos));
     str.erase(0, pos+1);
 
-    if(pos == std::string::npos)
+    if ( pos == std::string::npos )
       break;
   }
 
@@ -228,16 +216,16 @@ int split(const char* string, const char delim, std::vector<std::string>& items)
 }
 
 int pairsplit(const char* string, const char delim, std::string& name, std::string& value) {
-  if(string == NULL)
+  if ( string == nullptr )
     return -1;
 
-  if(string[0] == 0)
+  if ( string[0] == 0 )
     return -2;
 
   std::string str(string);
   size_t pos = str.find(delim);
 
-  if(pos == std::string::npos || pos == 0 || pos >= str.length())
+  if ( pos == std::string::npos || pos == 0 || pos >= str.length() )
     return -3;
 
   name = str.substr(0, pos);
@@ -249,7 +237,7 @@ int pairsplit(const char* string, const char delim, std::string& name, std::stri
 /* Detect special hardware features, such as SIMD instruction sets */
 void hwcaps_detect() {
   neonversion = 0;
-  sseversion = 0;
+  sse_version = 0;
 #if (defined(__i386__) || defined(__x86_64__))
   /* x86 or x86-64 processor */
   uint32_t r_edx, r_ecx, r_ebx;
@@ -286,33 +274,33 @@ void hwcaps_detect() {
   );
 #endif
 
-  if (r_ebx & 0x00000020) {
-    sseversion = 52; /* AVX2 */
-    Debug(1,"Detected a x86\\x86-64 processor with AVX2");
-  } else if (r_ecx & 0x10000000) {
-    sseversion = 51; /* AVX */
-    Debug(1,"Detected a x86\\x86-64 processor with AVX");
-  } else if (r_ecx & 0x00100000) {
-    sseversion = 42; /* SSE4.2 */
-    Debug(1,"Detected a x86\\x86-64 processor with SSE4.2");
-  } else if (r_ecx & 0x00080000) {
-    sseversion = 41; /* SSE4.1 */
-    Debug(1,"Detected a x86\\x86-64 processor with SSE4.1");
-  } else if (r_ecx & 0x00000200) {
-    sseversion = 35; /* SSSE3 */
+  if ( r_ebx & 0x00000020 ) {
+    sse_version = 52; /* AVX2 */
+    Debug(1, "Detected a x86\\x86-64 processor with AVX2");
+  } else if ( r_ecx & 0x10000000 ) {
+    sse_version = 51; /* AVX */
+    Debug(1, "Detected a x86\\x86-64 processor with AVX");
+  } else if ( r_ecx & 0x00100000 ) {
+    sse_version = 42; /* SSE4.2 */
+    Debug(1, "Detected a x86\\x86-64 processor with SSE4.2");
+  } else if ( r_ecx & 0x00080000 ) {
+    sse_version = 41; /* SSE4.1 */
+    Debug(1, "Detected a x86\\x86-64 processor with SSE4.1");
+  } else if ( r_ecx & 0x00000200 ) {
+    sse_version = 35; /* SSSE3 */
     Debug(1,"Detected a x86\\x86-64 processor with SSSE3");
-  } else if (r_ecx & 0x00000001) {
-    sseversion = 30; /* SSE3 */
-    Debug(1,"Detected a x86\\x86-64 processor with SSE3");
-  } else if (r_edx & 0x04000000) {
-    sseversion = 20; /* SSE2 */
-    Debug(1,"Detected a x86\\x86-64 processor with SSE2");
-  } else if (r_edx & 0x02000000) {
-    sseversion = 10; /* SSE */
-    Debug(1,"Detected a x86\\x86-64 processor with SSE");
+  } else if ( r_ecx & 0x00000001 ) {
+    sse_version = 30; /* SSE3 */
+    Debug(1, "Detected a x86\\x86-64 processor with SSE3");
+  } else if ( r_edx & 0x04000000 ) {
+    sse_version = 20; /* SSE2 */
+    Debug(1, "Detected a x86\\x86-64 processor with SSE2");
+  } else if ( r_edx & 0x02000000 ) {
+    sse_version = 10; /* SSE */
+    Debug(1, "Detected a x86\\x86-64 processor with SSE");
   } else {
-    sseversion = 0;
-    Debug(1,"Detected a x86\\x86-64 processor");
+    sse_version = 0;
+    Debug(1, "Detected a x86\\x86-64 processor");
   } 
 #elif defined(__arm__)
   // ARM processor in 32bit mode
@@ -342,7 +330,7 @@ __attribute__((noinline,__target__("sse2")))
 #endif
 void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-  if(bytes > 128) {
+  if ( bytes > 128 ) {
     unsigned int remainder = bytes % 128;
     const uint8_t* lastsrc = (uint8_t*)src + (bytes - remainder);
 
@@ -384,7 +372,7 @@ void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes) {
   }
 #else
   /* Non x86\x86-64 platform, use memcpy */
-  memcpy(dest,src,bytes);
+  memcpy(dest, src, bytes);
 #endif
   return dest;
 }
@@ -402,28 +390,50 @@ void timespec_diff(struct timespec *start, struct timespec *end, struct timespec
 char *timeval_to_string( struct timeval tv ) {
   time_t nowtime;
   struct tm *nowtm;
-  static char tmbuf[64], buf[64];
+  static char tmbuf[20], buf[28];
 
   nowtime = tv.tv_sec;
   nowtm = localtime(&nowtime);
   strftime(tmbuf, sizeof tmbuf, "%Y-%m-%d %H:%M:%S", nowtm);
-  snprintf(buf, sizeof buf, "%s.%06ld", tmbuf, tv.tv_usec);
+  snprintf(buf, sizeof buf-1, "%s.%06ld", tmbuf, tv.tv_usec);
   return buf;
 }
 
 std::string UriDecode( const std::string &encoded ) {
-#ifdef HAVE_LIBCURL 
-  CURL *curl = curl_easy_init();
-    int outlength;
-    char *cres = curl_easy_unescape(curl, encoded.c_str(), encoded.length(), &outlength);
-    std::string res(cres, cres + outlength);
-    curl_free(cres);
-    curl_easy_cleanup(curl);
-    return res;
-#else
-Warning("ZM Compiled without LIBCURL.  UriDecoding not implemented.");
-  return encoded;
-#endif
+  char a, b;
+  const char *src = encoded.c_str();
+  std::string retbuf;
+  retbuf.resize(encoded.length() + 1);
+  char *dst = &retbuf[0];
+  while (*src) {
+    if ((*src == '%') && ((a = src[1]) && (b = src[2])) && (isxdigit(a) && isxdigit(b))) {
+      if (a >= 'a')
+        a -= 'a'-'A';
+      if (a >= 'A')
+        a -= ('A' - 10);
+      else
+        a -= '0';
+      if (b >= 'a')
+        b -= 'a'-'A';
+      if (b >= 'A')
+        b -= ('A' - 10);
+      else
+        b -= '0';
+      *dst++ = 16*a+b;
+      src+=3;
+    } else if (*src == '+') {
+      *dst++ = ' ';
+      src++;
+    } else {
+      *dst++ = *src++;
+    }
+  }
+  *dst++ = '\0';
+  return retbuf;
+}
+
+void string_toupper( std::string& str) {
+  std::transform(str.begin(), str.end(), str.begin(), ::toupper);
 }
 
 void touch(const char *pathname) {
diff --git a/src/zm_utils.h b/src/zm_utils.h
index d1340cf4b..9c8cc01a0 100644
--- a/src/zm_utils.h
+++ b/src/zm_utils.h
@@ -40,6 +40,7 @@ StringVector split( const std::string &string, const std::string &chars, int lim
 const std::string join( const StringVector &, const char * );
 
 const std::string base64Encode( const std::string &inString );
+void string_toupper(std::string& str);
 
 int split(const char* string, const char delim, std::vector<std::string>& items);
 int pairsplit(const char* string, const char delim, std::string& name, std::string& value);
@@ -58,7 +59,7 @@ void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes);
 void timespec_diff(struct timespec *start, struct timespec *end, struct timespec *diff);
 
 void hwcaps_detect();
-extern unsigned int sseversion;
+extern unsigned int sse_version;
 extern unsigned int neonversion;
 
 char *timeval_to_string( struct timeval tv );
diff --git a/src/zm_video.cpp b/src/zm_video.cpp
index 309c507c0..d97c75167 100644
--- a/src/zm_video.cpp
+++ b/src/zm_video.cpp
@@ -57,7 +57,7 @@ int VideoWriter::Reset(const char* new_path) {
   /* Common variables reset */
 
   /* If there is a new path, use it */
-  if ( new_path != NULL ) {
+  if ( new_path != nullptr ) {
     path = new_path;
   }
 
@@ -116,7 +116,7 @@ X264MP4Writer::X264MP4Writer(
   }
 
   /* If supplied with user parameters to the encoder, copy them */
-  if ( p_user_params != NULL ) {
+  if ( p_user_params != nullptr ) {
     user_params = *p_user_params;
   }
 
@@ -144,7 +144,7 @@ X264MP4Writer::~X264MP4Writer() {
 int X264MP4Writer::Open() {
   /* Open the encoder */
   x264enc = x264_encoder_open(&x264params);
-  if ( x264enc == NULL ) {
+  if ( x264enc == nullptr ) {
     Error("Failed opening x264 encoder");
     return -1;
   }
@@ -269,7 +269,7 @@ int X264MP4Writer::Encode(
     const size_t data_size,
     const unsigned int frame_time) {
   /* Parameter checking */
-  if ( data == NULL ) {
+  if ( data == nullptr ) {
     Error("NULL buffer");
     return -1;
   }
@@ -418,7 +418,7 @@ int X264MP4Writer::x264encodeloop(bool bFlush) {
   int frame_size;
 
   if ( bFlush ) {
-    frame_size = x264_encoder_encode(x264enc, &nals, &i_nals, NULL, &x264picout);
+    frame_size = x264_encoder_encode(x264enc, &nals, &i_nals, nullptr, &x264picout);
   } else {
     frame_size = x264_encoder_encode(x264enc, &nals, &i_nals, &x264picin, &x264picout);
   }
@@ -515,12 +515,12 @@ int ParseEncoderParameters(
     const char* str,
     std::vector<EncoderParameter_t>* vec
     ) {
-  if ( vec == NULL ) {
+  if ( vec == nullptr ) {
     Error("NULL Encoder parameters vector pointer");
     return -1;
   }
 
-  if ( str == NULL ) {
+  if ( str == nullptr ) {
     Error("NULL Encoder parameters string");
     return -2;
   }
diff --git a/src/zm_video.h b/src/zm_video.h
index 46d7c3635..e185f82fc 100644
--- a/src/zm_video.h
+++ b/src/zm_video.h
@@ -81,7 +81,7 @@ public:
 	virtual int Encode(const Image* img, const unsigned int frame_time) = 0;
 	virtual int Open() = 0;
 	virtual int Close() = 0;
-	virtual int Reset(const char* new_path = NULL);
+	virtual int Reset(const char* new_path = nullptr);
 	
 	const char* GetContainer() const {
 		return container.c_str();
@@ -160,13 +160,13 @@ protected:
 
 
 public:
-	X264MP4Writer(const char* p_path, const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, const std::vector<EncoderParameter_t>* p_user_params = NULL);
+	X264MP4Writer(const char* p_path, const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, const std::vector<EncoderParameter_t>* p_user_params = nullptr);
 	~X264MP4Writer();
 	int Encode(const uint8_t* data, const size_t data_size, const unsigned int frame_time);
 	int Encode(const Image* img, const unsigned int frame_time);
 	int Open();
 	int Close();
-	int Reset(const char* new_path = NULL);
+	int Reset(const char* new_path = nullptr);
 	
 };
 #endif // HAVE_LIBX264 && HAVE_LIBMP4V2 && HAVE_LIBAVUTIL && HAVE_LIBSWSCALE
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index e4da18456..514518e09 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -20,13 +20,14 @@
 
 #define __STDC_FORMAT_MACROS 1
 
-#include <cinttypes>
-#include <stdlib.h>
-#include <string.h>
 
 #include "zm.h"
 #include "zm_videostore.h"
 
+#include <stdlib.h>
+#include <string.h>
+#include <cinttypes>
+
 extern "C" {
 #include "libavutil/time.h"
 }
@@ -57,6 +58,7 @@ VideoStore::VideoStore(
   packets_written = 0;
   frame_count = 0;
   in_frame = NULL;
+
   video_in_frame = NULL;
   video_in_ctx = NULL;
   // In future, we should just pass in the codec context instead of the stream.  Don't really need the stream.
@@ -84,245 +86,217 @@ VideoStore::VideoStore(
 
   video_start_pts = 0;
   audio_next_pts = 0;
-  audio_next_dts = 0;
   out_format = NULL;
   oc = NULL;
-  ret = 0;
 }  // VideoStore::VideoStore
 
 bool VideoStore::open() {
   Info("Opening video storage stream %s format: %s", filename, format);
 
-  ret = avformat_alloc_output_context2(&oc, NULL, NULL, filename);
+  int ret = avformat_alloc_output_context2(&oc, nullptr, nullptr, filename);
   if ( ret < 0 ) {
     Warning(
         "Could not create video storage stream %s as no out ctx"
         " could be assigned based on filename: %s",
         filename, av_make_error_string(ret).c_str());
-  } else {
-    Debug(4, "Success allocating out format ctx");
   }
 
   // Couldn't deduce format from filename, trying from format name
   if ( !oc ) {
-    avformat_alloc_output_context2(&oc, NULL, format, filename);
+    avformat_alloc_output_context2(&oc, nullptr, format, filename);
     if ( !oc ) {
       Error(
           "Could not create video storage stream %s as no out ctx"
           " could not be assigned based on filename or format %s",
           filename, format);
       return false;
-    } else {
-      Debug(4, "Success allocating out ctx");
     }
   } // end if ! oc
-  Debug(2, "Success opening output contect");
 
-  AVDictionary *pmetadata = NULL;
+  AVDictionary *pmetadata = nullptr;
   ret = av_dict_set(&pmetadata, "title", "Zoneminder Security Recording", 0);
   if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
 
   oc->metadata = pmetadata;
   out_format = oc->oformat;
-	out_format->flags |= AVFMT_TS_NONSTRICT; // allow non increasing dts
+  out_format->flags |= AVFMT_TS_NONSTRICT; // allow non increasing dts
 
   if ( video_in_stream ) {
     video_in_stream_index = video_in_stream->index;
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     video_in_ctx = avcodec_alloc_context3(NULL);
-    Debug(2, "copy to video_in_context");
     ret = avcodec_parameters_to_context(video_in_ctx, video_in_stream->codecpar);
     if ( ret < 0 ) {
       Error("Couldn't copy params to context");
       return false;
     } else {
-      zm_dump_codecpar( video_in_stream->codecpar );
+      zm_dump_codecpar(video_in_stream->codecpar);
     }
-#else
-    video_in_ctx = video_in_stream->codec;
-    Debug(2,"Copied video context from input stream");
-    zm_dump_codec(video_in_ctx);
-#endif
-  } else {
-    Debug(2, "No input ctx");
-    video_in_ctx = avcodec_alloc_context3(NULL);
-    video_in_stream_index = 0;
-  }
 
-  video_out_ctx = avcodec_alloc_context3(NULL);
-  if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) {
+    video_out_ctx = avcodec_alloc_context3(NULL);
+    if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) {
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-    video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+      video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 #else
-    video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+      video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
 #endif
-  }
-  if ( !video_out_ctx->codec_tag ) {
-    video_out_ctx->codec_tag =
+    }
+    if ( !video_out_ctx->codec_tag ) {
+      video_out_ctx->codec_tag =
         av_codec_get_tag(oc->oformat->codec_tag, video_in_ctx->codec_id);
-    Debug(2, "No codec_tag, setting to %d", video_out_ctx->codec_tag);
-  }
-  int wanted_codec = monitor->OutputCodec();
-  if ( !wanted_codec ) {
-    // default to h264
-    wanted_codec = AV_CODEC_ID_H264;
-  }
+      Debug(2, "No codec_tag, setting to %d", video_out_ctx->codec_tag);
+    }
+    int wanted_codec = monitor->OutputCodec();
+    if ( !wanted_codec ) {
+      // default to h264
+      Debug(2, "Defaulting to H264");
+      wanted_codec = AV_CODEC_ID_H264;
+    }
 
-  // FIXME SHould check that we are set to passthrough.  Might be same codec, but want privacy overlays
-  if ( video_in_stream && ( video_in_ctx->codec_id == wanted_codec ) ) {
+  // FIXME Should check that we are set to passthrough.  Might be same codec, but want privacy overlays
+    if ( video_in_ctx->codec_id == wanted_codec ) {
+      // Copy params from instream to ctx
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
+      ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
 #else
-    ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
+      ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
 #endif
-    // Copy params from instream to ctx
-    if ( ret < 0 ) {
-      Error("Could not initialize ctx parameteres");
-      return false;
-    }
-    //video_out_ctx->time_base = (AVRational){1, 1000000}; // microseconds as base frame rate
-    video_out_ctx->time_base = video_in_ctx->time_base;
-    // Fix deprecated formats
-    switch ( video_out_ctx->pix_fmt ) {
-      case AV_PIX_FMT_YUVJ422P  :
-        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
-        break;
-      case AV_PIX_FMT_YUVJ444P   :
-        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
-        break;
-      case AV_PIX_FMT_YUVJ440P :
-        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
-        break;
-      case AV_PIX_FMT_NONE :
-      case AV_PIX_FMT_YUVJ420P :
-      default:
-        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-        break;
-    }
-    // Only set orientation if doing passthrough, otherwise the frame image will be rotated
-    Monitor::Orientation orientation = monitor->getOrientation();
-    if ( orientation ) {
-      Debug(3, "Have orientation");
-      if ( orientation == Monitor::ROTATE_0 ) {
-      } else if ( orientation == Monitor::ROTATE_90 ) {
-        ret = av_dict_set(&video_out_stream->metadata, "rotate", "90", 0);
-        if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
-      } else if ( orientation == Monitor::ROTATE_180 ) {
-        ret = av_dict_set(&video_out_stream->metadata, "rotate", "180", 0);
-        if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
-      } else if ( orientation == Monitor::ROTATE_270 ) {
-        ret = av_dict_set(&video_out_stream->metadata, "rotate", "270", 0);
-        if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
-      } else {
-        Warning("Unsupported Orientation(%d)", orientation);
-      }
-    } // end if orientation
-  } else {
-    for ( unsigned int i = 0; i < sizeof(codec_data) / sizeof(*codec_data); i++ ) {
-      if ( codec_data[i].codec_id != monitor->OutputCodec() )
-        continue;
-
-      video_out_codec = avcodec_find_encoder_by_name(codec_data[i].codec_name);
-      if ( ! video_out_codec ) {
-        Debug(1, "Didn't find encoder for %s", codec_data[i].codec_name);
-        continue;
-      }
-
-      Debug(1, "Using %s for codec", video_out_codec->name);
-      //video_out_ctx = avcodec_alloc_context3(video_out_codec);
-      if ( video_out_codec->id != video_out_ctx->codec_id ) {
-        Warning("Have to set codec_id?");
-        video_out_ctx->codec_id = AV_CODEC_ID_H264;
-      }
-
-      video_out_ctx->pix_fmt = codec_data[i].pix_fmt;
-      video_out_ctx->level = 32;
-
-      // Don't have an input stream, so need to tell it what we are sending it, or are transcoding
-      video_out_ctx->width = monitor->Width();
-      video_out_ctx->height = monitor->Height();
-      video_out_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
-
-      // Just copy them from the in, no reason to choose different
-      video_out_ctx->time_base = video_in_ctx->time_base;
-      if ( ! (video_out_ctx->time_base.num && video_out_ctx->time_base.den) ) {
-        video_out_ctx->time_base = AV_TIME_BASE_Q;
-      }	
-      video_out_stream->time_base = video_in_stream->time_base;
-
-      if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
-        video_out_ctx->max_b_frames = 1;
-        if ( video_out_ctx->priv_data ) {
-          //av_opt_set(video_out_ctx->priv_data, "crf", "1", AV_OPT_SEARCH_CHILDREN);
-          //av_opt_set(video_out_ctx->priv_data, "preset", "ultrafast", 0);
-        } else {
-          Debug(2, "Not setting priv_data");
-        }
-      } else if (video_out_ctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
-        /* just for testing, we also add B frames */
-        video_out_ctx->max_b_frames = 2;
-      } else if (video_out_ctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
-        /* Needed to avoid using macroblocks in which some coeffs overflow.
-         * This does not happen with normal video, it just happens here as
-         * the motion of the chroma plane does not match the luma plane. */
-        video_out_ctx->mb_decision = 2;
-      }
-
-      AVDictionary *opts = 0;
-      std::string Options = monitor->GetEncoderOptions();
-      ret = av_dict_parse_string(&opts, Options.c_str(), "=", ",#\n", 0);
       if ( ret < 0 ) {
-        Warning("Could not parse ffmpeg encoder options list '%s'\n", Options.c_str());
-      } else {
+        Error("Could not initialize ctx parameters");
+        return false;
+      }
+      //video_out_ctx->time_base = (AVRational){1, 1000000}; // microseconds as base frame rate
+      video_out_ctx->time_base = video_in_ctx->time_base;
+      // Fix deprecated formats
+      switch ( video_out_ctx->pix_fmt ) {
+        case AV_PIX_FMT_YUVJ422P  :
+          video_out_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
+          break;
+        case AV_PIX_FMT_YUVJ444P   :
+          video_out_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
+          break;
+        case AV_PIX_FMT_YUVJ440P :
+          video_out_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
+          break;
+        case AV_PIX_FMT_NONE :
+        case AV_PIX_FMT_YUVJ420P :
+        default:
+          video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+          break;
+      }
+      // Only set orientation if doing passthrough, otherwise the frame image will be rotated
+      Monitor::Orientation orientation = monitor->getOrientation();
+      if ( orientation ) {
+        Debug(3, "Have orientation");
+        if ( orientation == Monitor::ROTATE_0 ) {
+        } else if ( orientation == Monitor::ROTATE_90 ) {
+          ret = av_dict_set(&video_out_stream->metadata, "rotate", "90", 0);
+          if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+        } else if ( orientation == Monitor::ROTATE_180 ) {
+          ret = av_dict_set(&video_out_stream->metadata, "rotate", "180", 0);
+          if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+        } else if ( orientation == Monitor::ROTATE_270 ) {
+          ret = av_dict_set(&video_out_stream->metadata, "rotate", "270", 0);
+          if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+        } else {
+          Warning("Unsupported Orientation(%d)", orientation);
+        }
+      } // end if orientation
+    } else { // Either no video in or not the desired codec
+      for ( unsigned int i = 0; i < sizeof(codec_data) / sizeof(*codec_data); i++ ) {
+        if ( codec_data[i].codec_id != monitor->OutputCodec() )
+          continue;
+
+        video_out_codec = avcodec_find_encoder_by_name(codec_data[i].codec_name);
+        if ( ! video_out_codec ) {
+          Debug(1, "Didn't find encoder for %s", codec_data[i].codec_name);
+          continue;
+        }
+
+        video_out_ctx->pix_fmt = codec_data[i].pix_fmt;
+        video_out_ctx->level = 32;
+
+        // Don't have an input stream, so need to tell it what we are sending it, or are transcoding
+        video_out_ctx->width = monitor->Width();
+        video_out_ctx->height = monitor->Height();
+        video_out_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
+
+        // Just copy them from the in, no reason to choose different
+        video_out_ctx->time_base = video_in_ctx->time_base;
+        if ( ! (video_out_ctx->time_base.num && video_out_ctx->time_base.den) ) {
+          Debug(2,"No timebase found in video in context, defaulting to Q");
+          video_out_ctx->time_base = AV_TIME_BASE_Q;
+        }	
+        video_out_stream->time_base =  video_in_stream ? video_in_stream->time_base : AV_TIME_BASE_Q;
+
+        if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
+          video_out_ctx->max_b_frames = 1;
+          if ( video_out_ctx->priv_data ) {
+            //av_opt_set(video_out_ctx->priv_data, "crf", "1", AV_OPT_SEARCH_CHILDREN);
+            //av_opt_set(video_out_ctx->priv_data, "preset", "ultrafast", 0);
+          } else {
+            Debug(2, "Not setting priv_data");
+          }
+        } else if ( video_out_ctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ) {
+          /* just for testing, we also add B frames */
+          video_out_ctx->max_b_frames = 2;
+        } else if ( video_out_ctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ) {
+          /* Needed to avoid using macroblocks in which some coeffs overflow.
+           * This does not happen with normal video, it just happens here as
+           * the motion of the chroma plane does not match the luma plane. */
+          video_out_ctx->mb_decision = 2;
+        }
+
+        AVDictionary *opts = 0;
+        std::string Options = monitor->GetEncoderOptions();
+        ret = av_dict_parse_string(&opts, Options.c_str(), "=", ",#\n", 0);
+        if ( ret < 0 ) {
+          Warning("Could not parse ffmpeg encoder options list '%s'\n", Options.c_str());
+        } else {
+          AVDictionaryEntry *e = NULL;
+          while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
+            Debug(3, "Encoder Option %s=%s", e->key, e->value);
+          }
+        }
+
+        if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
+          Warning("Can't open video codec (%s) %s",
+              video_out_codec->name,
+              av_make_error_string(ret).c_str()
+              );
+          video_out_codec = NULL;
+        }
+
         AVDictionaryEntry *e = NULL;
         while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
-          Debug( 3, "Encoder Option %s=%s", e->key, e->value );
+          Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
         }
-      }
+        av_dict_free(&opts);
+        if ( video_out_codec ) break;
 
-      if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
-        Warning("Can't open video codec (%s) %s",
-            video_out_codec->name,
-            av_make_error_string(ret).c_str()
-            );
-        video_out_codec = NULL;
-      }
+      } // end foreach codec
 
-      AVDictionaryEntry *e = NULL;
-      while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
-        Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
-      }
-      av_dict_free(&opts);
-      if ( video_out_codec ) break;
-
-    } // end foreach codec
-
-    if ( !video_out_codec ) {
-      Error("Can't open video codec!");
+      if ( !video_out_codec ) {
+        Error("Can't open video codec!");
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      // We allocate and copy in newer ffmpeg, so need to free it
-      avcodec_free_context(&video_out_ctx);
+        // We allocate and copy in newer ffmpeg, so need to free it
+        avcodec_free_context(&video_out_ctx);
 #endif
-      video_out_ctx = NULL;
+        video_out_ctx = NULL;
 
-      return false;
-    } // end if can't open codec
+        return false;
+      } // end if can't open codec
 
-    Debug(2, "Sucess opening codec");
+      Debug(2, "Sucess opening codec");
 
-  } // end if copying or transcoding
-
-  if ( !video_out_ctx->codec_tag ) {
-    video_out_ctx->codec_tag =
-      av_codec_get_tag(oc->oformat->codec_tag, video_out_ctx->codec_id);
-    Debug(2, "No codec_tag, setting to h264 ? ");
-  }
+    } // end if copying or transcoding
+  }  // end if video_in_stream
 
   video_out_stream = avformat_new_stream(oc, video_out_codec);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
     return false;
   }
+  max_stream_index = video_out_stream->index;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
   if ( ret < 0 ) {
@@ -332,17 +306,26 @@ bool VideoStore::open() {
 #else
   avcodec_copy_context(video_out_stream->codec, video_out_ctx);
 #endif
+
+  converted_in_samples = nullptr;
+  audio_out_codec = nullptr;
+  audio_in_codec = nullptr;
+  audio_in_ctx = nullptr;
+  audio_out_stream = nullptr;
+  in_frame = nullptr;
+  out_frame = nullptr;
+#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
+  resample_ctx = nullptr;
+  fifo = nullptr;
+#endif
   video_first_pts = 0;
   video_first_dts = 0;
-  video_last_pts = 0;
-  video_last_dts = 0;
 
   audio_first_pts = 0;
   audio_first_dts = 0;
-  audio_next_pts = 0;
-  audio_next_dts = 0;
 
   if ( audio_in_stream ) {
+    Debug(2, "Have audio_in_stream");
     audio_in_stream_index = audio_in_stream->index;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     audio_in_ctx = avcodec_alloc_context3(NULL);
@@ -368,14 +351,14 @@ bool VideoStore::open() {
       }
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      audio_out_stream = avformat_new_stream(oc, NULL);
+      audio_out_stream = avformat_new_stream(oc, nullptr);
       audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
       if ( !audio_out_ctx ) {
         Error("could not allocate codec ctx for AAC");
-        audio_out_stream = NULL;
+        audio_out_stream = nullptr;
         return false;
       }
-#else 
+#else
       audio_out_stream = avformat_new_stream(oc, audio_out_codec);
       audio_out_ctx = audio_out_stream->codec;
 #endif
@@ -387,7 +370,7 @@ bool VideoStore::open() {
     } else {
       Debug(2, "Got AAC");
 
-      audio_out_stream = avformat_new_stream(oc, NULL);
+      audio_out_stream = avformat_new_stream(oc, nullptr);
       if ( !audio_out_stream ) {
         Error("Could not allocate new stream");
         return false;
@@ -424,7 +407,7 @@ bool VideoStore::open() {
       if ( ret < 0 ) {
         Error("Unable to copy audio ctx %s",
               av_make_error_string(ret).c_str());
-        audio_out_stream = NULL;
+        audio_out_stream = nullptr;
         return;
       } // end if
       audio_out_ctx->codec_tag = 0;
@@ -445,11 +428,21 @@ bool VideoStore::open() {
       audio_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
 #endif
     }
+
+    // We will assume that subsequent stream allocations will increase the index
+    max_stream_index = audio_out_stream->index;
   }  // end if audio_in_stream
 
+  //max_stream_index is 0-based, so add 1
+  next_dts = new int64_t[max_stream_index+1];
+  for ( int i = 0; i <= max_stream_index; i++ ) {
+    next_dts[i] = 0;
+  }
+
   /* open the out file, if needed */
   if ( !(out_format->flags & AVFMT_NOFILE) ) {
-    if ( (ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL) ) < 0 ) {
+    ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, nullptr, nullptr);
+    if ( ret < 0 ) {
       Error("Could not open out file '%s': %s", filename,
           av_make_error_string(ret).c_str());
       return false;
@@ -457,21 +450,39 @@ bool VideoStore::open() {
   }
 
   zm_dump_stream_format(oc, 0, 0, 1);
-  if (audio_out_stream) zm_dump_stream_format(oc, 1, 0, 1);
+  if ( audio_out_stream ) zm_dump_stream_format(oc, 1, 0, 1);
 
-  AVDictionary *opts = NULL;
-  // av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
-  // Shiboleth reports that this may break seeking in mp4 before it downloads
-  //av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
-  // av_dict_set(&opts, "movflags",
-  // "frag_keyframe+empty_moov+default_base_moof", 0);
+  AVDictionary *opts = nullptr;
+
+  std::string option_string = monitor->GetEncoderOptions();
+  ret = av_dict_parse_string(&opts, option_string.c_str(), "=", ",\n", 0);
+  if ( ret < 0 ) {
+    Warning("Could not parse ffmpeg output options '%s'", option_string.c_str());
+  }
+
+  const AVDictionaryEntry *movflags_entry = av_dict_get(opts, "movflags", nullptr, AV_DICT_MATCH_CASE);
+  if ( !movflags_entry ) {
+    Debug(1, "setting movflags to frag_keyframe+empty_moov");
+    // av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
+    // Shiboleth reports that this may break seeking in mp4 before it downloads
+    av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
+    // av_dict_set(&opts, "movflags",
+    // "frag_keyframe+empty_moov+default_base_moof", 0);
+  } else {
+    Debug(1, "using movflags %s", movflags_entry->value);
+  }
   if ( (ret = avformat_write_header(oc, &opts)) < 0 ) {
-    // if ((ret = avformat_write_header(oc, &opts)) < 0) {
-    Warning("Unable to set movflags to frag_custom+dash+delay_moov");
-    /* Write the stream header, if any. */
-    ret = avformat_write_header(oc, NULL);
+    Warning("Unable to set movflags trying with defaults.");
+    ret = avformat_write_header(oc, nullptr);
   } else if ( av_dict_count(opts) != 0 ) {
-    Warning("some options not set");
+    Info("some options not used, turn on debugging for a list.");
+    AVDictionaryEntry *e = nullptr;
+    while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != nullptr ) {
+      Debug(1, "Encoder Option %s=>%s", e->key, e->value);
+      if ( !e->value ) {
+        av_dict_set(&opts, e->key, nullptr, 0);
+      }
+    }
   }
   if ( opts ) av_dict_free(&opts);
   if ( ret < 0 ) {
@@ -486,27 +497,8 @@ bool VideoStore::open() {
   return true;
 } // end bool VideoStore::open()
 
-void VideoStore::write_audio_packet( AVPacket &pkt ) {
-  //Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts,
-  //pkt.dts, pkt.duration);
-  pkt.pts = audio_next_pts;
-  pkt.dts = audio_next_dts;
-
-  Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts, pkt.dts, pkt.duration);
-  if ( pkt.duration > 0 ) {
-    pkt.duration =
-      av_rescale_q(pkt.duration, audio_out_ctx->time_base,
-          audio_out_stream->time_base);
-  }
-  audio_next_pts += pkt.duration;
-  audio_next_dts += pkt.duration;
-
-  Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts, pkt.dts, pkt.duration);
-  pkt.stream_index = audio_out_stream->index;
-  av_interleaved_write_frame(oc, &pkt);
-} // end void VideoStore::Write_audio_packet( AVPacket &pkt )
-
 void VideoStore::flush_codecs() {
+  int ret;
   // The codec queues data.  We need to send a flush command and out
   // whatever we get. Failures are not fatal.
 
@@ -524,7 +516,7 @@ void VideoStore::flush_codecs() {
     while (1) {
       AVPacket pkt;
       // Without these we seg fault I don't know why.
-      pkt.data = NULL;
+      pkt.data = nullptr;
       pkt.size = 0;
       av_init_packet(&pkt);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -545,41 +537,82 @@ void VideoStore::flush_codecs() {
         break;
       }
 #endif
-      write_video_packet(pkt);
+      write_packet(&pkt, video_out_stream);
       zm_av_packet_unref(&pkt);
     } // while have buffered frames
   } // end if have delay capability
 
   if ( audio_out_codec ) {
-    avcodec_send_frame(audio_out_ctx, NULL);
-    while (1) {
-      AVPacket pkt;
-      pkt.data = NULL;
-      pkt.size = 0;
-      av_init_packet(&pkt);
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      if ( (ret = avcodec_receive_packet(audio_out_ctx, &pkt) ) < 0 ) {
-        if ( AVERROR_EOF != ret ) {
-          Error("ERror encoding audio while flushing (%d) (%s)", ret, av_err2str(ret));
+    // The codec queues data.  We need to send a flush command and out
+    // whatever we get. Failures are not fatal.
+    AVPacket pkt;
+    pkt.data = nullptr;
+    pkt.size = 0;
+    av_init_packet(&pkt);
+
+    int frame_size = audio_out_ctx->frame_size;
+    /*
+     * At the end of the file, we pass the remaining samples to
+     * the encoder. */
+    while ( zm_resample_get_delay(resample_ctx, audio_out_ctx->sample_rate) ) {
+      zm_resample_audio(resample_ctx, nullptr, out_frame);
+
+      if ( zm_add_samples_to_fifo(fifo, out_frame) ) {
+        // Should probably set the frame size to what is reported FIXME
+        if ( zm_get_samples_from_fifo(fifo, out_frame) ) {
+          if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, pkt) ) {
+            pkt.stream_index = audio_out_stream->index;
+
+            av_packet_rescale_ts(&pkt,
+                audio_out_ctx->time_base,
+                audio_out_stream->time_base);
+            write_packet(&pkt, audio_out_stream);
+          }
+        }  // end if data returned from fifo
+      }
+
+    } // end if have buffered samples in the resampler
+
+    Debug(2, "av_audio_fifo_size = %d", av_audio_fifo_size(fifo));
+    while ( av_audio_fifo_size(fifo) > 0 ) {
+      /* Take one frame worth of audio samples from the FIFO buffer,
+       * encode it and write it to the output file. */
+
+      Debug(1, "Remaining samples in fifo for AAC codec frame_size %d > fifo size %d",
+          frame_size, av_audio_fifo_size(fifo));
+
+      // SHould probably set the frame size to what is reported FIXME
+      if ( av_audio_fifo_read(fifo, (void **)out_frame->data, frame_size) ) {
+        if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, pkt) ) {
+          pkt.stream_index = audio_out_stream->index;
+
+          av_packet_rescale_ts(&pkt,
+              audio_out_ctx->time_base,
+              audio_out_stream->time_base);
+          write_packet(&pkt, audio_out_stream);
         }
-        break;
-      }
-#else
-      int got_packet = 0;
-      if ( (ret = avcodec_encode_audio2(audio_out_ctx, &pkt, NULL, &got_packet)) < 0 ) {
-        Error("ERror encoding audio while flushing (%d) (%s)", ret, av_err2str(ret));
-        break;
-      }
-      Debug(1, "Have audio encoder, need to flush it's out");
-      if (!got_packet) {
-        break;
-      }
+      }  // end if data returned from fifo
+    }  // end while still data in the fifo
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      // Put encoder into flushing mode
+      avcodec_send_frame(audio_out_ctx, nullptr);
 #endif
-      write_audio_packet(pkt);
+
+    while (1) {
+      if ( ! zm_receive_packet(audio_out_ctx, pkt) ) {
+        Debug(1, "No more packets");
+        break;
+      }
+
+      dumpPacket(&pkt, "raw from encoder");
+      av_packet_rescale_ts(&pkt, audio_out_ctx->time_base, audio_out_stream->time_base);
+      dumpPacket(audio_out_stream, &pkt, "writing flushed packet");
+      write_packet(&pkt, audio_out_stream);
       zm_av_packet_unref(&pkt);
-    } // while have buffered frames
-  } // end if audio_out_codec
-} // end flush_codecs
+    }  // while have buffered frames
+  }  // end if audio_out_codec
+}  // end flush_codecs
 
 VideoStore::~VideoStore() {
   if ( oc->pb ) {
@@ -590,9 +623,9 @@ VideoStore::~VideoStore() {
 
     // Flush Queues
     Debug(1, "Flushing interleaved queues");
-    av_interleaved_write_frame(oc, NULL);
+    av_interleaved_write_frame(oc, nullptr);
 
-    Debug(1,"Writing trailer");
+    Debug(1, "Writing trailer");
     /* Write the trailer before close */
     if ( int rc = av_write_trailer(oc) ) {
       Error("Error writing trailer %s", av_err2str(rc));
@@ -605,7 +638,7 @@ VideoStore::~VideoStore() {
       /* Close the out file. */
       Debug(2, "Closing");
       if ( int rc = avio_close(oc->pb) ) {
-        oc->pb = NULL;
+        oc->pb = nullptr;
         Error("Error closing avio %s", av_err2str(rc));
       }
     } else {
@@ -624,24 +657,24 @@ VideoStore::~VideoStore() {
     // We allocate and copy in newer ffmpeg, so need to free it
     //avcodec_free_context(&video_in_ctx);
 #endif
-    video_in_ctx = NULL;
+    video_in_ctx = nullptr;
 
     if ( video_out_codec ) {
       avcodec_close(video_out_ctx);
       Debug(4, "Success closing video_out_ctx");
-      video_out_codec = NULL;
+      video_out_codec = nullptr;
     } // end if video_out_codec
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     avcodec_free_context(&video_out_ctx);
 #endif
-    video_out_ctx = NULL;
+    video_out_ctx = nullptr;
   } // end if video_out_stream
 
   if ( audio_out_stream ) {
     if ( audio_in_codec ) {
       avcodec_close(audio_in_ctx);
       Debug(4, "Success closing audio_in_ctx");
-      audio_in_codec = NULL;
+      audio_in_codec = nullptr;
     } // end if audio_in_codec
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -649,7 +682,7 @@ VideoStore::~VideoStore() {
     avcodec_free_context(&audio_in_ctx);
 #endif
     Debug(4, "Success freeing audio_in_ctx");
-    audio_in_ctx = NULL;
+    audio_in_ctx = nullptr;
 
     if ( audio_out_ctx ) {
       avcodec_close(audio_out_ctx);
@@ -658,15 +691,15 @@ VideoStore::~VideoStore() {
       avcodec_free_context(&audio_out_ctx);
 #endif
     }
-    audio_out_ctx = NULL;
+    audio_out_ctx = nullptr;
 
 #if defined(HAVE_LIBAVRESAMPLE) || defined(HAVE_LIBSWRESAMPLE)
     if ( resample_ctx ) {
-  #if defined(HAVE_LIBSWRESAMPLE)
       if ( fifo ) {
         av_audio_fifo_free(fifo);
-        fifo = NULL;
+        fifo = nullptr;
       }
+  #if defined(HAVE_LIBSWRESAMPLE)
       swr_free(&resample_ctx);
   #else
     #if defined(HAVE_LIBAVRESAMPLE)
@@ -677,21 +710,33 @@ VideoStore::~VideoStore() {
     }
     if ( in_frame ) {
       av_frame_free(&in_frame);
-      in_frame = NULL;
+      in_frame = nullptr;
     }
     if ( out_frame ) {
       av_frame_free(&out_frame);
-      out_frame = NULL;
+      out_frame = nullptr;
     }
     if ( converted_in_samples ) {
       av_free(converted_in_samples);
-      converted_in_samples = NULL;
+      converted_in_samples = nullptr;
     }
 #endif
   } // end if audio_out_stream
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  if ( video_in_ctx ) {
+    avcodec_free_context(&video_in_ctx);
+    video_in_ctx = NULL;
+  }
+  if ( video_out_ctx ) {
+    avcodec_close(video_out_ctx);
+    avcodec_free_context(&video_out_ctx);
+    video_out_ctx = NULL;
+  }
+#endif
 
   /* free the streams */
   avformat_free_context(oc);
+  delete[] next_dts;
 } // VideoStore::~VideoStore()
 
 bool VideoStore::setup_resampler() {
@@ -701,6 +746,7 @@ bool VideoStore::setup_resampler() {
      "Cannot do audio conversion to AAC");
   return false;
 #else
+  int ret;
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   // Newer ffmpeg wants to keep everything separate... so have to lookup our own
@@ -719,12 +765,17 @@ bool VideoStore::setup_resampler() {
 #else
 // codec is already open in ffmpeg_camera
   audio_in_ctx = audio_in_stream->codec;
-  audio_in_codec = (AVCodec *)audio_in_ctx->codec;
-  //audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
+  audio_in_codec = reinterpret_cast<const AVCodec *>(audio_in_ctx->codec);
+  if ( !audio_in_codec ) {
+    audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
+  }
+  if ( !audio_in_codec ) {
+    return false;
+  }
 #endif
 
   // if the codec is already open, nothing is done.
-  if ( (ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL)) < 0 ) {
+  if ( (ret = avcodec_open2(audio_in_ctx, audio_in_codec, nullptr)) < 0 ) {
     Error("Can't open audio in codec!");
     return false;
   }
@@ -764,7 +815,7 @@ bool VideoStore::setup_resampler() {
       }
     }
     if ( found ) {
-      Debug(4, "Sample rate is good");
+      Debug(3, "Sample rate is good %d", audio_out_ctx->sample_rate);
     } else {
       audio_out_ctx->sample_rate =
         audio_out_codec->supported_samplerates[0];
@@ -783,7 +834,7 @@ bool VideoStore::setup_resampler() {
   // Example code doesn't set the codec tb.  I think it just uses whatever defaults
   //audio_out_ctx->time_base = (AVRational){1, audio_out_ctx->sample_rate};
 
-  AVDictionary *opts = NULL;
+  AVDictionary *opts = nullptr;
   // Needed to allow AAC
   if ( (ret = av_dict_set(&opts, "strict", "experimental", 0)) < 0 ) {
     Error("Couldn't set experimental");
@@ -793,11 +844,12 @@ bool VideoStore::setup_resampler() {
   if ( ret < 0 ) {
     Error("could not open codec (%d) (%s)",
         ret, av_make_error_string(ret).c_str());
-    audio_out_codec = NULL;
-    audio_out_ctx = NULL;
-    audio_out_stream = NULL;
+    audio_out_codec = nullptr;
+    audio_out_ctx = nullptr;
+    audio_out_stream = nullptr;
     return false;
   }
+  zm_dump_codec(audio_out_ctx);
 
   audio_out_stream->time_base = (AVRational){1, audio_out_ctx->sample_rate};
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -807,10 +859,7 @@ bool VideoStore::setup_resampler() {
     Error("Could not initialize stream parameteres");
     return false;
   }
-  //audio_out_stream->codecpar->frame_size = audio_out_ctx->frame_size;
-  //audio_out_stream->codecpar->bit_rate = audio_out_ctx->bit_rate;
-#else
-  avcodec_copy_context( audio_out_stream->codec, audio_out_ctx );
+  zm_dump_codecpar(audio_out_stream->codecpar);
 #endif
 
   Debug(3,
@@ -866,21 +915,21 @@ bool VideoStore::setup_resampler() {
   }
   out_frame->sample_rate = audio_out_ctx->sample_rate;
 
-#if defined(HAVE_LIBSWRESAMPLE)
-  if (!(fifo = av_audio_fifo_alloc(
+  if ( !(fifo = av_audio_fifo_alloc(
           audio_out_ctx->sample_fmt,
-          audio_out_ctx->channels, 1))) {
+          audio_out_ctx->channels, 1)) ) {
     Error("Could not allocate FIFO");
     return false;
   }
-  resample_ctx = swr_alloc_set_opts(NULL,
+#if defined(HAVE_LIBSWRESAMPLE)
+  resample_ctx = swr_alloc_set_opts(nullptr,
       audio_out_ctx->channel_layout,
       audio_out_ctx->sample_fmt,
       audio_out_ctx->sample_rate,
       audio_in_ctx->channel_layout,
       audio_in_ctx->sample_fmt,
       audio_in_ctx->sample_rate,
-      0, NULL);
+      0, nullptr);
   if ( !resample_ctx ) {
     Error("Could not allocate resample context");
     av_frame_free(&in_frame);
@@ -944,10 +993,10 @@ bool VideoStore::setup_resampler() {
   // The codec gives us the frame size, in samples, we calculate the size of the
   // samples buffer in bytes
   unsigned int audioSampleBuffer_size = av_samples_get_buffer_size(
-      NULL, audio_out_ctx->channels,
+      nullptr, audio_out_ctx->channels,
       audio_out_ctx->frame_size,
       audio_out_ctx->sample_fmt, 0);
-  converted_in_samples = (uint8_t *)av_malloc(audioSampleBuffer_size);
+  converted_in_samples = reinterpret_cast<uint8_t *>(av_malloc(audioSampleBuffer_size));
 
   if ( !converted_in_samples ) {
     Error("Could not allocate converted in sample pointers");
@@ -983,6 +1032,7 @@ int VideoStore::writePacket( ZMPacket *ipkt ) {
 }
 
 int VideoStore::writeVideoFramePacket(ZMPacket *zm_packet) {
+  int ret;
   frame_count += 1;
 
   // if we have to transcode
@@ -1117,7 +1167,7 @@ int VideoStore::writeVideoFramePacket(ZMPacket *zm_packet) {
           video_in_stream->time_base,
           video_out_stream->time_base);
       Debug(1, "duration from ipkt: pts(%" PRId64 ") - last_pts(%" PRId64 ") = (%" PRId64 ") => (%" PRId64 ") (%d/%d) (%d/%d)",
-          zm_packet->in_frame->pkt_pts,
+          zm_packet->in_frame->pts,
           video_last_pts,
           zm_packet->in_frame->pkt_duration,
           duration,
@@ -1129,13 +1179,13 @@ int VideoStore::writeVideoFramePacket(ZMPacket *zm_packet) {
     } else {
       duration =
         av_rescale_q(
-            zm_packet->in_frame->pkt_pts - video_last_pts,
+            zm_packet->in_frame->pts - video_last_pts,
             video_in_stream->time_base,
             video_out_stream->time_base);
       Debug(1, "duration calc: pts(%" PRId64 ") - last_pts(%" PRId64 ") = (%" PRId64 ") => (%" PRId64 ")",
-          zm_packet->in_frame->pkt_pts,
+          zm_packet->in_frame->pts,
           video_last_pts,
-          zm_packet->in_frame->pkt_pts - video_last_pts,
+          zm_packet->in_frame->pts - video_last_pts,
           duration
           );
       if ( duration <= 0 ) {
@@ -1152,92 +1202,39 @@ int VideoStore::writeVideoFramePacket(ZMPacket *zm_packet) {
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
     opkt.flags = ipkt->flags;
-    if ( ! video_start_pts ) {
-      // If video has b-frames, pts can be AV_NOPTS_VALUE so use dts intead
-      video_start_pts = ipkt->dts;
-      Debug(2, "No video_lsat_pts, set to (%" PRId64 ")", video_start_pts );
-      opkt.dts = opkt.pts = 0;
+    opkt.duration = ipkt->duration;
+
+    if ( ipkt->dts != AV_NOPTS_VALUE ) {
+      if ( !video_first_dts ) {
+        Debug(2, "Starting video first_dts will become %" PRId64, ipkt->dts);
+        video_first_dts = ipkt->dts;
+      }
+      opkt.dts = ipkt->dts - video_first_dts;
     } else {
-      dumpPacket(video_in_stream, ipkt);
-      if ( ipkt->pts != AV_NOPTS_VALUE ) 
-        opkt.pts = av_rescale_q(ipkt->pts - video_start_pts, video_in_stream->time_base, video_out_stream->time_base);
-      else
-        opkt.pts = 0;
-
-      if ( ipkt->dts != AV_NOPTS_VALUE ) 
-        opkt.dts = av_rescale_q(ipkt->dts - video_start_pts, video_in_stream->time_base, video_out_stream->time_base);
-      else
-        opkt.dts = 0;
-
-      Debug(2, "out_stream_time_base(%d/%d) in_stream_time_base(%d/%d) video_start_pts(%" PRId64 ")",
-          video_out_stream->time_base.num, video_out_stream->time_base.den,
-          video_in_stream->time_base.num, video_in_stream->time_base.den,
-          video_start_pts
-          );
-
-      dumpPacket(video_out_stream, &opkt);
-
-      opkt.duration = av_rescale_q( opkt.duration, video_in_stream->time_base, video_out_stream->time_base);
+      opkt.dts = next_dts[video_out_stream->index] ? av_rescale_q(next_dts[video_out_stream->index], video_out_stream->time_base, video_in_stream->time_base) : 0;
+      Debug(3, "Setting dts to video_next_dts %" PRId64 " from %" PRId64, opkt.dts, next_dts[video_out_stream->index]);
     }
+    if ( ipkt->pts != AV_NOPTS_VALUE ) {
+      opkt.pts = ipkt->pts - video_first_dts;
+    } else {
+      opkt.pts = AV_NOPTS_VALUE;
+    }
+
+    av_packet_rescale_ts(&opkt, video_in_stream->time_base, video_out_stream->time_base);
+
+    dumpPacket(video_out_stream, &opkt, "after pts adjustment");
   } // end if codec matches
 
-  write_video_packet(opkt);
+  write_packet(&opkt, video_out_stream);
   zm_av_packet_unref(&opkt);
 
   return 1;
 }  // end int VideoStore::writeVideoFramePacket( AVPacket *ipkt )
 
-void VideoStore::write_video_packet( AVPacket &opkt ) {
-
-  if ( opkt.dts > opkt.pts ) {
-    Debug(1,
-        "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 "). Decompression must happen "
-        "before presentation.",
-        opkt.dts, opkt.pts);
-    opkt.dts = opkt.pts;
-  }
-
-  opkt.stream_index = video_out_stream->index;
-  //av_packet_rescale_ts( &opkt, video_out_ctx->time_base, video_out_stream->time_base );
-
-  dumpPacket(video_out_stream, &opkt, "writing video packet");
-
-  if ( (opkt.data == NULL) || (opkt.size < 1) ) {
-    Warning("%s:%d: Mangled AVPacket: discarding frame", __FILE__, __LINE__);
-    //dumpPacket(&opkt);
-
-    //} else if ((video_next_dts > 0) && (video_next_dts > opkt.dts)) {
-    //Warning("%s:%d: DTS out of order: next:%lld \u226E opkt.dts %lld; discarding frame",
-    //__FILE__, __LINE__, video_next_dts, opkt.dts);
-    //video_next_dts = opkt.dts;
-    //dumpPacket(&opkt);
-
-} else {
-  if ( (ret = av_interleaved_write_frame(oc, &opkt)) < 0 ) {
-    // There's nothing we can really do if the frame is rejected, just drop it
-    // and get on with the next
-    Warning(
-        "%s:%d: Writing frame [av_interleaved_write_frame()] failed: %s(%d) "
-        " ",
-        __FILE__, __LINE__, av_make_error_string(ret).c_str(), ret);
-
-    //dumpPacket(&safepkt);
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    if ( video_in_stream )
-      zm_dump_codecpar(video_in_stream->codecpar);
-    zm_dump_codecpar(video_out_stream->codecpar);
-#endif
-  } else {
-    packets_written += 1;
-  }
-}
-
-} // end void VideoStore::write_video_packet
-
 int VideoStore::writeAudioFramePacket(ZMPacket *zm_packet) {
-  Debug(4, "writeAudioFrame");
 
   AVPacket *ipkt = &zm_packet->packet;
+  int ret;
 
   if ( !audio_out_stream ) {
     Debug(1, "Called writeAudioFramePacket when no audio_out_stream");
@@ -1246,89 +1243,79 @@ int VideoStore::writeAudioFramePacket(ZMPacket *zm_packet) {
   }
   dumpPacket(audio_in_stream, ipkt, "input packet");
 
+  if ( !audio_first_dts ) {
+    audio_first_dts = ipkt->dts;
+    audio_next_pts = audio_out_ctx->frame_size;
+  }
+
+  // Need to adjust pts before feeding to decoder.... should really copy the pkt instead of modifying it
+  ipkt->pts -= audio_first_dts;
+  ipkt->dts -= audio_first_dts;
+  dumpPacket(audio_in_stream, ipkt, "after pts adjustment");
+
   if ( audio_out_codec ) {
-    if ( ( ret = zm_receive_frame(audio_in_ctx, in_frame, *ipkt) ) < 0 ) {
-      Debug(3, "Not ready to receive frame");
+    // I wonder if we can get multiple frames per packet? Probably
+    ret = zm_send_packet_receive_frame(audio_in_ctx, in_frame, *ipkt);
+    if ( ret < 0 ) {
+      Debug(3, "failed to receive frame code: %d", ret);
       return 0;
     }
-
     zm_dump_frame(in_frame, "In frame from decode");
 
-    if ( !resample_audio() ) {
-      //av_frame_unref(in_frame);
-      return 0;
-    }
+    AVFrame *input_frame = in_frame;
 
-    out_frame->pts = in_frame->pts;
+    while ( zm_resample_audio(resample_ctx, input_frame, out_frame) ) {
+      //out_frame->pkt_duration = in_frame->pkt_duration; // resampling doesn't alter duration
+      if ( zm_add_samples_to_fifo(fifo, out_frame) <= 0 )
+        break;
+
+      // We put the samples into the fifo so we are basically resetting the frame
+      out_frame->nb_samples = audio_out_ctx->frame_size;
+      
+      if ( zm_get_samples_from_fifo(fifo, out_frame) <= 0 )
+        break;
+
+      out_frame->pts = audio_next_pts;
+      audio_next_pts += out_frame->nb_samples;
+
+      zm_dump_frame(out_frame, "Out frame after resample");
+
+      av_init_packet(&opkt);
+      if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, opkt) <= 0 )
+        break;
+
+      // Scale the PTS of the outgoing packet to be the correct time base
+      av_packet_rescale_ts(&opkt,
+          audio_out_ctx->time_base,
+          audio_out_stream->time_base);
+
+      write_packet(&opkt, audio_out_stream);
+      zm_av_packet_unref(&opkt);
+
+      if ( zm_resample_get_delay(resample_ctx, out_frame->sample_rate) < out_frame->nb_samples)
+        break;
+      // This will send a null frame, emptying out the resample buffer
+      input_frame = nullptr;
+    } // end while there is data in the resampler
 
-    av_init_packet(&opkt);
-    zm_send_frame(audio_out_ctx, out_frame, opkt);
   } else {
     Debug(2,"copying");
     av_init_packet(&opkt);
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
+    opkt.flags = ipkt->flags;
+
     opkt.duration = ipkt->duration;
-  }
+    opkt.pts = ipkt->pts;
+    opkt.dts = ipkt->dts;
+    av_packet_rescale_ts(&opkt, audio_in_stream->time_base, audio_out_stream->time_base);
+    write_packet(&opkt, audio_out_stream);
 
-  if ( ipkt->duration && (ipkt->duration != AV_NOPTS_VALUE) ) {
-    opkt.duration = av_rescale_q(
-        ipkt->duration,
-        audio_in_stream->time_base,
-        audio_out_stream->time_base);
-  }
-  // Scale the PTS of the outgoing packet to be the correct time base
-  if ( ipkt->pts != AV_NOPTS_VALUE ) {
-    if ( !audio_first_pts ) {
-      opkt.pts = 0;
-      audio_first_pts = ipkt->pts;
-      Debug(1, "No audio_first_pts");
-    } else {
-      opkt.pts = av_rescale_q(
-          ipkt->pts - audio_first_pts,
-          audio_in_stream->time_base,
-          audio_out_stream->time_base);
-      Debug(2, "audio opkt.pts = %" PRId64 " from ipkt->pts(%" PRId64 ") - first_pts(%" PRId64 ")",
-          opkt.pts, ipkt->pts, audio_first_pts);
-    }
-  } else {
-    Debug(2, "opkt.pts = undef");
-    opkt.pts = AV_NOPTS_VALUE;
-  }
+    zm_av_packet_unref(&opkt);
+  }  // end if encoding or copying
 
-  // audio_last_dts = ipkt->dts;
-  if ( opkt.dts > opkt.pts ) {
-    Debug(1,
-        "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 "). Decompression must happen "
-        "before presentation.",
-        opkt.dts, opkt.pts);
-    opkt.dts = opkt.pts;
-  }
-
-  //opkt.duration = out_frame ? out_frame->nb_samples : ipkt->duration;
-  // opkt.duration = av_rescale_q(ipkt->duration, audio_in_stream->time_base,
-  // audio_out_stream->time_base);
-  dumpPacket(audio_out_stream, &opkt);
-
-  // pkt.pos:  byte position in stream, -1 if unknown
-  opkt.pos = -1;
-  opkt.stream_index = audio_out_stream->index;
-  audio_next_dts = opkt.dts + opkt.duration;
-  audio_next_pts = opkt.pts + opkt.duration;
-
-  AVPacket safepkt;
-  memcpy(&safepkt, &opkt, sizeof(AVPacket));
-  ret = av_interleaved_write_frame(oc, &opkt);
-  if ( ret != 0 ) {
-    Error("Error writing audio frame packet: %s\n",
-        av_make_error_string(ret).c_str());
-    dumpPacket(audio_out_stream, &safepkt);
-  } else {
-    Debug(2, "Success writing audio frame");
-  }
-  zm_av_packet_unref(&opkt);
-  return 1;
-}  // end int VideoStore::writeAudioFramePacket( AVPacket *ipkt )
+  return 0;
+}  // end int VideoStore::writeAudioFramePacket(AVPacket *ipkt)
 
 int VideoStore::write_packets( zm_packetqueue &queue ) {
   // Need to write out all the frames from the last keyframe?
@@ -1351,86 +1338,38 @@ int VideoStore::write_packets( zm_packetqueue &queue ) {
   } // end while packets in the packetqueue
   Debug(2, "Wrote %d queued packets", packet_count );
   return packet_count;
-} // end int VideoStore::write_packets( PacketQueue &queue ) {
+}  // end int VideoStore::write_packets( PacketQueue &queue ) {
 
-int VideoStore::resample_audio() {
-  // Resample the in_frame into the audioSampleBuffer until we process the whole
-  // decoded data. Note: pts does not survive resampling or converting
-#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
-#if defined(HAVE_LIBSWRESAMPLE)
-  Debug(2, "Converting %d to %d samples using swresample",
-      in_frame->nb_samples, out_frame->nb_samples);
-  ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
-  if ( ret < 0 ) {
-    Error("Could not resample frame (error '%s')",
-        av_make_error_string(ret).c_str());
-    return 0;
+int VideoStore::write_packet(AVPacket *pkt, AVStream *stream) {
+  pkt->pos = -1;
+  pkt->stream_index = stream->index;
+
+  if ( pkt->dts == AV_NOPTS_VALUE ) {
+    Debug(1, "undef dts, fixing by setting to stream cur_dts %" PRId64, stream->cur_dts);
+    pkt->dts = stream->cur_dts;
+  } else if ( pkt->dts < stream->cur_dts ) {
+    Debug(1, "non increasing dts, fixing. our dts %" PRId64 " stream cur_dts %" PRId64, pkt->dts, stream->cur_dts);
+    pkt->dts = stream->cur_dts;
+  } 
+
+  if ( pkt->dts > pkt->pts ) {
+    Debug(1,
+          "pkt.dts(%" PRId64 ") must be <= pkt.pts(%" PRId64 ")."
+          "Decompression must happen before presentation.",
+          pkt->dts, pkt->pts);
+    pkt->pts = pkt->dts;
   }
 
-  ret = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + out_frame->nb_samples);
-  if ( ret < 0 ) {
-    Error("Could not reallocate FIFO");
-    return 0;
-  }
-  /** Store the new samples in the FIFO buffer. */
-  ret = av_audio_fifo_write(fifo, (void **)out_frame->data, out_frame->nb_samples);
-  if ( ret < out_frame->nb_samples ) {
-    Error("Could not write data to FIFO. %d written, expecting %d. Reason %s",
-        ret, out_frame->nb_samples, av_make_error_string(ret).c_str());
-    return 0;
-  }
+  dumpPacket(stream, pkt, "finished pkt");
+  next_dts[stream->index] = opkt.dts + opkt.duration;
+  Debug(3, "video_next_dts has become %" PRId64, next_dts[stream->index]);
 
-  // Reset frame_size to output_frame_size
-  int frame_size = audio_out_ctx->frame_size;
-
-  // AAC requires 1024 samples per encode.  Our input tends to be something else, so need to buffer them.
-  if ( frame_size > av_audio_fifo_size(fifo) ) {
-    return 0;
+  int ret = av_interleaved_write_frame(oc, pkt);
+  if ( ret != 0 ) {
+    Error("Error writing packet: %s",
+          av_make_error_string(ret).c_str());
+  } else {
+    Debug(2, "Success writing packet");
   }
-
-  if ( av_audio_fifo_read(fifo, (void **)out_frame->data, frame_size) < frame_size ) {
-    Error("Could not read data from FIFO");
-    return 0;
-  }
-  out_frame->nb_samples = frame_size;
-  // resampling changes the duration because the timebase is 1/samples
-  // I think we should be dealing in codec timebases not stream
-  if ( in_frame->pts != AV_NOPTS_VALUE ) {
-    out_frame->pts = av_rescale_q(
-        in_frame->pts,
-        audio_in_ctx->time_base,
-        audio_out_ctx->time_base);
-  }
-  zm_dump_frame(out_frame, "Out frame after timestamp conversion");
-#else
-#if defined(HAVE_LIBAVRESAMPLE)
-  ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
-                            0, in_frame->nb_samples);
-  if ( ret < 0 ) {
-    Error("Could not resample frame (error '%s')",
-        av_make_error_string(ret).c_str());
-    return 0;
-  }
-
-  int frame_size = audio_out_ctx->frame_size;
-
-  int samples_available = avresample_available(resample_ctx);
-  if ( samples_available < frame_size ) {
-    Debug(1, "Not enough samples yet (%d)", samples_available);
-    return 0;
-  }
-
-  // Read a frame audio data from the resample fifo
-  if ( avresample_read(resample_ctx, out_frame->data, frame_size) !=
-      frame_size) {
-    Warning("Error reading resampled audio.");
-    return 0;
-  }
-#endif
-#endif
-#else
-    Error("Have audio codec but no resampler?!");
-    return 0;
-#endif
-  return 1;
-} // end int VideoStore::resample_audio
+  return ret;
+}  // end int VideoStore::write_packet(AVPacket *pkt, AVStream *stream)
diff --git a/src/zm_videostore.h b/src/zm_videostore.h
index 701bbf656..e6ea83ab9 100644
--- a/src/zm_videostore.h
+++ b/src/zm_videostore.h
@@ -5,12 +5,12 @@
 extern "C"  {
 #ifdef HAVE_LIBSWRESAMPLE
   #include "libswresample/swresample.h"
-  #include "libavutil/audio_fifo.h"
 #else
   #ifdef HAVE_LIBAVRESAMPLE
     #include "libavresample/avresample.h"
   #endif
 #endif
+#include "libavutil/audio_fifo.h"
 }
 
 #if HAVE_LIBAVCODEC
@@ -36,15 +36,22 @@ static struct CodecData codec_data[];
 	AVOutputFormat *out_format;
 	AVFormatContext *oc;
 	AVStream *video_out_stream;
+	AVStream *audio_out_stream;
   int video_in_stream_index;
   int audio_in_stream_index;
 
   AVCodec *video_out_codec;
+  AVCodecContext *video_in_ctx;
   AVCodecContext *video_out_ctx;
 
   AVStream *video_in_stream;
   AVStream *audio_in_stream;
 
+  const AVCodec *audio_in_codec;
+  AVCodecContext *audio_in_ctx;
+  // The following are used when encoding the audio stream to AAC
+  AVCodec *audio_out_codec;
+  AVCodecContext *audio_out_ctx;
   // Move this into the object so that we aren't constantly allocating/deallocating it on the stack
   AVPacket opkt;
   // we are transcoding
@@ -52,27 +59,18 @@ static struct CodecData codec_data[];
   AVFrame *in_frame;
   AVFrame *out_frame;
 
-  AVCodecContext *video_in_ctx;
-  AVCodec *audio_in_codec;
-  AVCodecContext *audio_in_ctx;
-  int ret;
-
   SWScale swscale;
   unsigned int packets_written;
   unsigned int frame_count;
 
-  // The following are used when encoding the audio stream to AAC
-  AVStream *audio_out_stream;
-  AVCodec *audio_out_codec;
-  AVCodecContext *audio_out_ctx;
 #ifdef HAVE_LIBSWRESAMPLE
   SwrContext *resample_ctx;
-  AVAudioFifo *fifo;
 #else
 #ifdef HAVE_LIBAVRESAMPLE
   AVAudioResampleContext* resample_ctx;
 #endif
 #endif
+  AVAudioFifo *fifo;
   uint8_t *converted_in_samples;
     
 	const char *filename;
@@ -92,13 +90,13 @@ static struct CodecData codec_data[];
   int64_t audio_first_dts;
 
   // These are for out, should start at zero.  We assume they do not wrap because we just aren't going to save files that big.
-  int64_t video_next_pts;
-  int64_t video_next_dts;
+  int64_t *next_dts;
   int64_t audio_next_pts;
-  int64_t audio_next_dts;
+
+  int max_stream_index;
 
   bool setup_resampler();
-  int resample_audio();
+  int write_packet(AVPacket *pkt, AVStream *stream);
 
 public:
 	VideoStore(
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 48c0499c3..de2964283 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -53,7 +53,7 @@ void Zone::Setup(
 
   id = p_id;
   label = new char[strlen(p_label)+1];
-  strcpy( label, p_label );
+  strcpy(label, p_label);
   type = p_type;
   polygon = p_polygon;
   alarm_rgb = p_alarm_rgb;
@@ -83,16 +83,16 @@ void Zone::Setup(
   alarm_blobs = 0;
   min_blob_size = 0;
   max_blob_size = 0;
-  image = 0;
+  image = nullptr;
   score = 0;
 
   overload_count = 0;
   extend_alarm_count = 0;
 
-  pg_image = new Image( monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE );
+  pg_image = new Image(monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE);
   pg_image->Clear();
-  pg_image->Fill( 0xff, polygon );
-  pg_image->Outline( 0xff, polygon );
+  pg_image->Fill(0xff, polygon);
+  pg_image->Outline(0xff, polygon);
 
   ranges = new Range[monitor->Height()];
   for ( unsigned int y = 0; y < monitor->Height(); y++ ) {
@@ -113,14 +113,16 @@ void Zone::Setup(
   }
 
   if ( config.record_diag_images ) {
-    snprintf(diag_path, sizeof(diag_path), config.record_diag_images_fifo ? "%s/diagpipe-%d-poly.jpg" : "%s/diag-%d-poly.jpg", monitor->getStorage()->Path(), id);
-    if (config.record_diag_images_fifo)
+    snprintf(diag_path, sizeof(diag_path),
+        config.record_diag_images_fifo ? "%s/diagpipe-%d-poly.jpg" : "%s/diag-%d-poly.jpg",
+        monitor->getStorage()->Path(), id);
+    if ( config.record_diag_images_fifo )
       FifoStream::fifo_create_if_missing(diag_path);
     pg_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
   } else {
     diag_path[0] = 0;
   }
-} // end Zone::Setup
+}  // end Zone::Setup
 
 Zone::~Zone() {
   delete[] label;
@@ -129,18 +131,18 @@ Zone::~Zone() {
   delete[] ranges;
 }
 
-void Zone::RecordStats( const Event *event ) {
+void Zone::RecordStats(const Event *event) {
   static char sql[ZM_SQL_MED_BUFSIZ];
   db_mutex.lock();
   snprintf(sql, sizeof(sql),
       "INSERT INTO Stats SET MonitorId=%d, ZoneId=%d, EventId=%" PRIu64 ", FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d",
-      monitor->Id(), id, event->Id(), event->Frames()+1, pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score
+      monitor->Id(), id, event->Id(), event->Frames(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score
       );
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't insert event stats: %s", mysql_error(&dbconn));
   }
   db_mutex.unlock();
-} // end void Zone::RecordStats( const Event *event )
+}  // end void Zone::RecordStats( const Event *event )
 
 bool Zone::CheckOverloadCount() {
   if ( overload_count ) {
@@ -149,40 +151,40 @@ bool Zone::CheckOverloadCount() {
     return false;
   }
   return true;
-} // end bool Zone::CheckOverloadCount()
+}  // end bool Zone::CheckOverloadCount()
 
 void Zone::SetScore(unsigned int nScore) {
   score = nScore;
-} // end void Zone::SetScore(unsigned int nScore)
+}  // end void Zone::SetScore(unsigned int nScore)
 
 void Zone::SetAlarmImage(const Image* srcImage) {
   delete image;
   image = new Image(*srcImage);
-} // end void Zone::SetAlarmImage( const Image* srcImage )
+}  // end void Zone::SetAlarmImage( const Image* srcImage )
 
 int Zone::GetOverloadCount() {
   return overload_count;
-} // end int Zone::GetOverloadCount()
+}  // end int Zone::GetOverloadCount()
 
 void Zone::SetOverloadCount(int nOverCount) {
   overload_count = nOverCount;
-} // end void Zone::SetOverloadCount(int nOverCount )
+}  // end void Zone::SetOverloadCount(int nOverCount )
 
 int Zone::GetOverloadFrames() {
   return overload_frames;
-} // end int Zone::GetOverloadFrames
+}  // end int Zone::GetOverloadFrames
 
 int Zone::GetExtendAlarmCount() {
   return extend_alarm_count;
-} // end int Zone::GetExtendAlarmCount()
+}  // end int Zone::GetExtendAlarmCount()
 
 void Zone::SetExtendAlarmCount(int nExtendAlarmCount) {
   extend_alarm_count = nExtendAlarmCount;
-} // end void Zone::SetExtendAlarmCount( int nExtendAlarmCount )
+}  // end void Zone::SetExtendAlarmCount( int nExtendAlarmCount )
 
 int Zone::GetExtendAlarmFrames() {
   return extend_alarm_frames;
-} // end int Zone::GetExtendAlarmFrames()
+}  // end int Zone::GetExtendAlarmFrames()
 
 bool Zone::CheckExtendAlarmCount() {
   Info("ExtendAlarm count: %d, ExtendAlarm frames: %d", extend_alarm_count, extend_alarm_frames);
@@ -192,7 +194,7 @@ bool Zone::CheckExtendAlarmCount() {
     return true;
   }
   return false;
-} // end bool Zone::CheckExtendAlarmCount
+}  // end bool Zone::CheckExtendAlarmCount
 
 bool Zone::CheckAlarms(const Image *delta_image) {
   ResetStats();
@@ -227,7 +229,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
   Debug(4, "Checking alarms for zone %d/%s in lines %d -> %d", id, label, lo_y, hi_y);
 
-  /* if(config.cpu_extensions && sseversion >= 20) {
+  /* if(config.cpu_extensions && sse_version >= 20) {
      sse2_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
      } else {
      std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
@@ -245,7 +247,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
   if ( config.record_diag_images_fifo ) {
     FifoDebug(5, "{\"zone\":%d,\"type\":\"ALRM\",\"pixels\":%d,\"avg_diff\":%d}",
-        id,alarm_pixels, pixel_diff);
+        id, alarm_pixels, pixel_diff);
   }
 
   if ( alarm_pixels ) {
@@ -262,11 +264,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
     return false;
   }
 
-  if ( max_alarm_pixels != 0 )
-    score = (100*alarm_pixels)/max_alarm_pixels;
-  else
-    score = (100*alarm_pixels)/polygon.Area();
-  
+  score = (100*alarm_pixels)/(max_alarm_pixels?max_alarm_pixels:polygon.Area());
   if ( score < 1 )
     score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
   Debug(5, "Current score is %d", score);
@@ -356,8 +354,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
     if ( check_method >= BLOBS ) {
       Debug(5, "Checking for blob pixels");
-      typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
-      BlobStats blob_stats[256];
+      // ICON FIXME Would like to get rid of this memset
       memset(blob_stats, 0, sizeof(BlobStats)*256);
       uint8_t *spdiff;
       uint8_t last_x, last_y;
@@ -367,22 +364,15 @@ bool Zone::CheckAlarms(const Image *delta_image) {
         int lo_x = ranges[y].lo_x;
         int hi_x = ranges[y].hi_x;
 
-        pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
+        pdiff = (uint8_t*)diff_image->Buffer(lo_x, y);
         for ( int x = lo_x; x <= hi_x; x++, pdiff++ ) {
           if ( *pdiff == WHITE ) {
             Debug(9, "Got white pixel at %d,%d (%p)", x, y, pdiff);
-            //last_x = (x>lo_x)?*(pdiff-1):0;
-            //last_y = (y>lo_y&&x>=last_lo_x&&x<=last_hi_x)?*(pdiff-diff_width):0;
 
-            last_x = 0;
-            if ( x > 0 ) {
-              if ( (x-1) >= lo_x ) {
-                last_x = *(pdiff-1);
-              }
-            }
+            last_x = ((x > 0) && ( (x-1) >= lo_x )) ? *(pdiff-1) : 0;
 
             last_y = 0;
-            if (y > 0 ) {
+            if ( y > 0 ) {
               if ( (y-1) >= lo_y && ranges[(y-1)].lo_x <= x && ranges[(y-1)].hi_x >= x ) {
                 last_y = *(pdiff-diff_width);
               }
@@ -503,7 +493,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
                         ||
                         (max_blob_pixels && bs->count > max_blob_pixels)
                        ) {
-                      if ( config.create_analysis_images || config.record_diag_images ) {
+                      if ( ( monitor->GetOptSaveJPEGs() > 1 ) || config.record_diag_images ) {
                         for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ ) {
                           spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
                           for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ ) {
@@ -572,7 +562,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
         BlobStats *bs = &blob_stats[i];
         if ( bs->count ) {
           if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) ) {
-            if ( config.create_analysis_images || config.record_diag_images ) {
+            if ( ( monitor->GetOptSaveJPEGs() > 1 ) || config.record_diag_images ) {
               for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ ) {
                 spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
                 for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ ) {
@@ -629,7 +619,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
       }
       
       if ( max_blob_pixels != 0 )
-        score = (100*alarm_blob_pixels)/(max_blob_pixels);
+        score = (100*alarm_blob_pixels)/max_blob_pixels;
       else 
         score = (100*alarm_blob_pixels)/polygon.Area();
       
@@ -700,7 +690,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
       alarm_centre = alarm_box.Centre();
     }
 
-    if ( (type < PRECLUSIVE) && (check_method >= BLOBS) && config.create_analysis_images ) {
+    if ( (type < PRECLUSIVE) && (check_method >= BLOBS) && (monitor->GetOptSaveJPEGs() > 1) ) {
 
       // First mask out anything we don't want
       for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
@@ -756,67 +746,42 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 }
 
 bool Zone::ParsePolygonString(const char *poly_string, Polygon &polygon) {
-  Debug(3, "Parsing polygon string '%s'", poly_string);
-
-  char *str_ptr = new char[strlen(poly_string)+1];
-  char *str = str_ptr;
-  strcpy(str, poly_string);
 
+  char *str = (char *)poly_string;
   char *ws;
+  char *cp;
   int n_coords = 0;
   int max_n_coords = strlen(str)/4;
   Coord *coords = new Coord[max_n_coords];
-  while( true ) {
-    if ( *str == '\0' ) {
-      break;
-    }
-    ws = strchr(str, ' ');
-    if ( ws ) {
-      *ws = '\0';
-    }
-    char *cp = strchr(str, ',');
+  while ( *str != '\0' ) {
+    cp = strchr(str, ',');
     if ( !cp ) {
       Error("Bogus coordinate %s found in polygon string", str);
-      delete[] coords;
-      delete[] str_ptr;
-      return false;
-    } else {
-      *cp = '\0';
-      char *xp = str;
-      char *yp = cp+1;
+      break;
+    } 
+    int x = atoi(str);
+    int y = atoi(cp+1);
+    Debug(3, "Got coordinate %d,%d from polygon string", x, y);
+    coords[n_coords++] = Coord(x, y);
 
-      int x = atoi(xp);
-      int y = atoi(yp);
-
-      Debug(3, "Got coordinate %d,%d from polygon string", x, y);
-#if 0
-      if ( x < 0 )
-        x = 0;
-      else if ( x >= width )
-        x = width-1;
-      if ( y < 0 )
-        y = 0;
-      else if ( y >= height )
-        y = height-1;
-#endif
-      coords[n_coords++] = Coord( x, y );
-    }
+    ws = strchr(cp+2, ' ');
     if ( ws )
       str = ws+1;
     else
       break;
-  }
-  polygon = Polygon(n_coords, coords);
+  }  // end while ! end of string
 
-  Debug(3, "Successfully parsed polygon string");
-  //printf( "Area: %d\n", pg.Area() );
-  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
+  if ( n_coords > 2 ) {
+    Debug(3, "Successfully parsed polygon string %s", str);
+    polygon = Polygon(n_coords, coords);
+  } else {
+    Error("Not enough coordinates to form a polygon!");
+    n_coords = 0;
+  }
 
   delete[] coords;
-  delete[] str_ptr;
-
-  return true;
-}
+  return n_coords ? true : false;
+}  // end bool Zone::ParsePolygonString(const char *poly_string, Polygon &polygon)
 
 bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon) {
   Debug(3, "Parsing zone string '%s'", zone_string);
@@ -825,13 +790,12 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   char *str = str_ptr;
   strcpy(str, zone_string);
 
+  zone_id = strtol(str, 0, 10);
+  Debug(3, "Got zone %d from zone string", zone_id);
+
   char *ws = strchr(str, ' ');
   if ( !ws ) {
     Debug(3, "No initial whitespace found in zone string '%s', finishing", str);
-  }
-  zone_id = strtol(str, 0, 10);
-  Debug(3, "Got zone %d from zone string", zone_id);
-  if ( !ws ) {
     delete[] str_ptr;
     return true;
   }
@@ -839,13 +803,11 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   *ws = '\0';
   str = ws+1;
 
+  colour = strtol(str, 0, 16);
+  Debug(3, "Got colour %06x from zone string", colour);
   ws = strchr(str, ' ');
   if ( !ws ) {
     Debug(3, "No secondary whitespace found in zone string '%s', finishing", zone_string);
-  }
-  colour = strtol(str, 0, 16);
-  Debug(3, "Got colour %06x from zone string", colour);
-  if ( !ws ) {
     delete[] str_ptr;
     return true;
   }
@@ -853,34 +815,33 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   str = ws+1;
 
   bool result = ParsePolygonString(str, polygon);
-
-  //printf( "Area: %d\n", pg.Area() );
-  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
-
   delete[] str_ptr;
 
   return result;
-}
+}  // end bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon)
 
 int Zone::Load(Monitor *monitor, Zone **&zones) {
   static char sql[ZM_SQL_MED_BUFSIZ];
 
   db_mutex.lock();
-  snprintf(sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames,ExtendAlarmFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id());
+  snprintf(sql, sizeof(sql), "SELECT Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,"
+      "MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,"
+      "FilterX,FilterY,MinFilterPixels,MaxFilterPixels,"
+      "MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,"
+      "OverloadFrames,ExtendAlarmFrames"
+      " FROM Zones WHERE MonitorId = %d ORDER BY Type, Id", monitor->Id());
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
     db_mutex.unlock();
     return 0;
   }
 
-  MYSQL_RES *result = mysql_store_result( &dbconn );
+  MYSQL_RES *result = mysql_store_result(&dbconn);
   db_mutex.unlock();
   if ( !result ) {
     Error("Can't use query result: %s", mysql_error(&dbconn));
-    db_mutex.unlock();
     return 0;
   }
-  db_mutex.unlock();
   int n_zones = mysql_num_rows(result);
   Debug(1, "Got %d zones for monitor %s", n_zones, monitor->Name());
   delete[] zones;
@@ -943,7 +904,13 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
     } else if ( atoi(dbrow[2]) == Zone::PRIVACY ) {
       zones[i] = new Zone(monitor, Id, Name, (Zone::ZoneType)Type, polygon);
     }
-    zones[i] = new Zone(monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB, (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold, MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), MinFilterPixels, MaxFilterPixels, MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs, OverloadFrames, ExtendAlarmFrames);
+    zones[i] = new Zone(
+        monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB,
+        (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold,
+        MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), 
+        MinFilterPixels, MaxFilterPixels,
+        MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs,
+        OverloadFrames, ExtendAlarmFrames);
   } // end foreach row
   mysql_free_result(result);
   return n_zones;
@@ -952,9 +919,9 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
 bool Zone::DumpSettings(char *output, bool /*verbose*/) {
   output[0] = 0;
 
-  sprintf( output+strlen(output), "  Id : %d\n", id );
-  sprintf( output+strlen(output), "  Label : %s\n", label );
-  sprintf( output+strlen(output), "  Type: %d - %s\n", type,
+  sprintf(output+strlen(output), "  Id : %d\n", id );
+  sprintf(output+strlen(output), "  Label : %s\n", label );
+  sprintf(output+strlen(output), "  Type: %d - %s\n", type,
       type==ACTIVE?"Active":(
         type==INCLUSIVE?"Inclusive":(
           type==EXCLUSIVE?"Exclusive":(
@@ -983,10 +950,14 @@ bool Zone::DumpSettings(char *output, bool /*verbose*/) {
   sprintf( output+strlen(output), "  Max Blob Pixels : %d\n", max_blob_pixels );
   sprintf( output+strlen(output), "  Min Blobs : %d\n", min_blobs );
   sprintf( output+strlen(output), "  Max Blobs : %d\n", max_blobs );
-  return( true );
+  return true;
 }
 
-void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum) {
+void Zone::std_alarmedpixels(
+    Image* pdiff_image,
+    const Image* ppoly_image,
+    unsigned int* pixel_count,
+    unsigned int* pixel_sum) {
   uint32_t pixelsalarmed = 0;
   uint32_t pixelsdifference = 0;
   uint8_t calc_max_pixel_threshold = 255;
@@ -1015,10 +986,10 @@ void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsig
         *pdiff = BLACK;
       }
     }
-  }
+  }  // end for y = lo_y to hi_y
 
   /* Store the results */
   *pixel_count = pixelsalarmed;
   *pixel_sum = pixelsdifference;
   Debug(7, "STORED pixelsalarmed(%d), pixelsdifference(%d)", pixelsalarmed, pixelsdifference);
-}
+}  // end void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum)
diff --git a/src/zm_zone.h b/src/zm_zone.h
index 0c7b26a57..7d7797725 100644
--- a/src/zm_zone.h
+++ b/src/zm_zone.h
@@ -32,15 +32,14 @@ class Monitor;
 // This describes a 'zone', or an area of an image that has certain
 // detection characteristics.
 //
-class Zone
-{
+class Zone {
 protected:
-  struct Range
-  {
+  struct Range {
     int lo_x;
     int hi_x;
     int off_x;
   };
+  typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
 
 public:
   typedef enum { ACTIVE=1, INCLUSIVE, EXCLUSIVE, PRECLUSIVE, INACTIVE, PRIVACY } ZoneType;
@@ -52,8 +51,8 @@ protected:
 
   int        id;
   char      *label;
-  ZoneType    type;
-  Polygon      polygon;
+  ZoneType   type;
+  Polygon    polygon;
   Rgb        alarm_rgb;
   CheckMethod    check_method;
 
@@ -67,17 +66,18 @@ protected:
   int        min_filter_pixels;
   int        max_filter_pixels;
 
+  BlobStats blob_stats[256];
   int        min_blob_pixels;
   int        max_blob_pixels;
   int        min_blobs;
   int        max_blobs;
 
-  int       overload_frames;
+  int        overload_frames;
   int        extend_alarm_frames;
 
   // Outputs/Statistics
-  bool      alarmed;
-  bool      was_alarmed;
+  bool       alarmed;
+  bool       was_alarmed;
   int        pixel_diff;
   unsigned int      alarm_pixels;
   int        alarm_filter_pixels;
@@ -139,8 +139,7 @@ public:
   inline Coord GetAlarmCentre() const { return( alarm_centre ); }
   inline unsigned int Score() const { return( score ); }
 
-  inline void ResetStats()
-  {
+  inline void ResetStats() {
     alarmed = false;
 		was_alarmed = false;
     pixel_diff = 0;
diff --git a/src/zma.cpp b/src/zma.cpp
index a0cb048bf..edaf9c722 100644
--- a/src/zma.cpp
+++ b/src/zma.cpp
@@ -70,15 +70,15 @@ void Usage() {
 int main( int argc, char *argv[] ) {
   self = argv[0];
 
-  srand(getpid() * time(0));
+  srand(getpid() * time(nullptr));
 
   int id = -1;
 
   static struct option long_options[] = {
-    {"monitor", 1, 0, 'm'},
-    {"help", 0, 0, 'h'},
-    {"version", 0, 0, 'v'},
-    {0, 0, 0, 0}
+    {"monitor", 1, nullptr, 'm'},
+    {"help", 0, nullptr, 'h'},
+    {"version", 0, nullptr, 'v'},
+    {nullptr, 0, nullptr, 0}
   };
 
   while (1) {
@@ -146,15 +146,15 @@ int main( int argc, char *argv[] ) {
     unsigned int analysis_update_delay = monitor->GetAnalysisUpdateDelay();
     time_t last_analysis_update_time, cur_time;
     monitor->UpdateAdaptiveSkip();
-    last_analysis_update_time = time(0);
+    last_analysis_update_time = time(nullptr);
 
     while( (!zm_terminate) && monitor->ShmValid() ) {
       // Process the next image
-      sigprocmask(SIG_BLOCK, &block_set, 0);
+      sigprocmask(SIG_BLOCK, &block_set, nullptr);
 
       // Some periodic updates are required for variable capturing framerate
       if ( analysis_update_delay ) {
-        cur_time = time(0);
+        cur_time = time(nullptr);
         if ( (unsigned int)( cur_time - last_analysis_update_time ) > analysis_update_delay ) {
           analysis_rate = monitor->GetAnalysisRate();
           monitor->UpdateAdaptiveSkip();
@@ -174,7 +174,7 @@ int main( int argc, char *argv[] ) {
         logInit(log_id_string);
         zm_reload = false;
       }
-      sigprocmask(SIG_UNBLOCK, &block_set, 0);
+      sigprocmask(SIG_UNBLOCK, &block_set, nullptr);
     } // end while ! zm_terminate
     delete monitor;
   } else {
diff --git a/src/zmc.cpp b/src/zmc.cpp
index 47ab49c04..509183bb0 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -91,7 +91,7 @@ void Usage() {
 int main(int argc, char *argv[]) {
   self = argv[0];
 
-  srand(getpid() * time(0));
+  srand(getpid() * time(nullptr));
 
   const char *device = "";
   const char *protocol = "";
@@ -102,16 +102,16 @@ int main(int argc, char *argv[]) {
   int monitor_id = -1;
 
   static struct option long_options[] = {
-    {"device", 1, 0, 'd'},
-    {"protocol", 1, 0, 'r'},
-    {"host", 1, 0, 'H'},
-    {"port", 1, 0, 'P'},
-    {"path", 1, 0, 'p'},
-    {"file", 1, 0, 'f'},
-    {"monitor", 1, 0, 'm'},
-    {"help", 0, 0, 'h'},
-    {"version", 0, 0, 'v'},
-    {0, 0, 0, 0}
+    {"device", 1, nullptr, 'd'},
+    {"protocol", 1, nullptr, 'r'},
+    {"host", 1, nullptr, 'H'},
+    {"port", 1, nullptr, 'P'},
+    {"path", 1, nullptr, 'p'},
+    {"file", 1, nullptr, 'f'},
+    {"monitor", 1, nullptr, 'm'},
+    {"help", 0, nullptr, 'h'},
+    {"version", 0, nullptr, 'v'},
+    {nullptr, 0, nullptr, 0}
   };
 
   while (1) {
@@ -188,13 +188,13 @@ int main(int argc, char *argv[]) {
     snprintf(log_id_string, sizeof(log_id_string), "zmc_m%d", monitor_id);
   }
 
+  logInit(log_id_string);
   zmLoadConfig();
-
   logInit(log_id_string);
 
   hwcaps_detect();
 
-  Monitor **monitors = 0;
+  Monitor **monitors = nullptr;
   int n_monitors = 0;
 #if ZM_HAS_V4L
   if ( device[0] ) {
@@ -235,6 +235,8 @@ int main(int argc, char *argv[]) {
 
   int result = 0;
 
+  int prime_capture_log_count = 0;
+
   while ( !zm_terminate ) {
     result = 0;
     static char sql[ZM_SQL_SML_BUFSIZ];
@@ -243,7 +245,7 @@ int main(int argc, char *argv[]) {
       }
       if ( ! monitors[i]->connect() ) {
       }
-      time_t now = (time_t)time(NULL);
+      time_t now = (time_t)time(nullptr);
       monitors[i]->setStartupTime(now);
 
       snprintf(sql, sizeof(sql),
@@ -252,11 +254,18 @@ int main(int argc, char *argv[]) {
       if ( mysql_query(&dbconn, sql) ) {
         Error("Can't run query: %s", mysql_error(&dbconn));
       }
-    }
+    }  // end foreach monitor
+
     // Outer primary loop, handles connection to camera
     if ( monitors[0]->PrimeCapture() < 0 ) {
-      Error("Failed to prime capture of initial monitor");
-      sleep(10);
+      if ( prime_capture_log_count % 60 ) {
+        Error("Failed to prime capture of initial monitor");
+      } else {
+        Debug(1, "Failed to prime capture of initial monitor");
+      }
+      prime_capture_log_count ++;
+      if ( !zm_terminate )
+        sleep(10);
       continue;
     }
     for ( int i = 0; i < n_monitors; i++ ) {
@@ -319,7 +328,7 @@ int main(int argc, char *argv[]) {
           break;
         }
 
-        gettimeofday(&now, NULL);
+        gettimeofday(&now, nullptr);
         // capture_delay is the amount of time we should sleep to achieve the desired framerate.
         int delay = monitors[i]->GetState() == Monitor::ALARM ? alarm_capture_delays[i] : capture_delays[i];
         if ( delay && last_capture_times[i].tv_sec ) {
@@ -345,11 +354,13 @@ int main(int argc, char *argv[]) {
         last_capture_times[i] = now;
 
       } // end foreach n_monitors
+
       if ( result < 0 ) {
         // Failure, try reconnecting
-				sleep(1);
+				sleep(5);
         break;
       }
+
       if ( zm_reload ) {
         for ( int i = 0; i < n_monitors; i++ ) {
           monitors[i]->Reload();
diff --git a/src/zms.cpp b/src/zms.cpp
index 544aa9936..9b661c564 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -50,10 +50,10 @@ bool ValidateAccess(User *user, int mon_id) {
   return allowed;
 }
 
-int main(int argc, const char *argv[]) {
+int main(int argc, const char *argv[], char **envp) {
   self = argv[0];
 
-  srand(getpid() * time(0));
+  srand(getpid() * time(nullptr));
 
   enum { ZMS_UNKNOWN, ZMS_MONITOR, ZMS_EVENT, ZMS_FIFO } source = ZMS_UNKNOWN;
   enum { ZMS_JPEG, ZMS_MPEG, ZMS_RAW, ZMS_ZIP, ZMS_SINGLE } mode = ZMS_JPEG;
@@ -89,26 +89,30 @@ int main(int argc, const char *argv[]) {
   zmLoadConfig();
   char log_id_string[32] = "zms";
   logInit(log_id_string);
+  for (char **env = envp; *env != 0; env++) {
+    char *thisEnv = *env;
+    Debug(1, "env: %s", thisEnv);
+  }
 
   const char *query = getenv("QUERY_STRING");
   if ( query ) {
     Debug(1, "Query: %s", query);
 
     char temp_query[1024];
-    strncpy(temp_query, query, sizeof(temp_query));
+    strncpy(temp_query, query, sizeof(temp_query)-1);
     char *q_ptr = temp_query;
     char *parms[16];  // Shouldn't be more than this
     int parm_no = 0;
     while ( (parm_no < 16) && (parms[parm_no] = strtok(q_ptr, "&")) ) {
       parm_no++;
-      q_ptr = NULL;
+      q_ptr = nullptr;
     }
 
     for ( int p = 0; p < parm_no; p++ ) {
       char *name = strtok(parms[p], "=");
-      char *value = strtok(NULL, "=");
+      char const *value = strtok(nullptr, "=");
       if ( !value )
-        value = (char *)"";
+        value = "";
       if ( !strcmp(name, "source") ) {
         source = !strcmp(value, "event")?ZMS_EVENT:ZMS_MONITOR;
         if ( !strcmp(value, "fifo") )
@@ -127,10 +131,10 @@ int main(int argc, const char *argv[]) {
       } else if ( !strcmp(name, "time") ) {
         event_time = atoi(value);
       } else if ( !strcmp(name, "event") ) {
-        event_id = strtoull(value, (char **)NULL, 10);
+        event_id = strtoull(value, nullptr, 10);
         source = ZMS_EVENT;
       } else if ( !strcmp(name, "frame") ) {
-        frame_id = strtoull(value, (char **)NULL, 10);
+        frame_id = strtoull(value, nullptr, 10);
         source = ZMS_EVENT;
       } else if ( !strcmp(name, "scale") ) {
         scale = atoi(value);
@@ -159,7 +163,7 @@ int main(int argc, const char *argv[]) {
       } else if ( !strcmp(name, "buffer") ) {
         playback_buffer = atoi(value);
       } else if ( !strcmp(name, "auth") ) {
-        strncpy( auth, value, sizeof(auth)-1 );
+        strncpy(auth, value, sizeof(auth)-1);
       } else if ( !strcmp(name, "token") ) {
         jwt_token_str = value;
         Debug(1, "ZMS: JWT token found: %s", jwt_token_str.c_str());
@@ -184,7 +188,7 @@ int main(int argc, const char *argv[]) {
   logInit(log_id_string);
 
   if ( config.opt_use_auth ) {
-    User *user = 0;
+    User *user = nullptr;
 
     if ( jwt_token_str != "" ) {
       // user = zmLoadTokenUser(jwt_token_str, config.auth_hash_ips);
@@ -195,53 +199,53 @@ int main(int argc, const char *argv[]) {
       } else {
         Error("Bad username");
       }
-
     } else {
-      // if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-      {
-        if ( *auth ) {
-          user = zmLoadAuthUser(auth, config.auth_hash_ips);
-        }
-      }
-      // else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-      {
-        if ( username.length() && password.length() ) {
-          user = zmLoadUser(username.c_str(), password.c_str());
-        }
+      if ( *auth ) {
+        user = zmLoadAuthUser(auth, config.auth_hash_ips);
+      } else if ( username.length() && password.length() ) {
+        user = zmLoadUser(username.c_str(), password.c_str());
       }
     }
     if ( !user ) {
       fputs("HTTP/1.0 403 Forbidden\r\n\r\n", stdout);
-      Error("Unable to authenticate user");
+
+      const char *referer = getenv("HTTP_REFERER");
+      Error("Unable to authenticate user from %s", referer);
       logTerm();
       zmDbClose();
       return 0;
     }
     if ( !ValidateAccess(user, monitor_id) ) {
+      delete user;
+      user = nullptr;
       fputs("HTTP/1.0 403 Forbidden\r\n\r\n", stdout);
       logTerm();
       zmDbClose();
       return 0;
     }
+    delete user;
+    user = nullptr;
   }  // end if config.opt_use_auth
 
   hwcaps_detect();
   zmSetDefaultTermHandler();
   zmSetDefaultDieHandler();
 
-  setbuf(stdout, 0);
+  setbuf(stdout, nullptr);
   if ( nph ) {
     fputs("HTTP/1.0 200 OK\r\n", stdout);
   }
   fprintf(stdout, "Server: ZoneMinder Video Server/%s\r\n", ZM_VERSION);
 
-  time_t now = time(0);
+  time_t now = time(nullptr);
   char date_string[64];
-  strftime(date_string, sizeof(date_string)-1, "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
+  strftime(date_string, sizeof(date_string)-1,
+      "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
 
-  fprintf(stdout, "Last-Modified: %s\r\n", date_string);
+  fputs("Last-Modified: ", stdout);
+  fputs(date_string, stdout);
   fputs(
-      "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
+      "\r\nExpires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
       "Cache-Control: no-store, no-cache, must-revalidate\r\n"
       "Cache-Control: post-check=0, pre-check=0\r\n"
       "Pragma: no-cache\r\n",
@@ -255,14 +259,7 @@ int main(int argc, const char *argv[]) {
     stream.setStreamTTL(ttl);
     stream.setStreamQueue(connkey);
     stream.setStreamBuffer(playback_buffer);
-    if ( !stream.setStreamStart(monitor_id) ) {
-      Error("Unable to connect to zmc process for monitor %d", monitor_id);
-      fprintf(stderr, "Unable to connect to zmc process. "
-         " Please ensure that it is running.");
-      logTerm();
-      zmDbClose();
-      return -1;
-    }
+    stream.setStreamStart(monitor_id);
 
     if ( mode == ZMS_JPEG ) {
       stream.setStreamType(MonitorStream::STREAM_JPEG);
@@ -279,7 +276,9 @@ int main(int argc, const char *argv[]) {
       stream.setStreamType(MonitorStream::STREAM_MPEG);
 #else  // HAVE_LIBAVCODEC
       Error("MPEG streaming of '%s' attempted while disabled", query);
-      fprintf(stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n");
+      fprintf(stderr, "MPEG streaming is disabled.\n"
+          "You should configure with the --with-ffmpeg"
+          " option and rebuild to use this functionality.\n");
       logTerm();
       zmDbClose();
       return -1;
@@ -332,5 +331,5 @@ int main(int argc, const char *argv[]) {
   logTerm();
   zmDbClose();
 
-  return(0);
+  return 0;
 }
diff --git a/src/zmu.cpp b/src/zmu.cpp
index bd70f8337..bdc467812 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -196,12 +196,11 @@ bool ValidateAccess(User *user, int mon_id, int function) {
   return allowed;
 }
 
-int exit_zmu(int exit_code) {
+void exit_zmu(int exit_code) {
   logTerm();
   zmDbClose();
 
   exit(exit_code);
-  return exit_code;
 }
 
 int main(int argc, char *argv[]) {
@@ -212,45 +211,45 @@ int main(int argc, char *argv[]) {
 
   self = argv[0];
 
-  srand(getpid() * time(0));
+  srand(getpid() * time(nullptr));
 
   static struct option long_options[] = {
-    {"device", 2, 0, 'd'},
-    {"monitor", 1, 0, 'm'},
-    {"verbose", 0, 0, 'v'},
-    {"image", 2, 0, 'i'},
-    {"scale", 1, 0, 'S'},
-    {"timestamp", 2, 0, 't'},
-    {"state", 0, 0, 's'},
-    {"brightness", 2, 0, 'B'},
-    {"contrast", 2, 0, 'C'},
-    {"hue", 2, 0, 'H'},
-    {"contrast", 2, 0, 'O'},
-    {"read_index", 0, 0, 'R'},
-    {"write_index", 0, 0, 'W'},
-    {"event", 0, 0, 'e'},
-    {"fps", 0, 0, 'f'},
-    {"zones", 2, 0, 'z'},
-    {"alarm", 0, 0, 'a'},
-    {"noalarm", 0, 0, 'n'},
-    {"cancel", 0, 0, 'c'},
-    {"reload", 0, 0, 'L'},
-    {"enable", 0, 0, 'E'},
-    {"disable", 0, 0, 'D'},
-    {"suspend", 0, 0, 'u'},
-    {"resume", 0, 0, 'r'},
-    {"query", 0, 0, 'q'},
-    {"username", 1, 0, 'U'},
-    {"password", 1, 0, 'P'},
-    {"auth", 1, 0, 'A'},
-    {"token", 1, 0, 'T'},
-    {"version", 1, 0, 'V'},
-    {"help", 0, 0, 'h'},
-    {"list", 0, 0, 'l'},
-    {0, 0, 0, 0}
+    {"device", 2, nullptr, 'd'},
+    {"monitor", 1, nullptr, 'm'},
+    {"verbose", 0, nullptr, 'v'},
+    {"image", 2, nullptr, 'i'},
+    {"scale", 1, nullptr, 'S'},
+    {"timestamp", 2, nullptr, 't'},
+    {"state", 0, nullptr, 's'},
+    {"brightness", 2, nullptr, 'B'},
+    {"contrast", 2, nullptr, 'C'},
+    {"hue", 2, nullptr, 'H'},
+    {"contrast", 2, nullptr, 'O'},
+    {"read_index", 0, nullptr, 'R'},
+    {"write_index", 0, nullptr, 'W'},
+    {"event", 0, nullptr, 'e'},
+    {"fps", 0, nullptr, 'f'},
+    {"zones", 2, nullptr, 'z'},
+    {"alarm", 0, nullptr, 'a'},
+    {"noalarm", 0, nullptr, 'n'},
+    {"cancel", 0, nullptr, 'c'},
+    {"reload", 0, nullptr, 'L'},
+    {"enable", 0, nullptr, 'E'},
+    {"disable", 0, nullptr, 'D'},
+    {"suspend", 0, nullptr, 'u'},
+    {"resume", 0, nullptr, 'r'},
+    {"query", 0, nullptr, 'q'},
+    {"username", 1, nullptr, 'U'},
+    {"password", 1, nullptr, 'P'},
+    {"auth", 1, nullptr, 'A'},
+    {"token", 1, nullptr, 'T'},
+    {"version", 1, nullptr, 'V'},
+    {"help", 0, nullptr, 'h'},
+    {"list", 0, nullptr, 'l'},
+    {nullptr, 0, nullptr, 0}
   };
 
-  const char *device = 0;
+  const char *device = nullptr;
   int mon_id = 0;
   bool verbose = false;
   int function = ZMU_BOGUS;
@@ -261,10 +260,10 @@ int main(int argc, char *argv[]) {
   int contrast = -1;
   int hue = -1;
   int colour = -1;
-  char *zoneString = 0;
-  char *username = 0;
-  char *password = 0;
-  char *auth = 0;
+  char *zoneString = nullptr;
+  char *username = nullptr;
+  char *password = nullptr;
+  char *auth = nullptr;
   std::string jwt_token_str = "";
 #if ZM_HAS_V4L
 #if ZM_HAS_V4L2
@@ -430,7 +429,9 @@ int main(int argc, char *argv[]) {
   User *user = 0;
 
   if ( config.opt_use_auth ) {
-    if ( strcmp(config.auth_relay, "none") == 0 ) {
+    if ( jwt_token_str != "" ) {
+      user = zmLoadTokenUser(jwt_token_str, false);
+    } else if ( strcmp(config.auth_relay, "none") == 0 ) {
       if ( !username ) {
         Error("Username must be supplied");
         exit_zmu(-1);
@@ -444,13 +445,10 @@ int main(int argc, char *argv[]) {
       user = zmLoadUser(username);
     } else {
        
-      if ( !(username && password) && !auth  && (jwt_token_str=="")) {
+      if ( !(username && password) && !auth ) {
         Error("Username and password or auth/token string must be supplied");
         exit_zmu(-1);
       }
-      if (jwt_token_str != "") {
-        user = zmLoadTokenUser(jwt_token_str, false);
-      }
       if ( auth ) {
         user = zmLoadAuthUser(auth, false);
       }
@@ -477,225 +475,234 @@ int main(int argc, char *argv[]) {
   } // end if auth
 
   if ( mon_id > 0 ) {
-		//fprintf(stderr,"Monitor %d\n", mon_id);
     Monitor *monitor = Monitor::Load(mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY);
-    if ( monitor ) {
-        //fprintf(stderr,"Monitor %d(%s)\n", monitor->Id(), monitor->Name());
-      if ( verbose ) {
-        printf("Monitor %d(%s)\n", monitor->Id(), monitor->Name());
-      }
-      if ( ! monitor->connect() ) {
-        Error("Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name());
-        exit_zmu(-1);
-      }
+    if ( !monitor ) {
+      Error("Unable to load monitor %d", mon_id);
+      exit_zmu(-1);
+    } // end if ! MONITOR
 
-      char separator = ' ';
-      bool have_output = false;
-      if ( function & ZMU_STATE ) {
-        Monitor::State state = monitor->GetState();
-        if ( verbose ) {
-          printf("Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle"));
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%d", state);
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_TIME ) {
-        struct timeval timestamp = monitor->GetTimestamp( image_idx );
-        if ( verbose ) {
-          char timestamp_str[64] = "None";
-          if ( timestamp.tv_sec )
-            strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime(&timestamp.tv_sec));
-          if ( image_idx == -1 )
-            printf("Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000);
-          else
-            printf("Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000);
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000);
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_READ_IDX ) {
-        if ( verbose )
-          printf("Last read index: %d\n", monitor->GetLastReadIndex());
-        else {
-          if ( have_output ) printf("%c", separator);
-          printf("%d", monitor->GetLastReadIndex());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_WRITE_IDX ) {
-        if ( verbose ) {
-          printf("Last write index: %d\n", monitor->GetLastWriteIndex());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%d", monitor->GetLastWriteIndex());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_EVENT ) {
-        if ( verbose ) {
-          printf("Last event id: %" PRIu64 "\n", monitor->GetLastEventId());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%" PRIu64, monitor->GetLastEventId());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_FPS ) {
-        if ( verbose )
-          printf("Current capture rate: %.2f frames per second\n", monitor->GetFPS());
-        else {
-          if ( have_output ) printf("%c", separator);
-          printf("%.2f", monitor->GetFPS());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_IMAGE ) {
-        if ( verbose ) {
-          if ( image_idx == -1 )
-            printf("Dumping last image captured to Monitor%d.jpg", monitor->Id());
-          else
-            printf("Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id());
-          if ( scale != -1 )
-            printf(", scaling by %d%%", scale);
-          printf("\n");
-        }
-        monitor->GetImage(image_idx, scale>0?scale:100);
-      }
-      if ( function & ZMU_ZONES ) {
-        if ( verbose )
-          printf("Dumping zone image to Zones%d.jpg\n", monitor->Id());
-        monitor->DumpZoneImage(zoneString);
-      }
-      if ( function & ZMU_ALARM ) {
-        if ( monitor->GetFunction() == Monitor::Function::MONITOR ) {
-         printf("A Monitor in monitor mode cannot handle alarms.  Please use NoDect\n");
-        } else {
-          if ( verbose )
-            printf("Forcing alarm on\n");
-          monitor->ForceAlarmOn(config.forced_alarm_score, "Forced Web");
-          while ( (monitor->GetState() != Monitor::ALARM) && !zm_terminate ) {
-            // Wait for monitor to notice.
-            usleep(1000);
-          }
-          printf("Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId());
-        } // end if ! MONITOR
-      }
-      if ( function & ZMU_NOALARM ) {
-        if ( verbose )
-          printf("Forcing alarm off\n");
-        monitor->ForceAlarmOff();
-      }
-      if ( function & ZMU_CANCEL ) {
-        if ( verbose )
-          printf("Cancelling forced alarm on/off\n");
-        monitor->CancelForced();
-      }
-      if ( function & ZMU_RELOAD ) {
-        if ( verbose )
-          printf("Reloading monitor settings\n");
-        monitor->actionReload();
-      }
-      if ( function & ZMU_ENABLE ) {
-        if ( verbose )
-          printf("Enabling event generation\n");
-        monitor->actionEnable();
-      }
-      if ( function & ZMU_DISABLE ) {
-        if ( verbose )
-          printf("Disabling event generation\n");
-        monitor->actionDisable();
-      }
-      if ( function & ZMU_SUSPEND ) {
-        if ( verbose )
-          printf("Suspending event generation\n");
-        monitor->actionSuspend();
-      }
-      if ( function & ZMU_RESUME ) {
-        if ( verbose )
-          printf("Resuming event generation\n");
-        monitor->actionResume();
-      }
-      if ( function & ZMU_QUERY ) {
-        char monString[16382] = "";
-        monitor->DumpSettings(monString, verbose);
-        printf("%s\n", monString);
-      }
-      if ( function & ZMU_BRIGHTNESS ) {
-        if ( verbose ) {
-          if ( brightness >= 0 )
-            printf("New brightness: %d\n", monitor->actionBrightness(brightness));
-          else
-            printf("Current brightness: %d\n", monitor->actionBrightness());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          if ( brightness >= 0 )
-            printf("%d", monitor->actionBrightness(brightness));
-          else
-            printf("%d", monitor->actionBrightness());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_CONTRAST ) {
-        if ( verbose ) {
-          if ( contrast >= 0 )
-            printf("New brightness: %d\n", monitor->actionContrast(contrast));
-          else
-            printf("Current contrast: %d\n", monitor->actionContrast());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          if ( contrast >= 0 )
-            printf("%d", monitor->actionContrast(contrast));
-          else
-            printf("%d", monitor->actionContrast());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_HUE ) {
-        if ( verbose ) {
-          if ( hue >= 0 )
-            printf("New hue: %d\n", monitor->actionHue(hue));
-          else
-            printf("Current hue: %d\n", monitor->actionHue());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          if ( hue >= 0 )
-            printf("%d", monitor->actionHue(hue));
-          else
-            printf("%d", monitor->actionHue());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_COLOUR ) {
-        if ( verbose ) {
-          if ( colour >= 0 )
-            printf("New colour: %d\n", monitor->actionColour(colour));
-          else
-            printf("Current colour: %d\n", monitor->actionColour());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          if ( colour >= 0 )
-            printf("%d", monitor->actionColour(colour));
-          else
-            printf("%d", monitor->actionColour());
-          have_output = true;
-        }
-      }
-      if ( have_output ) {
-        printf("\n");
-      }
-      if ( !function ) {
-        Usage();
-      }
+    if ( verbose ) {
+      printf("Monitor %d(%s)\n", monitor->Id(), monitor->Name());
+    }
+    if ( !monitor->connect() ) {
+      Error("Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name());
       delete monitor;
-    } else {
-      Error("Invalid monitor id %d", mon_id);
+      monitor = nullptr;
       exit_zmu(-1);
     }
-  } else {
+
+    char separator = ' ';
+    bool have_output = false;
+    if ( function & ZMU_STATE ) {
+      Monitor::State state = monitor->GetState();
+      if ( verbose ) {
+        printf("Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle"));
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%d", state);
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_TIME ) {
+      struct timeval timestamp = monitor->GetTimestamp(image_idx);
+      if ( verbose ) {
+        char timestamp_str[64] = "None";
+        if ( timestamp.tv_sec )
+          strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime(&timestamp.tv_sec));
+        if ( image_idx == -1 )
+          printf("Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000);
+        else
+          printf("Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000);
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000);
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_READ_IDX ) {
+      if ( verbose )
+        printf("Last read index: %d\n", monitor->GetLastReadIndex());
+      else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%d", monitor->GetLastReadIndex());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_WRITE_IDX ) {
+      if ( verbose ) {
+        printf("Last write index: %d\n", monitor->GetLastWriteIndex());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%d", monitor->GetLastWriteIndex());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_EVENT ) {
+      if ( verbose ) {
+        printf("Last event id: %" PRIu64 "\n", monitor->GetLastEventId());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%" PRIu64, monitor->GetLastEventId());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_FPS ) {
+      if ( verbose ) {
+        printf("Current capture rate: %.2f frames per second\n", monitor->GetFPS());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%.2f", monitor->GetFPS());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_IMAGE ) {
+      if ( verbose ) {
+        if ( image_idx == -1 )
+          printf("Dumping last image captured to Monitor%d.jpg", monitor->Id());
+        else
+          printf("Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id());
+        if ( scale != -1 )
+          printf(", scaling by %d%%", scale);
+        printf("\n");
+      }
+      monitor->GetImage(image_idx, scale>0?scale:100);
+    }
+    if ( function & ZMU_ZONES ) {
+      if ( verbose )
+        printf("Dumping zone image to Zones%d.jpg\n", monitor->Id());
+      monitor->DumpZoneImage(zoneString);
+    }
+    if ( function & ZMU_ALARM ) {
+      if ( monitor->GetFunction() == Monitor::Function::MONITOR ) {
+        printf("A Monitor in monitor mode cannot handle alarms.  Please use NoDect\n");
+      } else {
+        Monitor::State state = monitor->GetState();
+
+        if ( verbose ) {
+          printf("Forcing alarm on current state: %s, event %" PRIu64 "\n",
+              state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle"),
+              monitor->GetLastEventId()
+              );
+        }
+        monitor->ForceAlarmOn(config.forced_alarm_score, "Forced Web");
+        while ( ((state = monitor->GetState()) != Monitor::ALARM) && !zm_terminate ) {
+          // Wait for monitor to notice.
+          usleep(1000);
+        }
+        printf("Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId());
+      }
+    }  // end if ZMU_ALARM
+
+    if ( function & ZMU_NOALARM ) {
+      if ( verbose )
+        printf("Forcing alarm off\n");
+      monitor->ForceAlarmOff();
+    }
+    if ( function & ZMU_CANCEL ) {
+      if ( verbose )
+        printf("Cancelling forced alarm on/off\n");
+      monitor->CancelForced();
+    }
+    if ( function & ZMU_RELOAD ) {
+      if ( verbose )
+        printf("Reloading monitor settings\n");
+      monitor->actionReload();
+    }
+    if ( function & ZMU_ENABLE ) {
+      if ( verbose )
+        printf("Enabling event generation\n");
+      monitor->actionEnable();
+    }
+    if ( function & ZMU_DISABLE ) {
+      if ( verbose )
+        printf("Disabling event generation\n");
+      monitor->actionDisable();
+    }
+    if ( function & ZMU_SUSPEND ) {
+      if ( verbose )
+        printf("Suspending event generation\n");
+      monitor->actionSuspend();
+    }
+    if ( function & ZMU_RESUME ) {
+      if ( verbose )
+        printf("Resuming event generation\n");
+      monitor->actionResume();
+    }
+    if ( function & ZMU_QUERY ) {
+      char monString[16382] = "";
+      monitor->DumpSettings(monString, verbose);
+      printf("%s\n", monString);
+    }
+    if ( function & ZMU_BRIGHTNESS ) {
+      if ( verbose ) {
+        if ( brightness >= 0 )
+          printf("New brightness: %d\n", monitor->actionBrightness(brightness));
+        else
+          printf("Current brightness: %d\n", monitor->actionBrightness());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        if ( brightness >= 0 )
+          printf("%d", monitor->actionBrightness(brightness));
+        else
+          printf("%d", monitor->actionBrightness());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_CONTRAST ) {
+      if ( verbose ) {
+        if ( contrast >= 0 )
+          printf("New brightness: %d\n", monitor->actionContrast(contrast));
+        else
+          printf("Current contrast: %d\n", monitor->actionContrast());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        if ( contrast >= 0 )
+          printf("%d", monitor->actionContrast(contrast));
+        else
+          printf("%d", monitor->actionContrast());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_HUE ) {
+      if ( verbose ) {
+        if ( hue >= 0 )
+          printf("New hue: %d\n", monitor->actionHue(hue));
+        else
+          printf("Current hue: %d\n", monitor->actionHue());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        if ( hue >= 0 )
+          printf("%d", monitor->actionHue(hue));
+        else
+          printf("%d", monitor->actionHue());
+        have_output = true;
+      }
+    }
+    if ( function & ZMU_COLOUR ) {
+      if ( verbose ) {
+        if ( colour >= 0 )
+          printf("New colour: %d\n", monitor->actionColour(colour));
+        else
+          printf("Current colour: %d\n", monitor->actionColour());
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        if ( colour >= 0 )
+          printf("%d", monitor->actionColour(colour));
+        else
+          printf("%d", monitor->actionColour());
+        have_output = true;
+      }
+    }
+
+    if ( have_output ) {
+      printf("\n");
+    }
+    if ( !function ) {
+      Usage();
+    }
+    delete monitor;
+    monitor = nullptr;
+  } else { // non monitor functions
     if ( function & ZMU_QUERY ) {
 #if ZM_HAS_V4L
 			char vidString[0x10000] = "";
@@ -709,11 +716,11 @@ int main(int argc, char *argv[]) {
     }
 
     if ( function & ZMU_LIST ) {
-      std::string sql = "select Id, Function+0 from Monitors";
+      std::string sql = "SELECT `Id`, `Function`+0 FROM `Monitors`";
       if ( !verbose ) {
-        sql += "where Function != 'None'";
+        sql += "WHERE `Function` != 'None'";
       }
-      sql += " order by Id asc";
+      sql += " ORDER BY Id ASC";
 
       if ( mysql_query(&dbconn, sql.c_str()) ) {
         Error("Can't run query: %s", mysql_error(&dbconn));
@@ -767,8 +774,9 @@ int main(int argc, char *argv[]) {
       } // end foreach row
       mysql_free_result(result);
     } // end if function && ZMU_LIST
-  }
+  } // end if monitor id or not
   delete user;
 
-  return exit_zmu(0);
-}
+  exit_zmu(0);
+  return 0;
+}  // end int main()
diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index f80bc520c..d6107c5a9 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -80,7 +80,7 @@ fi;
 
 if [ "$DISTROS" == "" ]; then
   if [ "$RELEASE" != "" ]; then
-    DISTROS="xenial,bionic,disco,trusty"
+    DISTROS="xenial,bionic,focal"
   else
     DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
   fi;
@@ -110,7 +110,12 @@ else
   fi;
   if [ "$SNAPSHOT" == "stable" ]; then
     if [ "$BRANCH" == "" ]; then
-      BRANCH=$(git describe --tags $(git rev-list --tags --max-count=1));
+      #REV=$(git rev-list --tags --max-count=1)
+      BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
+      if [ "$BRANCH" == "" ]; then
+        echo "Unable to determine latest stable branch!"
+        exit 0;
+      fi
       echo "Latest stable branch is $BRANCH";
     fi;
   else
@@ -120,18 +125,22 @@ else
     fi;
     if [ "$SNAPSHOT" == "NOW" ]; then
       SNAPSHOT=`date +%Y%m%d%H%M%S`;
+    else
+      if [ "$SNAPSHOT" == "CURRENT" ]; then
+        SNAPSHOT="`date +%Y%m%d.`$(git rev-list ${versionhash}..HEAD --count)"
+      fi;
     fi;
   fi;
 fi
 
+IFS='.' read -r -a VERSION_PARTS <<< "$RELEASE"
 if [ "$PPA" == "" ]; then
   if [ "$RELEASE" != "" ]; then
     # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
-    IFS='.' read -r -a VERSION <<< "$RELEASE"
-    if [ "${VERSION[0]}.${VERSION[1]}" == "1.30" ]; then
+    if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
       PPA="ppa:iconnor/zoneminder-stable"
     else
-      PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
+      PPA="ppa:iconnor/zoneminder-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
     fi;
   else
     if [ "$BRANCH" == "" ]; then
@@ -147,10 +156,14 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
   if [ -d "${GITHUB_FORK}_ZoneMinder.git" ]; then
     echo "Using local clone ${GITHUB_FORK}_ZoneMinder.git to pull from."
     cd "${GITHUB_FORK}_ZoneMinder.git"
-    echo "git pull..."
-    git pull
+    echo "git fetch..."
+    git fetch
     echo "git checkout $BRANCH"
     git checkout $BRANCH
+    if [ $? -ne 0 ]; then
+      echo "Failed to switch to branch."
+      exit 1;
+    fi;
     echo "git pull..."
     git pull
     cd ../
@@ -171,7 +184,7 @@ cd ../
 
 VERSION=`cat ${GITHUB_FORK}_zoneminder_release/version`
 
-if [ $VERSION == "" ]; then
+if [ -z "$VERSION" ]; then
   exit 1;
 fi;
 if [ "$SNAPSHOT" != "stable" ] && [ "$SNAPSHOT" != "" ]; then
@@ -216,14 +229,13 @@ IFS=',' ;for DISTRO in `echo "$DISTROS"`; do
   fi;
 
   # Generate Changlog
-  if [ "$DISTRO" == "trusty" ] || [ "$DISTRO" == "precise" ]; then 
-    cp -Rpd distros/ubuntu1204 debian
-  else 
-    if [ "$DISTRO" == "wheezy" ]; then 
-      cp -Rpd distros/debian debian
-    else 
-      cp -Rpd distros/ubuntu1604 debian
-    fi;
+  if [ "$DISTRO" == "focal" ] || [ "$DISTRO" == "buster" ]; then 
+    cp -Rpd distros/ubuntu2004 debian
+  elif [ "$DISTRO" == "beowulf" ]
+  then
+    cp -Rpd distros/beowulf debian
+  else
+    cp -Rpd distros/ubuntu1604 debian
   fi;
 
   if [ "$DEBEMAIL" != "" ] && [ "$DEBFULLNAME" != "" ]; then
@@ -312,7 +324,7 @@ EOF
       read -p "Do you want to upload this binary to zmrepo? (y/N)"
       if [[ $REPLY == [yY] ]]; then
         if [ "$RELEASE" != "" ]; then
-          scp "zoneminder_${VERSION}-${DISTRO}"* "zoneminder-doc_${VERSION}-${DISTRO}"* "zoneminder-dbg_${VERSION}-${DISTRO}"* "zoneminder_${VERSION}.orig.tar.gz" "zmrepo@zmrepo.connortechnology.com:debian/stable/mini-dinstall/incoming/"
+          scp "zoneminder_${VERSION}-${DISTRO}"* "zoneminder-doc_${VERSION}-${DISTRO}"* "zoneminder-dbg_${VERSION}-${DISTRO}"* "zoneminder_${VERSION}.orig.tar.gz" "zmrepo@zmrepo.connortechnology.com:debian/release-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}/mini-dinstall/incoming/"
         else
           if [ "$BRANCH" == "" ]; then
             scp "zoneminder_${VERSION}-${DISTRO}"* "zoneminder-doc_${VERSION}-${DISTRO}"* "zoneminder-dbg_${VERSION}-${DISTRO}"* "zoneminder_${VERSION}.orig.tar.gz" "zmrepo@zmrepo.connortechnology.com:debian/master/mini-dinstall/incoming/"
@@ -327,7 +339,7 @@ EOF
 
     dput="Y";
     if [ "$INTERACTIVE" != "no" ]; then
-      read -p "Ready to dput $SC to $PPA ? Y/N...";
+      read -p "Ready to dput $SC to $PPA ? Y/n...";
       if [[ "$REPLY" == [yY] ]]; then
         dput $PPA $SC
       fi;
diff --git a/utils/mk_bigfont.pl b/utils/mk_bigfont.pl
index 41ebb34bf..96e6881c3 100755
--- a/utils/mk_bigfont.pl
+++ b/utils/mk_bigfont.pl
@@ -48,18 +48,18 @@ while (my $line = <F>) {
     $in_head-- if $line =~ /^$/ and $in_head;
     next while $in_head;
     unless ($line =~ /^\s+(0x..), \/\* (........)/) {
-        $line =~ s/static unsigned char fontdata/static unsigned int bigfontdata/;
+      #$line =~ s/static unsigned char fontdata/static unsigned int bigfontdata/;
         print $line;
         next;
     }
     my $code = $1;
     my $bincode = $2;
     $bincode = "$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8" if $bincode =~ /(.)(.)(.)(.)(.)(.)(.)(.)$/;
-    $bincode =~ s/ /1/g;
-    my $intcode = unpack("N", pack("B32", substr("0" x 32 . $bincode, -32)));
-    my $hexcode = sprintf("%#x", $intcode);
-    $hexcode =~ s/^0$/0x0/;
-    $bincode =~ s/1/ /g;
+    #$bincode =~ s/ /1/g;
+    #my $intcode = unpack("N", pack("B32", substr("0" x 32 . $bincode, -32)));
+    #my $hexcode = sprintf("%#x", $intcode);
+    #$hexcode =~ s/^0$/0x0/;
+    #$bincode =~ s/1/ /g;
     print sprintf("\t%10s, /* %s */\n", $hexcode, $bincode);
     print sprintf("\t%10s, /* %s */\n", $hexcode, $bincode);
 }
diff --git a/utils/packpack/rsync_xfer.sh b/utils/packpack/rsync_xfer.sh
index 8a7f01f4f..5078194a4 100755
--- a/utils/packpack/rsync_xfer.sh
+++ b/utils/packpack/rsync_xfer.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# We don't deploy during eslint checks, so exit immediately
+if [ "${DIST}" == "eslint" ]; then
+  exit 0
+fi
+
 # Check to see if this script has access to all the commands it needs
 for CMD in sshfs rsync find fusermount mkdir; do
   type $CMD 2>&1 > /dev/null
@@ -12,39 +17,35 @@ for CMD in sshfs rsync find fusermount mkdir; do
   fi
 done
 
-# We only want to deploy packages during cron events
-# See https://docs.travis-ci.com/user/cron-jobs/
-if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then
-
-    if [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then
-        targetfolder="debian/master/mini-dinstall/incoming"
+if [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbian" ]; then
+  if [ "${RELEASE}" != "" ]; then
+    IFS='.' read -r -a VERSION_PARTS <<< "$RELEASE"
+    if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
+      targetfolder="debian/release/mini-dinstall/incoming"
     else
-        targetfolder="travis"
-    fi
-
-    echo
-    echo "Target subfolder set to $targetfolder"
-    echo
-
-    mkdir -p ./zmrepo
-    ssh_mntchk="$(sshfs zmrepo@zmrepo.zoneminder.com:./ ./zmrepo -o workaround=rename,reconnect 2>&1)"
-
-    if [ -z "$ssh_mntchk" ]; then
-        echo
-        echo "Remote filesystem mounted successfully."
-        echo "Begin transfering files..."
-        echo
-
-        # Don't keep packages older than 5 days
-        find ./zmrepo/$targetfolder/ -maxdepth 1 -type f -mtime +5 -delete
-        rsync -vzlh --ignore-errors build/* zmrepo/$targetfolder/
-        fusermount -zu zmrepo
-    else
-        echo
-        echo "ERROR: Attempt to mount zmrepo.zoneminder.com failed!"
-        echo "sshfs gave the following error message:"
-        echo \"$ssh_mntchk\"
-        echo
-        exit 99
+      targetfolder="debian/release-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}/mini-dinstall/incoming"
     fi
+  else
+    targetfolder="debian/master/mini-dinstall/incoming"
+  fi
+else
+  targetfolder="travis"
+fi
+
+echo
+echo "Target subfolder set to $targetfolder"
+echo
+
+echo "Running \$(rsync -v -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,buildinfo,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1)"
+rsync -v --ignore-missing-args --exclude 'external-repo.noarch.rpm' -e 'ssh -v' build/*.{rpm,deb,dsc,tar.xz,buildinfo,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1
+if [ "$?" -eq 0 ]; then
+  echo 
+  echo "Files copied successfully."
+  echo
+else 
+  echo
+  echo "ERROR: Attempt to rsync to zmrepo.zoneminder.com failed!"
+  echo "See log output for details."
+  echo
+  exit 99
 fi
diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 677fa1f32..1b2eafd8f 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -o pipefail
+
 # packpack setup file for the ZoneMinder project
 # Written by Andrew Bauer
 
@@ -9,7 +12,7 @@
 # General sanity checks
 checksanity () {
     # Check to see if this script has access to all the commands it needs
-    for CMD in set echo curl git ln mkdir rmdir cat patch; do
+    for CMD in set echo curl git ln mkdir rmdir cat patch sed; do
       type $CMD 2>&1 > /dev/null
 
       if [ $? -ne 0 ]; then
@@ -19,7 +22,7 @@ checksanity () {
         exit 1
       fi
     done
-   
+
     # Verify OS & DIST environment variables have been set before calling this script
     if [ -z "${OS}" ] || [ -z "${DIST}" ]; then
         echo "ERROR: both OS and DIST environment variables must be set"
@@ -30,7 +33,7 @@ checksanity () {
         ARCH="x86_64"
     fi
 
-    if [[ "${ARCH}" != "x86_64" && "${ARCH}" != "i386" && "${ARCH}" != "armhf" ]]; then
+    if [[ "${ARCH}" != "x86_64" && "${ARCH}" != "i386" && "${ARCH}" != "armhf" && "${ARCH}" != "aarch64" ]]; then
         echo
         echo "ERROR: Unsupported architecture specified \"${ARCH}\"."
         echo
@@ -86,31 +89,9 @@ commonprep () {
         git -C packpack pull origin master
     else
         echo "Cloning packpack github repo..."
-        git clone https://github.com/packpack/packpack.git packpack
+        git clone https://github.com/zoneminder/packpack.git packpack
     fi
 
-    # Rpm builds are broken in latest packpack master. Temporarily roll back.
-    #git -C packpack checkout 7cf23ee
-
-    # Patch packpack
-    patch --dry-run --silent -f -p1 < utils/packpack/packpack-rpm.patch
-    if [ $? -eq 0 ]; then
-        patch -p1 < utils/packpack/packpack-rpm.patch
-    fi
-
-    # Skip deb lintian checks to speed up the build
-    patch --dry-run --silent -f -p1 < utils/packpack/nolintian.patch
-    if [ $? -eq 0 ]; then
-        patch -p1 < utils/packpack/nolintian.patch
-    fi
-
-    # fix 32bit rpm builds
-    # FIXME: breaks arm rpm builds
-    #patch --dry-run --silent -f -p1 < utils/packpack/setarch.patch
-    #if [ $? -eq 0 ]; then
-    #    patch -p1 < utils/packpack/setarch.patch
-    #fi
-
     # The rpm specfile requires we download each submodule as a tarball then manually move it into place
     # Might as well do this for Debian as well, rather than git submodule init
     CRUDVER="3.1.0-zm"
@@ -142,7 +123,7 @@ commonprep () {
 movecrud () {
     if [ -e "web/api/app/Plugin/Crud/LICENSE.txt" ]; then
         echo "Crud plugin already installed..."
-    else     
+    else
         echo "Unpacking Crud plugin..."
         tar -xzf build/crud-${CRUDVER}.tar.gz
         rmdir web/api/app/Plugin/Crud
@@ -150,7 +131,7 @@ movecrud () {
     fi
     if [ -e "web/api/app/Plugin/CakePHP-Enum-Behavior/readme.md" ]; then
         echo "CakePHP-Enum-Behavior plugin already installed..."
-    else     
+    else
         echo "Unpacking CakePHP-Enum-Behavior plugin..."
         tar -xzf build/cakephp-enum-behavior-${CEBVER}.tar.gz
         rmdir web/api/app/Plugin/CakePHP-Enum-Behavior
@@ -159,8 +140,8 @@ movecrud () {
 }
 
 # previsouly part of installzm.sh
-# install the trusty deb and test zoneminder
-installtrusty () {
+# install the xenial deb and test zoneminder
+install_deb () {
 
     # Check we've got gdebi installed
     type gdebi 2>&1 > /dev/null
@@ -172,14 +153,18 @@ installtrusty () {
       exit 1
     fi
 
-    # Install and test the zoneminder package (only) for Ubuntu Trusty
+    # Install and test the zoneminder package (only) for Ubuntu Xenial
     pkgname="build/zoneminder_${VERSION}-${RELEASE}_amd64.deb"
 
     if [ -e $pkgname ]; then
         sudo gdebi --quiet --non-interactive $pkgname
+        echo "Return code from installing $?"
         mysql -uzmuser -pzmpass zm < db/test.monitor.sql
+        echo "Return code from adding test monitor $?"
         sudo /usr/bin/zmpkg.pl start
-        sudo /usr/bin/zmfilter.pl -f purgewhenfull
+        echo "Return code from starting $?"
+        sudo /usr/bin/zmfilter.pl --filter=purgewhenfull
+        echo "Return code from running purgewhenfull $?"
     else
       echo
       echo "ERROR: The script cannot find the package $pkgname"
@@ -200,7 +185,7 @@ setrpmpkgname () {
     export RELEASE="1.${numcommits}.${thedate}git${shorthash}"
 
     checkvars
-    
+
     echo
     echo "Packpack VERSION has been set to: ${VERSION}"
     echo "Packpack RELEASE has been set to: ${RELEASE}"
@@ -219,7 +204,7 @@ setdebpkgname () {
     export RELEASE="${DIST}"
 
     checkvars
-    
+
     echo
     echo "Packpack VERSION has been set to: ${VERSION}"
     echo "Packpack RELEASE has been set to: ${RELEASE}"
@@ -241,9 +226,9 @@ setrpmchangelog () {
 setdebchangelog () {
 DATE=`date -R`
 cat <<EOF > debian/changelog
-zoneminder ($VERSION-${DIST}-1) unstable; urgency=low
-  * 
- -- Isaac Connor <iconnor@connortechnology.com>  $DATE
+zoneminder ($VERSION-${DIST}) ${DIST}; urgency=low
+  *
+ -- Isaac Connor <isaac@zoneminder.com>  $DATE
 EOF
 }
 
@@ -268,6 +253,13 @@ execpackpack () {
     else
         packpack/packpack $parms
     fi
+
+    if [ $? -ne 0 ]; then
+      echo
+      echo "ERROR: An error occurred while executing packpack."
+      echo
+      exit 1
+    fi
 }
 
 # Check for connectivity with the deploy target host
@@ -293,6 +285,8 @@ checkdeploytarget () {
         echo "*** TRACEROUTE ***"
         echo
         traceroute -w 2 -m 15 ${DEPLOYTARGET}
+
+        exit 97
     fi
 }
 
@@ -309,87 +303,84 @@ if [ "${TRAVIS}" == "true" ]; then
 fi
 checksanity
 
-# We don't want to build packages for all supported distros after every commit
-# Only build all packages when executed via cron
-# See https://docs.travis-ci.com/user/cron-jobs/
-if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true"  ]; then
-    commonprep
+# Steps common to Redhat distros
+if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then
+  commonprep
+  echo "Begin Redhat build..."
 
-    # Steps common to Redhat distros
-    if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then
-        echo "Begin Redhat build..."
+  # Newer Redhat distros use dnf package manager rather than yum
+  if [ "${DIST}" -gt "7" ]; then
+    sed -i 's\yum\dnf\' utils/packpack/redhat_package.mk
+  fi
 
-        setrpmpkgname
+  setrpmpkgname
 
-        ln -sfT distros/redhat rpm
+  ln -sfT distros/redhat rpm
 
-        # The rpm specfile requires the Crud submodule folder to be empty
-        rm -rf web/api/app/Plugin/Crud
-        mkdir web/api/app/Plugin/Crud
+  # The rpm specfile requires the Crud submodule folder to be empty
+  rm -rf web/api/app/Plugin/Crud
+  mkdir web/api/app/Plugin/Crud
 
-        reporpm="rpmfusion-free-release"
-        dlurl="https://download1.rpmfusion.org/free/${OS}/${reporpm}-${DIST}.noarch.rpm"
+  reporpm="rpmfusion-free-release"
+  dlurl="https://download1.rpmfusion.org/free/${OS}/${reporpm}-${DIST}.noarch.rpm"
 
-        # Give our downloaded repo rpm a common name so redhat_package.mk can find it
-        if [ -n "$dlurl" ] && [ $? -eq 0  ]; then
-            echo "Retrieving ${reporpm} repo rpm..."
-            curl $dlurl > build/external-repo.noarch.rpm
-        else
-            echo "ERROR: Failed to retrieve ${reporpm} repo rpm..."
-            echo "Download url was: $dlurl"
-            exit 1
-        fi
+  # Give our downloaded repo rpm a common name so redhat_package.mk can find it
+  if [ -n "$dlurl" ] && [ $? -eq 0  ]; then
+    echo "Retrieving ${reporpm} repo rpm..."
+    curl $dlurl > build/external-repo.noarch.rpm
+  else
+    echo "ERROR: Failed to retrieve ${reporpm} repo rpm..."
+    echo "Download url was: $dlurl"
+    exit 1
+  fi
 
-        setrpmchangelog
+  setrpmchangelog
 
-        echo "Starting packpack..."
-        execpackpack
+  echo "Starting packpack..."
+  execpackpack
 
-    # Steps common to Debian based distros
-    elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbian" ]; then
-        echo "Begin ${OS} ${DIST} build..."
+# Steps common to Debian based distros
+elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbian" ]; then
+  commonprep
+  echo "Begin ${OS} ${DIST} build..."
 
-        setdebpkgname
-        movecrud
+  setdebpkgname
+  movecrud
 
-        if [ "${DIST}" == "trusty" ] || [ "${DIST}" == "precise" ]; then
-            ln -sfT distros/ubuntu1204 debian
-        elif [ "${DIST}" == "wheezy" ]; then 
-            ln -sfT distros/debian debian
-        else 
-            ln -sfT distros/ubuntu1604 debian
-        fi
-        
-        setdebchangelog
-        
-        echo "Starting packpack..."
-        execpackpack
-        
-        if [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ] && [ "${ARCH}" == "x86_64" ] && [ "${TRAVIS}" == "true" ]; then
-            installtrusty
-        fi
+  if [ "${DIST}" == "focal" ] || [ "${DIST}" == "buster" ]; then
+    ln -sfT distros/ubuntu2004 debian
+  elif [ "${DIST}" == "beowulf" ]; then
+    ln -sfT distros/beowulf debian
+  else
+    ln -sfT distros/ubuntu1604 debian
+  fi
+
+  setdebchangelog
+
+  echo "Starting packpack..."
+  execpackpack
+
+  # Try to install and run the newly built zoneminder package
+  if [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "bionic" ] && [ "${ARCH}" == "x86_64" ] && [ "${TRAVIS}" == "true" ]; then
+      echo "Begin Deb package installation..."
+      install_deb
+  fi
+
+# Steps common to eslint checks
+elif [ "${OS}" == "eslint" ] || [ "${DIST}" == "eslint" ]; then
+
+    # Check we've got npm installed
+    type npm 2>&1 > /dev/null
+
+    if [ $? -ne 0 ]; then
+      echo
+      echo "ERROR: The script cannot find the required command \"npm\"."
+      echo
+      exit 1
     fi
 
-# We were not triggered via cron so just build and test trusty
-elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ] && [ "${ARCH}" == "x86_64" ]; then
-    echo "Begin Ubuntu Trusty build..."
-
-    commonprep
-    setdebpkgname
-    movecrud
-
-    ln -sfT distros/ubuntu1204 debian
-
-    setdebchangelog
-    
-    echo "Starting packpack..."
-    execpackpack
-
-    # If we are running inside Travis then attempt to install the deb we just built
-    if [ "${TRAVIS}" == "true" ]; then
-        installtrusty
-    fi
+    npm install -g eslint@5.12.0 eslint-config-google@0.11.0 eslint-plugin-html@5.0.0 eslint-plugin-php-markup@0.2.5
+    echo "Begin eslint checks..."
+    eslint --ext .php,.js .
 fi
 
-exit 0
-
diff --git a/utils/resample_event_video.sh b/utils/resample_event_video.sh
new file mode 100755
index 000000000..845216cc0
--- /dev/null
+++ b/utils/resample_event_video.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+FFMPEG=`which ffmpeg`;
+
+if [ -z "$FFMPEG" ]; then
+  echo "You must install the ffmpeg package.  Try sudo apt-get install ffmpeg";
+  exit;
+fi
+
+for i in "$@"
+do
+case $i in
+ -r=*|--rate=*)
+   FPS="${i#*=}"
+   shift
+   ;;
+ -f=*|--file=*)
+   VIDEO_FILE="${i#*=}"
+   shift
+   ;;
+
+ *)
+   EVENT_PATH="${i#*=}"
+   shift
+   ;;
+esac
+done
+
+if [ -z "$EVENT_PATH" ]; then
+  echo "You must specify the path to the event.";
+  exit 255
+fi;
+
+if [ -z "$FPS" ]; then
+  echo "You must specify the new fps.";
+  exit 255
+fi;
+
+$FFMPEG -i "$EVENT_PATH/$VIDEO_FILE" -filter:v fps=fps=$FPS "$EVENT_PATH/output.mp4"
+echo $?
+if [ $? -eq 0 ]; then
+  mv "$EVENT_PATH/output.mp4" "$EVENT_PATH/$VIDEO_FILE"
+fi;
+
+exit 0;
diff --git a/utils/travis/bootstrap-zm.sh b/utils/travis/bootstrap-zm.sh
deleted file mode 100644
index 397a8f90e..000000000
--- a/utils/travis/bootstrap-zm.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -x
-
-set -e
-set -o pipefail
-set -x
-
-with_timestamps() {
-	while read -r line; do
-	echo -e "$(date +%T)\t$line";
-	done
-}
-
-
-bootstrap_zm() {
-
-	if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize --force; fi
-	if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal; fi
-	if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
-	if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
-	if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
-
-	mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
-	mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
-	mysql -uroot -e "FLUSH PRIVILEGES"
-	mysql -uzmuser -pzmpass < ${TRAVIS_BUILD_DIR}/db/zm_create.sql
-
-}
-
-bootstrap_zm | with_timestamps
diff --git a/utils/travis/build-zm.sh b/utils/travis/build-zm.sh
deleted file mode 100644
index 2d758f61b..000000000
--- a/utils/travis/build-zm.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail
-
-with_timestamps() {
-	while read -r line; do
-	echo -e "$(date +%T)\t$line";
-	done
-}
-
-cd $TRAVIS_BUILD_DIR
-
-build_zm() {
-
-	if [ "$ZM_BUILDMETHOD" = "autotools" ]; then
-		./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl
-	fi
-
-	if [ "$ZM_BUILDMETHOD" = "cmake" ]; then
-		cmake -DCMAKE_INSTALL_PREFIX="/usr"
-	fi
-
-	make
-	sudo make install
-
-	if [ "$ZM_BUILDMETHOD" = "cmake" ]; then
-		sudo ./zmlinkcontent.sh
-	fi
-
-}
-
-build_zm | with_timestamps
diff --git a/utils/travis/install-deps.sh b/utils/travis/install-deps.sh
deleted file mode 100644
index d7981cb5a..000000000
--- a/utils/travis/install-deps.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail
-
-with_timestamps() {
-	while read -r line; do
-	echo -e "$(date +%T)\t$line";
-	done
-}
-
-
-install_deps() {
-
-	sudo apt-get update -qq
-	sudo apt-get install -y -qq zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev 2>&1 > /dev/null 
-
-}
-
-install_deps | with_timestamps
diff --git a/utils/travis/install-ffmpeg.sh b/utils/travis/install-ffmpeg.sh
deleted file mode 100644
index c2a2e9733..000000000
--- a/utils/travis/install-ffmpeg.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-
-git clone --depth=10 --branch=master git://source.ffmpeg.org/ffmpeg.git 
-cd ffmpeg 
-./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
-make -j `grep processor /proc/cpuinfo|wc -l` 
-sudo make install 
-sudo make install-libs
diff --git a/utils/travis/run-tests.sh b/utils/travis/run-tests.sh
deleted file mode 100644
index c3bb392d9..000000000
--- a/utils/travis/run-tests.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail
-
-with_timestamps() {
-	while read -r line; do
-	echo -e "$(date +%T)\t$line";
-	done
-}
-
-run_tests() {
-	mysql -uzmuser -pzmpass zm < ../../db/test.monitor.sql
-	sudo zmu -l
-	sudo zmc -m1 &
-	sudo zma -m1 &
-	sudo zmu -l
-	sudo grep ERR /var/log/syslog
-	sudo zmpkg.pl start
-	sudo zmfilter.pl -f purgewhenfull
-}
-
-run_tests | with_timestamps
diff --git a/utils/zm-alarm.pl b/utils/zm-alarm.pl
index d68c82663..92171db99 100755
--- a/utils/zm-alarm.pl
+++ b/utils/zm-alarm.pl
@@ -16,7 +16,7 @@ my @monitors;
 my $dbh = zmDbConnect();
 
 my $sql = "SELECT * FROM Monitors
-  WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )".
+  WHERE find_in_set( `Function`, 'Modect,Mocord,Nodect' )".
   ( $Config{ZM_SERVER_ID} ? 'AND ServerId=?' : '' )
   ;
 
diff --git a/version b/version
index bd9492a0b..21cbe96c2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.14
+1.35.6
diff --git a/web/ajax/add_monitors.php b/web/ajax/add_monitors.php
index b7e3c376c..aaa86790e 100644
--- a/web/ajax/add_monitors.php
+++ b/web/ajax/add_monitors.php
@@ -54,18 +54,18 @@ if ( 0 ) {
           SOL_SOCKET,  // socket level
           SO_SNDTIMEO, // timeout option
           array(
-            "sec"=>0, // Timeout in seconds
-            "usec"=>500  // I assume timeout in microseconds
+            'sec'=>0, // Timeout in seconds
+            'usec'=>500  // I assume timeout in microseconds
             )
           );
       $new_stream = null;
-Info("Testing connection to " . $url_bits['host'].':'.$port);
+      Info('Testing connection to '.$url_bits['host'].':'.$port);
       if ( socket_connect( $socket, $url_bits['host'], $port ) ) {
         $new_stream = $url_bits; // make a copy
         $new_stream['port'] = $port;
       } else {
         socket_close($socket); 
-        ZM\Info("No connection to ".$url_bits['host'] . " on port $port");
+        ZM\Info('No connection to '.$url_bits['host'].' on port '.$port);
         continue;
       }
       if ( $new_stream ) {
@@ -100,10 +100,10 @@ Info("Testing connection to " . $url_bits['host'].':'.$port);
   }
   foreach ( $available_streams as &$stream ) {
     # check for existence in db.
-    $stream['url'] = unparse_url( $stream, array('path'=>'/','query'=>'action=stream') );
-    $monitors = ZM\Monitor::find( array('Path'=>$stream['url']) );
+    $stream['url'] = unparse_url($stream, array('path'=>'/','query'=>'action=stream'));
+    $monitors = ZM\Monitor::find(array('Path'=>$stream['url']));
     if ( count($monitors) ) {
-      ZM\Info("Found monitors matching " . $stream['url'] );
+      ZM\Info('Found monitors matching ' . $stream['url'] );
       $stream['Monitor'] = $monitors[0];
       if ( isset( $stream['Width'] ) and ( $stream['Monitor']->Width() != $stream['Width'] ) ) {
         $stream['Warning'] .= 'Monitor width ('.$stream['Monitor']->Width().') and stream width ('.$stream['Width'].") do not match!\n";
@@ -114,11 +114,11 @@ Info("Testing connection to " . $url_bits['host'].':'.$port);
     } else {
       $stream['Monitor'] = clone $defaultMonitor;
       if ( isset($stream['Width']) ) {
-        $stream['Monitor']->Width( $stream['Width'] );
-        $stream['Monitor']->Height( $stream['Height'] );
+        $stream['Monitor']->Width($stream['Width']);
+        $stream['Monitor']->Height($stream['Height']);
       }
       if ( isset($stream['Name']) ) {
-        $stream['Monitor']->Name( $stream['Name'] );
+        $stream['Monitor']->Name($stream['Name']);
       }
     } // Monitor found or not
   } // end foreach Stream
@@ -129,16 +129,16 @@ Info("Testing connection to " . $url_bits['host'].':'.$port);
   return $available_streams;
 } // end function probe
 
-if ( canEdit( 'Monitors' ) ) {
+if ( canEdit('Monitors') ) {
     switch ( $_REQUEST['action'] ) {
       case 'probe' :
         {
         $available_streams = array();
         $url_bits = null;
-        if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $_REQUEST['url'] ) ) {
-          $url_bits = array( 'host'=>$_REQUEST['url'] );
+        if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $_REQUEST['url']) ) {
+          $url_bits = array('host'=>$_REQUEST['url']);
         } else {
-          $url_bits = parse_url( $_REQUEST['url'] );
+          $url_bits = parse_url($_REQUEST['url']);
         }
 
 if ( 0 ) {
@@ -155,13 +155,13 @@ if ( 0 ) {
 }
 
         if ( ! $url_bits ) {
-          ajaxError("The given URL was too malformed to parse.");
+          ajaxError('The given URL was too malformed to parse.');
           return;
         }
 
-        $available_streams = probe( $url_bits );
+        $available_streams = probe($url_bits);
 
-        ajaxResponse( array('Streams'=>$available_streams) );
+        ajaxResponse(array('Streams'=>$available_streams));
         return;
       } // end case url_probe
       case 'import':
@@ -169,16 +169,16 @@ if ( 0 ) {
 
         $file = $_FILES['import_file'];
 
-        if ($file["error"] > 0) {
-          ajaxError($file["error"]);
+        if ( $file['error'] > 0 ) {
+          ajaxError($file['error']);
           return;
         } else {
-          $filename = $file["name"];
+          $filename = $file['name'];
 
-        $available_streams = array();
+          $available_streams = array();
           $row = 1;
-          if (($handle = fopen($file['tmp_name'], 'r')) !== FALSE) {
-            while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
+          if ( ($handle = fopen($file['tmp_name'], 'r')) !== FALSE ) {
+            while ( ($data = fgetcsv($handle, 1000, ',')) !== FALSE ) {
               $name = $data[0];
               $url = $data[1];
               $group = $data[2];
@@ -186,16 +186,16 @@ if ( 0 ) {
 
               $url_bits = null;
               if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $url) ) {
-                $url_bits = array( 'host'=>$url, 'scheme'=>'http' );
+                $url_bits = array('host'=>$url, 'scheme'=>'http');
               } else {
-                $url_bits = parse_url( $url );
+                $url_bits = parse_url($url);
               }
               if ( ! $url_bits ) {
                 ZM\Info("Bad url, skipping line $name $url $group");
                 continue;
               }
 
-              $available_streams += probe( $url_bits );
+              $available_streams += probe($url_bits);
 
               //$url_bits['url'] = unparse_url( $url_bits );
               //$url_bits['Monitor'] = $defaultMonitor;
@@ -205,23 +205,19 @@ if ( 0 ) {
               
             } // end while rows
             fclose($handle);
-            ajaxResponse( array('Streams'=>$available_streams) );
+            ajaxResponse(array('Streams'=>$available_streams));
           } else {
-            ajaxError("Uploaded file does not exist");
+            ajaxError('Uploaded file does not exist');
             return;
           }
-
         }
       } // end case import
       default:
-      {
-        ZM\Warning("unknown action " . $_REQUEST['action'] );
-      } // end ddcase default
-    }
+        ZM\Warning('unknown action '.$_REQUEST['action']);
+    } // end switch action
 } else {
-  ZM\Warning("Cannot edit monitors" );
+  ZM\Warning('Cannot edit monitors');
 }
 
-ajaxError( 'Unrecognised action or insufficient permissions' );
-
+ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user ' . $user['Username']);
 ?>
diff --git a/web/ajax/console.php b/web/ajax/console.php
index 1a5919b58..ae8a60b15 100644
--- a/web/ajax/console.php
+++ b/web/ajax/console.php
@@ -1,35 +1,33 @@
 <?php
 if ( canEdit('Monitors') ) {
-    switch ( $_REQUEST['action'] ) {
-      case 'sort' :
-        {
-          $monitor_ids = $_POST['monitor_ids'];
-          # Two concurrent sorts could generate odd sortings... so lock the table.
-          global $dbConn;
-          $dbConn->beginTransaction();
-          $dbConn->exec('LOCK TABLES Monitors WRITE');
-          for ( $i = 0; $i < count($monitor_ids); $i += 1 ) {
-            $monitor_id = $monitor_ids[$i];
-            $monitor_id = preg_replace( '/^monitor_id-/', '', $monitor_id );
-            if ( ( ! $monitor_id ) or ! ( is_integer( $monitor_id ) or ctype_digit( $monitor_id ) ) ) {
-              Warning("Got $monitor_id from " . $monitor_ids[$i]);
-              continue;
-            }
-            dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($i, $monitor_id));
-          } // end for each monitor_id
-          $dbConn->commit();
-          $dbConn->exec('UNLOCK TABLES');
-        
-          return;
-      } // end case sort
-      default:
-      {
-        ZM\Warning('unknown action ' . $_REQUEST['action']);
-      } // end ddcase default
-    }
+  switch ( $_REQUEST['action'] ) {
+  case 'sort' :
+  {
+    $monitor_ids = $_POST['monitor_ids'];
+    # Two concurrent sorts could generate odd sortings... so lock the table.
+    global $dbConn;
+    $dbConn->beginTransaction();
+    $dbConn->exec('LOCK TABLES Monitors WRITE');
+    for ( $i = 0; $i < count($monitor_ids); $i += 1 ) {
+      $monitor_id = $monitor_ids[$i];
+      $monitor_id = preg_replace('/^monitor_id-/', '', $monitor_id);
+      if ( ( !$monitor_id ) or ! ( is_integer($monitor_id) or ctype_digit($monitor_id) ) ) {
+        Warning('Got '.$monitor_id.' from '.$monitor_ids[$i]);
+        continue;
+      }
+      dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($i, $monitor_id));
+    } // end for each monitor_id
+    $dbConn->commit();
+    $dbConn->exec('UNLOCK TABLES');
+
+    return;
+  } // end case sort
+  default:
+    ZM\Warning('unknown action '.$_REQUEST['action']);
+  }
 } else {
   ZM\Warning('Cannot edit monitors');
 }
 
-ajaxError('Unrecognised action or insufficient permissions');
+ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user ' . $user['Username']);
 ?>
diff --git a/web/ajax/control.php b/web/ajax/control.php
index ae7acac9e..2dfa551a9 100644
--- a/web/ajax/control.php
+++ b/web/ajax/control.php
@@ -1,65 +1,27 @@
 <?php
-require_once( 'includes/control_functions.php' );
-require_once( 'includes/Monitor.php' );
+require_once('includes/control_functions.php');
+require_once('includes/Monitor.php');
 
 // Monitor control actions, require a monitor id and control view permissions for that monitor
 if ( empty($_REQUEST['id']) )
-    ajaxError( "No monitor id supplied" );
+  ajaxError('No monitor id supplied');
 
-if ( canView( 'Control', $_REQUEST['id'] ) )
-{
-    $monitor = new ZM\Monitor( $_REQUEST['id'] );
+if ( canView('Control', $_REQUEST['id']) ) {
+  $monitor = new ZM\Monitor($_REQUEST['id']);
 
-    $ctrlCommand = buildControlCommand( $monitor );
+  $ctrlCommand = buildControlCommand($monitor);
 
-    if ( $ctrlCommand )
-    {
-        $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
-        if ( !$socket )
-            ajaxError( "socket_create() failed: ".socket_strerror(socket_last_error()) );
+  if ( !$ctrlCommand ) {
+    ajaxError('No command received');
+    return;
+  }
 
-        $sock_file = ZM_PATH_SOCKS.'/zmcontrol-'.$monitor->Id().'.sock';
-        if ( @socket_connect( $socket, $sock_file ) )
-        {
-            $options = array();
-            foreach ( explode( " ", $ctrlCommand ) as $option )
-            {
-                if ( preg_match( '/--([^=]+)(?:=(.+))?/', $option, $matches ) )
-                {
-                    $options[$matches[1]] = !empty($matches[2])?$matches[2]:1;
-                }
-            }
-            $option_string = jsonEncode( $options );
-            if ( !socket_write( $socket, $option_string ) )
-                ajaxError( "socket_write() failed: ".socket_strerror(socket_last_error()) );
-            ajaxResponse( 'Used socket' );
-            //socket_close( $socket );
-        }
-        else
-        {
-            $ctrlCommand .= " --id=".$monitor->Id();
-
-            // Can't connect so use script
-            $ctrlStatus = '';
-            $ctrlOutput = array();
-            exec( escapeshellcmd( $ctrlCommand ), $ctrlOutput, $ctrlStatus );
-            if ( $ctrlStatus )
-                ajaxError( $ctrlCommand.'=>'.join( ' // ', $ctrlOutput ) );
-            ajaxResponse( 'Used script' );
-        }
-    }
-    else
-    {
-        ajaxError( "No command received" );
-    }
+  if ( $monitor->sendControlCommand($ctrlCommand) ) {
+    ajaxResponse('Success');
+  } else {
+    ajaxError('Failed');
+  }
 }
 
-ajaxError( 'Unrecognised action or insufficient permissions' );
-
-function ajaxCleanup()
-{
-    global $socket;
-    if ( !empty( $socket ) )
-        @socket_close( $socket );
-}
+ajaxError('Unrecognised action or insufficient permissions');
 ?>
diff --git a/web/ajax/event.php b/web/ajax/event.php
index cb4d3d7ad..1456bd192 100644
--- a/web/ajax/event.php
+++ b/web/ajax/event.php
@@ -1,5 +1,5 @@
 <?php
-error_reporting(E_ERROR);
+ini_set('display_errors', '0');
 
 if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
   ajaxError('No event id(s) supplied');
@@ -28,8 +28,8 @@ if ( canView('Events') ) {
     $ok = true;
     break;
   case 'deleteVideo' :
-    unlink( $videoFiles[$_REQUEST['id']] );
-    unset( $videoFiles[$_REQUEST['id']] );
+    unlink($videoFiles[$_REQUEST['id']]);
+    unset($videoFiles[$_REQUEST['id']]);
     ajaxResponse();
     break;
   case 'export' :
@@ -110,7 +110,11 @@ if ( canView('Events') ) {
       false#,#Compress
       #$exportStructure
     ) ) {
-      ajaxResponse(array('exportFile'=>$exportFile,'exportFormat'=>$exportFormat, 'connkey'=>(isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'')));
+    ajaxResponse(array(
+      'exportFile'=>$exportFile,
+      'exportFormat'=>$exportFormat,
+      'connkey'=>(isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'')
+    ));
     } else {
       ajaxError('Export Failed');
     }
@@ -145,7 +149,7 @@ if ( canEdit('Events') ) {
     break;
   case 'delete' :
     $Event = new ZM\Event($_REQUEST['id']);
-    if ( ! $Event->Id() ) {
+    if ( !$Event->Id() ) {
       ajaxResponse(array('refreshEvent'=>false, 'refreshParent'=>true, 'message'=> 'Event not found.'));
     } else {
       $Event->delete();
@@ -155,5 +159,5 @@ if ( canEdit('Events') ) {
   } // end switch action
 } // end if canEdit('Events')
 
-ajaxError('Unrecognised action or insufficient permissions');
+ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user '.$user['Username']);
 ?>
diff --git a/web/ajax/events.php b/web/ajax/events.php
new file mode 100644
index 000000000..16c777ebf
--- /dev/null
+++ b/web/ajax/events.php
@@ -0,0 +1,41 @@
+<?php
+ini_set('display_errors', '0');
+
+if ( empty($_REQUEST['eids']) ) {
+  ajaxError('No event id(s) supplied');
+}
+
+if ( canView('Events') ) {
+} // end if canView('Events')
+
+if ( canEdit('Events') ) {
+  $message = array();
+
+  foreach ( $_REQUEST['eids'] as $eid ) {
+
+    switch ( $_REQUEST['action'] ) {
+    case 'archive' :
+    case 'unarchive' :
+      $archiveVal = ($_REQUEST['action'] == 'archive') ? 1 : 0;
+      dbQuery(
+        'UPDATE Events SET Archived = ? WHERE Id = ?',
+        array($archiveVal, $eid)
+      );
+      break;
+    case 'delete' :
+      $event = new ZM\Event($eid);
+      if ( !$event->Id() ) {
+        $message[] = array($eid=>'Event not found.');
+      } else if ( $event->Archived() ) {
+        $message[] = array($eid=>'Event is archived, cannot delete it.');
+      } else {
+        $event->delete();
+      }
+      break;
+    } // end switch action
+  } // end foreach
+  ajaxResponse($message);
+} // end if canEdit('Events')
+
+ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user '.$user['Username']);
+?>
diff --git a/web/ajax/log.php b/web/ajax/log.php
index 2fd220578..16f7ac573 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -1,8 +1,65 @@
 <?php
+ini_set('display_errors', '0');
 
 # Moved up here because it is used in several spots.
 # These are the valid columns that you can filter on.
-$filterFields = array( 'Component', 'ServerId', 'Pid', 'Level', 'File', 'Line' );
+$filterFields = array('Component', 'ServerId', 'Pid', 'Level', 'File', 'Line');
+
+function buildLogQuery($action) {
+  global $filterFields;
+
+  $minTime = isset($_REQUEST['minTime']) ? $_REQUEST['minTime'] : NULL;
+  $maxTime = isset($_REQUEST['maxTime']) ? $_REQUEST['maxTime'] : NULL;
+
+  $limit = 100;
+  if ( isset($_REQUEST['limit']) ) {
+    if ( ( !is_integer($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+      ZM\Error('Invalid value for limit ' . $_REQUEST['limit']);
+    } else {
+      $limit = $_REQUEST['limit'];
+    }
+  }
+  $sortField = 'TimeKey';
+  if ( isset($_REQUEST['sortField']) ) {
+    if ( !in_array($_REQUEST['sortField'], $filterFields) and ( $_REQUEST['sortField'] != 'TimeKey' ) ) {
+      ZM\Error('Invalid sort field ' . $_REQUEST['sortField']);
+    } else {
+      $sortField = $_REQUEST['sortField'];
+    }
+  }
+  $sortOrder = (isset($_REQUEST['sortOrder']) and ($_REQUEST['sortOrder'] == 'asc')) ? 'asc' : 'desc';
+  $filter = isset($_REQUEST['filter']) ? $_REQUEST['filter'] : array();
+
+  $sql = $action.' FROM Logs';
+  $where = array();
+  $values = array();
+  if ( $minTime ) {
+    $where[] = 'TimeKey > ?';
+    $values[] = $minTime;
+  } elseif ( $maxTime ) {
+    $where[] = 'TimeKey < ?';
+    $values[] = $maxTime;
+  }
+
+  foreach ( $filter as $field=>$value ) {
+    if ( !in_array($field, $filterFields) ) {
+      ZM\Error("'$field' is not in valid filter fields " . print_r($filterField, true));
+      continue;
+    }
+    if ( $field == 'Level' ) {
+      $where[] = $field.' <= ?';
+      $values[] = $value;
+    } else {
+      $where[] = $field.' = ?';
+      $values[] = $value;
+    }
+  }
+  if ( count($where) )
+    $sql.= ' WHERE '.join(' AND ', $where);
+  $sql .= ' ORDER BY '.$sortField.' '.$sortOrder.' LIMIT '.$limit;
+
+  return array('sql'=>$sql, 'values'=>$values);
+} # function buildLogQuery($action)
 
 switch ( $_REQUEST['task'] ) {
   case 'create' :
@@ -13,93 +70,59 @@ switch ( $_REQUEST['task'] ) {
 
       $string = $_POST['message'];
 
-      $file = !empty($_POST['file']) ? preg_replace( '/\w+:\/\/[\w.:]+\//', '', $_POST['file'] ) : '';
-      if ( !empty( $_POST['line'] ) )
+      $file = !empty($_POST['file']) ? preg_replace('/\w+:\/\/[\w.:]+\//', '', $_POST['file']) : '';
+      if ( !empty($_POST['line']) ) {
         $line = validInt($_POST['line']);
-      else
+      } else {
         $line = NULL;
+      }
 
       $levels = array_flip(ZM\Logger::$codes);
-      if ( !isset($levels[$_POST['level']]) )
-        ZM\Panic("Unexpected logger level '".$_POST['level']."'");
+      if ( !isset($levels[$_POST['level']]) ) {
+        ZM\Panic('Unexpected logger level '.$_POST['level']);
+      }
       $level = $levels[$_POST['level']];
       ZM\Logger::fetch()->logPrint($level, $string, $file, $line);
+    } else {
+      ZM\Error('Invalid log create: '.print_r($_POST, true));
     }
     ajaxResponse();
     break;
   }
+  case 'delete' :
+  {
+    if ( !canEdit('System') )
+      ajaxError('Insufficient permissions to delete log entries');
+
+    $query = buildLogQuery('DELETE');
+    $result = dbQuery($query['sql'], $query['values']);
+    ajaxResponse(array('result'=>'Ok', 'deleted'=>$result->rowCount()));
+  }
   case 'query' :
   {
     if ( !canView('System') )
       ajaxError('Insufficient permissions to view log entries');
+    $total = dbFetchOne('SELECT count(*) AS Total FROM Logs', 'Total');
+    $query = buildLogQuery('SELECT *');
 
-    $servers = ZM\Server::find();
+    global $Servers;
+    if ( !$Servers )
+      $Servers = ZM\Server::find();
     $servers_by_Id = array();
     # There is probably a better way to do this.
-    foreach ( $servers as $server ) {
+    foreach ( $Servers as $server ) {
       $servers_by_Id[$server->Id()] = $server;
     }
 
-    $minTime = isset($_REQUEST['minTime'])?$_REQUEST['minTime']:NULL;
-    $maxTime = isset($_REQUEST['maxTime'])?$_REQUEST['maxTime']:NULL;
-
-    $limit = 100;
-    if ( isset($_REQUEST['limit']) ) {
-      if ( ( !is_integer($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
-        ZM\Error('Invalid value for limit ' . $_REQUEST['limit']);
-      } else {
-        $limit = $_REQUEST['limit'];
-      }
-    }
-    $sortField = 'TimeKey';
-    if ( isset($_REQUEST['sortField']) ) {
-      if ( !in_array($_REQUEST['sortField'], $filterFields) and ( $_REQUEST['sortField'] != 'TimeKey' ) ) {
-        ZM\Error("Invalid sort field " . $_REQUEST['sortField']);
-      } else {
-        $sortField = $_REQUEST['sortField'];
-      }
-    }
-    $sortOrder = (isset($_REQUEST['sortOrder']) and ($_REQUEST['sortOrder'] == 'asc')) ? 'asc' : 'desc';
-    $filter = isset($_REQUEST['filter']) ? $_REQUEST['filter'] : array();
-
-    $total = dbFetchOne('SELECT count(*) AS Total FROM Logs', 'Total');
-    $sql = 'SELECT * FROM Logs';
-    $where = array();
-    $values = array();
-    if ( $minTime ) {
-      $where[] = 'TimeKey > ?';
-      $values[] = $minTime;
-    } elseif ( $maxTime ) {
-      $where[] = 'TimeKey < ?';
-      $values[] = $maxTime;
-    }
-
-    foreach ( $filter as $field=>$value ) {
-      if ( ! in_array($field, $filterFields) ) {
-        ZM\Error("$field is not in valid filter fields");
-        continue;
-      }
-      if ( $field == 'Level' ){
-        $where[] = $field.' <= ?';
-        $values[] = $value;
-      } else {
-        $where[] = $field.' = ?';
-        $values[] = $value;
-      }
-    }
-    $options = array();
-    if ( count($where) )
-      $sql.= ' WHERE '.join(' AND ', $where);
-    $sql .= ' ORDER BY '.$sortField.' '.$sortOrder.' LIMIT '.$limit;
     $logs = array();
-    foreach ( dbFetchAll($sql, NULL, $values) as $log ) {
+    $options = array();
+
+    foreach ( dbFetchAll($query['sql'], NULL, $query['values']) as $log ) {
 
       $log['DateTime'] = strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey']));
-      #Warning("TimeKey: " . $log['TimeKey'] . 'Intval:'.intval($log['TimeKey']).' DateTime:'.$log['DateTime']);
-      #$log['DateTime'] = preg_replace('/^\d+/', strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey'])), $log['TimeKey']);
       $log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
       $log['Message'] = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $log['Message']);
-      foreach( $filterFields as $field ) {
+      foreach ( $filterFields as $field ) {
         if ( !isset($options[$field]) ) 
           $options[$field] = array();
         $value = $log[$field];
@@ -116,17 +139,21 @@ switch ( $_REQUEST['task'] ) {
         }
       }
       $logs[] = $log;
+    } # end foreach log db row
+
+    foreach ( $options as $field => $values ) {
+      asort($options[$field]);
     }
 
     $available = count($logs);
-    ajaxResponse( array(
-      'updated' => preg_match('/%/', DATE_FMT_CONSOLE_LONG)?strftime(DATE_FMT_CONSOLE_LONG):date(DATE_FMT_CONSOLE_LONG), 
+    ajaxResponse(array(
+      'updated' => preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG), 
       'total' => $total,
       'available' => isset($available) ? $available : $total,
       'logs' => $logs,
       'state' => logState(),
       'options' => $options,
-    ) );
+    ));
     break;
   }
   case 'export' :
@@ -134,9 +161,9 @@ switch ( $_REQUEST['task'] ) {
     if ( !canView('System') )
       ajaxError('Insufficient permissions to export logs');
 
-    $minTime = isset($_POST['minTime'])?$_POST['minTime']:NULL;
-    $maxTime = isset($_POST['maxTime'])?$_POST['maxTime']:NULL;
-    if ( !is_null($minTime) && !is_null($maxTime) && $minTime > $maxTime ) {
+    $minTime = isset($_POST['minTime']) ? $_POST['minTime'] : NULL;
+    $maxTime = isset($_POST['maxTime']) ? $_POST['maxTime'] : NULL;
+    if ( !is_null($minTime) && !is_null($maxTime) && ($minTime > $maxTime) ) {
       $tempTime = $minTime;
       $minTime = $maxTime;
       $maxTime = $tempTime;
@@ -145,18 +172,20 @@ switch ( $_REQUEST['task'] ) {
     $filter = isset($_POST['filter'])?$_POST['filter']:array();
     $sortField = 'TimeKey';
     if ( isset($_POST['sortField']) ) {
-      if ( ! in_array( $_POST['sortField'], $filterFields ) and ( $_POST['sortField'] != 'TimeKey' ) ) {
-        ZM\Error("Invalid sort field " . $_POST['sortField'] );
+      if ( !in_array($_POST['sortField'], $filterFields) and ($_POST['sortField'] != 'TimeKey') ) {
+        ZM\Error('Invalid sort field '.$_POST['sortField']);
       } else {
         $sortField = $_POST['sortField'];
       }
     }
-    $sortOrder = (isset($_POST['sortOrder']) and $_POST['sortOrder']) == 'asc' ? 'asc':'desc';
+    $sortOrder = (isset($_POST['sortOrder']) and $_POST['sortOrder']) == 'asc' ? 'asc' : 'desc';
 
-    $servers = ZM\Server::find();
+    global $Servers;
+    if ( !$Servers )
+      $Servers = ZM\Server::find();
     $servers_by_Id = array();
     # There is probably a better way to do this.
-    foreach ( $servers as $server ) {
+    foreach ( $Servers as $server ) {
       $servers_by_Id[$server->Id()] = $server;
     }
 
@@ -164,11 +193,9 @@ switch ( $_REQUEST['task'] ) {
     $where = array();
     $values = array();
     if ( $minTime ) {
-      ZM\Logger::Debug("MinTime: $minTime");
       if ( preg_match('/(.+)(\.\d+)/', $minTime, $matches) ) {
         # This handles sub second precision
         $minTime = strtotime($matches[1]).$matches[2];
-        ZM\Logger::Debug("MinTime: $minTime");
       } else {
         $minTime = strtotime($minTime);
       }
@@ -196,11 +223,11 @@ switch ( $_REQUEST['task'] ) {
       }
     }
     if ( count($where) )
-      $sql.= ' WHERE '.join( ' AND ', $where );
+      $sql.= ' WHERE '.join(' AND ', $where);
     $sql .= ' ORDER BY '.$sortField.' '.$sortOrder;
     //$sql .= " limit ".dbEscape($limit);
-    $format = isset($_POST['format'])?$_POST['format']:'text';
-    switch( $format ) {
+    $format = isset($_POST['format']) ? $_POST['format'] : 'text';
+    switch ( $format ) {
       case 'text' :
         $exportExt = 'txt';
         break;
@@ -216,43 +243,43 @@ switch ( $_REQUEST['task'] ) {
       default :
         ZM\Fatal("Unrecognised log export format '$format'");
     }
-    $exportKey = substr(md5(rand()),0,8);
-    $exportFile = "zm-log.$exportExt";
-    if ( ! file_exists(ZM_DIR_EXPORTS) ) {
-      ZM\Logger::Debug('Creating ' . ZM_DIR_EXPORTS);
-      if ( ! mkdir(ZM_DIR_EXPORTS) ) {
-        ZM\Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
-      }
+    $exportKey = substr(md5(rand()), 0, 8);
+    $exportFile = 'zm-log.'.$exportExt;
+
+    // mkdir will generate a warning if it exists, but that is ok
+    error_reporting(0);
+    if ( ! ( mkdir(ZM_DIR_EXPORTS) || file_exists(ZM_DIR_EXPORTS) ) ) {
+      ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\'');
     }
-    $exportPath = ZM_DIR_EXPORTS."/zm-log-$exportKey.$exportExt";
+    $exportPath = ZM_DIR_EXPORTS.'/zm-log-'.$exportKey.$exportExt;
     ZM\Logger::Debug("Exporting to $exportPath");
     if ( !($exportFP = fopen($exportPath, 'w')) )
       ZM\Fatal("Unable to open log export file $exportPath");
     $logs = array();
     foreach ( dbFetchAll($sql, NULL, $values) as $log ) {
-      $log['DateTime'] = preg_replace('/^\d+/', strftime( "%Y-%m-%d %H:%M:%S", intval($log['TimeKey']) ), $log['TimeKey']);
+      $log['DateTime'] = preg_replace('/^\d+/', strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey'])), $log['TimeKey']);
       $log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
       $logs[] = $log;
     }
-    ZM\Logger::Debug(count($logs)." lines being exported by $sql " . implode(',',$values));
+    ZM\Logger::Debug(count($logs).' lines being exported by '.$sql.implode(',', $values));
 
   switch( $format ) {
     case 'text' :
     {
       foreach ( $logs as $log ) {
         if ( $log['Line'] )
-          fprintf( $exportFP, "%s %s[%d].%s-%s/%d [%s]\n",
-            $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['File'], $log['Line'], $log['Message'] );
+          fprintf($exportFP, "%s %s[%d].%s-%s/%d [%s]\n",
+            $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['File'], $log['Line'], $log['Message']);
         else
-          fprintf( $exportFP, "%s %s[%d].%s-%s [%s]\n",
-            $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['File'], $log['Message'] );
+          fprintf($exportFP, "%s %s[%d].%s-%s [%s]\n",
+            $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['File'], $log['Message']);
       }
       break;
     }
     case 'tsv' :
     {
       # This line doesn't need fprintf, it could use fwrite
-      fprintf( $exportFP, join( "\t",
+      fprintf($exportFP, join("\t",
         translate('DateTime'),
         translate('Component'),
         translate('Server'),
@@ -261,17 +288,17 @@ switch ( $_REQUEST['task'] ) {
         translate('Message'),
         translate('File'),
         translate('Line')
-      )."\n" );
+      )."\n");
       foreach ( $logs as $log ) {
-        fprintf( $exportFP, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n", $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
+        fprintf($exportFP, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n",
+          $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line']);
       }
       break;
     }
     case 'html' :
     {
-    fwrite( $exportFP,
-      '
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    fwrite($exportFP,
+'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <title>'.translate('ZoneMinderLog').'</title>
@@ -310,34 +337,36 @@ switch ( $_REQUEST['task'] ) {
     </head>
     <body>
     <h3>'.translate('ZoneMinderLog').'</h3>
-    <p>'.htmlspecialchars(preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG )).'</p>
+    <p>'.htmlspecialchars(preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)).'</p>
     <p>'.count($logs).' '.translate('Logs').'</p>
     <table>
     <tbody>
     <tr><th>'.translate('DateTime').'</th><th>'.translate('Component').'</th><th>'.translate('Server').'</th><th>'.translate('Pid').'</th><th>'.translate('Level').'</th><th>'.translate('Message').'</th><th>'.translate('File').'</th><th>'.translate('Line').'</th></tr>
-    ' );
+    ');
     foreach ( $logs as $log ) {
       $classLevel = $log['Level'];
-      if ( $classLevel < ZM\Logger::FATAL )
+      if ( $classLevel < ZM\Logger::FATAL ) {
         $classLevel = ZM\Logger::FATAL;
-      elseif ( $classLevel > ZM\Logger::DEBUG )
+      } else if ( $classLevel > ZM\Logger::DEBUG ) {
         $classLevel = ZM\Logger::DEBUG;
+      }
       $logClass = 'log-'.strtolower(ZM\Logger::$codes[$classLevel]);
-      fprintf( $exportFP, "        <tr class=\"%s\"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", $logClass, $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
+      fprintf($exportFP, '        <tr class="%s"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>
+        ', $logClass, $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line']);
     }
-    fwrite( $exportFP, 
+    fwrite($exportFP, 
       '      </tbody>
       </table>
       </body>
-      </html>' );
+      </html>');
       break;
     }
     case 'xml' :
     {
-        fwrite( $exportFP,
+        fwrite($exportFP,
           '<?xml version="1.0" encoding="utf-8"?>
-          <logexport title="'.translate('ZoneMinderLog').'" date="'.htmlspecialchars(preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG )).'">
-          <selector>'.$_POST['selector'].'</selector>' );
+          <logexport title="'.translate('ZoneMinderLog').'" date="'.htmlspecialchars(preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)).'">
+          <selector>'.$_POST['selector'].'</selector>');
         foreach ( $filter as $field=>$value )
           if ( $value != '' )
             fwrite( $exportFP, 
@@ -345,14 +374,22 @@ switch ( $_REQUEST['task'] ) {
             <'.strtolower($field).'>'.htmlspecialchars($value).'</'.strtolower($field).'>
             </filter>' );
         fwrite( $exportFP, 
-          '  <columns>
-          <column field="datetime">'.translate('DateTime').'</column><column field="component">'.translate('Component').'</column><column field="'.translate('Server').'</column><column field="pid">'.translate('Pid').'</column><column field="level">'.translate('Level').'</column><column field="message">'.translate('Message').'</column><column field="file">'.translate('File').'</column><column field="line">'.translate('Line').'</column>
+          '
+          <columns>
+            <column field="datetime">'.translate('DateTime').'</column>
+            <column field="component">'.translate('Component').'</column>
+            <column field="server">'.translate('Server').'</column>
+            <column field="pid">'.translate('Pid').'</column>
+            <column field="level">'.translate('Level').'</column>
+            <column field="message">'.translate('Message').'</column>
+            <column field="file">'.translate('File').'</column>
+            <column field="line">'.translate('Line').'</column>
           </columns>
           <logs count="'.count($logs).'">
           ' );
       foreach ( $logs as $log ) {
         fprintf( $exportFP, 
-          "    <log>
+          '    <log>
           <datetime>%s</datetime>
           <component>%s</component>
           <server>%s</server>
@@ -361,7 +398,8 @@ switch ( $_REQUEST['task'] ) {
           <message><![CDATA[%s]]></message>
           <file>%s</file>
           <line>%d</line>
-          </log>\n", $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], utf8_decode( $log['Message'] ), $log['File'], $log['Line'] );
+          </log>
+', $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], utf8_decode( $log['Message'] ), $log['File'], $log['Line'] );
       }
       fwrite( $exportFP, 
         '  </logs>
@@ -390,7 +428,7 @@ switch ( $_REQUEST['task'] ) {
       ZM\Fatal('No log export format given');
     $format = $_REQUEST['format'];
 
-    switch( $format ) {
+    switch ( $format ) {
     case 'text' :
       $exportExt = 'txt';
       break;
@@ -407,15 +445,15 @@ switch ( $_REQUEST['task'] ) {
       ZM\Fatal("Unrecognised log export format '$format'");
     }
 
-    $exportFile = "zm-log.$exportExt";
-    $exportPath = ZM_DIR_EXPORTS."/zm-log-$exportKey.$exportExt";
+    $exportFile = 'zm-log.'.$exportExt;
+    $exportPath = ZM_DIR_EXPORTS.'/zm-log-'.$exportKey.$exportExt;
 
     header('Pragma: public');
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-    header('Cache-Control: private', false ); // required by certain browsers
+    header('Cache-Control: private', false); // required by certain browsers
     header('Content-Description: File Transfer');
-    header('Content-Disposition: attachment; filename="'.$exportFile.'"' );
+    header('Content-Disposition: attachment; filename="'.$exportFile.'"');
     header('Content-Transfer-Encoding: binary');
     header('Content-Type: application/force-download');
     header('Content-Length: '.filesize($exportPath));
@@ -423,6 +461,6 @@ switch ( $_REQUEST['task'] ) {
     exit(0);
     break;
   }
-}
+} // end switch ( $_REQUEST['task'] )
 ajaxError('Unrecognised action or insufficient permissions');
 ?>
diff --git a/web/ajax/modal.php b/web/ajax/modal.php
new file mode 100644
index 000000000..bd96b137f
--- /dev/null
+++ b/web/ajax/modal.php
@@ -0,0 +1,24 @@
+<?php
+
+if ( empty($_REQUEST['modal']) ) {
+  ajaxError('Modal Name Not Provided');
+  return;
+}
+
+$modal = validJsStr($_REQUEST['modal']);
+$data = array();
+
+ZM\Logger::Debug("Including modals/$modal.php");
+# Shouldn't be necessary but at the moment we have last .conf file contents
+ob_start();
+@$result = include('modals/'.$modal.'.php');
+$data['html'] = ob_get_contents();
+ob_end_clean();
+if ( !$result ) {
+  ajaxError("Unknown modal '".$modal."'");
+  return;
+}
+
+ajaxResponse($data);
+return;
+?>
diff --git a/web/ajax/modals/delconfirm.php b/web/ajax/modals/delconfirm.php
new file mode 100644
index 000000000..9aec739f4
--- /dev/null
+++ b/web/ajax/modals/delconfirm.php
@@ -0,0 +1,24 @@
+<?php
+// This is the HTML representing the Delete confirmation modal on the Events page
+
+?>  
+<div id="deleteConfirm" class="modal fade" class="modal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Delete Confirmation</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p><?php echo translate('ConfirmDeleteEvents') ?></p>
+      </div>
+      <div class="modal-footer">
+        <button id="delCancelBtn" type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+        <button id ="delConfirmBtn" type="button" class="btn btn-danger"><?php echo translate('Delete') ?></button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/donate.php b/web/ajax/modals/donate.php
new file mode 100644
index 000000000..374d4e0d2
--- /dev/null
+++ b/web/ajax/modals/donate.php
@@ -0,0 +1,67 @@
+<?php
+//
+// ZoneMinder web donate view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+
+if ( !canEdit('System') ) return;
+
+$options = array( 
+  'go'      => translate('DonateYes'),
+  'hour'    => translate('DonateRemindHour'),
+  'day'     => translate('DonateRemindDay'),
+  'week'    => translate('DonateRemindWeek'),
+  'month'   => translate('DonateRemindMonth'),
+  'never'   => translate('DonateRemindNever'),
+  'already' => translate('DonateAlready'),
+);
+
+?>
+<!-- Donate Modal -->
+<div class="modal fade" id="donate" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="donateLabel">ZoneMinder - <?php echo translate('Donate') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form name="contentForm" id="donateForm" method="post" action="?">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="donate"/>
+        <input type="hidden" name="action" value="donate"/>
+        <p>
+          <?php echo translate('DonateEnticement') ?>
+        </p>
+        <p>
+          <?php echo buildSelect('option', $options); ?>
+        </p>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary" id="donateApplyBtn"><?php echo translate('Apply') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/enoperm.php b/web/ajax/modals/enoperm.php
new file mode 100644
index 000000000..6fd2fbe23
--- /dev/null
+++ b/web/ajax/modals/enoperm.php
@@ -0,0 +1,24 @@
+<?php
+// Return an Error No Permissions Modal
+
+?>
+<div id="ENoPerm" class="modal fade" id="staticBackdrop" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">ZoneMinder <?php echo translate('Error') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p><?php echo translate('YouNoPerms') ?></p>
+        <p><?php echo translate('ContactAdmin') ?></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" id="enpCloseBtn" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/eventdetail.php b/web/ajax/modals/eventdetail.php
new file mode 100644
index 000000000..bb2f53ecc
--- /dev/null
+++ b/web/ajax/modals/eventdetail.php
@@ -0,0 +1,89 @@
+<?php
+// This is the HTML representing the Event Detail modal on the Events page
+
+$eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
+$eids = isset($_REQUEST['eids']) ? $_REQUEST['eids'] : '';
+
+$result = '';
+$inputs = '';
+$disabled = 'disabled="disabled"';
+$null = '';
+  
+if ( !canEdit('Events') ) return;
+
+if ( $eid ){ // Single Event Mode
+  $eid = validInt($eid);
+  $title = translate('Event').' '.$eid.PHP_EOL;
+  $inputs .= '<input type="hidden" name="markEids[]" value="' .$eid. '"/>';
+  $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
+
+} elseif ( $eids ) { // Multi Event Mode
+
+  $title = translate('Events');
+  $sql = 'SELECT E.* FROM Events AS E WHERE ';
+  $sqlWhere = array();
+  $sqlValues = array();
+  foreach ( $eids as $eid ) {
+    $eid = validInt($eid);
+    $inputs .= '<input type="hidden" name="markEids[]" value="' .$eid. '"/>';
+    $sqlWhere[] = 'E.Id = ?';
+    $sqlValues[] = $eid;
+  }
+  unset($eid);
+  $sql .= join(' OR ', $sqlWhere);
+  foreach( dbFetchAll( $sql, NULL, $sqlValues ) as $row ) {
+    if ( !isset($newEvent) ) {
+      $newEvent = $row;
+    } else {
+      if ( $newEvent['Cause'] && $newEvent['Cause'] != $row['Cause'] )
+        $newEvent['Cause'] = '';
+      if ( $newEvent['Notes'] && $newEvent['Notes'] != $row['Notes'] )
+        $newEvent['Notes'] = '';
+    }
+  }
+
+} else { // Event Mode not specified - should we really proceed if neither eid nor eids is set?
+  $title = translate('Events');
+}
+
+?>
+<div class="modal fade" id="eventDetailModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo $title ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form name="contentForm" id="eventDetailForm" method="post" action="?view=eventdetail&action=eventdetail">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          echo $inputs;
+          ?>
+          <input type="hidden" name="action" value="eventdetail"/>
+          <input type="hidden" name="view" value="eventdetail"/>
+          <table class="table-sm">
+            <tbody>
+              <tr>
+                <th scope="row"><?php echo translate('Cause') ?></th>
+                <td><input type="text" name="newEvent[Cause]" value="<?php echo validHtmlStr($newEvent['Cause']) ?>" size="32"/></td>
+              </tr>
+              <tr>
+                <th scope="row" class="align-middle"><?php echo translate('Notes') ?></th>
+                <td><textarea name="newEvent[Notes]" rows="6" cols="33"><?php echo validHtmlStr($newEvent['Notes']) ?></textarea></td>
+              </tr>
+            </tbody>
+          </table>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" name="action" id="eventDetailSaveBtn" class="btn btn-primary" value="save" <?php echo !canEdit('Events') ? $disabled : $null .'>'. translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+      </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/filterdebug.php b/web/ajax/modals/filterdebug.php
new file mode 100644
index 000000000..725539a99
--- /dev/null
+++ b/web/ajax/modals/filterdebug.php
@@ -0,0 +1,35 @@
+<div class="modal fade" id="filterdebugModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+     <div class="modal-header">
+     <h5 class="modal-title"><?php echo translate('FilterDebug') ?></h5>
+       <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+         <span aria-hidden="true">&times;</span>
+       </button>
+     </div>
+     <div class="modal-body">
+<?php
+  //require_once('includes/Filter.php');
+  $fid = validInt($_REQUEST['fid']);
+  if ( !$fid ) {
+    echo '<div class="error">No filter id specified.</div>';
+  } else {
+    $filter = new ZM\Filter($_REQUEST['fid']);
+    if ( ! $filter->Id() ) {
+      echo '<div class="error">Filter not found for id '.$_REQUEST['fid'].'</div>';
+    }
+  }
+?>
+       <form name="contentForm" id="filterdebugForm" method="post" action="?">
+<?php 
+            // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+            echo getCSRFinputHTML();
+?>
+          <p><label>SQL</label><?php echo $filter->sql() ?></p>
+         <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel')?> </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/function.php b/web/ajax/modals/function.php
new file mode 100644
index 000000000..e6bab2718
--- /dev/null
+++ b/web/ajax/modals/function.php
@@ -0,0 +1,53 @@
+<?php
+//
+// ZoneMinder web function view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+
+if ( !canEdit('Monitors') ) return;
+
+?>
+<div id="modalFunction" class="modal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <form id="function_form" action="?view=function&action=function" method="post">
+      <?php
+      // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+      echo getCSRFinputHTML();
+      ?>
+      <input type="hidden" name="mid"/>
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Function') ?> - <span id="function_monitor_name"></span></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p>
+          <?php echo htmlSelect('newFunction', ZM\getMonitorFunctionTypes(), null, array('id'=>'newFunction')); ?>
+          <label for="newEnabled"><?php echo translate('Enabled') ?></label>
+          <input type="checkbox" name="newEnabled" id="newEnabled" value="1"/>
+        </p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="funcSaveBtn btn btn-primary"><?php echo translate('Save') ?></button>
+        <button type="button" class="funcCancelBtn btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/log_export.php b/web/ajax/modals/log_export.php
new file mode 100644
index 000000000..8f359bb86
--- /dev/null
+++ b/web/ajax/modals/log_export.php
@@ -0,0 +1,46 @@
+<div class="modal fade" id="log_exportModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('ExportLog') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+
+        <form id="exportForm" action="" method="post">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          echo $inputs;
+          ?>
+          <fieldset title="<?php echo translate('ChooseLogSelection') ?>">
+            <legend><?php echo translate('SelectLog') ?></legend>
+            <label for="selectorAll"><?php echo translate('All') ?></label>
+            <input type="radio" id="selectorAll" name="selector" value="all"/>
+            <label for="selectorFilter"><?php echo translate('Filter') ?></label>
+            <input type="radio" id="selectorFilter" name="selector" value="filter"/>
+            <label for="selectorCurrent"><?php echo translate('Current') ?></label>
+            <input type="radio" id="selectorCurrent" name="selector" value="current" data-validators="validate-one-required"/>
+          </fieldset>
+          <fieldset title="<?php echo translate('ChooseLogFormat') ?>">
+            <legend><?php echo translate('SelectFormat') ?></legend>
+            <label for="formatText">TXT</label><input type="radio" id="formatText" name="format" value="text"/>
+            <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
+            <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
+            <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" class="validate-one-required"/>
+          </fieldset>
+          <div id="exportError">
+            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
+          </div>
+
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" id="exportButton" value="Export" data-on-click="exportRequest"><?php echo translate('Export') ?></button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/logout.php b/web/ajax/modals/logout.php
new file mode 100644
index 000000000..565e80cc2
--- /dev/null
+++ b/web/ajax/modals/logout.php
@@ -0,0 +1,48 @@
+<?php
+//
+// ZoneMinder web logout view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+global $CLANG;
+?>
+<div id="modalLogout" class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo validHtmlStr(ZM_WEB_TITLE) . ' ' . translate('Logout') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p><?php echo sprintf( $CLANG['CurrentLogin'], $user['Username'] ) ?></p>
+      </div>
+      <div class="modal-footer">
+        <form name="logoutForm" id="logoutForm" method="post" action="?">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          ?>
+          <input type="hidden" name="view" value="logout"/>
+          <button type="submit" name="action" value="logout"><?php echo translate('Logout') ?></button>
+          <?php if ( ZM_USER_SELF_EDIT ) echo '<button type="submit" name="action" value="config">'.translate('Config').'</button>'.PHP_EOL; ?>
+          <button type="button" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/optionhelp.php b/web/ajax/modals/optionhelp.php
new file mode 100644
index 000000000..424354dd2
--- /dev/null
+++ b/web/ajax/modals/optionhelp.php
@@ -0,0 +1,43 @@
+<?php
+
+// Returns the modal html representing the selected Option Help item
+if ( empty($_REQUEST['ohndx']) ) {
+  ajaxError('Option Help Index Not Provided');
+  return;
+}
+
+global $OLANG;
+$result = '';
+$optionHelpIndex = $_REQUEST['ohndx'];
+$ZMoptionHelpIndex = 'ZM_'.$optionHelpIndex;
+ 
+if ( !empty($OLANG[$optionHelpIndex]) ) {
+  $optionHelpText = $OLANG[$optionHelpIndex]['Help'];
+} else {
+  $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($optionHelpIndex));
+}
+$optionHelpText = validHtmlStr($optionHelpText);
+$optionHelpText = preg_replace('/~~/', '<br/>', $optionHelpText );
+$optionHelpText = preg_replace('/\[(.+)\]\((.+)\)/', '<a href="$2" target="_blank">$1</a>', $optionHelpText);
+
+?>
+<div id="optionhelp" class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('OptionHelp') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <h3><?php echo validHtmlStr($optionHelpIndex) ?></h3>
+        <p class="textblock"><?php echo $optionHelpText ?></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" id="ohCloseBtn" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/skins/classic/views/server.php b/web/ajax/modals/server.php
similarity index 55%
rename from web/skins/classic/views/server.php
rename to web/ajax/modals/server.php
index cd6767f4d..6c5ec8c67 100644
--- a/web/skins/classic/views/server.php
+++ b/web/ajax/modals/server.php
@@ -1,49 +1,40 @@
 <?php
-//
-// ZoneMinder web user view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
+// This is the HTML representing the Server modal from Options -> Server
+if ( !isset($_REQUEST['id']) ) {
+  ajaxError('Server Id Not Provided');
   return;
 }
 
-$Server = new ZM\Server($_REQUEST['id']);
-if ( $_REQUEST['id'] and ! $Server->Id() ) {
-  $view = 'error';
-  return;
-}
+$result = '';
+$checked = ' checked="checked"';
+$null = '';
+$sid = $_REQUEST['id'];
 
-$focusWindow = true;
+if ( !canEdit('System') ) return;
+
+$Server = new ZM\Server($sid);
+if ( $sid and ! $Server->Id() ) return;
 
-xhtmlHeaders(__FILE__, translate('Server').' - '.$Server->Name());
 ?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Server').' - '.$Server->Name() ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="post" action="?" class="validateFormOnSubmit">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
+<div class="modal fade" id="ServerModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Server') .' - '. $Server->Name() ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="serverModalForm" name="contentForm" method="post" action="?view=server&action=save" class="validateFormOnSubmit">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="server"/>
         <input type="hidden" name="object" value="server"/>
         <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
-        <table id="contentTable" class="major">
+        <table class="table-sm">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('Name') ?></th>
@@ -76,39 +67,39 @@ xhtmlHeaders(__FILE__, translate('Server').' - '.$Server->Name());
             <tr>
               <th scope="row"><?php echo translate('RunStats') ?></th>
               <td>
-                <input type="radio" name="newServer[zmstats]" value="1"<?php echo $Server->zmstats() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmstats]" value="0"<?php echo $Server->zmstats() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmstats]" value="1" <?php echo $Server->zmstats() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmstats]" value="0" <?php echo $Server->zmstats() ? $null : $checked ?>/> No
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('RunAudit') ?></th>
               <td>
-                <input type="radio" name="newServer[zmaudit]" value="1"<?php echo $Server->zmaudit() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmaudit]" value="0"<?php echo $Server->zmaudit() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmaudit]" value="1"<?php echo $Server->zmaudit() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmaudit]" value="0"<?php echo $Server->zmaudit() ? $null : $checked ?>/> No
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('RunTrigger') ?></th>
               <td>
-                <input type="radio" name="newServer[zmtrigger]" value="1"<?php echo $Server->zmtrigger() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmtrigger]" value="0"<?php echo $Server->zmtrigger() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmtrigger]" value="1" <?php echo $Server->zmtrigger() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmtrigger]" value="0" <?php echo $Server->zmtrigger() ? $null : $checked ?>/> No
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('RunEventNotification') ?></th>
               <td>
-                <input type="radio" name="newServer[zmeventnotification]" value="1"<?php echo $Server->zmeventnotification() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmeventnotification]" value="0"<?php echo $Server->zmeventnotification() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmeventnotification]" value="1" <?php echo $Server->zmeventnotification() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmeventnotification]" value="0" <?php echo $Server->zmeventnotification() ? $null : $checked ?>/> No
               </td>
             </tr>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <button type="submit" name="action" value="Save" ><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
+      </div>
+      <div class="modal-footer">
+        <button name="action" id="serverSubmitBtn" type="submit" class="btn btn-primary" value="Save"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
     </div>
   </div>
-</body>
-</html>
+</div>
+
diff --git a/web/ajax/modals/state.php b/web/ajax/modals/state.php
new file mode 100644
index 000000000..a3b6734a3
--- /dev/null
+++ b/web/ajax/modals/state.php
@@ -0,0 +1,86 @@
+<?php
+//
+// ZoneMinder web run state view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+
+if ( !canEdit('System') ) return;
+
+$running = daemonCheck();
+
+$content = '';
+if ( $running ) {
+  $content .= '<option value="stop" selected="selected">' .translate('Stop'). '</option>'.PHP_EOL;
+  $content .= '<option value="restart">' .translate('Restart'). '</option>'.PHP_EOL;
+} else {
+  $content .= '<option value="start" selected="selected">' .translate('Start'). '</option>'.PHP_EOL;
+}
+
+$states = dbFetchAll('SELECT * FROM States');
+foreach ( $states as $state ) {
+  $selected = $state['IsActive'] ? 'selected="selected"' : '';
+  
+  $content .= '<option value="' .validHtmlStr($state["Name"]). '" ' .$selected. '>'.PHP_EOL;
+  $content .= validHtmlStr($state['Name']).PHP_EOL;
+  $content .= '</option>'.PHP_EOL;
+}
+
+?>
+<div id="modalState" class="modal fade" tabindex="-1">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Run State</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+          <form class="" name="contentForm" method="get" action="?view=state">
+            <?php
+            // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+            echo getCSRFinputHTML();
+            ?>
+            <input type="hidden" name="view" value="state"/>
+            <input type="hidden" name="action" value="state"/>
+            <input type="hidden" name="apply" value="1"/>
+            <div class="form-group">
+              <label for="runState" class="col-md-3 col-form-label float-left">Change State</label>
+              <div class="col-md-9">
+                <select id="runState" name="runState" class="form-control">
+                  <?php echo $content ?>
+                </select>
+              </div><!--col-md-9-->
+            </div><!--form-group-->
+            <div class="form-group">
+              <label for="newState" class="col-md-3 col-form-label float-left"><?php echo translate('NewState') ?></label>
+                <div class="col-md-9">
+                  <input class="form-control" type="text" id="newState"/>
+                </div>
+            </div>
+          </form>        
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-primary" type="button" id="btnApply"><?php echo translate('Apply') ?></button>
+        <button class="btn btn-primary" type="button" id="btnSave" disabled><?php echo translate('Save') ?></button>
+        <button class="btn btn-danger" type="button" id="btnDelete" disabled><?php echo translate('Delete') ?></button>
+        <p class="pull-left hidden" id="pleasewait"><?php echo translate('PleaseWait') ?></p>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/storage.php b/web/ajax/modals/storage.php
new file mode 100644
index 000000000..70cc956dc
--- /dev/null
+++ b/web/ajax/modals/storage.php
@@ -0,0 +1,110 @@
+<?php
+// This is the HTML representing the Storage modal from Options -> Storage
+  if ( !isset($_REQUEST['id']) ) {
+    ajaxError('Storage Id Not Provided');
+    return;
+  }
+
+  $null = '';
+  $checked = 'checked="checked"';
+  $sid = $_REQUEST['id'];
+  
+  if ( !canEdit('System') ) return;
+
+  require_once('includes/Server.php');
+  require_once('includes/Storage.php');
+
+  if ( $_REQUEST['id'] ) {
+    if ( !($newStorage = ZM\Storage::find_one(array('Id'=>$sid)) ) ) {
+      // Perhaps do something different here, rather than return nothing
+      return;
+    }
+  } else {
+    $newStorage = new ZM\Storage();
+    $newStorage->Name(translate('NewStorage'));
+  }
+
+  $type_options = array( 'local' => translate('Local'), 's3fs' => translate('s3fs') );
+  $scheme_options = array(
+    'Deep' => translate('Deep'),
+    'Medium' => translate('Medium'),
+    'Shallow' => translate('Shallow'),
+  );
+
+  $servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
+  $ServersById = array();
+  foreach ( $servers as $S ) {
+    $ServersById[$S->Id()] = $S;
+  }
+
+?>
+<div class="modal fade" id="storageModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Storage') .' - '. $newStorage->Name() ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="storageModalForm" name="contentForm" method="post" action="?view=storage&action=save" class="validateFormOnSubmit">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="storage"/>
+        <input type="hidden" name="object" value="storage"/>
+        <input type="hidden" name="id" value="<?php echo validHtmlStr($sid) ?>"/>
+        <table class="major table-sm">
+          <tbody>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage->Name() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Path') ?></th>
+              <td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage->Path() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Url') ?></th>
+              <td><input type="text" name="newStorage[Url]" value="<?php echo $newStorage->Url() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Server') ?></th>
+              <td><?php echo htmlSelect('newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage->ServerId()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Type') ?></th>
+              <td><?php echo htmlSelect('newStorage[Type]', $type_options, $newStorage->Type()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('StorageScheme') ?></th>
+              <td><?php echo htmlSelect('newStorage[Scheme]', $scheme_options, $newStorage->Scheme()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('StorageDoDelete') ?></th>
+              <td>
+              <input type="radio" name="newStorage[DoDelete]" value="1" <?php echo $newStorage->DoDelete() ? $checked : $null ?>>Yes
+              <input type="radio" name="newStorage[DoDelete]" value="0" <?php echo $newStorage->DoDelete() ? $null : $checked ?>>No
+              </td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Enabled') ?></th>
+              <td>
+              <input type="radio" name="newStorage[Enabled]" value="1" <?php echo $newStorage->Enabled() ? $checked : $null ?>>Yes
+              <input type="radio" name="newStorage[Enabled]" value="0" <?php echo $newStorage->Enabled() ? $null : $checked ?>>No
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="modal-footer">
+        <button name="action" id="storageSubmitBtn" type="submit" class="btn btn-primary" value="Save"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/newlog.php b/web/ajax/newlog.php
new file mode 100644
index 000000000..9e6bd9585
--- /dev/null
+++ b/web/ajax/newlog.php
@@ -0,0 +1,132 @@
+<?php
+global $Servers;
+
+if ( !canView('System') ) {
+  ajaxError('Insufficient permissions to view log entries');
+  return;
+}
+
+// Only the query task is supported at the moment
+if ( !isset($_REQUEST['task']) or $_REQUEST['task'] != 'query' ) {
+  ajaxError('Unrecognised action');
+  return;
+}
+// The table we want our data from
+$table = 'Logs';
+
+// The names of the dB columns in the log table we are interested in
+$columns = array('TimeKey', 'Component', 'ServerId', 'Pid', 'Code', 'Message', 'File', 'Line');
+
+// The names of columns shown in the log view that are NOT dB columns in the database
+$col_alt = array('DateTime', 'Server');
+
+// Search contains a user entered string to search on
+$search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
+
+// Advanced search contains an array of "column name" => "search text" pairs
+// Bootstrap table sends json_ecoded array, which we must decode
+$advsearch = isset($_REQUEST['filter']) ? json_decode($_REQUEST['filter'], JSON_OBJECT_AS_ARRAY) : array();
+
+// Sort specifies the name of the column to sort on
+$sort = 'TimeKey';
+if ( isset($_REQUEST['sort']) ) {
+  if ( !in_array($_REQUEST['sort'], array_merge($columns, $col_alt)) ) {
+    ZM\Error('Invalid sort field: ' . $_REQUEST['sort']);
+  } else {
+    $sort = $_REQUEST['sort'];
+    if ( $sort == 'DateTime' ) $sort = 'TimeKey';
+  }
+}
+
+// Offset specifies the starting row to return, used for pagination
+$offset = 0;
+if ( isset($_REQUEST['offset']) ) {
+  if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+    ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
+  } else {
+    $offset = $_REQUEST['offset'];
+  }
+}
+
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
+// Limit specifies the number of rows to return
+$limit = 100;
+if ( isset($_REQUEST['limit']) ) {
+  if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+    ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
+  } else {
+    $limit = $_REQUEST['limit'];
+  }
+}
+
+$col_str = implode(', ', $columns);
+$data = array();
+$query = array();
+$query['values'] = array();
+$likes = array();
+$where = '';
+// There are two search bars in the log view, normal and advanced
+// Making an exuctive decision to ignore the normal search, when advanced search is in use
+// Alternatively we could try to do both
+if ( count($advsearch) ) {
+
+  foreach ( $advsearch as $col=>$text ) {
+    if ( !in_array($col, array_merge($columns, $col_alt)) ) {
+      ZM\Error("'$col' is not a sortable column name");
+      continue;
+    }
+    $text = '%' .$text. '%';
+    array_push($likes, $col.' LIKE ?');
+    array_push($query['values'], $text);
+  }
+  $wherevalues = $query['values'];
+  $where = ' WHERE (' .implode(' OR ', $likes). ')';
+
+} else if ( $search != '' ) {
+
+  $search = '%' .$search. '%';
+  foreach ( $columns as $col ) {
+    array_push($likes, $col.' LIKE ?');
+    array_push($query['values'], $search);
+  }
+  $wherevalues = $query['values'];
+  $where = ' WHERE (' .implode(' OR ', $likes). ')';
+}  
+
+$query['sql'] = 'SELECT ' .$col_str. ' FROM `' .$table. '` ' .$where. ' ORDER BY ' .$sort. ' ' .$order. ' LIMIT ?, ?';
+array_push($query['values'], $offset, $limit);
+
+//ZM\Warning('Calling the following sql query: ' .$query['sql']);
+
+$data['totalNotFiltered'] = dbFetchOne('SELECT count(*) AS Total FROM ' .$table, 'Total');
+if ( $search != '' || count($advsearch) ) {
+  $data['total'] = dbFetchOne('SELECT count(*) AS Total FROM ' .$table.$where , 'Total', $wherevalues);
+} else {
+  $data['total'] = $data['totalNotFiltered'];
+}
+
+if ( !$Servers )
+  $Servers = ZM\Server::find();
+$servers_by_Id = array();
+# There is probably a better way to do this.
+foreach ( $Servers as $server ) {
+  $servers_by_Id[$server->Id()] = $server;
+}
+
+$rows = array();
+foreach ( dbFetchAll($query['sql'], NULL, $query['values']) as $row ) {
+  $row['DateTime'] = strftime('%Y-%m-%d %H:%M:%S', intval($row['TimeKey']));
+  $row['Server'] = ( $row['ServerId'] and isset($servers_by_Id[$row['ServerId']]) ) ? $servers_by_Id[$row['ServerId']]->Name() : '';
+  // First strip out any html tags
+  // Second strip out all characters that are not ASCII 32-126 (yes, 126)
+  $row['Message'] = preg_replace('/[^\x20-\x7E]/', '', strip_tags($row['Message']));
+  $rows[] = $row;
+}
+$data['rows'] = $rows;
+$data['logstate'] = logState();
+$data['updated'] = preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG);
+
+ajaxResponse($data);
+
diff --git a/web/ajax/stats.php b/web/ajax/stats.php
new file mode 100644
index 000000000..3789ff448
--- /dev/null
+++ b/web/ajax/stats.php
@@ -0,0 +1,24 @@
+<?php
+
+if ( empty($_REQUEST['eid']) ) ajaxError('Event Id Not Provided');
+if ( empty($_REQUEST['fid']) ) ajaxError('Frame Id Not Provided');
+
+$eid = $_REQUEST['eid'];
+$fid = $_REQUEST['fid'];
+$row = ( isset($_REQUEST['row']) ) ? $_REQUEST['row'] : '';
+$data = array();
+
+// Not sure if this is required
+if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
+  $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+  if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+    $data['auth'] = $auth_hash;
+  }
+}
+
+$data['html'] = getStatsTableHTML($eid, $fid, $row);
+$data['id'] = '#contentStatsTable' .$row;
+
+ajaxResponse($data);
+return;
+?>
diff --git a/web/ajax/status.php b/web/ajax/status.php
index 5def27268..6e3920dec 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -1,202 +1,214 @@
 <?php
-if ($_REQUEST['entity'] == 'navBar') {
-  $data  = array();
-  if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) {
-    $data['auth'] = generateAuthHash( ZM_AUTH_HASH_IPS );
+if ( $_REQUEST['entity'] == 'navBar' ) {
+  global $bandwidth_options, $user;
+  $data = array();
+  if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
+    $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+    if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+      $data['auth'] = $auth_hash;
+    }
   }
-  $data['message'] = getNavBarHtml('reload');
+  // Each widget on the navbar has its own function
+  // Call the functions we want to dynamically update
+  $data['getBandwidthHTML'] = getBandwidthHTML($bandwidth_options, $user);
+  $data['getSysLoadHTML'] = getSysLoadHTML();
+  $data['getDbConHTML'] = getDbConHTML();
+  $data['getStorageHTML'] = getStorageHTML();
+  $data['getShmHTML'] = getShmHTML();
+
   ajaxResponse($data);
   return;
 }
 
 $statusData = array(
-    'system' => array(
-      'permission' => 'System',
-      'table' => 'Monitors',
-      'limit' => 1,
-      'elements' => array(
-        'MonitorCount' => array( 'sql' => 'count(*)' ),
-        'ActiveMonitorCount' => array( 'sql' => "count(if(Function != 'None',1,NULL))" ),
-        'State' => array( 'func' => 'daemonCheck()?'.translate('Running').':'.translate('Stopped') ),
-        'Load' => array( 'func' => 'getLoad()' ),
-        'Disk' => array( 'func' => 'getDiskPercent()' ),
-        ),
-      ),
-    'monitor' => array(
-      'permission' => 'Monitors',
-      'table' => 'Monitors',
-      'limit' => 1,
-      'selector' => 'Monitors.Id',
-      'elements' => array(
-        'Id' => array( 'sql' => 'Monitors.Id' ),
-        'Name' => array( 'sql' => 'Monitors.Name' ),
-        'Type' => true,
-        'Function' => true,
-        'Enabled' => true,
-        'LinkedMonitors' => true,
-        'Triggers' => true,
-        'Device' => true,
-        'Channel' => true,
-        'Format' => true,
-        'Host' => true,
-        'Port' => true,
-        'Path' => true,
-        'Width' => array( 'sql' => 'Monitors.Width' ),
-        'Height' => array( 'sql' => 'Monitors.Height' ),
-        'Palette' => true,
-        'Orientation' => true,
-        'Brightness' => true,
-        'Contrast' => true,
-        'Hue' => true,
-        'Colour' => true,
-        'EventPrefix' => true,
-        'LabelFormat' => true,
-        'LabelX' => true,
-        'LabelY' => true,
-        'LabelSize' => true,
-        'ImageBufferCount' => true,
-        'WarmupCount' => true,
-        'PreEventCount' => true,
-        'PostEventCount' => true,
-        'AlarmFrameCount' => true,
-        'SectionLength' => true,
-        'FrameSkip' => true,
-        'MotionFrameSkip' => true,
-        'MaxFPS' => true,
-        'AlarmMaxFPS' => true,
-        'FPSReportInterval' => true,
-        'RefBlendPerc' => true,
-        'Controllable' => true,
-        'ControlId' => true,
-        'ControlDevice' => true,
-        'ControlAddress' => true,
-        'AutoStopTimeout' => true,
-        'TrackMotion' => true,
-        'TrackDelay' => true,
-        'ReturnLocation' => true,
-        'ReturnDelay' => true,
-        'DefaultView' => true,
-        'DefaultRate' => true,
-        'DefaultScale' => true,
-        'WebColour' => true,
-        'Sequence' => true,
-        'MinEventId' => array( 'sql' => '(SELECT min(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ),
-        'MaxEventId' => array( 'sql' => '(SELECT max(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ),
-        'TotalEvents' => array( 'sql' => '(SELECT count(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ),
-        'Status' => array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -s' ),
-        'FrameRate' => array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -f' ),
-        ),
-      ),
-      'events' => array(
-            'permission' => 'Events',
-            'table' => 'Events',
-            'selector' => 'Events.MonitorId',
-            'elements' => array(
-              'Id' => true,
-              'Name' => true,
-              'Cause' => true,
-              'Notes' => true,
-              'StartTime' => true,
-              'StartTimeShort' => array( 'sql' => "date_format( StartTime, '".MYSQL_FMT_DATETIME_SHORT."' )" ), 
-              'EndTime' => true,
-              'Width' => true,
-              'Height' => true,
-              'Length' => true,
-              'Frames' => true,
-              'AlarmFrames' => true,
-              'TotScore' => true,
-              'AvgScore' => true,
-              'MaxScore' => true,
-              ),
-            ),
-      'event' => array(
-        'permission' => 'Events',
-        'table' => 'Events',
-        'limit' => 1,
-        'selector' => 'Events.Id',
-        'elements' => array(
-          'Id' => array( 'sql' => 'Events.Id' ),
-          'MonitorId' => true,
-          'MonitorName' => array('sql' => '(SELECT Monitors.Name FROM Monitors WHERE Monitors.Id = Events.MonitorId)'),
-          'Name' => true,
-          'Cause' => true,
-          'StartTime' => true,
-          'StartTimeShort' => array( 'sql' => "date_format( StartTime, '".MYSQL_FMT_DATETIME_SHORT."' )" ), 
-          'EndTime' => true,
-          'Width' => true,
-          'Height' => true,
-          'Length' => true,
-          'Frames' => true,
-          'DefaultVideo' => true,
-          'AlarmFrames' => true,
-          'TotScore' => true,
-          'AvgScore' => true,
-          'MaxScore' => true,
-          'Archived' => true,
-          'Videoed' => true,
-          'Uploaded' => true,
-          'Emailed' => true,
-          'Messaged' => true,
-          'Executed' => true,
-          'Notes' => true,
-          'MinFrameId' => array( 'sql' => '(SELECT min(Frames.FrameId) FROM Frames WHERE EventId=Events.Id)' ),
-          'MaxFrameId' => array( 'sql' => '(SELECT max(Frames.FrameId) FROM Frames WHERE Events.Id = Frames.EventId)' ),
-          'MinFrameDelta' => array( 'sql' => '(SELECT min(Frames.Delta) FROM Frames WHERE Events.Id = Frames.EventId)' ),
-          'MaxFrameDelta' => array( 'sql' => '(SELECT max(Frames.Delta) FROM Frames WHERE Events.Id = Frames.EventId)' ),
-          ),
-        ),
-        'frames' => array(
-            'permission' => 'Events',
-            'table' => 'Frames',
-            'selector' => 'EventId',
-            'elements' => array(
-              'EventId' => true,
-              'FrameId' => true,
-              'Type' => true,
-              'Delta' => true,
-            ),
-        ),
-        'frame' => array(
-            'permission' => 'Events',
-            'table' => 'Frames',
-            'limit' => 1,
-            'selector' => array( array( 'table' => 'Events', 'join' => 'Events.Id = Frames.EventId', 'selector'=>'Events.Id' ), 'Frames.FrameId' ),
-            'elements' => array(
-              //'Id' => array( 'sql' => 'Frames.FrameId' ),
-              'FrameId' => true,
-              'EventId' => true,
-              'Type' => true,
-              'TimeStamp' => true,
-              'TimeStampShort' => array( 'sql' => "date_format( StartTime, '".MYSQL_FMT_DATETIME_SHORT."' )" ), 
-              'Delta' => true,
-              'Score' => true,
-              //'Image' => array( 'postFunc' => 'getFrameImage' ),
-              ),
-            ),
-        'frameimage' => array(
-            'permission' => 'Events',
-            'func' => 'getFrameImage()'
-            ),
-        'nearframe' => array(
-            'permission' => 'Events',
-            'func' => 'getNearFrame()'
-            ),
-        'nearevents' => array(
-            'permission' => 'Events',
-            'func' => 'getNearEvents()'
-            )
-        );
+  'system' => array(
+    'permission' => 'System',
+    'table' => 'Monitors',
+    'limit' => 1,
+    'elements' => array(
+      'MonitorCount' => array( 'sql' => 'count(*)' ),
+      'ActiveMonitorCount' => array( 'sql' => 'count(if(`Function` != \'None\',1,NULL))' ),
+      'State' => array( 'func' => 'daemonCheck()?'.translate('Running').':'.translate('Stopped') ),
+      'Load' => array( 'func' => 'getLoad()' ),
+      'Disk' => array( 'func' => 'getDiskPercent()' ),
+    ),
+  ),
+  'monitor' => array(
+    'permission' => 'Monitors',
+    'table' => 'Monitors',
+    'limit' => 1,
+    'selector' => 'Monitors.Id',
+    'elements' => array(
+      'Id' => array( 'sql' => 'Monitors.Id' ),
+      'Name' => array( 'sql' => 'Monitors.Name' ),
+      'Type' => true,
+      'Function' => true,
+      'Enabled' => true,
+      'LinkedMonitors' => true,
+      'Triggers' => true,
+      'Device' => true,
+      'Channel' => true,
+      'Format' => true,
+      'Host' => true,
+      'Port' => true,
+      'Path' => true,
+      'Width' => array( 'sql' => 'Monitors.Width' ),
+      'Height' => array( 'sql' => 'Monitors.Height' ),
+      'Palette' => true,
+      'Orientation' => true,
+      'Brightness' => true,
+      'Contrast' => true,
+      'Hue' => true,
+      'Colour' => true,
+      'EventPrefix' => true,
+      'LabelFormat' => true,
+      'LabelX' => true,
+      'LabelY' => true,
+      'LabelSize' => true,
+      'ImageBufferCount' => true,
+      'WarmupCount' => true,
+      'PreEventCount' => true,
+      'PostEventCount' => true,
+      'AlarmFrameCount' => true,
+      'SectionLength' => true,
+      'FrameSkip' => true,
+      'MotionFrameSkip' => true,
+      'MaxFPS' => true,
+      'AlarmMaxFPS' => true,
+      'FPSReportInterval' => true,
+      'RefBlendPerc' => true,
+      'Controllable' => true,
+      'ControlId' => true,
+      'ControlDevice' => true,
+      'ControlAddress' => true,
+      'AutoStopTimeout' => true,
+      'TrackMotion' => true,
+      'TrackDelay' => true,
+      'ReturnLocation' => true,
+      'ReturnDelay' => true,
+      'DefaultView' => true,
+      'DefaultRate' => true,
+      'DefaultScale' => true,
+      'WebColour' => true,
+      'Sequence' => true,
+      'MinEventId' => array( 'sql' => '(SELECT min(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ),
+      'MaxEventId' => array( 'sql' => '(SELECT max(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ),
+      'TotalEvents' => array( 'sql' => '(SELECT count(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ),
+      'Status' => (isset($_REQUEST['id'])?array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -s' ):null),
+      'FrameRate' => (isset($_REQUEST['id'])?array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -f' ):null),
+    ),
+  ),
+  'events' => array(
+    'permission' => 'Events',
+    'table' => 'Events',
+    'selector' => 'Events.MonitorId',
+    'elements' => array(
+      'Id' => true,
+      'MonitorId' => true,
+      'Name' => true,
+      'Cause' => true,
+      'Notes' => true,
+      'StartTime' => true,
+      'StartTimeShort' => array( 'sql' => 'date_format( StartTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'EndTime' => true,
+      'Width' => true,
+      'Height' => true,
+      'Length' => true,
+      'Frames' => true,
+      'AlarmFrames' => true,
+      'TotScore' => true,
+      'AvgScore' => true,
+      'MaxScore' => true,
+    ),
+  ),
+  'event' => array(
+    'permission' => 'Events',
+    'table' => 'Events',
+    'limit' => 1,
+    'selector' => 'Events.Id',
+    'elements' => array(
+      'Id' => array( 'sql' => 'Events.Id' ),
+      'MonitorId' => true,
+      'MonitorName' => array('sql' => '(SELECT Monitors.Name FROM Monitors WHERE Monitors.Id = Events.MonitorId)'),
+      'Name' => true,
+      'Cause' => true,
+      'StartTime' => true,
+      'StartTimeShort' => array( 'sql' => 'date_format( StartTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'EndTime' => true,
+      'Width' => true,
+      'Height' => true,
+      'Length' => true,
+      'Frames' => true,
+      'DefaultVideo' => true,
+      'AlarmFrames' => true,
+      'TotScore' => true,
+      'AvgScore' => true,
+      'MaxScore' => true,
+      'Archived' => true,
+      'Videoed' => true,
+      'Uploaded' => true,
+      'Emailed' => true,
+      'Messaged' => true,
+      'Executed' => true,
+      'Notes' => true,
+      'MinFrameId' => array( 'sql' => '(SELECT min(Frames.FrameId) FROM Frames WHERE EventId=Events.Id)' ),
+      'MaxFrameId' => array( 'sql' => '(SELECT max(Frames.FrameId) FROM Frames WHERE Events.Id = Frames.EventId)' ),
+      'MinFrameDelta' => array( 'sql' => '(SELECT min(Frames.Delta) FROM Frames WHERE Events.Id = Frames.EventId)' ),
+      'MaxFrameDelta' => array( 'sql' => '(SELECT max(Frames.Delta) FROM Frames WHERE Events.Id = Frames.EventId)' ),
+    ),
+  ),
+  'frames' => array(
+    'permission' => 'Events',
+    'table' => 'Frames',
+    'selector' => 'EventId',
+    'elements' => array(
+      'EventId' => true,
+      'FrameId' => true,
+      'Type' => true,
+      'Delta' => true,
+    ),
+  ),
+  'frame' => array(
+    'permission' => 'Events',
+    'table' => 'Frames',
+    'limit' => 1,
+    'selector' => array( array( 'table' => 'Events', 'join' => 'Events.Id = Frames.EventId', 'selector'=>'Events.Id' ), 'Frames.FrameId' ),
+    'elements' => array(
+      //'Id' => array( 'sql' => 'Frames.FrameId' ),
+      'FrameId' => true,
+      'EventId' => true,
+      'Type' => true,
+      'TimeStamp' => true,
+      'TimeStampShort' => array( 'sql' => 'date_format( StartTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'Delta' => true,
+      'Score' => true,
+      //'Image' => array( 'postFunc' => 'getFrameImage' ),
+    ),
+  ),
+  'frameimage' => array(
+    'permission' => 'Events',
+    'func' => 'getFrameImage()'
+  ),
+  'nearframe' => array(
+    'permission' => 'Events',
+    'func' => 'getNearFrame()'
+  ),
+  'nearevents' => array(
+    'permission' => 'Events',
+    'func' => 'getNearEvents()'
+  )
+);
 
 function collectData() {
   global $statusData;
 
   $entitySpec = &$statusData[strtolower(validJsStr($_REQUEST['entity']))];
 #print_r( $entitySpec );
-  if ( !canView( $entitySpec['permission'] ) )
+  if ( !canView($entitySpec['permission']) )
     ajaxError('Unrecognised action or insufficient permissions');
 
   if ( !empty($entitySpec['func']) ) {
-    $data = eval( 'return( '.$entitySpec['func']." );" );
+    $data = eval('return('.$entitySpec['func'].');');
   } else {
     $data = array();
     $postFuncs = array();
@@ -204,19 +216,20 @@ function collectData() {
     $fieldSql = array();
     $joinSql = array();
     $groupSql = array();
+    $values = array();
 
     $elements = &$entitySpec['elements'];
-    $lc_elements = array_change_key_case( $elements );
+    $lc_elements = array_change_key_case($elements);
 
     $id = false;
     if ( isset($_REQUEST['id']) )
       if ( !is_array($_REQUEST['id']) )
         $id = array( validJsStr($_REQUEST['id']) );
       else
-        $id = array_values( $_REQUEST['id'] );
+        $id = array_values($_REQUEST['id']);
 
     if ( !isset($_REQUEST['element']) )
-      $_REQUEST['element'] = array_keys( $elements );
+      $_REQUEST['element'] = array_keys($elements);
     else if ( !is_array($_REQUEST['element']) )
       $_REQUEST['element'] = array( validJsStr($_REQUEST['element']) );
 
@@ -230,18 +243,18 @@ function collectData() {
 
     foreach ( $_REQUEST['element'] as $element ) {
       if ( !($elementData = $lc_elements[strtolower($element)]) )
-        ajaxError( 'Bad '.validJsStr($_REQUEST['entity']).' element '.$element );
+        ajaxError('Bad '.validJsStr($_REQUEST['entity']).' element '.$element);
       if ( isset($elementData['func']) )
-        $data[$element] = eval( 'return( '.$elementData['func']." );" );
+        $data[$element] = eval('return( '.$elementData['func'].' );');
       else if ( isset($elementData['postFunc']) )
         $postFuncs[$element] = $elementData['postFunc'];
       else if ( isset($elementData['zmu']) )
-        $data[$element] = exec( escapeshellcmd( getZmuCommand( ' '.$elementData['zmu'] ) ) );
+        $data[$element] = exec(escapeshellcmd(getZmuCommand(' '.$elementData['zmu'])));
       else {
         if ( isset($elementData['sql']) )
           $fieldSql[] = $elementData['sql'].' as '.$element;
         else
-          $fieldSql[] = $element;
+          $fieldSql[] = '`'.$element.'`';
         if ( isset($elementData['table']) && isset($elementData['join']) ) {
           $joinSql[] = 'left join '.$elementData['table'].' on '.$elementData['join'];
         }
@@ -249,19 +262,19 @@ function collectData() {
           $groupSql[] = $elementData['group'];
         }
       }
-    }
+    } # end foreach element
 
     if ( count($fieldSql) ) {
-      $sql = 'select '.join( ', ', $fieldSql ).' from '.$entitySpec['table'];
+      $sql = 'SELECT '.join(', ', $fieldSql).' FROM '.$entitySpec['table'];
+      #$sql = 'SELECT '.join(', ', array_map($fieldSql, function($f){return '`'.$f.'`';})).' FROM '.$entitySpec['table'];
       if ( $joinSql )
-        $sql .= ' '.join( ' ', array_unique( $joinSql ) );
+        $sql .= ' '.join(' ', array_unique($joinSql));
       if ( $id && !empty($entitySpec['selector']) ) {
         $index = 0;
         $where = array();
-        $values = array();
-        foreach( $entitySpec['selector'] as $selIndex => $selector ) {
+        foreach ( $entitySpec['selector'] as $selIndex => $selector ) {
           $selectorParamName = ':selector' . $selIndex;
-          if ( is_array( $selector ) ) {
+          if ( is_array($selector) ) {
             $where[] = $selector['selector'].' = '.$selectorParamName;
             $values[$selectorParamName] = validInt($id[$index]);
           } else {
@@ -270,21 +283,21 @@ function collectData() {
           }
           $index++;
         }
-        $sql .= ' WHERE '.join( ' AND ', $where );
+        $sql .= ' WHERE '.join(' AND ', $where);
       }
       if ( $groupSql )
-        $sql .= ' GROUP BY '.join( ',', array_unique( $groupSql ) );
+        $sql .= ' GROUP BY '.join(',', array_unique($groupSql));
       if ( !empty($_REQUEST['sort']) ) {
         $sql .= ' ORDER BY ';
-        $sort_fields = explode(',',$_REQUEST['sort']);
+        $sort_fields = explode(',', $_REQUEST['sort']);
         foreach ( $sort_fields as $sort_field ) {
           
-          preg_match('/^(\w+)\s*(ASC|DESC)?( NULLS FIRST)?$/i', $sort_field, $matches);
+          preg_match('/^`?(\w+)`?\s*(ASC|DESC)?( NULLS FIRST)?$/i', $sort_field, $matches);
           if ( count($matches) ) {
-            if ( in_array($matches[1], $fieldSql) ) {
+            if ( in_array($matches[1], $fieldSql) or  in_array('`'.$matches[1].'`', $fieldSql) ) {
               $sql .= $matches[1];
             } else {
-              ZM\Error('Sort field ' . $matches[1] . ' not in SQL Fields');
+              ZM\Error('Sort field '.$matches[1].' from ' .$sort_field.' not in SQL Fields: '.join(',', $sort_field));
             }
             if ( count($matches) > 2 ) {
               $sql .= ' '.strtoupper($matches[2]);
@@ -292,7 +305,7 @@ function collectData() {
                 $sql .= ' '.strtoupper($matches[3]);
             }
           } else {
-            ZM\Error("Sort field didn't match regexp $sort_field");
+            ZM\Error('Sort field didn\'t match regexp '.$sort_field);
           }
         } # end foreach sort field
       } # end if has sort
@@ -306,7 +319,7 @@ function collectData() {
       if ( !empty( $limit ) )
         $sql .= ' limit '.$limit_offset.$limit;
       if ( isset($limit) && $limit == 1 ) {
-        if ( $sqlData = dbFetchOne( $sql, NULL, $values ) ) {
+        if ( $sqlData = dbFetchOne($sql, NULL, $values) ) {
           foreach ( $postFuncs as $element=>$func )
             $sqlData[$element] = eval( 'return( '.$func.'( $sqlData ) );' );
           $data = array_merge( $data, $sqlData );
@@ -335,31 +348,31 @@ if ( !isset($_REQUEST['layout']) ) {
 
 switch( $_REQUEST['layout'] ) {
   case 'xml NOT CURRENTLY SUPPORTED' :
-    {
-      header("Content-type: application/xml" );
-      echo( '<?xml version="1.0" encoding="iso-8859-1"?>'."\n" );
-      echo '<'.strtolower($_REQUEST['entity']).">\n";
+      header('Content-type: application/xml');
+      echo('<?xml version="1.0" encoding="iso-8859-1"?>
+');
+      echo '<'.strtolower($_REQUEST['entity']).'>
+';
       foreach ( $data as $key=>$value ) {
-        $key = strtolower( $key );
+        $key = strtolower($key);
         echo "<$key>".htmlentities($value)."</$key>\n";
       }
       echo '</'.strtolower($_REQUEST['entity']).">\n";
       break;
-    }
   case 'json' :
     {
       $response = array( strtolower(validJsStr($_REQUEST['entity'])) => $data );
       if ( isset($_REQUEST['loopback']) )
         $response['loopback'] = validJsStr($_REQUEST['loopback']);
-      ajaxResponse( $response );
+      ajaxResponse($response);
       break;
     }
   case 'text' :
-    {
       header('Content-type: text/plain' );
       echo join( ' ', array_values( $data ) );
       break;
-    }
+  default:
+    ZM\Error('Unsupported layout: '. $_REQUEST['layout']);
 }
 
 function getFrameImage() {
diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index 910b18cb5..297b744c6 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -86,10 +86,8 @@ if ( sem_acquire($semaphore,1) !== false ) {
   $numSockets = socket_select($rSockets, $wSockets, $eSockets, intval($timeout/1000), ($timeout%1000)*1000);
 
   if ( $numSockets === false ) {
-    ZM\Error('socket_select failed: ' . socket_strerror(socket_last_error()));
     ajaxError('socket_select failed: '.socket_strerror(socket_last_error()));
   } else if ( $numSockets < 0 ) {
-    ZM\Error("Socket closed $remSockFile");
     ajaxError("Socket closed $remSockFile");
   } else if ( $numSockets == 0 ) {
     ZM\Error("Timed out waiting for msg $remSockFile");
@@ -97,7 +95,6 @@ if ( sem_acquire($semaphore,1) !== false ) {
     #ajaxError("Timed out waiting for msg $remSockFile");
   } else if ( $numSockets > 0 ) {
     if ( count($rSockets) != 1 ) {
-      ZM\Error('Bogus return from select, '.count($rSockets).' sockets available');
       ajaxError('Bogus return from select, '.count($rSockets).' sockets available');
     }
   }
@@ -119,17 +116,17 @@ if ( sem_acquire($semaphore,1) !== false ) {
   switch ( $data['type'] ) {
   case MSG_DATA_WATCH :
     $data = unpack('ltype/imonitor/istate/dfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced', $msg);
-    ZM\Logger::Debug('FPS: ' . $data['fps']);
     $data['fps'] = round( $data['fps'], 2 );
-    ZM\Logger::Debug('FPS: ' . $data['fps'] );
     $data['rate'] /= RATE_BASE;
     $data['delay'] = round( $data['delay'], 2 );
     $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
-    if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) {
-      $time = time();
-      // Regenerate auth hash after half the lifetime of the hash
-      if ( (!isset($_SESSION['AuthHashGeneratedAt'])) or ( $_SESSION['AuthHashGeneratedAt'] < $time - (ZM_AUTH_HASH_TTL * 1800) ) ) {
-        $data['auth'] = generateAuthHash(ZM_AUTH_HASH_IPS);
+    if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
+      $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+      if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+        $data['auth'] = $auth_hash;
+        ZM\Logger::Debug("including nw auth hash " . $data['auth']);
+      } else {
+        ZM\Logger::Debug('Not including nw auth hash becase it hashn\'t changed '.$auth_hash);
       } 
     }
     ajaxResponse(array('status'=>$data));
@@ -143,12 +140,11 @@ if ( sem_acquire($semaphore,1) !== false ) {
       $data = unpack('ltype/Qevent/iprogress/irate/izoom/Cpaused', $msg);
     }
     $data['rate'] /= RATE_BASE;
-    $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
-    if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) {
-      $time = time();
-      // Regenerate auth hash after half the lifetime of the hash
-      if ( (!isset($_SESSION['AuthHashGeneratedAt'])) or ( $_SESSION['AuthHashGeneratedAt'] < $time - (ZM_AUTH_HASH_TTL * 1800) ) ) {
-        $data['auth'] = generateAuthHash(ZM_AUTH_HASH_IPS);
+    $data['zoom'] = round($data['zoom']/SCALE_BASE, 1);
+    if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
+      $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+      if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+        $data['auth'] = $auth_hash;
       } 
     }
     ajaxResponse(array('status'=>$data));
diff --git a/web/api/app/Config/bootstrap.php.in b/web/api/app/Config/bootstrap.php.in
index 881c08eb5..894b3ec00 100644
--- a/web/api/app/Config/bootstrap.php.in
+++ b/web/api/app/Config/bootstrap.php.in
@@ -102,21 +102,21 @@ CakeLog::config('debug', array(
 	'engine' => 'File',
 	'types' => array('notice', 'info', 'debug'),
 	'file' => 'cake_debug',
-    'path' => '@ZM_LOGDIR@/'
+  'path' => '@ZM_LOGDIR@/'
 ));
 CakeLog::config('error', array(
 	'engine' => 'File',
 	'types' => array('warning', 'error', 'critical', 'alert', 'emergency'),
 	'file' => 'cake_error',
-    'path' => '@ZM_LOGDIR@/'
+  'path' => '@ZM_LOGDIR@/'
 ));
 CakeLog::config('custom_path', array(
-    'engine' => 'File',
-    'path' => '@ZM_LOGDIR@/'
+  'engine' => 'File',
+  'path' => '@ZM_LOGDIR@/'
 ));
 
-Configure::write('ZM_CONFIG',  '@ZM_CONFIG@');
-Configure::write('ZM_CONFIG_SUBDIR',  '@ZM_CONFIG_SUBDIR@');
+Configure::write('ZM_CONFIG', '@ZM_CONFIG@');
+Configure::write('ZM_CONFIG_SUBDIR', '@ZM_CONFIG_SUBDIR@');
 Configure::write('ZM_VERSION', '@VERSION@');
 Configure::write('ZM_API_VERSION', '@API_VERSION@');
 
@@ -128,27 +128,3 @@ global $configvals;
 foreach( $configvals as $key => $value) {
   Configure::write($key, $value);
 }
-if ( 0 ) {
-  // No longer needed, but I want to keep the code for reference
-  //
-// For Human-readability, use ZM_SERVER_HOST or ZM_SERVER_NAME in zm.conf, and convert it here to a ZM_SERVER_ID
-if ( ! defined('ZM_SERVER_ID') ) {
-  App::uses('ClassRegistry', 'Utility');
-  $ServerModel = ClassRegistry::init('Server');
-  if ( defined('ZM_SERVER_NAME') and ZM_SERVER_NAME ) {
-    $Server = $ServerModel->find( 'first', array( 'conditions'=>array('Name'=>ZM_SERVER_NAME) ) );
-    if ( ! $Server ) {
-      Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.');
-    } else {
-      define( 'ZM_SERVER_ID', $Server['Server']['Id'] );
-    }
-  } else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) {
-    $Server = $ServerModel->find( 'first', array( 'conditions'=>array('Name'=>ZM_SERVER_HOST) ) );
-    if ( ! $Server ) {
-      Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.');
-    } else {
-      define( 'ZM_SERVER_ID', $Server['Server']['Id'] );
-    }
-  }
-}
-}
diff --git a/web/api/app/Config/core.php.default b/web/api/app/Config/core.php.default
index 64f439420..e14c7d2e5 100644
--- a/web/api/app/Config/core.php.default
+++ b/web/api/app/Config/core.php.default
@@ -31,7 +31,7 @@
  * In production mode, flash messages redirect after a time interval.
  * In development mode, you need to click the flash message to continue.
  */
-	Configure::write('debug', 2);
+	Configure::write('debug', 0);
 
 /**
  * Configure the Error handler used to handle errors for your application. By default
diff --git a/web/api/app/Controller/AppController.php b/web/api/app/Controller/AppController.php
index 6b71ffb84..737dedacf 100644
--- a/web/api/app/Controller/AppController.php
+++ b/web/api/app/Controller/AppController.php
@@ -34,7 +34,6 @@ class AppController extends Controller {
   use CrudControllerTrait;
 
   public $components = [
-    'Session', //  We are going to use SessionHelper to check PHP session vars
     'RequestHandler',
     'Crud.Crud' => [
       'actions' => [
@@ -67,48 +66,79 @@ class AppController extends Controller {
 
     # For use throughout the app. If not logged in, this will be null.
     global $user;
-    
    
     if ( ZM_OPT_USE_AUTH ) {
+      # This will auto-login if username=&password= are set, or auth=
       require_once __DIR__ .'/../../../includes/auth.php';
 
-      $mUser = $this->request->query('user') ? $this->request->query('user') : $this->request->data('user');
-      $mPassword = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');
-      $mToken = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');
-
-      if ( $mUser and $mPassword ) {
-        // log (user, pass, nothashed, api based login so skip recaptcha)
-        $user = userLogin($mUser, $mPassword, false, true);
-        if ( !$user ) {
-          throw new UnauthorizedException(__('Incorrect credentials or API disabled'));
-          return;
+      if ( ZM_OPT_USE_LEGACY_API_AUTH or !strcasecmp($this->params->action, 'login') ) {
+        # This is here because historically we allowed user=&pass= in the api. web-ui auth uses username=&password=
+        $username = $this->request->query('user') ? $this->request->query('user') : $this->request->data('user');
+        $password = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');
+        if ( $username and $password ) {
+          $ret = validateUser($username, $password);
+          $user = $ret[0];
+          $retstatus = $ret[1];
+          if ( !$user ) {
+            throw new UnauthorizedException(__($retstatus));
+            return;
+          } 
+          ZM\Info("Login successful for user \"$username\"");
         }
-      } else if ( $mToken ) {
+      }
+
+      if ( ZM_OPT_USE_LEGACY_API_AUTH ) {
+        require_once __DIR__ .'/../../../includes/session.php';
+        $stateful = $this->request->query('stateful') ? $this->request->query('stateful') : $this->request->data('stateful');
+        if ( $stateful ) {
+          zm_session_start();
+          $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
+          $_SESSION['username'] = $user['Username'];
+          if ( ZM_AUTH_RELAY == 'plain' ) {
+            // Need to save this in session, can't use the value in User because it is hashed
+            $_SESSION['password'] = $_REQUEST['password'];
+          }
+          generateAuthHash(ZM_AUTH_HASH_IPS);
+          session_write_close();
+        } else if ( $_COOKIE['ZMSESSID'] and !$user ) {
+          # Have a cookie set, try to load user by session
+          if ( ! is_session_started() )
+            zm_session_start();
+
+          ZM\Logger::Debug(print_r($_SESSION, true));
+          $user = userFromSession();
+          session_write_close();
+        }
+      }
+
+      # NON LEGACY, token based access
+      $token = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');
+      if ( $token ) {
         // if you pass a token to login, we should only allow
         // refresh tokens to regenerate new access and refresh tokens
         if ( !strcasecmp($this->params->action, 'login') ) {
-          $only_allow_token_type='refresh';
+          $only_allow_token_type = 'refresh';
         } else {
           // for any other methods, don't allow refresh tokens
           // they are supposed to be infrequently used for security
           // purposes
-          $only_allow_token_type='access';
-
+          $only_allow_token_type = 'access';
         }
-        $ret = validateToken($mToken, $only_allow_token_type, true);
+        $ret = validateToken($token, $only_allow_token_type, true);
         $user = $ret[0];
         $retstatus = $ret[1];
         if ( !$user ) {
           throw new UnauthorizedException(__($retstatus));
           return;
         } 
-      } else if ( $mAuth ) {
-          $user = getAuthUser($mAuth, true);
-          if ( !$user ) {
-            throw new UnauthorizedException(__('Invalid Auth Key'));
-            return;
-          }
+      } # end if token
+
+      if ( $user and ( $user['APIEnabled'] != 1 ) ) {
+        ZM\Error('API disabled for: '.$user['Username']);
+        throw new UnauthorizedException(__('API disabled for: '.$user['Username']));
+        $user = null;
       }
+
       // We need to reject methods that are not authenticated
       // besides login and logout
       if ( strcasecmp($this->params->action, 'logout') ) {
@@ -120,10 +150,7 @@ class AppController extends Controller {
           return;
         }
       } # end if ! login or logout
-      if ($user['APIEnabled'] == 0 ) {
-        throw new UnauthorizedException(__('API Disabled'));
-        return;
-      }
+
     } # end if ZM_OPT_AUTH
     // make sure populated user object has APIs enabled
   } # end function beforeFilter()
diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 2eb5f7280..3b132e932 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -15,6 +15,10 @@ class EventsController extends AppController {
    */
   public $components = array('RequestHandler', 'Scaler', 'Image', 'Paginator');
 
+  public function beforeRender() {
+    $this->set($this->Event->enumValues());
+  }
+
   public function beforeFilter() {
     parent::beforeFilter();
     global $user;
@@ -145,6 +149,10 @@ class EventsController extends AppController {
     ));
     $event['Event']['NextOfMonitor'] = $event_monitor_neighbors['next']['Event']['Id'];
     $event['Event']['PrevOfMonitor'] = $event_monitor_neighbors['prev']['Event']['Id'];
+  
+    $this->loadModel('Frame');
+    $event['Event']['MaxScoreFrameId'] = $this->Frame->findByEventid($id,'FrameId',array('Score'=>'desc','FrameId'=>'asc'))['Frame']['FrameId'];
+    $event['Event']['AlarmFrameId'] = $this->Frame->findByEventidAndType($id,'Alarm')['Frame']['FrameId'];
 
     $this->set(array(
       'event' => $event,
@@ -426,14 +434,11 @@ class EventsController extends AppController {
     // Find the max Frame for this Event.  Error out otherwise.
     $this->loadModel('Frame');
 
-    if (! $frame = $this->Frame->find('first', array(
+    $frame = $this->Frame->find('first', array(
       'conditions' => array(
-        'EventId' => $event['Event']['Id'],
-        'Score' => $event['Event']['MaxScore']
-      )
-    ))) {
-      throw new NotFoundException(__('Can not find Frame for Event ' . $event['Event']['Id']));
-    }
-    return $frame['Frame']['Id'];
+      'EventId' => $event['Event']['Id'],
+      'Score' => $event['Event']['MaxScore']
+    )));
+    return empty($frame)?null:$frame['Frame']['Id'];
   }
 } // end class EventsController
diff --git a/web/api/app/Controller/GroupsController.php b/web/api/app/Controller/GroupsController.php
index 6f0a88300..f4185fe76 100644
--- a/web/api/app/Controller/GroupsController.php
+++ b/web/api/app/Controller/GroupsController.php
@@ -77,16 +77,24 @@ class GroupsController extends AppController {
       }
 
 			$this->Group->create();
-			if ( $this->Group->save($this->request->data) ) {
+
+      if ( $this->request->data['Group']['MonitorIds'] and ! isset($this->request->data['Monitor']) ) {
+        $this->request->data['Monitor'] = explode(',', $this->request->data['Group']['MonitorIds']);
+        unset($this->request->data['Group']['MonitorIds']);
+      }
+      if ( $this->Group->saveAssociated($this->request->data, array('atomic'=>true)) ) {
         return $this->flash(
           __('The group has been saved.'),
           array('action' => 'index')
         );
-			}
-		}
-		$monitors = $this->Group->Monitor->find('list');
+      } else {
+        ZM\Error("Failed to save Group");
+        debug($this->Group->invalidFields());
+      }
+    } # end if post
+    $monitors = $this->Group->Monitor->find('list');
 		$this->set(compact('monitors'));
-	}
+	} # end add
 
 /**
  * edit method
@@ -162,5 +170,23 @@ class GroupsController extends AppController {
         array('action' => 'index')
       );
 		}
-	} // end function delete
+  } // end function delete
+  
+  // returns monitor associations
+  public function associations() {
+    $this->Group->recursive = -1;
+    $groups = $this->Group->find('all', array(
+                                        'contain'=> array(
+                                          'Monitor' => array(
+                                            'fields'=>array('Id','Name')
+                                          )
+                                        )
+                                      )
+                                );
+            $this->set(array(
+                    'groups' => $groups,
+                    '_serialize' => array('groups')
+            ));
+  } // end associations
+
 } // end class GroupController
diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php
index 490eee953..cf6e99b53 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -3,10 +3,10 @@ App::uses('AppController', 'Controller');
 
 class HostController extends AppController {
 
-  public $components = array('RequestHandler', 'Session');
+  public $components = array('RequestHandler');
 
   public function daemonCheck($daemon=false, $args=false) {
-    $string = Configure::read('ZM_PATH_BIN').'/zmdc.pl check';
+    $string = ZM_PATH_BIN.'/zmdc.pl check';
     if ( $daemon ) {
       $string .= " $daemon";
       if ( $args )
@@ -29,15 +29,19 @@ class HostController extends AppController {
       '_serialize' => array('load')
     ));
   }
-  
+
   function login() {
-  
-    $mUser = $this->request->query('user') ? $this->request->query('user') : $this->request->data('user');
-    $mPassword = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');
-    $mToken = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');
 
+    $username = $this->request->query('user') ? $this->request->query('user') : $this->request->data('user');
+    if ( !$username )
+      $username = $this->request->query('username') ? $this->request->query('username') : $this->request->data('username');
+    $password = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');
+    if ( !$password )
+      $password = $this->request->query('password') ? $this->request->query('password') : $this->request->data('password');
 
-    if ( !($mUser && $mPassword) && !$mToken ) {
+    $token = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');
+
+    if ( !($username && $password) && !$token ) {
       throw new UnauthorizedException(__('No identity provided'));
     }
 
@@ -45,46 +49,39 @@ class HostController extends AppController {
     $cred = [];
     $cred_depr = [];
 
-    if ($mUser && $mPassword) {
-      $cred = $this->_getCredentials(true); // generate refresh
-    }
-    else {
-      $cred = $this->_getCredentials(false, $mToken); // don't generate refresh
+    if ( $username && $password ) {
+      ZM\Logger::Debug('Username and password provided, generating access and refresh tokens');
+      $cred = $this->_getCredentials(true, '', $username); // generate refresh
+    } else {
+      ZM\Logger::Debug('Only generating access token');
+      $cred = $this->_getCredentials(false, $token); // don't generate refresh
     }
 
     $login_array = array (
-      'access_token'=>$cred[0],
-      'access_token_expires'=>$cred[1]
+      'access_token'          => $cred[0],
+      'access_token_expires'  => $cred[1]
     );
 
-    $login_serialize_list = array (
-      'access_token',
-      'access_token_expires'
-    );
-
-    if ($mUser && $mPassword) {
+    if ( $username && $password ) {
       $login_array['refresh_token'] = $cred[2];
       $login_array['refresh_token_expires'] = $cred[3];
-      array_push ($login_serialize_list, 'refresh_token', 'refresh_token_expires');
     }
 
-    if (ZM_OPT_USE_LEGACY_API_AUTH) {
+    if ( ZM_OPT_USE_LEGACY_API_AUTH ) {
       $cred_depr = $this->_getCredentialsDeprecated();
-      $login_array ['credentials']=$cred_depr[0];
-      $login_array ['append_password']=$cred_depr[1];
-      array_push ($login_serialize_list, 'credentials', 'append_password');
+      $login_array['credentials'] = $cred_depr[0];
+      $login_array['append_password'] = $cred_depr[1];
+    } else {
+      ZM\Logger::Debug('Legacy Auth is disabled, not generating auth= credentials');
     }
 
-
     $login_array['version'] = $ver[0];
     $login_array['apiversion'] = $ver[1];
-    array_push ($login_serialize_list, 'version', 'apiversion');
 
-    $login_array["_serialize"] = $login_serialize_list;
+    $login_array['_serialize'] = array_keys($login_array);
 
     $this->set($login_array);
 
-   
   } // end function login()
 
   // clears out session
@@ -101,106 +98,98 @@ class HostController extends AppController {
   private function _getCredentialsDeprecated() {
     $credentials = '';
     $appendPassword = 0;
-    if (ZM_OPT_USE_AUTH) {
-      require_once __DIR__ .'/../../../includes/auth.php'; 
-      if (ZM_AUTH_RELAY=='hashed') {
-        $credentials = 'auth='.generateAuthHash(ZM_AUTH_HASH_IPS,true);
-      }
-      else {
-        $credentials = 'user='.$this->Session->read('Username').'&pass=';
+    if ( ZM_OPT_USE_AUTH ) {
+      require_once __DIR__ .'/../../../includes/auth.php';
+      if ( ZM_AUTH_RELAY == 'hashed' ) {
+        $credentials = 'auth='.generateAuthHash(ZM_AUTH_HASH_IPS, true);
+      } else {
+        $credentials = 'user='.$_SESSION['Username'].'&pass=';
         $appendPassword = 1;
       }
       return array($credentials, $appendPassword);
     }
   }
-  
-  private function _getCredentials($generate_refresh_token=false, $mToken='') {
-    $credentials = '';
-    $this->loadModel('Config');
 
-    if ( ZM_OPT_USE_AUTH ) {
-      require_once __DIR__ .'/../../../includes/auth.php'; 
-      require_once __DIR__.'/../../../vendor/autoload.php';
-    
-      $key = ZM_AUTH_HASH_SECRET;
-      if (!$key) {
-        throw new ForbiddenException(__('Please create a valid AUTH_HASH_SECRET in ZoneMinder'));
-      }
+  private function _getCredentials($generate_refresh_token=false, $token='', $username='') {
 
-      if ($mToken) {
-        // If we have a token, we need to derive username from there
-        $ret = validateToken($mToken, 'refresh', true);
-        $mUser = $ret[0]['Username'];
+    if ( !ZM_OPT_USE_AUTH ) {
+      ZM\Error('OPT_USE_AUTH is turned off. Tokens will be null');
+      return;
+    }
+      
 
-      } else {
-        $mUser = $_SESSION['username'];
-      }
+    if ( !ZM_AUTH_HASH_SECRET )
+      throw new ForbiddenException(__('Please create a valid AUTH_HASH_SECRET in ZoneMinder'));
 
-      ZM\Info("Creating token for \"$mUser\"");
+    require_once __DIR__ .'/../../../includes/auth.php';
+    require_once __DIR__.'/../../../vendor/autoload.php';
 
-      /* we won't support AUTH_HASH_IPS in token mode
-        reasons: 
-        a) counter-intuitive for mobile consumers 
-        b) zmu will never be able to to validate via a token if we sign
-           it after appending REMOTE_ADDR
-     
-      if (ZM_AUTH_HASH_IPS) {
-        $key = $key . $_SERVER['REMOTE_ADDR'];
-      }*/
+    if ( $token ) {
+      // If we have a token, we need to derive username from there
+      $ret = validateToken($token, 'refresh', true);
+      $username = $ret[0]['Username'];
+    }
 
-      $access_issued_at   = time();
-      $access_ttl = (ZM_AUTH_HASH_TTL || 2) * 3600; 
+    ZM\Info("Creating token for \"$username\"");
 
-      // by default access token will expire in 2 hrs
-      // you can change it by changing the value of ZM_AUTH_HASH_TLL
-      $access_expire_at     = $access_issued_at + $access_ttl;
-      //$access_expire_at = $access_issued_at + 60; // TEST, REMOVE
-  
-      $access_token = array(
-          "iss" => "ZoneMinder",
-          "iat" => $access_issued_at,
-          "exp" => $access_expire_at,
-          "user" => $mUser,
-          "type" => "access"
+    /* we won't support AUTH_HASH_IPS in token mode
+      reasons:
+      a) counter-intuitive for mobile consumers
+      b) zmu will never be able to to validate via a token if we sign
+         it after appending REMOTE_ADDR
+
+    if (ZM_AUTH_HASH_IPS) {
+      $key = $key . $_SERVER['REMOTE_ADDR'];
+    }*/
+
+    $access_issued_at = time();
+    $access_ttl = max(ZM_AUTH_HASH_TTL,1) * 3600;
+
+    // by default access token will expire in 2 hrs
+    // you can change it by changing the value of ZM_AUTH_HASH_TLL
+    $access_expire_at     = $access_issued_at + $access_ttl;
+    //$access_expire_at = $access_issued_at + 60; // TEST, REMOVE
+
+    $access_token = array(
+        'iss' => 'ZoneMinder',
+        'iat' => $access_issued_at,
+        'exp' => $access_expire_at,
+        'user' => $username,
+        'type' => 'access'
+    );
+
+    $jwt_access_token = \Firebase\JWT\JWT::encode($access_token, ZM_AUTH_HASH_SECRET, 'HS256');
+
+    $jwt_refresh_token = '';
+    $refresh_ttl = 0;
+
+    if ( $generate_refresh_token ) {
+      $refresh_issued_at = time();
+      $refresh_ttl = 24 * 3600; // 1 day
+
+      $refresh_expire_at = $refresh_issued_at + $refresh_ttl;
+      $refresh_token = array(
+          'iss' => 'ZoneMinder',
+          'iat' => $refresh_issued_at,
+          'exp' => $refresh_expire_at,
+          'user' => $username,
+          'type' => 'refresh'
       );
-    
-      $jwt_access_token = \Firebase\JWT\JWT::encode($access_token, $key, 'HS256');
-
-      $jwt_refresh_token = "";
-      $refresh_ttl = 0;
-
-      if ($generate_refresh_token) {
-        $refresh_issued_at   = time();
-        $refresh_ttl = 24 * 3600; // 1 day
-  
-        $refresh_expire_at     = $refresh_issued_at + $refresh_ttl;
-        $refresh_token = array(
-            "iss" => "ZoneMinder",
-            "iat" => $refresh_issued_at,
-            "exp" => $refresh_expire_at,
-            "user" => $mUser,
-            "type" => "refresh"  
-        );
-        $jwt_refresh_token = \Firebase\JWT\JWT::encode($refresh_token, $key, 'HS256');
-      }
-     
-    } 
+      $jwt_refresh_token = \Firebase\JWT\JWT::encode($refresh_token, ZM_AUTH_HASH_SECRET, 'HS256');
+    } # end if generate_refresh_token
     return array($jwt_access_token, $access_ttl, $jwt_refresh_token, $refresh_ttl);
-  }
+  } # end function _getCredentials($generate_refresh_token=false, $token='')
 
   // If $mid is set, only return disk usage for that monitor
   // Else, return an array of total disk usage, and per-monitor
   // usage.
   // This function is deprecated.  Use the Storage object or monitor object instead
   function getDiskPercent($mid = null) {
-    $this->loadModel('Config');
     $this->loadModel('Monitor');
 
     // If $mid is passed, see if it is valid
-    if ( $mid ) {
-      if ( !$this->Monitor->exists($mid) ) {
-        throw new NotFoundException(__('Invalid monitor'));
-      }
+    if ( $mid and !$this->Monitor->exists($mid) ) {
+      throw new NotFoundException(__('Invalid monitor'));
     }
 
     $zm_dir_events = ZM_DIR_EVENTS;
@@ -228,8 +217,8 @@ class HostController extends AppController {
         $name = $value['Monitor']['Name'];
         $color = $value['Monitor']['WebColour'];
 
-        $space = shell_exec ("du -s0 $zm_dir_events/$id | awk '{print $1}'");
-        if ($space == null) {
+        $space = shell_exec("du -s0 $zm_dir_events/$id | awk '{print $1}'");
+        if ( $space == null ) {
           $space = 0;
         }
         $space = $space/1024/1024;
@@ -265,7 +254,7 @@ class HostController extends AppController {
   }
 
   private function _getVersion() {
-    $version = Configure::read('ZM_VERSION');
+    $version = ZM_VERSION;
     $apiversion = '2.0';
     return array($version, $apiversion);
   }
diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 0686232df..3818f69d3 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -44,33 +44,26 @@ class MonitorsController extends AppController {
     } else {
       $conditions = array();
     }
-
     global $user;
     $allowedMonitors = $user ? preg_split('@,@', $user['MonitorIds'], NULL, PREG_SPLIT_NO_EMPTY) : null;
     if ( $allowedMonitors ) {
       $conditions['Monitor.Id' ] = $allowedMonitors;
     }
-    $find_array = array('conditions'=>$conditions,'contain'=>array('Group'));
 
-    if ( isset($conditions['GroupId']) ) {
-      $find_array['joins'] = array(
+    $find_array = array(
+      'conditions' => &$conditions,
+      'contain'    => array('Group'),
+      'joins'      => array(
         array(
           'table' => 'Groups_Monitors',
-          'type' => 'inner',
+          'type'  => 'left',
           'conditions' => array(
-            'Groups_Monitors.MonitorId = Monitor.Id'
+            'Groups_Monitors.MonitorId = Monitor.Id',
           ),
         ),
-        //array(
-          //'table' => 'Groups',
-          //'type' => 'inner',
-          //'conditions' => array(
-            //'Groups.Id = Groups_Monitors.GroupId',
-            //'Groups.Id' => $this->request->params['GroupId'],
-          //),
-        //)
-      );
-    }
+      ),
+      'group' => '`Monitor`.`Id`',
+    );
     $monitors = $this->Monitor->find('all',$find_array);
     $this->set(array(
           'monitors' => $monitors,
@@ -124,14 +117,17 @@ class MonitorsController extends AppController {
         throw new UnauthorizedException(__('Insufficient privileges'));
         return;
       }
-
       $this->Monitor->create();
-      if ( $this->Monitor->save($this->request->data) ) {
+      if ($this->Monitor->save($this->request->data) ) {
         $this->daemonControl($this->Monitor->id, 'start');
         //return $this->flash(__('The monitor has been saved.'), array('action' => 'index'));
         $message = 'Saved';
       } else {
         $message = 'Error';
+        // if there is a validation message, use it
+        if (!$this->Monitor->validates()) {
+          $message = $this->Monitor->validationErrors;
+       }
       }
       $this->set(array(
         'message' => $message,
@@ -246,16 +242,11 @@ class MonitorsController extends AppController {
   // where C=on|off|status
   public function alarm() {
     $id = $this->request->params['named']['id'];
-    $cmd = strtolower($this->request->params['named']['command']);
     if ( !$this->Monitor->exists($id) ) {
       throw new NotFoundException(__('Invalid monitor'));
     }
-    if ( $cmd != 'on' && $cmd != 'off' && $cmd != 'status' ) {
-      throw new BadRequestException(__('Invalid command'));
-    }
-    $zm_path_bin = Configure::read('ZM_PATH_BIN');
-    $mToken = $this->request->query('token') ? $this->request->query('token') : null;
 
+    $cmd = strtolower($this->request->params['named']['command']);
     switch ($cmd) {
       case 'on':
         $q = '-a';
@@ -269,42 +260,43 @@ class MonitorsController extends AppController {
         $verbose = ''; // zmu has a bug - gives incorrect verbose output in this case
         $q = '-s';
         break;      
+      default :
+        throw new BadRequestException(__('Invalid command'));
     }
 
     // form auth key based on auth credentials
-    $this->loadModel('Config');
-    $options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_OPT_USE_AUTH'));
-    $config = $this->Config->find('first', $options);
-    $zmOptAuth = $config['Config']['Value'];
-
-    $options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY'));
-    $config = $this->Config->find('first', $options);
-    $zmAuthRelay = $config['Config']['Value'];
-  
     $auth = '';
     
-    if ( $zmOptAuth ) {
-      if ($mToken) {
+    if ( ZM_OPT_USE_AUTH ) {
+      global $user;
+      $mToken = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');;
+      if ( $mToken ) {
         $auth = ' -T '.$mToken;
-      }  
-      elseif ( $zmAuthRelay == 'hashed' ) {
-        $options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_SECRET'));
-        $config = $this->Config->find('first', $options);
-        $zmAuthHashSecret = $config['Config']['Value'];
+      } else if ( ZM_AUTH_RELAY == 'hashed' ) {
+        $auth = ' -A '.generateAuthHash(ZM_AUTH_HASH_IPS);
+      } else if ( ZM_AUTH_RELAY == 'plain' ) {
+        # Plain requires the plain text password which must either be in request or stored in session
+        $password = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');;
+        if ( !$password ) 
+          $password = $this->request->query('password') ? $this->request->query('password') : $this->request->data('password');
 
-        $time = localtime();
-        $ak = $zmAuthHashSecret.$this->Session->Read('username').$this->Session->Read('passwordHash').$time[2].$time[3].$time[4].$time[5];
-        $ak = md5($ak);
-        $auth = ' -A '.$ak;
-      } else if ( $zmAuthRelay == 'plain' ) {
-        $auth = ' -U ' .$this->Session->Read('username').' -P '.$this->Session->Read('password');
-        
-      } else if ( $zmAuthRelay == 'none' ) {
-        $auth = ' -U ' .$this->Session->Read('username');
+        if ( ! $password ) {
+          # during auth the session will have been populated with the plaintext password
+          $stateful = $this->request->query('stateful') ? $this->request->query('stateful') : $this->request->data('stateful');
+          if ( $stateful ) {
+            $password = $_SESSION['password'];
+          }
+        } else if ( $_COOKIE['ZMSESSID'] ) {
+          $password = $_SESSION['password'];
+        }
+
+        $auth = ' -U ' .$user['Username'].' -P '.$password;
+      } else if ( ZM_AUTH_RELAY == 'none' ) {
+        $auth = ' -U ' .$user['Username'];
       }
     }
     
-    $shellcmd = escapeshellcmd("$zm_path_bin/zmu $verbose -m$id $q $auth");
+    $shellcmd = escapeshellcmd(ZM_PATH_BIN."/zmu $verbose -m$id $q $auth");
     $status = exec ($shellcmd);
 
     $this->set(array(
@@ -387,6 +379,8 @@ class MonitorsController extends AppController {
       $args = '';
       if ( $daemon == 'zmc' and $monitor['Type'] == 'Local' ) {
         $args = '-d ' . $monitor['Device'];
+      } else if ( $daemon == 'zmcontrol.pl' ) {
+        $args = '--id '.$id;
       } else {
         $args = '-m ' . $id;
       }
diff --git a/web/api/app/Controller/ServersController.php b/web/api/app/Controller/ServersController.php
index c30de038f..c3ac6fad7 100644
--- a/web/api/app/Controller/ServersController.php
+++ b/web/api/app/Controller/ServersController.php
@@ -17,12 +17,17 @@ class ServersController extends AppController {
 
   public function beforeFilter() {
     parent::beforeFilter();
+    /*
+     * A user needs the server data to calculate how to view a monitor, and there really isn't anything sensitive in this data.
+     * So it has been decided for now to just let everyone read it.
+     
     global $user;
     $canView = (!$user) || ($user['System'] != 'None');
     if ( !$canView ) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;
     }
+     */
   }
 
 /**
@@ -34,7 +39,7 @@ class ServersController extends AppController {
     $this->Server->recursive = 0;
     
     $options = '';
-    $servers = $this->Server->find('all',$options);
+    $servers = $this->Server->find('all', $options);
 		$this->set(array(
 					'servers' => $servers,
 					'_serialize' => array('servers')
@@ -50,13 +55,13 @@ class ServersController extends AppController {
  */
   public function view($id = null) {
     $this->Server->recursive = 0;
-    if (!$this->Server->exists($id)) {
+    if ( !$this->Server->exists($id) ) {
       throw new NotFoundException(__('Invalid server'));
     }
     $restricted = '';
     
     $options = array('conditions' => array( 
-          array('Server.' . $this->Server->primaryKey => $id),
+          array('Server.'.$this->Server->primaryKey => $id),
           $restricted
           )
         );
diff --git a/web/api/app/Controller/UsersController.php b/web/api/app/Controller/UsersController.php
index 6b691cee1..502a929ff 100644
--- a/web/api/app/Controller/UsersController.php
+++ b/web/api/app/Controller/UsersController.php
@@ -14,6 +14,18 @@ class UsersController extends AppController {
  */
 	public $components = array('RequestHandler', 'Paginator');
 
+  public function beforeFilter() {
+    parent::beforeFilter();
+
+    global $user;
+    # We already tested for auth in appController, so we just need to test for specific permission
+    $canView = (!$user) || ($user['System'] != 'None');
+    if ( !$canView ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+  }
+
 /**
  * index method
  *
@@ -23,6 +35,12 @@ class UsersController extends AppController {
 	public function index() {
 		$this->User->recursive = 0;
 
+    global $user;
+    # We should actually be able to list our own user, but I'm not bothering at this time.
+    if ( $user['System'] == 'None' ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
 		$users = $this->Paginator->paginate('User');
 
 		$this->set(compact('users'));
@@ -36,16 +54,20 @@ class UsersController extends AppController {
  * @return void
  */
 	public function view($id = null) {
-		$this->loadModel('Config');
-		$configs = $this->Config->find('list', array(
-			'fields' => array('Name', 'Value'),
-			'conditions' => array('Name' => array('ZM_DIR_EVENTS'))
-		));
-
 		$this->User->recursive = 1;
-		if (!$this->User->exists($id)) {
+
+    global $user;
+    # We can view ourselves
+    $canView = ($user['System'] != 'None') or ($user['Id'] == $id);
+    if ( !$canView ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+
+		if ( !$this->User->exists($id) ) {
 			throw new NotFoundException(__('Invalid user'));
 		}
+
 		$options = array('conditions' => array('User.' . $this->User->primaryKey => $id));
 		$user = $this->User->find('first', $options);
 		
@@ -61,9 +83,16 @@ class UsersController extends AppController {
  * @return void
  */
 	public function add() {
-		if ($this->request->is('post')) {
+		if ( $this->request->is('post') ) {
+
+      global $user;
+      if ( $user['System'] != 'Edit' ) {
+        throw new UnauthorizedException(__('Insufficient Privileges'));
+        return;
+      }
+
 			$this->User->create();
-			if ($this->User->save($this->request->data)) {
+			if ( $this->User->save($this->request->data) ) {
 				return $this->flash(__('The user has been saved.'), array('action' => 'index'));
 			}
 			$this->Session->setFlash(
@@ -82,20 +111,29 @@ class UsersController extends AppController {
 	public function edit($id = null) {
 		$this->User->id = $id;
 
-		if (!$this->User->exists($id)) {
+    global $user;
+    $canEdit = ($user['System'] == 'Edit') or (($user['Id'] == $id) and ZM_USER_SELF_EDIT);
+    if ( !$canEdit ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+
+		if ( !$this->User->exists($id) ) {
 			throw new NotFoundException(__('Invalid user'));
 		}
 
-		if ($this->request->is('post') || $this->request->is('put')) {
-			if ($this->User->save($this->request->data)) {
+		if ( $this->request->is('post') || $this->request->is('put') ) {
+			if ( $this->User->save($this->request->data) ) {
 				$message = 'Saved';
 			} else {
 				$message = 'Error';
 			}
 		} else {
-            $this->request->data = $this->User->read(null, $id);
-            unset($this->request->data['User']['password']);
-        }
+      # What is this doing? Resetting the request data? I understand clearing the password field
+      # but generally I feel like the request data should be read only
+      $this->request->data = $this->User->read(null, $id);
+      unset($this->request->data['User']['Password']);
+    }
 
 		$this->set(array(
 			'message' => $message,
@@ -112,11 +150,18 @@ class UsersController extends AppController {
  */
 	public function delete($id = null) {
 		$this->User->id = $id;
-		if (!$this->User->exists()) {
+
+    global $user;
+    # Can't delete ourselves
+    if ( ($user['System'] != 'Edit') or ($user['Id'] == $id) ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+		if ( !$this->User->exists() ) {
 			throw new NotFoundException(__('Invalid user'));
 		}
 		$this->request->allowMethod('post', 'delete');
-		if ($this->User->delete()) {
+		if ( $this->User->delete() ) {
 			$message = 'The user has been deleted.';
 		} else {
 			$message = 'The user could not be deleted. Please, try again.';
@@ -126,47 +171,4 @@ class UsersController extends AppController {
 			'_serialize' => array('message')
 		));
 	}
-
-    public function beforeFilter() {
-        parent::beforeFilter();
-
-		$this->loadModel('Config');
-		$configs = $this->Config->find('list', array(
-			'fields' => array('Name', 'Value'),
-			'conditions' => array('Name' => array('ZM_OPT_USE_AUTH'))
-		));
-		if ( $configs['ZM_OPT_USE_AUTH'] ) {
-        $this->Auth->allow('add','logout');
-		} else {
-		$this->Auth->allow();
-		}
-    }
-
-	public function login() {
-		$this->loadModel('Config');
-		$configs = $this->Config->find('list', array(
-			'fields' => array('Name', 'Value'),
-			'conditions' => array('Name' => array('ZM_OPT_USE_AUTH'))
-		));
-
-		if ( ! $configs['ZM_OPT_USE_AUTH'] ) {
-			$this->set(array(
-						'message' => 'Login is not required.',
-						'_serialize' => array('message')
-						));
-			return;
-		}
-
-		if ($this->request->is('post')) {
-			if ($this->Auth->login()) {
-				return $this->redirect($this->Auth->redirectUrl());
-			}
-			$this->Session->setFlash(__('Invalid username or password, try again'));
-		}
-	}
-
-	public function logout() {
-		return $this->redirect($this->Auth->logout());
-	}
-
-}
+}  # end class UsersController
diff --git a/web/api/app/Controller/ZonesController.php b/web/api/app/Controller/ZonesController.php
index 5b8c3f1a3..8d5e661bb 100644
--- a/web/api/app/Controller/ZonesController.php
+++ b/web/api/app/Controller/ZonesController.php
@@ -40,6 +40,7 @@ class ZonesController extends AppController {
       '_serialize' => array('zones')
     ));
   }
+
   public function index() {
     $this->Zone->recursive = -1;
 
@@ -63,23 +64,43 @@ class ZonesController extends AppController {
    * @return void
    */
   public function add() {
-    if ( $this->request->is('post') ) {
 
-      global $user;
-      $canEdit = (!$user) || $user['Monitors'] == 'Edit';
-      if ( !$canEdit ) {
-        throw new UnauthorizedException(__('Insufficient Privileges'));
-        return;
-      }
+    if ( !$this->request->is('post') ) {
+      throw new BadRequestException(__('Invalid method. Should be post'));
+      return;
+    }
 
-      $this->Zone->create();
-      if ( $this->Zone->save($this->request->data) ) {
-        return $this->flash(__('The zone has been saved.'), array('action' => 'index'));
+    global $user;
+    $canEdit = (!$user) || $user['Monitors'] == 'Edit';
+    if ( !$canEdit ) {
+      throw new UnauthorizedException(__('Insufficient Privileges'));
+      return;
+    }
+
+    $zone = null;
+
+    $this->Zone->create();
+    $zone = $this->Zone->save($this->request->data);
+    if ( $zone ) {
+      require_once __DIR__ .'/../../../includes/Monitor.php';
+      $monitor = new ZM\Monitor($zone['Zone']['MonitorId']);
+      $monitor->zmaControl('restart');
+      $message = 'Saved';
+      //$zone = $this->Zone->find('first', array('conditions' => array( array('Zone.' . $this->Zone->primaryKey => $this->Zone),
+    } else {
+      $message = 'Error: ';
+      // if there is a validation message, use it
+      if ( !$this->Zone->validates() ) {
+        $message = $this->Zone->validationErrors;
       }
     }
-    $monitors = $this->Zone->Monitor->find('list');
-    $this->set(compact('monitors'));
-  }
+
+    $this->set(array(
+      'message' => $message,
+      'zone' => $zone,
+      '_serialize' => array('message','zone')
+    ));
+  } // end function add()
 
   /**
    * edit method
@@ -94,6 +115,7 @@ class ZonesController extends AppController {
     if ( !$this->Zone->exists($id) ) {
       throw new NotFoundException(__('Invalid zone'));
     }
+    $message = '';
     if ( $this->request->is(array('post', 'put')) ) {
       global $user;
       $canEdit = (!$user) || $user['Monitors'] == 'Edit';
@@ -102,14 +124,15 @@ class ZonesController extends AppController {
         return;
       }
       if ( $this->Zone->save($this->request->data) ) {
-        return $this->flash(__('The zone has been saved.'), array('action' => 'index'));
+        $message = 'The zone has been saved.';
+      } else {
+        $message = 'Error ' . print_r($this->Zone->invalidFields());
       }
-    } else {
-      $options = array('conditions' => array('Zone.' . $this->Zone->primaryKey => $id));
-      $this->request->data = $this->Zone->find('first', $options);
     }
-    $monitors = $this->Zone->Monitor->find('list');
-    $this->set(compact('monitors'));
+    $this->set(array(
+      'message' => $message,
+      '_serialize' => array('message')
+    ));
   }
 
   /**
diff --git a/web/api/app/Model/Event.php b/web/api/app/Model/Event.php
index de83473f1..2c686d79a 100644
--- a/web/api/app/Model/Event.php
+++ b/web/api/app/Model/Event.php
@@ -102,6 +102,13 @@ class Event extends AppModel {
     ),
   );
 
+  public $actsAs = array(
+    'CakePHP-Enum-Behavior.Enum' => array(
+      'Orientation'     => array('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT'),
+      'Scheme'          => array('Deep','Medium','Shallow')
+    )
+  );
+
   public function Relative_Path() {
     $Event = new ZM\Event($this->id);
     return $Event->Relative_Path();
diff --git a/web/api/app/Model/Group.php b/web/api/app/Model/Group.php
index 108f9b9c7..04d783b14 100644
--- a/web/api/app/Model/Group.php
+++ b/web/api/app/Model/Group.php
@@ -59,7 +59,7 @@ class Group extends AppModel {
  *
  * @var array
  */
-	public $hasMany = array(
+	public $hasAndBelongsToMany = array(
 		'Monitor' => array(
 			'className' => 'Monitor',
       'joinTable' =>  'Groups_Monitors',
@@ -77,4 +77,5 @@ class Group extends AppModel {
 			'counterQuery' => ''
 		),
   );
+  var $actsAs = array( 'Containable' );
 }
diff --git a/web/api/app/Model/Monitor.php b/web/api/app/Model/Monitor.php
index 2e6584794..2de0b6fcb 100644
--- a/web/api/app/Model/Monitor.php
+++ b/web/api/app/Model/Monitor.php
@@ -47,7 +47,16 @@ class Monitor extends AppModel {
 				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 			),
 		),
-	);
+    'Name' => array(
+       'required' => array(
+         'on'         => 'create',
+         'rule'       => 'notBlank',
+         'message'    => 'Monitor Name must be specified for creation',
+         'required'   => true,
+       ),
+     )
+
+  );
 
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
@@ -110,9 +119,9 @@ class Monitor extends AppModel {
   );
   public $actsAs = array(
     'CakePHP-Enum-Behavior.Enum' => array(
-      'Type'            => array('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite'),
+      'Type'            => array('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite', 'VNC'),
       'Function'        => array('None','Monitor','Modect','Record','Mocord','Nodect'),
-      'Orientation'     => array('0','90','180','270','hori','vert'),
+      'Orientation'     => array('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT'),
       'OutputCodec'     => array('h264','mjpeg','mpeg1','mpeg2'),
       'OutputContainer' => array('auto','mp4','mkv'),
       'DefaultView'     => array('Events','Control'),
diff --git a/web/api/app/Model/User.php b/web/api/app/Model/User.php
index 9137ebfc5..1548aaee3 100644
--- a/web/api/app/Model/User.php
+++ b/web/api/app/Model/User.php
@@ -3,8 +3,6 @@ App::uses('AppModel', 'Model');
 /**
  * User Model
  *
- * @property Monitor $Monitor
- * @property Frame $Frame
  */
 class User extends AppModel {
 
@@ -23,6 +21,20 @@ class User extends AppModel {
         )
     );
 
+    function beforeFind($query) {
+      if ( empty($query['fields']) ) {
+        $schema = $this->schema();
+        unset($schema['Password']);
+
+        foreach (array_keys($schema) as $field) {
+          $query['fields'][] = $this->alias . '.' . $field;
+        }
+        return $query;
+      }
+      return parent::beforeFind($query);
+    }
+
+
 /**
  * Use table
  *
@@ -53,14 +65,6 @@ class User extends AppModel {
  * @var array
  */
 	public $belongsTo = array(
-		/*'Monitor' => array(
-			'className' => 'Monitor',
-			'foreignKey' => 'MonitorId',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		)
-*/
 	);
 
 /**
@@ -69,21 +73,6 @@ class User extends AppModel {
  * @var array
  */
 	public $hasMany = array(
-/*
-		'Frame' => array(
-			'className' => 'Frame',
-			'foreignKey' => 'UserId',
-			'dependent' => true,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		)
-*/
 	);
 
 }
diff --git a/web/api/app/Model/Zone.php b/web/api/app/Model/Zone.php
index 8cdc8131b..cdf8464e2 100644
--- a/web/api/app/Model/Zone.php
+++ b/web/api/app/Model/Zone.php
@@ -30,6 +30,28 @@ class Zone extends AppModel {
 
 	public $recursive = -1;
 
+  /**
+ * Validation rules
+ *
+ * @var array
+ */
+  public $validate = array(
+    'MonitorId' => array(
+      'rule' => 'checkMonitorId',
+      //array('naturalNumber'),
+      'message' => 'Zones must have a valid MonitorId',
+      'allowEmpty' => false,
+        //'last' => false, // Stop validation after this rule
+        //'on' => 'create', // Limit validation to 'create' or 'update' operations
+    ),
+    'Name' => array(
+       'required' => array(
+         'rule'       => 'notBlank',
+         'message'    => 'Zone Name must be specified for creation',
+       ),
+     )
+  );
+
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 /**
@@ -41,9 +63,17 @@ class Zone extends AppModel {
 		'Monitor' => array(
 			'className' => 'Monitor',
 			'foreignKey' => 'MonitorId',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
+			//'conditions' => '',
+			//'fields' => '',
+			//'order' => ''
 		)
 	);
+
+  public function checkMonitorId($data) {
+    if ( !$this->Monitor->find('first', array('conditions'=>array('Id'=>$data['MonitorId']))) ) {
+      //$this->invalidate('MonitorId', 'Invalid Monitor Id');
+      return false;
+    }
+    return true;
+  }
 }
diff --git a/web/api/app/View/Zones/json/add.ctp b/web/api/app/View/Zones/json/add.ctp
new file mode 100644
index 000000000..1675fa9be
--- /dev/null
+++ b/web/api/app/View/Zones/json/add.ctp
@@ -0,0 +1,2 @@
+echo json_encode($message);
+echo json_encode($zone);
diff --git a/web/api/app/View/Zones/json/edit.ctp b/web/api/app/View/Zones/json/edit.ctp
new file mode 100644
index 000000000..1675fa9be
--- /dev/null
+++ b/web/api/app/View/Zones/json/edit.ctp
@@ -0,0 +1,2 @@
+echo json_encode($message);
+echo json_encode($zone);
diff --git a/web/api/app/View/Zones/xml/add.ctp b/web/api/app/View/Zones/xml/add.ctp
new file mode 100644
index 000000000..a8fcec73b
--- /dev/null
+++ b/web/api/app/View/Zones/xml/add.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response'=>$message, 'zone'=>$zone));
+echo $xml->asXML();
diff --git a/web/api/app/View/Zones/xml/edit.ctp b/web/api/app/View/Zones/xml/edit.ctp
new file mode 100644
index 000000000..cb6f92f66
--- /dev/null
+++ b/web/api/app/View/Zones/xml/edit.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $message, 'zone'=>$zone));
+echo $xml->asXML();
diff --git a/web/css/bootstrap-table-page-jump-to.min.css b/web/css/bootstrap-table-page-jump-to.min.css
new file mode 100644
index 000000000..cfa51a197
--- /dev/null
+++ b/web/css/bootstrap-table-page-jump-to.min.css
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+.bootstrap-table.bootstrap3 .fixed-table-pagination>.pagination .page-jump-to,.bootstrap-table.bootstrap3 .fixed-table-pagination>.pagination ul.pagination{display:inline}.bootstrap-table .fixed-table-pagination>.pagination .page-jump-to input{width:70px;margin-left:5px;text-align:center;float:left}
\ No newline at end of file
diff --git a/web/css/bootstrap-table.min.css b/web/css/bootstrap-table.min.css
new file mode 100644
index 000000000..dc0113c73
--- /dev/null
+++ b/web/css/bootstrap-table.min.css
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{align-items:center;background:#fff;display:flex;justify-content:center;position:absolute;bottom:0;width:100%;z-index:1000;transition:visibility 0s,opacity .15s ease-in-out;opacity:0;visibility:hidden}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.open{visibility:visible;opacity:1}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap{align-items:baseline;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text{margin-right:6px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap{align-items:center;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{content:"";animation-duration:1.5s;animation-iteration-count:infinite;animation-name:LOADING;background:#212529;border-radius:50%;display:block;height:5px;margin:0 4px;opacity:0;width:5px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot{animation-delay:.3s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after{animation-delay:.6s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark{background:#212529}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before{background:#fff}.bootstrap-table .fixed-table-container .fixed-table-footer{overflow:hidden}.bootstrap-table .fixed-table-pagination::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-pagination>.pagination,.bootstrap-table .fixed-table-pagination>.pagination-detail{margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-pagination>.pagination-detail .pagination-info{line-height:34px;margin-right:5px}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list{display:inline-block}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group{position:relative;display:inline-block;vertical-align:middle}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group .dropdown-menu{margin-bottom:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination{margin:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination a{padding:6px 12px;line-height:1.428571429}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a{color:#c8c8c8}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::before{content:'\2B05'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::after{content:'\27A1'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.disabled a{pointer-events:none;cursor:default}.bootstrap-table.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#fff;height:calc(100vh);overflow-y:scroll}div.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}@keyframes LOADING{0%{opacity:0}50%{opacity:1}to{opacity:0}}
\ No newline at end of file
diff --git a/web/css/bootstrap.min.css b/web/css/bootstrap.min.css
index 73bd8aed0..387b56b2c 100644
--- a/web/css/bootstrap.min.css
+++ b/web/css/bootstrap.min.css
@@ -1,5 +1,6 @@
 /*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
+ * Bootstrap v4.5.0 (https://getbootstrap.com/)
+ * Copyright 2011-2020 The Bootstrap Authors
+ * Copyright 2011-2020 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^="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:"\002a"}.glyphicon-plus:before{content:"\002b"}.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: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: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::-ms-expand{background-color:transparent;border:0}.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:11px;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: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.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,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.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,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.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,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.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,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.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,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.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,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-left-radius:4px;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-right-radius:4px;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 .form-control:focus{z-index:3}.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:2;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:3;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{padding-right:15px;padding-left:15px;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{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);background-color:rgba(0,0,0,0);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:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.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,.modal-header:after,.modal-header: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,.modal-header: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}}
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-weight:500;line-height:1.2}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem;font-weight:300;line-height:1.2}.display-2{font-size:5.5rem;font-weight:300;line-height:1.2}.display-3{font-size:4.5rem;font-weight:300;line-height:1.2}.display-4{font-size:3.5rem;font-weight:300;line-height:1.2}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer::before{content:"\2014\00A0"}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem;max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#e83e8c;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid,.container-lg,.container-md,.container-sm,.container-xl{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container,.container-sm{max-width:540px}}@media (min-width:768px){.container,.container-md,.container-sm{max-width:720px}}@media (min-width:992px){.container,.container-lg,.container-md,.container-sm{max-width:960px}}@media (min-width:1200px){.container,.container-lg,.container-md,.container-sm,.container-xl{max-width:1140px}}.row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-10,.col-11,.col-12,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-auto,.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto,.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto,.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{position:relative;width:100%;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-ms-flex-order:-1;order:-1}.order-last{-ms-flex-order:13;order:13}.order-0{-ms-flex-order:0;order:0}.order-1{-ms-flex-order:1;order:1}.order-2{-ms-flex-order:2;order:2}.order-3{-ms-flex-order:3;order:3}.order-4{-ms-flex-order:4;order:4}.order-5{-ms-flex-order:5;order:5}.order-6{-ms-flex-order:6;order:6}.order-7{-ms-flex-order:7;order:7}.order-8{-ms-flex-order:8;order:8}.order-9{-ms-flex-order:9;order:9}.order-10{-ms-flex-order:10;order:10}.order-11{-ms-flex-order:11;order:11}.order-12{-ms-flex-order:12;order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-sm-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-sm-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-sm-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-sm-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-sm-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-sm-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-ms-flex-order:-1;order:-1}.order-sm-last{-ms-flex-order:13;order:13}.order-sm-0{-ms-flex-order:0;order:0}.order-sm-1{-ms-flex-order:1;order:1}.order-sm-2{-ms-flex-order:2;order:2}.order-sm-3{-ms-flex-order:3;order:3}.order-sm-4{-ms-flex-order:4;order:4}.order-sm-5{-ms-flex-order:5;order:5}.order-sm-6{-ms-flex-order:6;order:6}.order-sm-7{-ms-flex-order:7;order:7}.order-sm-8{-ms-flex-order:8;order:8}.order-sm-9{-ms-flex-order:9;order:9}.order-sm-10{-ms-flex-order:10;order:10}.order-sm-11{-ms-flex-order:11;order:11}.order-sm-12{-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-md-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-md-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-md-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-md-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-md-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-md-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-md-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-ms-flex-order:-1;order:-1}.order-md-last{-ms-flex-order:13;order:13}.order-md-0{-ms-flex-order:0;order:0}.order-md-1{-ms-flex-order:1;order:1}.order-md-2{-ms-flex-order:2;order:2}.order-md-3{-ms-flex-order:3;order:3}.order-md-4{-ms-flex-order:4;order:4}.order-md-5{-ms-flex-order:5;order:5}.order-md-6{-ms-flex-order:6;order:6}.order-md-7{-ms-flex-order:7;order:7}.order-md-8{-ms-flex-order:8;order:8}.order-md-9{-ms-flex-order:9;order:9}.order-md-10{-ms-flex-order:10;order:10}.order-md-11{-ms-flex-order:11;order:11}.order-md-12{-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-lg-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-lg-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-lg-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-lg-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-lg-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-lg-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-ms-flex-order:-1;order:-1}.order-lg-last{-ms-flex-order:13;order:13}.order-lg-0{-ms-flex-order:0;order:0}.order-lg-1{-ms-flex-order:1;order:1}.order-lg-2{-ms-flex-order:2;order:2}.order-lg-3{-ms-flex-order:3;order:3}.order-lg-4{-ms-flex-order:4;order:4}.order-lg-5{-ms-flex-order:5;order:5}.order-lg-6{-ms-flex-order:6;order:6}.order-lg-7{-ms-flex-order:7;order:7}.order-lg-8{-ms-flex-order:8;order:8}.order-lg-9{-ms-flex-order:9;order:9}.order-lg-10{-ms-flex-order:10;order:10}.order-lg-11{-ms-flex-order:11;order:11}.order-lg-12{-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-xl-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-xl-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-xl-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-xl-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-xl-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-xl-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-ms-flex-order:-1;order:-1}.order-xl-last{-ms-flex-order:13;order:13}.order-xl-0{-ms-flex-order:0;order:0}.order-xl-1{-ms-flex-order:1;order:1}.order-xl-2{-ms-flex-order:2;order:2}.order-xl-3{-ms-flex-order:3;order:3}.order-xl-4{-ms-flex-order:4;order:4}.order-xl-5{-ms-flex-order:5;order:5}.order-xl-6{-ms-flex-order:6;order:6}.order-xl-7{-ms-flex-order:7;order:7}.order-xl-8{-ms-flex-order:8;order:8}.order-xl-9{-ms-flex-order:9;order:9}.order-xl-10{-ms-flex-order:10;order:10}.order-xl-11{-ms-flex-order:11;order:11}.order-xl-12{-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;margin-bottom:1rem;color:#212529}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table-sm td,.table-sm th{padding:.3rem}.table-bordered{border:1px solid #dee2e6}.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{color:#212529;background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#7abaff}.table-hover .table-primary:hover{background-color:#9fcdff}.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#b3b7bb}.table-hover .table-secondary:hover{background-color:#c8cbcf}.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-success tbody+tbody,.table-success td,.table-success th,.table-success thead th{border-color:#8fd19e}.table-hover .table-success:hover{background-color:#b1dfbb}.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-info tbody+tbody,.table-info td,.table-info th,.table-info thead th{border-color:#86cfda}.table-hover .table-info:hover{background-color:#abdde5}.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-warning tbody+tbody,.table-warning td,.table-warning th,.table-warning thead th{border-color:#ffdf7e}.table-hover .table-warning:hover{background-color:#ffe8a1}.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-danger tbody+tbody,.table-danger td,.table-danger th,.table-danger thead th{border-color:#ed969e}.table-hover .table-danger:hover{background-color:#f1b0b7}.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-light tbody+tbody,.table-light td,.table-light th,.table-light thead th{border-color:#fbfcfc}.table-hover .table-light:hover{background-color:#ececf6}.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#95999c}.table-hover .table-dark:hover{background-color:#b9bbbe}.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#343a40}.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:rgba(255,255,255,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:-moz-focusring{color:transparent;text-shadow:0 0 0 #495057}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{-webkit-appearance:none;-moz-appearance:none;appearance:none}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.25rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding:.375rem 0;margin-bottom:0;font-size:1rem;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.5em + .5rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.form-control-lg{height:calc(1.5em + 1rem + 2px);padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}select.form-control[multiple],select.form-control[size]{height:auto}textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label,.form-check-input[disabled]~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:.25rem}.is-valid~.valid-feedback,.is-valid~.valid-tooltip,.was-validated :valid~.valid-feedback,.was-validated :valid~.valid-tooltip{display:block}.form-control.is-valid,.was-validated .form-control:valid{border-color:#28a745;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-valid,.was-validated .custom-select:valid{border-color:#28a745;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-valid:focus,.was-validated .custom-select:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label::before,.was-validated .custom-control-input:valid~.custom-control-label::before{border-color:#28a745}.custom-control-input.is-valid:checked~.custom-control-label::before,.was-validated .custom-control-input:valid:checked~.custom-control-label::before{border-color:#34ce57;background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label::before,.was-validated .custom-control-input:valid:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-control-input.is-valid:focus:not(:checked)~.custom-control-label::before,.was-validated .custom-control-input:valid:focus:not(:checked)~.custom-control-label::before{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:.25rem}.is-invalid~.invalid-feedback,.is-invalid~.invalid-tooltip,.was-validated :invalid~.invalid-feedback,.was-validated :invalid~.invalid-tooltip{display:block}.form-control.is-invalid,.was-validated .form-control:invalid{border-color:#dc3545;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-invalid,.was-validated .custom-select:invalid{border-color:#dc3545;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-invalid:focus,.was-validated .custom-select:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label::before,.was-validated .custom-control-input:invalid~.custom-control-label::before{border-color:#dc3545}.custom-control-input.is-invalid:checked~.custom-control-label::before,.was-validated .custom-control-input:invalid:checked~.custom-control-label::before{border-color:#e4606d;background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-control-input.is-invalid:focus:not(:checked)~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus:not(:checked)~.custom-control-label::before{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}.form-inline .form-group{display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center;margin-bottom:0}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .custom-select,.form-inline .input-group{width:auto}.form-inline .form-check{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;-ms-flex-negative:0;flex-shrink:0;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;color:#212529;text-align:center;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529;text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#0069d9;border-color:#0062cc;box-shadow:0 0 0 .2rem rgba(38,143,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(38,143,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{color:#fff;background-color:#5a6268;border-color:#545b62;box-shadow:0 0 0 .2rem rgba(130,138,145,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(130,138,145,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#218838;border-color:#1e7e34;box-shadow:0 0 0 .2rem rgba(72,180,97,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(72,180,97,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#138496;border-color:#117a8b;box-shadow:0 0 0 .2rem rgba(58,176,195,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(58,176,195,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{color:#212529;background-color:#e0a800;border-color:#d39e00;box-shadow:0 0 0 .2rem rgba(222,170,12,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(222,170,12,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c82333;border-color:#bd2130;box-shadow:0 0 0 .2rem rgba(225,83,97,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(225,83,97,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{color:#212529;background-color:#e2e6ea;border-color:#dae0e5;box-shadow:0 0 0 .2rem rgba(216,217,219,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(216,217,219,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{color:#fff;background-color:#23272b;border-color:#1d2124;box-shadow:0 0 0 .2rem rgba(82,88,93,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(82,88,93,.5)}.btn-outline-primary{color:#007bff;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-success{color:#28a745;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;text-decoration:none}.btn-link:hover{color:#0056b3;text-decoration:underline}.btn-link.focus,.btn-link:focus{text-decoration:underline}.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media (prefers-reduced-motion:reduce){.collapsing{transition:none}}.dropdown,.dropleft,.dropright,.dropup{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropdown-menu-left{right:auto;left:0}.dropdown-menu-right{right:0;left:auto}@media (min-width:576px){.dropdown-menu-sm-left{right:auto;left:0}.dropdown-menu-sm-right{right:0;left:auto}}@media (min-width:768px){.dropdown-menu-md-left{right:auto;left:0}.dropdown-menu-md-right{right:0;left:auto}}@media (min-width:992px){.dropdown-menu-lg-left{right:auto;left:0}.dropdown-menu-lg-right{right:0;left:auto}}@media (min-width:1200px){.dropdown-menu-xl-left{right:auto;left:0}.dropdown-menu-xl-right{right:0;left:auto}}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-toggle::after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:""}.dropleft .dropdown-toggle::after{display:none}.dropleft .dropdown-toggle::before{display:inline-block;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty::after{margin-left:0}.dropleft .dropdown-toggle::before{vertical-align:0}.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;pointer-events:none;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#212529}.btn-group,.btn-group-vertical{position:relative;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-ms-flex:1 1 auto;flex:1 1 auto}.btn-group-vertical>.btn:hover,.btn-group>.btn:hover{z-index:1}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus{z-index:1}.btn-toolbar{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn-group:not(:first-child),.btn-group>.btn:not(:first-child){margin-left:-1px}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split::after,.dropright .dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after{margin-left:0}.dropleft .dropdown-toggle-split::before{margin-right:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-ms-flex-direction:column;flex-direction:column;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:center;justify-content:center}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}.btn-group-vertical>.btn-group:not(:first-child),.btn-group-vertical>.btn:not(:first-child){margin-top:-1px}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio],.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control,.input-group>.form-control-plaintext{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;min-width:0;margin-bottom:0}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control,.input-group>.form-control-plaintext+.custom-file,.input-group>.form-control-plaintext+.custom-select,.input-group>.form-control-plaintext+.form-control{margin-left:-1px}.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn:focus,.input-group-prepend .btn:focus{z-index:3}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group-lg>.custom-select,.input-group-lg>.form-control:not(textarea){height:calc(1.5em + 1rem + 2px)}.input-group-lg>.custom-select,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.input-group-sm>.custom-select,.input-group-sm>.form-control:not(textarea){height:calc(1.5em + .5rem + 2px)}.input-group-sm>.custom-select,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.input-group-lg>.custom-select,.input-group-sm>.custom-select{padding-right:1.75rem}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;left:0;z-index:-1;width:1rem;height:1.25rem;opacity:0}.custom-control-input:checked~.custom-control-label::before{color:#fff;border-color:#007bff;background-color:#007bff}.custom-control-input:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:focus:not(:checked)~.custom-control-label::before{border-color:#80bdff}.custom-control-input:not(:disabled):active~.custom-control-label::before{color:#fff;background-color:#b3d7ff;border-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label,.custom-control-input[disabled]~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label::before,.custom-control-input[disabled]~.custom-control-label::before{background-color:#e9ecef}.custom-control-label{position:relative;margin-bottom:0;vertical-align:top}.custom-control-label::before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;pointer-events:none;content:"";background-color:#fff;border:#adb5bd solid 1px}.custom-control-label::after{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:"";background:no-repeat 50%/50% 50%}.custom-checkbox .custom-control-label::before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before{border-color:#007bff;background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label::before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-switch{padding-left:2.25rem}.custom-switch .custom-control-label::before{left:-2.25rem;width:1.75rem;pointer-events:all;border-radius:.5rem}.custom-switch .custom-control-label::after{top:calc(.25rem + 2px);left:calc(-2.25rem + 2px);width:calc(1rem - 4px);height:calc(1rem - 4px);background-color:#adb5bd;border-radius:.5rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-transform .15s ease-in-out;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-transform .15s ease-in-out}@media (prefers-reduced-motion:reduce){.custom-switch .custom-control-label::after{transition:none}}.custom-switch .custom-control-input:checked~.custom-control-label::after{background-color:#fff;-webkit-transform:translateX(.75rem);transform:translateX(.75rem)}.custom-switch .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem 1.75rem .375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{display:none}.custom-select:-moz-focusring{color:transparent;text-shadow:0 0 0 #495057}.custom-select-sm{height:calc(1.5em + .5rem + 2px);padding-top:.25rem;padding-bottom:.25rem;padding-left:.5rem;font-size:.875rem}.custom-select-lg{height:calc(1.5em + 1rem + 2px);padding-top:.5rem;padding-bottom:.5rem;padding-left:1rem;font-size:1.25rem}.custom-file{position:relative;display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);margin-bottom:0}.custom-file-input{position:relative;z-index:2;width:100%;height:calc(1.5em + .75rem + 2px);margin:0;opacity:0}.custom-file-input:focus~.custom-file-label{border-color:#80bdff;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:disabled~.custom-file-label,.custom-file-input[disabled]~.custom-file-label{background-color:#e9ecef}.custom-file-input:lang(en)~.custom-file-label::after{content:"Browse"}.custom-file-input~.custom-file-label[data-browse]::after{content:attr(data-browse)}.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-weight:400;line-height:1.5;color:#495057;background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:calc(1.5em + .75rem);padding:.375rem .75rem;line-height:1.5;color:#495057;content:"Browse";background-color:#e9ecef;border-left:inherit;border-radius:0 .25rem .25rem 0}.custom-range{width:100%;height:1.4rem;padding:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:0}.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#007bff;border:0;border-radius:1rem;-webkit-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}@media (prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#b3d7ff}.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#007bff;border:0;border-radius:1rem;-moz-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}@media (prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{-moz-transition:none;transition:none}}.custom-range::-moz-range-thumb:active{background-color:#b3d7ff}.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#007bff;border:0;border-radius:1rem;-ms-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}@media (prefers-reduced-motion:reduce){.custom-range::-ms-thumb{-ms-transition:none;transition:none}}.custom-range::-ms-thumb:active{background-color:#b3d7ff}.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}.custom-range::-ms-fill-lower{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px;background-color:#dee2e6;border-radius:1rem}.custom-range:disabled::-webkit-slider-thumb{background-color:#adb5bd}.custom-range:disabled::-webkit-slider-runnable-track{cursor:default}.custom-range:disabled::-moz-range-thumb{background-color:#adb5bd}.custom-range:disabled::-moz-range-track{cursor:default}.custom-range:disabled::-ms-thumb{background-color:#adb5bd}.custom-control-label::before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.custom-control-label::before,.custom-file-label,.custom-select{transition:none}}.nav{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between;padding:.5rem 1rem}.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-ms-flex-positive:1;flex-grow:1;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand{color:rgba(0,0,0,.9)}.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 0, 0, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a{color:rgba(0,0,0,.9)}.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:rgba(255,255,255,.5);border-color:rgba(255,255,255,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.navbar-dark .navbar-text{color:rgba(255,255,255,.5)}.navbar-dark .navbar-text a{color:#fff}.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group{border-top:inherit;border-bottom:inherit}.card>.list-group:first-child{border-top-width:0;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card>.list-group:last-child{border-bottom-width:0;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-body{-ms-flex:1 1 auto;flex:1 1 auto;min-height:1px;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-right:-.625rem;margin-bottom:-.75rem;margin-left:-.625rem;border-bottom:0}.card-header-pills{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img,.card-img-bottom,.card-img-top{-ms-flex-negative:0;flex-shrink:0;width:100%}.card-img,.card-img-top{border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img,.card-img-bottom{border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck .card{-ms-flex:1 0 0%;flex:1 0 0%;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:not(:last-child) .card-header,.card-group>.card:not(:last-child) .card-img-top{border-top-right-radius:0}.card-group>.card:not(:last-child) .card-footer,.card-group>.card:not(:last-child) .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:not(:first-child) .card-header,.card-group>.card:not(:first-child) .card-img-top{border-top-left-radius:0}.card-group>.card:not(:first-child) .card-footer,.card-group>.card:not(:first-child) .card-img-bottom{border-bottom-left-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion>.card{overflow:hidden}.accordion>.card:not(:last-of-type){border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion>.card:not(:first-of-type){border-top-left-radius:0;border-top-right-radius:0}.accordion>.card>.card-header{border-radius:0;margin-bottom:-1px}.breadcrumb{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item{display:-ms-flexbox;display:flex}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item::before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{z-index:2;color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:3;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:3;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.25rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.badge{transition:none}}a.badge:focus,a.badge:hover{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}a.badge-primary:focus,a.badge-primary:hover{color:#fff;background-color:#0062cc}a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.badge-secondary{color:#fff;background-color:#6c757d}a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#545b62}a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.badge-success{color:#fff;background-color:#28a745}a.badge-success:focus,a.badge-success:hover{color:#fff;background-color:#1e7e34}a.badge-success.focus,a.badge-success:focus{outline:0;box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.badge-info{color:#fff;background-color:#17a2b8}a.badge-info:focus,a.badge-info:hover{color:#fff;background-color:#117a8b}a.badge-info.focus,a.badge-info:focus{outline:0;box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.badge-warning{color:#212529;background-color:#ffc107}a.badge-warning:focus,a.badge-warning:hover{color:#212529;background-color:#d39e00}a.badge-warning.focus,a.badge-warning:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.badge-danger{color:#fff;background-color:#dc3545}a.badge-danger:focus,a.badge-danger:hover{color:#fff;background-color:#bd2130}a.badge-danger.focus,a.badge-danger:focus{outline:0;box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.badge-light{color:#212529;background-color:#f8f9fa}a.badge-light:focus,a.badge-light:hover{color:#212529;background-color:#dae0e5}a.badge-light.focus,a.badge-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.badge-dark{color:#fff;background-color:#343a40}a.badge-dark:focus,a.badge-dark:hover{color:#fff;background-color:#1d2124}a.badge-dark.focus,a.badge-dark:focus{outline:0;box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;line-height:0;font-size:.75rem;background-color:#e9ecef;border-radius:.25rem}.progress-bar{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;overflow:hidden;color:#fff;text-align:center;white-space:nowrap;background-color:#007bff;transition:width .6s ease}@media (prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}@media (prefers-reduced-motion:reduce){.progress-bar-animated{-webkit-animation:none;animation:none}}.media{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start}.media-body{-ms-flex:1;flex:1}.list-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;border-radius:.25rem}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{z-index:1;color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:inherit;border-top-right-radius:inherit}.list-group-item:last-child{border-bottom-right-radius:inherit;border-bottom-left-radius:inherit}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;pointer-events:none;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-item+.list-group-item{border-top-width:0}.list-group-item+.list-group-item.active{margin-top:-1px;border-top-width:1px}.list-group-horizontal{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal>.list-group-item.active{margin-top:0}.list-group-horizontal>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}@media (min-width:576px){.list-group-horizontal-sm{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-sm>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-sm>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-sm>.list-group-item.active{margin-top:0}.list-group-horizontal-sm>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-sm>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width:768px){.list-group-horizontal-md{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-md>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-md>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-md>.list-group-item.active{margin-top:0}.list-group-horizontal-md>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-md>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width:992px){.list-group-horizontal-lg{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-lg>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-lg>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-lg>.list-group-item.active{margin-top:0}.list-group-horizontal-lg>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-lg>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width:1200px){.list-group-horizontal-xl{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-xl>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-xl>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-xl>.list-group-item.active{margin-top:0}.list-group-horizontal-xl>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xl>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}.list-group-flush{border-radius:0}.list-group-flush>.list-group-item{border-width:0 0 1px}.list-group-flush>.list-group-item:last-child{border-bottom-width:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:hover{color:#000;text-decoration:none}.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{opacity:.75}button.close{padding:0;background-color:transparent;border:0}a.close.disabled{pointer-events:none}.toast{max-width:350px;overflow:hidden;font-size:.875rem;background-color:rgba(255,255,255,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 .25rem .75rem rgba(0,0,0,.1);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);opacity:0;border-radius:.25rem}.toast:not(:last-child){margin-bottom:.75rem}.toast.showing{opacity:1}.toast.show{display:block;opacity:1}.toast.hide{display:none}.toast-header{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.25rem .75rem;color:#6c757d;background-color:rgba(255,255,255,.85);background-clip:padding-box;border-bottom:1px solid rgba(0,0,0,.05)}.toast-body{padding:.75rem}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translate(0,-50px);transform:translate(0,-50px)}@media (prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{-webkit-transform:none;transform:none}.modal.modal-static .modal-dialog{-webkit-transform:scale(1.02);transform:scale(1.02)}.modal-dialog-scrollable{display:-ms-flexbox;display:flex;max-height:calc(100% - 1rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 1rem);overflow:hidden}.modal-dialog-scrollable .modal-footer,.modal-dialog-scrollable .modal-header{-ms-flex-negative:0;flex-shrink:0}.modal-dialog-scrollable .modal-body{overflow-y:auto}.modal-dialog-centered{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}.modal-dialog-centered::before{display:block;height:calc(100vh - 1rem);height:-webkit-min-content;height:-moz-min-content;height:min-content;content:""}.modal-dialog-centered.modal-dialog-scrollable{-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;height:100%}.modal-dialog-centered.modal-dialog-scrollable .modal-content{max-height:none}.modal-dialog-centered.modal-dialog-scrollable::before{content:none}.modal-content{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:justify;justify-content:space-between;padding:1rem 1rem;border-bottom:1px solid #dee2e6;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.modal-header .close{padding:1rem 1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:end;justify-content:flex-end;padding:.75rem;border-top:1px solid #dee2e6;border-bottom-right-radius:calc(.3rem - 1px);border-bottom-left-radius:calc(.3rem - 1px)}.modal-footer>*{margin:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-scrollable{max-height:calc(100% - 3.5rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 3.5rem)}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-dialog-centered::before{height:calc(100vh - 3.5rem);height:-webkit-min-content;height:-moz-min-content;height:min-content}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg,.modal-xl{max-width:800px}}@media (min-width:1200px){.modal-xl{max-width:1140px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow::before,.bs-tooltip-top .arrow::before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow::before,.bs-tooltip-right .arrow::before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow::before,.bs-tooltip-bottom .arrow::before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow::before,.bs-tooltip-left .arrow::before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover .arrow{position:absolute;display:block;width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow::after,.popover .arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top]>.arrow,.bs-popover-top>.arrow{bottom:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=top]>.arrow::before,.bs-popover-top>.arrow::before{bottom:0;border-width:.5rem .5rem 0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top]>.arrow::after,.bs-popover-top>.arrow::after{bottom:1px;border-width:.5rem .5rem 0;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right]>.arrow,.bs-popover-right>.arrow{left:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right]>.arrow::before,.bs-popover-right>.arrow::before{left:0;border-width:.5rem .5rem .5rem 0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right]>.arrow::after,.bs-popover-right>.arrow::after{left:1px;border-width:.5rem .5rem .5rem 0;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom]>.arrow,.bs-popover-bottom>.arrow{top:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=bottom]>.arrow::before,.bs-popover-bottom>.arrow::before{top:0;border-width:0 .5rem .5rem .5rem;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom]>.arrow::after,.bs-popover-bottom>.arrow::after{top:1px;border-width:0 .5rem .5rem .5rem;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left]>.arrow,.bs-popover-left>.arrow{right:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left]>.arrow::before,.bs-popover-left>.arrow::before{right:0;border-width:.5rem 0 .5rem .5rem;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left]>.arrow::after,.bs-popover-left>.arrow::after{right:1px;border-width:.5rem 0 .5rem .5rem;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel.pointer-event{-ms-touch-action:pan-y;touch-action:pan-y}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner::after{display:block;clear:both;content:""}.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;transition:transform .6s ease-in-out,-webkit-transform .6s ease-in-out}@media (prefers-reduced-motion:reduce){.carousel-item{transition:none}}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.active.carousel-item-right,.carousel-item-next:not(.carousel-item-left){-webkit-transform:translateX(100%);transform:translateX(100%)}.active.carousel-item-left,.carousel-item-prev:not(.carousel-item-right){-webkit-transform:translateX(-100%);transform:translateX(-100%)}.carousel-fade .carousel-item{opacity:0;transition-property:opacity;-webkit-transform:none;transform:none}.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{z-index:1;opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{z-index:0;opacity:0;transition:opacity 0s .6s}@media (prefers-reduced-motion:reduce){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{transition:none}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;z-index:1;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5;transition:opacity .15s ease}@media (prefers-reduced-motion:reduce){.carousel-control-next,.carousel-control-prev{transition:none}}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:no-repeat 50%/100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e")}.carousel-control-next-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e")}.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:15;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{box-sizing:content-box;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;transition:opacity .6s ease}@media (prefers-reduced-motion:reduce){.carousel-indicators li{transition:none}}.carousel-indicators .active{opacity:1}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}@-webkit-keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:.25em solid currentColor;border-right-color:transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}@-webkit-keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}50%{opacity:1;-webkit-transform:none;transform:none}}@keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}50%{opacity:1;-webkit-transform:none;transform:none}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded-sm{border-radius:.2rem!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important;border-top-right-radius:.25rem!important}.rounded-right{border-top-right-radius:.25rem!important;border-bottom-right-radius:.25rem!important}.rounded-bottom{border-bottom-right-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-lg{border-radius:.3rem!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:50rem!important}.rounded-0{border-radius:0!important}.clearfix::after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive::before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9::before{padding-top:42.857143%}.embed-responsive-16by9::before{padding-top:56.25%}.embed-responsive-4by3::before{padding-top:75%}.embed-responsive-1by1::before{padding-top:100%}.flex-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-sm-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-sm-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-sm-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-sm-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-sm-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-sm-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-md-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-md-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-md-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-md-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-md-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-md-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-lg-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-lg-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-lg-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-lg-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-lg-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-lg-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-xl-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-xl-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-xl-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-xl-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-xl-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-xl-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.user-select-all{-webkit-user-select:all!important;-moz-user-select:all!important;-ms-user-select:all!important;user-select:all!important}.user-select-auto{-webkit-user-select:auto!important;-moz-user-select:auto!important;-ms-user-select:auto!important;user-select:auto!important}.user-select-none{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.min-vw-100{min-width:100vw!important}.min-vh-100{min-height:100vh!important}.vw-100{width:100vw!important}.vh-100{height:100vh!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-n1{margin:-.25rem!important}.mt-n1,.my-n1{margin-top:-.25rem!important}.mr-n1,.mx-n1{margin-right:-.25rem!important}.mb-n1,.my-n1{margin-bottom:-.25rem!important}.ml-n1,.mx-n1{margin-left:-.25rem!important}.m-n2{margin:-.5rem!important}.mt-n2,.my-n2{margin-top:-.5rem!important}.mr-n2,.mx-n2{margin-right:-.5rem!important}.mb-n2,.my-n2{margin-bottom:-.5rem!important}.ml-n2,.mx-n2{margin-left:-.5rem!important}.m-n3{margin:-1rem!important}.mt-n3,.my-n3{margin-top:-1rem!important}.mr-n3,.mx-n3{margin-right:-1rem!important}.mb-n3,.my-n3{margin-bottom:-1rem!important}.ml-n3,.mx-n3{margin-left:-1rem!important}.m-n4{margin:-1.5rem!important}.mt-n4,.my-n4{margin-top:-1.5rem!important}.mr-n4,.mx-n4{margin-right:-1.5rem!important}.mb-n4,.my-n4{margin-bottom:-1.5rem!important}.ml-n4,.mx-n4{margin-left:-1.5rem!important}.m-n5{margin:-3rem!important}.mt-n5,.my-n5{margin-top:-3rem!important}.mr-n5,.mx-n5{margin-right:-3rem!important}.mb-n5,.my-n5{margin-bottom:-3rem!important}.ml-n5,.mx-n5{margin-left:-3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-n1{margin:-.25rem!important}.mt-sm-n1,.my-sm-n1{margin-top:-.25rem!important}.mr-sm-n1,.mx-sm-n1{margin-right:-.25rem!important}.mb-sm-n1,.my-sm-n1{margin-bottom:-.25rem!important}.ml-sm-n1,.mx-sm-n1{margin-left:-.25rem!important}.m-sm-n2{margin:-.5rem!important}.mt-sm-n2,.my-sm-n2{margin-top:-.5rem!important}.mr-sm-n2,.mx-sm-n2{margin-right:-.5rem!important}.mb-sm-n2,.my-sm-n2{margin-bottom:-.5rem!important}.ml-sm-n2,.mx-sm-n2{margin-left:-.5rem!important}.m-sm-n3{margin:-1rem!important}.mt-sm-n3,.my-sm-n3{margin-top:-1rem!important}.mr-sm-n3,.mx-sm-n3{margin-right:-1rem!important}.mb-sm-n3,.my-sm-n3{margin-bottom:-1rem!important}.ml-sm-n3,.mx-sm-n3{margin-left:-1rem!important}.m-sm-n4{margin:-1.5rem!important}.mt-sm-n4,.my-sm-n4{margin-top:-1.5rem!important}.mr-sm-n4,.mx-sm-n4{margin-right:-1.5rem!important}.mb-sm-n4,.my-sm-n4{margin-bottom:-1.5rem!important}.ml-sm-n4,.mx-sm-n4{margin-left:-1.5rem!important}.m-sm-n5{margin:-3rem!important}.mt-sm-n5,.my-sm-n5{margin-top:-3rem!important}.mr-sm-n5,.mx-sm-n5{margin-right:-3rem!important}.mb-sm-n5,.my-sm-n5{margin-bottom:-3rem!important}.ml-sm-n5,.mx-sm-n5{margin-left:-3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-n1{margin:-.25rem!important}.mt-md-n1,.my-md-n1{margin-top:-.25rem!important}.mr-md-n1,.mx-md-n1{margin-right:-.25rem!important}.mb-md-n1,.my-md-n1{margin-bottom:-.25rem!important}.ml-md-n1,.mx-md-n1{margin-left:-.25rem!important}.m-md-n2{margin:-.5rem!important}.mt-md-n2,.my-md-n2{margin-top:-.5rem!important}.mr-md-n2,.mx-md-n2{margin-right:-.5rem!important}.mb-md-n2,.my-md-n2{margin-bottom:-.5rem!important}.ml-md-n2,.mx-md-n2{margin-left:-.5rem!important}.m-md-n3{margin:-1rem!important}.mt-md-n3,.my-md-n3{margin-top:-1rem!important}.mr-md-n3,.mx-md-n3{margin-right:-1rem!important}.mb-md-n3,.my-md-n3{margin-bottom:-1rem!important}.ml-md-n3,.mx-md-n3{margin-left:-1rem!important}.m-md-n4{margin:-1.5rem!important}.mt-md-n4,.my-md-n4{margin-top:-1.5rem!important}.mr-md-n4,.mx-md-n4{margin-right:-1.5rem!important}.mb-md-n4,.my-md-n4{margin-bottom:-1.5rem!important}.ml-md-n4,.mx-md-n4{margin-left:-1.5rem!important}.m-md-n5{margin:-3rem!important}.mt-md-n5,.my-md-n5{margin-top:-3rem!important}.mr-md-n5,.mx-md-n5{margin-right:-3rem!important}.mb-md-n5,.my-md-n5{margin-bottom:-3rem!important}.ml-md-n5,.mx-md-n5{margin-left:-3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-n1{margin:-.25rem!important}.mt-lg-n1,.my-lg-n1{margin-top:-.25rem!important}.mr-lg-n1,.mx-lg-n1{margin-right:-.25rem!important}.mb-lg-n1,.my-lg-n1{margin-bottom:-.25rem!important}.ml-lg-n1,.mx-lg-n1{margin-left:-.25rem!important}.m-lg-n2{margin:-.5rem!important}.mt-lg-n2,.my-lg-n2{margin-top:-.5rem!important}.mr-lg-n2,.mx-lg-n2{margin-right:-.5rem!important}.mb-lg-n2,.my-lg-n2{margin-bottom:-.5rem!important}.ml-lg-n2,.mx-lg-n2{margin-left:-.5rem!important}.m-lg-n3{margin:-1rem!important}.mt-lg-n3,.my-lg-n3{margin-top:-1rem!important}.mr-lg-n3,.mx-lg-n3{margin-right:-1rem!important}.mb-lg-n3,.my-lg-n3{margin-bottom:-1rem!important}.ml-lg-n3,.mx-lg-n3{margin-left:-1rem!important}.m-lg-n4{margin:-1.5rem!important}.mt-lg-n4,.my-lg-n4{margin-top:-1.5rem!important}.mr-lg-n4,.mx-lg-n4{margin-right:-1.5rem!important}.mb-lg-n4,.my-lg-n4{margin-bottom:-1.5rem!important}.ml-lg-n4,.mx-lg-n4{margin-left:-1.5rem!important}.m-lg-n5{margin:-3rem!important}.mt-lg-n5,.my-lg-n5{margin-top:-3rem!important}.mr-lg-n5,.mx-lg-n5{margin-right:-3rem!important}.mb-lg-n5,.my-lg-n5{margin-bottom:-3rem!important}.ml-lg-n5,.mx-lg-n5{margin-left:-3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-n1{margin:-.25rem!important}.mt-xl-n1,.my-xl-n1{margin-top:-.25rem!important}.mr-xl-n1,.mx-xl-n1{margin-right:-.25rem!important}.mb-xl-n1,.my-xl-n1{margin-bottom:-.25rem!important}.ml-xl-n1,.mx-xl-n1{margin-left:-.25rem!important}.m-xl-n2{margin:-.5rem!important}.mt-xl-n2,.my-xl-n2{margin-top:-.5rem!important}.mr-xl-n2,.mx-xl-n2{margin-right:-.5rem!important}.mb-xl-n2,.my-xl-n2{margin-bottom:-.5rem!important}.ml-xl-n2,.mx-xl-n2{margin-left:-.5rem!important}.m-xl-n3{margin:-1rem!important}.mt-xl-n3,.my-xl-n3{margin-top:-1rem!important}.mr-xl-n3,.mx-xl-n3{margin-right:-1rem!important}.mb-xl-n3,.my-xl-n3{margin-bottom:-1rem!important}.ml-xl-n3,.mx-xl-n3{margin-left:-1rem!important}.m-xl-n4{margin:-1.5rem!important}.mt-xl-n4,.my-xl-n4{margin-top:-1.5rem!important}.mr-xl-n4,.mx-xl-n4{margin-right:-1.5rem!important}.mb-xl-n4,.my-xl-n4{margin-bottom:-1.5rem!important}.ml-xl-n4,.mx-xl-n4{margin-left:-1.5rem!important}.m-xl-n5{margin:-3rem!important}.mt-xl-n5,.my-xl-n5{margin-top:-3rem!important}.mr-xl-n5,.mx-xl-n5{margin-right:-3rem!important}.mb-xl-n5,.my-xl-n5{margin-bottom:-3rem!important}.ml-xl-n5,.mx-xl-n5{margin-left:-3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.stretched-link::after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:rgba(0,0,0,0)}.text-monospace{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace!important}.text-justify{text-align:justify!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-lighter{font-weight:lighter!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-weight-bolder{font-weight:bolder!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0056b3!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#494f54!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#19692c!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#0f6674!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#ba8b00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#a71d2a!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#cbd3da!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#121416!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(0,0,0,.5)!important}.text-white-50{color:rgba(255,255,255,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none!important}.text-break{word-wrap:break-word!important}.text-reset{color:inherit!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #adb5bd;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}body{min-width:992px!important}.container{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}.table-dark{color:inherit}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#dee2e6}.table .thead-dark th{color:inherit;border-color:#dee2e6}}
diff --git a/web/css/bootstrap.min.css.map b/web/css/bootstrap.min.css.map
deleted file mode 100644
index 6c7fa40b9..000000000
--- a/web/css/bootstrap.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["less/normalize.less","less/print.less","bootstrap.css","dist/css/bootstrap.css","less/glyphicons.less","less/scaffolding.less","less/mixins/vendor-prefixes.less","less/mixins/tab-focus.less","less/mixins/image.less","less/type.less","less/mixins/text-emphasis.less","less/mixins/background-variant.less","less/mixins/text-overflow.less","less/code.less","less/grid.less","less/mixins/grid.less","less/mixins/grid-framework.less","less/tables.less","less/mixins/table-row.less","less/forms.less","less/mixins/forms.less","less/buttons.less","less/mixins/buttons.less","less/mixins/opacity.less","less/component-animations.less","less/dropdowns.less","less/mixins/nav-divider.less","less/mixins/reset-filter.less","less/button-groups.less","less/mixins/border-radius.less","less/input-groups.less","less/navs.less","less/navbar.less","less/mixins/nav-vertical-align.less","less/utilities.less","less/breadcrumbs.less","less/pagination.less","less/mixins/pagination.less","less/pager.less","less/labels.less","less/mixins/labels.less","less/badges.less","less/jumbotron.less","less/thumbnails.less","less/alerts.less","less/mixins/alerts.less","less/progress-bars.less","less/mixins/gradients.less","less/mixins/progress-bar.less","less/media.less","less/list-group.less","less/mixins/list-group.less","less/panels.less","less/mixins/panels.less","less/responsive-embed.less","less/wells.less","less/close.less","less/modals.less","less/tooltip.less","less/mixins/reset-text.less","less/popovers.less","less/carousel.less","less/mixins/clearfix.less","less/mixins/center-block.less","less/mixins/hide-text.less","less/responsive-utilities.less","less/mixins/responsive-visibility.less"],"names":[],"mappings":";;;;4EAQA,KACE,YAAA,WACA,yBAAA,KACA,qBAAA,KAOF,KACE,OAAA,EAaF,QAAA,MAAA,QAAA,WAAA,OAAA,OAAA,OAAA,OAAA,KAAA,KAAA,IAAA,QAAA,QAaE,QAAA,MAQF,MAAA,OAAA,SAAA,MAIE,QAAA,aACA,eAAA,SAQF,sBACE,QAAA,KACA,OAAA,EAQF,SAAA,SAEE,QAAA,KAUF,EACE,iBAAA,YAQF,SAAA,QAEE,QAAA,EAUF,YACE,cAAA,IAAA,OAOF,EAAA,OAEE,YAAA,IAOF,IACE,WAAA,OAQF,GACE,OAAA,MAAA,EACA,UAAA,IAOF,KACE,MAAA,KACA,WAAA,KAOF,MACE,UAAA,IAOF,IAAA,IAEE,SAAA,SACA,UAAA,IACA,YAAA,EACA,eAAA,SAGF,IACE,IAAA,MAGF,IACE,OAAA,OAUF,IACE,OAAA,EAOF,eACE,SAAA,OAUF,OACE,OAAA,IAAA,KAOF,GACE,OAAA,EAAA,mBAAA,YAAA,gBAAA,YACA,WAAA,YAOF,IACE,SAAA,KAOF,KAAA,IAAA,IAAA,KAIE,YAAA,UAAA,UACA,UAAA,IAkBF,OAAA,MAAA,SAAA,OAAA,SAKE,OAAA,EACA,KAAA,QACA,MAAA,QAOF,OACE,SAAA,QAUF,OAAA,OAEE,eAAA,KAWF,OAAA,wBAAA,kBAAA,mBAIE,mBAAA,OACA,OAAA,QAOF,iBAAA,qBAEE,OAAA,QAOF,yBAAA,wBAEE,QAAA,EACA,OAAA,EAQF,MACE,YAAA,OAWF,qBAAA,kBAEE,mBAAA,WAAA,gBAAA,WAAA,WAAA,WACA,QAAA,EASF,8CAAA,8CAEE,OAAA,KAQF,mBACE,mBAAA,YACA,gBAAA,YAAA,WAAA,YAAA,mBAAA,UASF,iDAAA,8CAEE,mBAAA,KAOF,SACE,QAAA,MAAA,OAAA,MACA,OAAA,EAAA,IACA,OAAA,IAAA,MAAA,OAQF,OACE,QAAA,EACA,OAAA,EAOF,SACE,SAAA,KAQF,SACE,YAAA,IAUF,MACE,eAAA,EACA,gBAAA,SAGF,GAAA,GAEE,QAAA,uFCjUF,aA7FI,EAAA,OAAA,QAGI,MAAA,eACA,YAAA,eACA,WAAA,cAAA,mBAAA,eACA,WAAA,eAGJ,EAAA,UAEI,gBAAA,UAGJ,cACI,QAAA,KAAA,WAAA,IAGJ,kBACI,QAAA,KAAA,YAAA,IAKJ,6BAAA,mBAEI,QAAA,GAGJ,WAAA,IAEI,OAAA,IAAA,MAAA,KC4KL,kBAAA,MDvKK,MC0KL,QAAA,mBDrKK,IE8KN,GDLC,kBAAA,MDrKK,ICwKL,UAAA,eCUD,GF5KM,GE2KN,EF1KM,QAAA,ECuKL,OAAA,ECSD,GF3KM,GCsKL,iBAAA,MD/JK,QCkKL,QAAA,KCSD,YFtKU,oBCiKT,iBAAA,eD7JK,OCgKL,OAAA,IAAA,MAAA,KD5JK,OC+JL,gBAAA,mBCSD,UFpKU,UC+JT,iBAAA,eDzJS,mBEkKV,mBDLC,OAAA,IAAA,MAAA,gBEjPD,WACA,YAAA,uBFsPD,IAAA,+CE7OC,IAAK,sDAAuD,4BAA6B,iDAAkD,gBAAiB,gDAAiD,eAAgB,+CAAgD,mBAAoB,2EAA4E,cAE7W,WACA,SAAA,SACA,IAAA,IACA,QAAA,aACA,YAAA,uBACA,WAAA,OACA,YAAA,IACA,YAAA,EAIkC,uBAAA,YAAW,wBAAA,UACX,2BAAW,QAAA,QAEX,uBDuPlC,QAAS,QCtPyB,sBFiPnC,uBEjP8C,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,2BAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX,6BAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,2BAAW,QAAA,QACX,qBAAW,QAAA,QACX,0BAAW,QAAA,QACX,qBAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,2BAAW,QAAA,QACX,sBAAW,QAAA,QACX,yBAAW,QAAA,QACX,sBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,+BAAW,QAAA,QACX,2BAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,8BAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,2BAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,6BAAW,QAAA,QACX,6BAAW,QAAA,QACX,8BAAW,QAAA,QACX,4BAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,sBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,2BAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,yBAAW,QAAA,QACX,8BAAW,QAAA,QACX,6BAAW,QAAA,QACX,6BAAW,QAAA,QACX,+BAAW,QAAA,QACX,8BAAW,QAAA,QACX,gCAAW,QAAA,QACX,uBAAW,QAAA,QACX,8BAAW,QAAA,QACX,+BAAW,QAAA,QACX,iCAAW,QAAA,QACX,0BAAW,QAAA,QACX,6BAAW,QAAA,QACX,yBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX,gCAAW,QAAA,QACX,gCAAW,QAAA,QACX,2BAAW,QAAA,QACX,uBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX,0BAAW,QAAA,QACX,+BAAW,QAAA,QACX,+BAAW,QAAA,QACX,wBAAW,QAAA,QACX,+BAAW,QAAA,QACX,gCAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,8BAAW,QAAA,QACX,0BAAW,QAAA,QACX,gCAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,gCAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,6BAAW,QAAA,QACX,8BAAW,QAAA,QACX,2BAAW,QAAA,QACX,6BAAW,QAAA,QACX,4BAAW,QAAA,QACX,8BAAW,QAAA,QACX,+BAAW,QAAA,QACX,mCAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,2BAAW,QAAA,QACX,4BAAW,QAAA,QACX,+BAAW,QAAA,QACX,wBAAW,QAAA,QACX,2BAAW,QAAA,QACX,yBAAW,QAAA,QACX,0BAAW,QAAA,QACX,yBAAW,QAAA,QACX,6BAAW,QAAA,QACX,+BAAW,QAAA,QACX,0BAAW,QAAA,QACX,gCAAW,QAAA,QACX,+BAAW,QAAA,QACX,8BAAW,QAAA,QACX,kCAAW,QAAA,QACX,oCAAW,QAAA,QACX,sBAAW,QAAA,QACX,2BAAW,QAAA,QACX,uBAAW,QAAA,QACX,8BAAW,QAAA,QACX,4BAAW,QAAA,QACX,8BAAW,QAAA,QACX,6BAAW,QAAA,QACX,4BAAW,QAAA,QACX,0BAAW,QAAA,QACX,4BAAW,QAAA,QACX,qCAAW,QAAA,QACX,oCAAW,QAAA,QACX,kCAAW,QAAA,QACX,oCAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,4BAAW,QAAA,QACX,4BAAW,QAAA,QACX,8BAAW,QAAA,QACX,uBAAW,QAAA,QACX,wBAAW,QAAA,QACX,0BAAW,QAAA,QACX,sBAAW,QAAA,QACX,sBAAW,QAAA,QACX,uBAAW,QAAA,QACX,mCAAW,QAAA,QACX,uCAAW,QAAA,QACX,gCAAW,QAAA,QACX,oCAAW,QAAA,QACX,qCAAW,QAAA,QACX,yCAAW,QAAA,QACX,4BAAW,QAAA,QACX,yBAAW,QAAA,QACX,gCAAW,QAAA,QACX,8BAAW,QAAA,QACX,yBAAW,QAAA,QACX,wBAAW,QAAA,QACX,0BAAW,QAAA,QACX,6BAAW,QAAA,QACX,yBAAW,QAAA,QACX,uBAAW,QAAA,QACX,uBAAW,QAAA,QACX,wBAAW,QAAA,QACX,yBAAW,QAAA,QACX,yBAAW,QAAA,QACX,uBAAW,QAAA,QACX,8BAAW,QAAA,QACX,+BAAW,QAAA,QACX,gCAAW,QAAA,QACX,8BAAW,QAAA,QACX,8BAAW,QAAA,QACX,8BAAW,QAAA,QACX,2BAAW,QAAA,QACX,0BAAW,QAAA,QACX,yBAAW,QAAA,QACX,6BAAW,QAAA,QACX,2BAAW,QAAA,QACX,4BAAW,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,2BAAW,QAAA,QACX,2BAAW,QAAA,QACX,4BAAW,QAAA,QACX,+BAAW,QAAA,QACX,8BAAW,QAAA,QACX,4BAAW,QAAA,QACX,4BAAW,QAAA,QACX,4BAAW,QAAA,QACX,iCAAW,QAAA,QACX,oCAAW,QAAA,QACX,iCAAW,QAAA,QACX,+BAAW,QAAA,QACX,+BAAW,QAAA,QACX,iCAAW,QAAA,QACX,qBAAW,QAAA,QACX,4BAAW,QAAA,QACX,4BAAW,QAAA,QACX,2BAAW,QAAA,QACX,uBAAW,QAAA,QASX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,4BAAW,QAAA,QACX,uBAAW,QAAA,QACX,wBAAW,QAAA,QACX,uBAAW,QAAA,QACX,yBAAW,QAAA,QACX,yBAAW,QAAA,QACX,+BAAW,QAAA,QACX,uBAAW,QAAA,QACX,6BAAW,QAAA,QACX,sBAAW,QAAA,QACX,wBAAW,QAAA,QACX,wBAAW,QAAA,QACX,4BAAW,QAAA,QACX,uBAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,2BAAW,QAAA,QACX,0BAAW,QAAA,QACX,sBAAW,QAAA,QACX,sBAAW,QAAA,QACX,sBAAW,QAAA,QACX,sBAAW,QAAA,QACX,wBAAW,QAAA,QACX,sBAAW,QAAA,QACX,wBAAW,QAAA,QACX,4BAAW,QAAA,QACX,mCAAW,QAAA,QACX,4BAAW,QAAA,QACX,oCAAW,QAAA,QACX,kCAAW,QAAA,QACX,iCAAW,QAAA,QACX,+BAAW,QAAA,QACX,sBAAW,QAAA,QACX,wBAAW,QAAA,QACX,6BAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,kCAAW,QAAA,QACX,mCAAW,QAAA,QACX,sCAAW,QAAA,QACX,0CAAW,QAAA,QACX,oCAAW,QAAA,QACX,wCAAW,QAAA,QACX,qCAAW,QAAA,QACX,iCAAW,QAAA,QACX,gCAAW,QAAA,QACX,kCAAW,QAAA,QACX,+BAAW,QAAA,QACX,0BAAW,QAAA,QACX,8BAAW,QAAA,QACX,4BAAW,QAAA,QACX,4BAAW,QAAA,QACX,6BAAW,QAAA,QACX,4BAAW,QAAA,QCtS/C,0BCgEE,QAAA,QHi+BF,EDNC,mBAAA,WGxhCI,gBAAiB,WFiiCZ,WAAY,WGl+BZ,OADL,QJg+BJ,mBAAA,WGthCI,gBAAiB,WACpB,WAAA,WHyhCD,KGrhCC,UAAW,KAEX,4BAAA,cAEA,KACA,YAAA,iBAAA,UAAA,MAAA,WHuhCD,UAAA,KGnhCC,YAAa,WF4hCb,MAAO,KACP,iBAAkB,KExhClB,OADA,MAEA,OHqhCD,SG/gCC,YAAa,QACb,UAAA,QACA,YAAA,QAEA,EFwhCA,MAAO,QEthCL,gBAAA,KAIF,QH8gCD,QKjkCC,MAAA,QACA,gBAAA,UF6DF,QACE,QAAA,IAAA,KAAA,yBHygCD,eAAA,KGlgCC,OHqgCD,OAAA,ECSD,IACE,eAAgB,ODDjB,4BM/kCC,0BLklCF,gBKnlCE,iBADA,eH4EA,QAAS,MACT,UAAA,KHugCD,OAAA,KGhgCC,aACA,cAAA,IAEA,eACA,QAAA,aC6FA,UAAA,KACK,OAAA,KACG,QAAA,IEvLR,YAAA,WACA,iBAAA,KACA,OAAA,IAAA,MAAA,KN+lCD,cAAA,IGjgCC,mBAAoB,IAAI,IAAI,YAC5B,cAAA,IAAA,IAAA,YHmgCD,WAAA,IAAA,IAAA,YG5/BC,YACA,cAAA,IAEA,GH+/BD,WAAA,KGv/BC,cAAe,KACf,OAAA,EACA,WAAA,IAAA,MAAA,KAEA,SACA,SAAA,SACA,MAAA,IACA,OAAA,IACA,QAAA,EHy/BD,OAAA,KGj/BC,SAAA,OF0/BA,KAAM,cEx/BJ,OAAA,EAEA,0BACA,yBACA,SAAA,OACA,MAAA,KHm/BH,OAAA,KGx+BC,OAAQ,EACR,SAAA,QH0+BD,KAAA,KCSD,cACE,OAAQ,QAQV,IACA,IMlpCE,IACA,IACA,IACA,INwoCF,GACA,GACA,GACA,GACA,GACA,GDAC,YAAA,QOlpCC,YAAa,IN2pCb,YAAa,IACb,MAAO,QAoBT,WAZA,UAaA,WAZA,UM5pCI,WN6pCJ,UM5pCI,WN6pCJ,UM5pCI,WN6pCJ,UDMC,WCLD,UACA,UAZA,SAaA,UAZA,SAaA,UAZA,SAaA,UAZA,SAaA,UAZA,SAaA,UAZA,SMppCE,YAAa,INwqCb,YAAa,EACb,MAAO,KAGT,IMxqCE,IAJF,IN2qCA,GAEA,GDLC,GCSC,WAAY,KACZ,cAAe,KASjB,WANA,UDCC,WCCD,UM5qCA,WN8qCA,UACA,UANA,SM5qCI,UN8qCJ,SM3qCA,UN6qCA,SAQE,UAAW,IAGb,IMprCE,IAJF,INurCA,GAEA,GDLC,GCSC,WAAY,KACZ,cAAe,KASjB,WANA,UDCC,WCCD,UMvrCA,WNyrCA,UACA,UANA,SMxrCI,UN0rCJ,SMtrCA,UNwrCA,SMxrCU,UAAA,IACV,IAAA,GAAU,UAAA,KACV,IAAA,GAAU,UAAA,KACV,IAAA,GAAU,UAAA,KACV,IAAA,GAAU,UAAA,KACV,IAAA,GAAU,UAAA,KAOR,IADF,GPssCC,UAAA,KCSD,EMzsCE,OAAA,EAAA,EAAA,KAEA,MPosCD,cAAA,KO/rCC,UAAW,KAwOX,YAAa,IA1OX,YAAA,IPssCH,yBO7rCC,MNssCE,UAAW,MMjsCf,OAAA,MAEE,UAAA,IAKF,MP0rCC,KO1rCsB,QAAA,KP6rCtB,iBAAA,QO5rCsB,WP+rCtB,WAAA,KO9rCsB,YPisCtB,WAAA,MOhsCsB,aPmsCtB,WAAA,OOlsCsB,cPqsCtB,WAAA,QOlsCsB,aPqsCtB,YAAA,OOpsCsB,gBPusCtB,eAAA,UOtsCsB,gBPysCtB,eAAA,UOrsCC,iBPwsCD,eAAA,WQ3yCC,YR8yCD,MAAA,KCSD,cOpzCI,MAAA,QAHF,qBDwGF,qBP6sCC,MAAA,QCSD,cO3zCI,MAAA,QAHF,qBD2GF,qBPitCC,MAAA,QCSD,WOl0CI,MAAA,QAHF,kBD8GF,kBPqtCC,MAAA,QCSD,cOz0CI,MAAA,QAHF,qBDiHF,qBPytCC,MAAA,QCSD,aOh1CI,MAAA,QDwHF,oBAHF,oBExHE,MAAA,QACA,YR01CA,MAAO,KQx1CL,iBAAA,QAHF,mBF8HF,mBP2tCC,iBAAA,QCSD,YQ/1CI,iBAAA,QAHF,mBFiIF,mBP+tCC,iBAAA,QCSD,SQt2CI,iBAAA,QAHF,gBFoIF,gBPmuCC,iBAAA,QCSD,YQ72CI,iBAAA,QAHF,mBFuIF,mBPuuCC,iBAAA,QCSD,WQp3CI,iBAAA,QF6IF,kBADF,kBAEE,iBAAA,QPsuCD,aO7tCC,eAAgB,INsuChB,OAAQ,KAAK,EAAE,KMpuCf,cAAA,IAAA,MAAA,KAFF,GPkuCC,GCSC,WAAY,EACZ,cAAe,KM9tCf,MP0tCD,MO3tCD,MAPI,MASF,cAAA,EAIF,eALE,aAAA,EACA,WAAA,KPkuCD,aO9tCC,aAAc,EAKZ,YAAA,KACA,WAAA,KP6tCH,gBOvtCC,QAAS,aACT,cAAA,IACA,aAAA,IAEF,GNguCE,WAAY,EM9tCZ,cAAA,KAGA,GADF,GP0tCC,YAAA,WOttCC,GPytCD,YAAA,IOnnCD,GAvFM,YAAA,EAEA,yBACA,kBGtNJ,MAAA,KACA,MAAA,MACA,SAAA,OVq6CC,MAAA,KO7nCC,WAAY,MAhFV,cAAA,SPgtCH,YAAA,OOtsCD,kBNgtCE,YAAa,OM1sCjB,0BPssCC,YOrsCC,OAAA,KA9IqB,cAAA,IAAA,OAAA,KAmJvB,YACE,UAAA,IACA,eAAA,UAEA,WPssCD,QAAA,KAAA,KOjsCG,OAAA,EAAA,EAAA,KN0sCF,UAAW,OACX,YAAa,IAAI,MAAM,KMptCzB,yBP+sCC,wBO/sCD,yBNytCE,cAAe,EMnsCb,kBAFA,kBACA,iBPksCH,QAAA,MO/rCG,UAAA,INwsCF,YAAa,WACb,MAAO,KMhsCT,yBP2rCC,yBO3rCD,wBAEE,QAAA,cAEA,oBACA,sBACA,cAAA,KP6rCD,aAAA,EOvrCG,WAAA,MNgsCF,aAAc,IAAI,MAAM,KACxB,YAAa,EMhsCX,kCNksCJ,kCMnsCe,iCACX,oCNmsCJ,oCDLC,mCCUC,QAAS,GMjsCX,iCNmsCA,iCMzsCM,gCAOJ,mCNmsCF,mCDLC,kCO7rCC,QAAA,cPksCD,QWv+CC,cAAe,KVg/Cf,WAAY,OACZ,YAAa,WU7+Cb,KXy+CD,IWr+CD,IACE,KACA,YAAA,MAAA,OAAA,SAAA,cAAA,UAEA,KACA,QAAA,IAAA,IXu+CD,UAAA,IWn+CC,MAAO,QACP,iBAAA,QACA,cAAA,IAEA,IACA,QAAA,IAAA,IACA,UAAA,IV4+CA,MU5+CA,KXq+CD,iBAAA,KW3+CC,cAAe,IASb,mBAAA,MAAA,EAAA,KAAA,EAAA,gBACA,WAAA,MAAA,EAAA,KAAA,EAAA,gBAEA,QV6+CF,QU7+CE,EXq+CH,UAAA,KWh+CC,YAAa,IACb,mBAAA,KACA,WAAA,KAEA,IACA,QAAA,MACA,QAAA,MACA,OAAA,EAAA,EAAA,KACA,UAAA,KACA,YAAA,WACA,MAAA,KACA,WAAA,UXk+CD,UAAA,WW7+CC,iBAAkB,QAehB,OAAA,IAAA,MAAA,KACA,cAAA,IAEA,SACA,QAAA,EACA,UAAA,QXi+CH,MAAA,QW59CC,YAAa,SACb,iBAAA,YACA,cAAA,EC1DF,gBCHE,WAAA,MACA,WAAA,OAEA,Wb8hDD,cAAA,KYxhDC,aAAA,KAqEA,aAAc,KAvEZ,YAAA,KZ+hDH,yBY1hDC,WAkEE,MAAO,OZ69CV,yBY5hDC,WA+DE,MAAO,OZk+CV,0BYzhDC,WCvBA,MAAA,QAGA,iBbmjDD,cAAA,KYthDC,aAAc,KCvBd,aAAA,KACA,YAAA,KCAE,KACE,aAAA,MAEA,YAAA,MAGA,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UdgjDL,SAAA,SchiDG,WAAA,IACE,cAAA,KdkiDL,aAAA,Kc1hDG,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,Ud6hDH,MAAA,Kc7hDG,WdgiDH,MAAA,KchiDG,WdmiDH,MAAA,acniDG,WdsiDH,MAAA,actiDG,UdyiDH,MAAA,IcziDG,Ud4iDH,MAAA,ac5iDG,Ud+iDH,MAAA,ac/iDG,UdkjDH,MAAA,IcljDG,UdqjDH,MAAA,acrjDG,UdwjDH,MAAA,acxjDG,Ud2jDH,MAAA,Ic3jDG,Ud8jDH,MAAA,ac/iDG,UdkjDH,MAAA,YcljDG,gBdqjDH,MAAA,KcrjDG,gBdwjDH,MAAA,acxjDG,gBd2jDH,MAAA,ac3jDG,ed8jDH,MAAA,Ic9jDG,edikDH,MAAA,acjkDG,edokDH,MAAA,acpkDG,edukDH,MAAA,IcvkDG,ed0kDH,MAAA,ac1kDG,ed6kDH,MAAA,ac7kDG,edglDH,MAAA,IchlDG,edmlDH,MAAA,ac9kDG,edilDH,MAAA,YchmDG,edmmDH,MAAA,KcnmDG,gBdsmDH,KAAA,KctmDG,gBdymDH,KAAA,aczmDG,gBd4mDH,KAAA,ac5mDG,ed+mDH,KAAA,Ic/mDG,edknDH,KAAA,aclnDG,edqnDH,KAAA,acrnDG,edwnDH,KAAA,IcxnDG,ed2nDH,KAAA,ac3nDG,ed8nDH,KAAA,ac9nDG,edioDH,KAAA,IcjoDG,edooDH,KAAA,ac/nDG,edkoDH,KAAA,YcnnDG,edsnDH,KAAA,KctnDG,kBdynDH,YAAA,KcznDG,kBd4nDH,YAAA,ac5nDG,kBd+nDH,YAAA,ac/nDG,iBdkoDH,YAAA,IcloDG,iBdqoDH,YAAA,acroDG,iBdwoDH,YAAA,acxoDG,iBd2oDH,YAAA,Ic3oDG,iBd8oDH,YAAA,ac9oDG,iBdipDH,YAAA,acjpDG,iBdopDH,YAAA,IcppDG,iBdupDH,YAAA,acvpDG,iBd0pDH,YAAA,Yc5rDG,iBACE,YAAA,EAOJ,yBACE,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,Ud0rDD,MAAA,Kc1rDC,Wd6rDD,MAAA,Kc7rDC,WdgsDD,MAAA,achsDC,WdmsDD,MAAA,acnsDC,UdssDD,MAAA,IctsDC,UdysDD,MAAA,aczsDC,Ud4sDD,MAAA,ac5sDC,Ud+sDD,MAAA,Ic/sDC,UdktDD,MAAA,acltDC,UdqtDD,MAAA,acrtDC,UdwtDD,MAAA,IcxtDC,Ud2tDD,MAAA,ac5sDC,Ud+sDD,MAAA,Yc/sDC,gBdktDD,MAAA,KcltDC,gBdqtDD,MAAA,acrtDC,gBdwtDD,MAAA,acxtDC,ed2tDD,MAAA,Ic3tDC,ed8tDD,MAAA,ac9tDC,ediuDD,MAAA,acjuDC,edouDD,MAAA,IcpuDC,eduuDD,MAAA,acvuDC,ed0uDD,MAAA,ac1uDC,ed6uDD,MAAA,Ic7uDC,edgvDD,MAAA,ac3uDC,ed8uDD,MAAA,Yc7vDC,edgwDD,MAAA,KchwDC,gBdmwDD,KAAA,KcnwDC,gBdswDD,KAAA,actwDC,gBdywDD,KAAA,aczwDC,ed4wDD,KAAA,Ic5wDC,ed+wDD,KAAA,ac/wDC,edkxDD,KAAA,aclxDC,edqxDD,KAAA,IcrxDC,edwxDD,KAAA,acxxDC,ed2xDD,KAAA,ac3xDC,ed8xDD,KAAA,Ic9xDC,ediyDD,KAAA,ac5xDC,ed+xDD,KAAA,YchxDC,edmxDD,KAAA,KcnxDC,kBdsxDD,YAAA,KctxDC,kBdyxDD,YAAA,aczxDC,kBd4xDD,YAAA,ac5xDC,iBd+xDD,YAAA,Ic/xDC,iBdkyDD,YAAA,aclyDC,iBdqyDD,YAAA,acryDC,iBdwyDD,YAAA,IcxyDC,iBd2yDD,YAAA,ac3yDC,iBd8yDD,YAAA,ac9yDC,iBdizDD,YAAA,IcjzDC,iBdozDD,YAAA,acpzDC,iBduzDD,YAAA,YY9yDD,iBE3CE,YAAA,GAQF,yBACE,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,Udw1DD,MAAA,Kcx1DC,Wd21DD,MAAA,Kc31DC,Wd81DD,MAAA,ac91DC,Wdi2DD,MAAA,acj2DC,Udo2DD,MAAA,Icp2DC,Udu2DD,MAAA,acv2DC,Ud02DD,MAAA,ac12DC,Ud62DD,MAAA,Ic72DC,Udg3DD,MAAA,ach3DC,Udm3DD,MAAA,acn3DC,Uds3DD,MAAA,Ict3DC,Udy3DD,MAAA,ac12DC,Ud62DD,MAAA,Yc72DC,gBdg3DD,MAAA,Kch3DC,gBdm3DD,MAAA,acn3DC,gBds3DD,MAAA,act3DC,edy3DD,MAAA,Icz3DC,ed43DD,MAAA,ac53DC,ed+3DD,MAAA,ac/3DC,edk4DD,MAAA,Icl4DC,edq4DD,MAAA,acr4DC,edw4DD,MAAA,acx4DC,ed24DD,MAAA,Ic34DC,ed84DD,MAAA,acz4DC,ed44DD,MAAA,Yc35DC,ed85DD,MAAA,Kc95DC,gBdi6DD,KAAA,Kcj6DC,gBdo6DD,KAAA,acp6DC,gBdu6DD,KAAA,acv6DC,ed06DD,KAAA,Ic16DC,ed66DD,KAAA,ac76DC,edg7DD,KAAA,ach7DC,edm7DD,KAAA,Icn7DC,eds7DD,KAAA,act7DC,edy7DD,KAAA,acz7DC,ed47DD,KAAA,Ic57DC,ed+7DD,KAAA,ac17DC,ed67DD,KAAA,Yc96DC,edi7DD,KAAA,Kcj7DC,kBdo7DD,YAAA,Kcp7DC,kBdu7DD,YAAA,acv7DC,kBd07DD,YAAA,ac17DC,iBd67DD,YAAA,Ic77DC,iBdg8DD,YAAA,ach8DC,iBdm8DD,YAAA,acn8DC,iBds8DD,YAAA,Ict8DC,iBdy8DD,YAAA,acz8DC,iBd48DD,YAAA,ac58DC,iBd+8DD,YAAA,Ic/8DC,iBdk9DD,YAAA,acl9DC,iBdq9DD,YAAA,YYz8DD,iBE9CE,YAAA,GAQF,0BACE,UAAA,WAAA,WAAA,WAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,UAAA,Uds/DD,MAAA,Kct/DC,Wdy/DD,MAAA,Kcz/DC,Wd4/DD,MAAA,ac5/DC,Wd+/DD,MAAA,ac//DC,UdkgED,MAAA,IclgEC,UdqgED,MAAA,acrgEC,UdwgED,MAAA,acxgEC,Ud2gED,MAAA,Ic3gEC,Ud8gED,MAAA,ac9gEC,UdihED,MAAA,acjhEC,UdohED,MAAA,IcphEC,UduhED,MAAA,acxgEC,Ud2gED,MAAA,Yc3gEC,gBd8gED,MAAA,Kc9gEC,gBdihED,MAAA,acjhEC,gBdohED,MAAA,acphEC,eduhED,MAAA,IcvhEC,ed0hED,MAAA,ac1hEC,ed6hED,MAAA,ac7hEC,edgiED,MAAA,IchiEC,edmiED,MAAA,acniEC,edsiED,MAAA,actiEC,edyiED,MAAA,IcziEC,ed4iED,MAAA,acviEC,ed0iED,MAAA,YczjEC,ed4jED,MAAA,Kc5jEC,gBd+jED,KAAA,Kc/jEC,gBdkkED,KAAA,aclkEC,gBdqkED,KAAA,acrkEC,edwkED,KAAA,IcxkEC,ed2kED,KAAA,ac3kEC,ed8kED,KAAA,ac9kEC,edilED,KAAA,IcjlEC,edolED,KAAA,acplEC,edulED,KAAA,acvlEC,ed0lED,KAAA,Ic1lEC,ed6lED,KAAA,acxlEC,ed2lED,KAAA,Yc5kEC,ed+kED,KAAA,Kc/kEC,kBdklED,YAAA,KcllEC,kBdqlED,YAAA,acrlEC,kBdwlED,YAAA,acxlEC,iBd2lED,YAAA,Ic3lEC,iBd8lED,YAAA,ac9lEC,iBdimED,YAAA,acjmEC,iBdomED,YAAA,IcpmEC,iBdumED,YAAA,acvmEC,iBd0mED,YAAA,ac1mEC,iBd6mED,YAAA,Ic7mEC,iBdgnED,YAAA,achnEC,iBdmnED,YAAA,YetrED,iBACA,YAAA,GAGA,MACA,iBAAA,YAEA,QfyrED,YAAA,IevrEC,eAAgB,IAChB,MAAA,KfyrED,WAAA,KelrEC,GACA,WAAA,KfsrED,OexrEC,MAAO,KdmsEP,UAAW,KACX,cAAe,KcvrET,mBd0rER,mBczrEQ,mBAHA,mBACA,mBd0rER,mBDHC,QAAA,IensEC,YAAa,WAoBX,eAAA,IACA,WAAA,IAAA,MAAA,KArBJ,mBdktEE,eAAgB,OAChB,cAAe,IAAI,MAAM,KDJ1B,uCCMD,uCcrtEA,wCdstEA,wCclrEI,2CANI,2CforEP,WAAA,EezqEG,mBf4qEH,WAAA,IAAA,MAAA,KCWD,cACE,iBAAkB,Kc/pEpB,6BdkqEA,6BcjqEE,6BAZM,6BfsqEP,6BCMD,6BDHC,QAAA,ICWD,gBACE,OAAQ,IAAI,MAAM,Kc1qEpB,4Bd6qEA,4Bc7qEA,4BAQQ,4Bf8pEP,4BCMD,4Bc7pEM,OAAA,IAAA,MAAA,KAYF,4BAFJ,4BfopEC,oBAAA,IevoEG,yCf0oEH,iBAAA,QehoEC,4BACA,iBAAA,QfooED,uBe9nEG,SAAA,OdyoEF,QAAS,acxoEL,MAAA,KAEA,sBfioEL,sBgB7wEC,SAAA,OfwxEA,QAAS,WACT,MAAO,KAST,0BerxEE,0Bf+wEF,0BAGA,0BexxEM,0BAMJ,0BfgxEF,0BAGA,0BACA,0BDNC,0BCAD,0BAGA,0BASE,iBAAkB,QDLnB,sCgBlyEC,sCAAA,oCfyyEF,sCetxEM,sCf2xEJ,iBAAkB,QASpB,2Be1yEE,2BfoyEF,2BAGA,2Be7yEM,2BAMJ,2BfqyEF,2BAGA,2BACA,2BDNC,2BCAD,2BAGA,2BASE,iBAAkB,QDLnB,uCgBvzEC,uCAAA,qCf8zEF,uCe3yEM,uCfgzEJ,iBAAkB,QASpB,wBe/zEE,wBfyzEF,wBAGA,wBel0EM,wBAMJ,wBf0zEF,wBAGA,wBACA,wBDNC,wBCAD,wBAGA,wBASE,iBAAkB,QDLnB,oCgB50EC,oCAAA,kCfm1EF,oCeh0EM,oCfq0EJ,iBAAkB,QASpB,2Bep1EE,2Bf80EF,2BAGA,2Bev1EM,2BAMJ,2Bf+0EF,2BAGA,2BACA,2BDNC,2BCAD,2BAGA,2BASE,iBAAkB,QDLnB,uCgBj2EC,uCAAA,qCfw2EF,uCer1EM,uCf01EJ,iBAAkB,QASpB,0Bez2EE,0Bfm2EF,0BAGA,0Be52EM,0BAMJ,0Bfo2EF,0BAGA,0BACA,0BDNC,0BCAD,0BAGA,0BASE,iBAAkB,QDLnB,sCehtEC,sCADF,oCdwtEA,sCe12EM,sCDoJJ,iBAAA,QA6DF,kBACE,WAAY,KA3DV,WAAA,KAEA,oCACA,kBACA,MAAA,KfotED,cAAA,Ke7pEC,WAAY,OAnDV,mBAAA,yBfmtEH,OAAA,IAAA,MAAA,KCWD,yBACE,cAAe,Ec5qEjB,qCd+qEA,qCcjtEI,qCARM,qCfktET,qCCMD,qCDHC,YAAA,OCWD,kCACE,OAAQ,EcvrEV,0Dd0rEA,0Dc1rEA,0DAzBU,0Df4sET,0DCMD,0DAME,YAAa,Ec/rEf,yDdksEA,yDclsEA,yDArBU,yDfgtET,yDCMD,yDAME,aAAc,EDLjB,yDe1sEW,yDEzNV,yDjBk6EC,yDiBj6ED,cAAA,GAMA,SjBk6ED,UAAA,EiB/5EC,QAAS,EACT,OAAA,EACA,OAAA,EAEA,OACA,QAAA,MACA,MAAA,KACA,QAAA,EACA,cAAA,KACA,UAAA,KjBi6ED,YAAA,QiB95EC,MAAO,KACP,OAAA,EACA,cAAA,IAAA,MAAA,QAEA,MjBg6ED,QAAA,aiBr5EC,UAAW,Kb4BX,cAAA,IACG,YAAA,IJ63EJ,mBiBr5EC,mBAAoB,WhBg6EjB,gBAAiB,WgB95EpB,WAAA,WjBy5ED,qBiBv5EC,kBAGA,OAAQ,IAAI,EAAE,EACd,WAAA,MjBs5ED,YAAA,OiBj5EC,iBACA,QAAA,MAIF,kBhB25EE,QAAS,MgBz5ET,MAAA,KAIF,iBAAA,ahB05EE,OAAQ,KI99ER,uBY2EF,2BjB64EC,wBiB54EC,QAAA,IAAA,KAAA,yBACA,eAAA,KAEA,OACA,QAAA,MjB+4ED,YAAA,IiBr3EC,UAAW,KACX,YAAA,WACA,MAAA,KAEA,cACA,QAAA,MACA,MAAA,KACA,OAAA,KACA,QAAA,IAAA,KACA,UAAA,KACA,YAAA,WACA,MAAA,KbxDA,iBAAA,KACQ,iBAAA,KAyHR,OAAA,IAAA,MAAA,KACK,cAAA,IACG,mBAAA,MAAA,EAAA,IAAA,IAAA,iBJwzET,WAAA,MAAA,EAAA,IAAA,IAAA,iBkBh8EC,mBAAA,aAAA,YAAA,KAAA,mBAAA,YAAA,KACE,cAAA,aAAA,YAAA,KAAA,WAAA,YAAA,KACA,WAAA,aAAA,YAAA,KAAA,WAAA,YAAA,KdWM,oBJy7ET,aAAA,QIx5EC,QAAA,EACE,mBAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,qBACA,WAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,qBAEF,gCAA0B,MAAA,KJ25E3B,QAAA,EI15EiC,oCJ65EjC,MAAA,KiBh4EG,yCACA,MAAA,KAQF,0BhBs4EA,iBAAkB,YAClB,OAAQ,EgBn4EN,wBjB63EH,wBiB13EC,iChBq4EA,iBAAkB,KgBn4EhB,QAAA,EAIF,wBACE,iCjB03EH,OAAA,YiB72EC,sBjBg3ED,OAAA,KiB91EG,mBhB02EF,mBAAoB,KAEtB,qDgB32EM,8BjBo2EH,8BiBj2EC,wCAAA,+BhB62EA,YAAa,KgB32EX,iCjBy2EH,iCiBt2EC,2CAAA,kChB02EF,0BACA,0BACA,oCACA,2BAKE,YAAa,KgBh3EX,iCjB82EH,iCACF,2CiBp2EC,kChBu2EA,0BACA,0BACA,oCACA,2BgBz2EA,YAAA,MhBi3EF,YgBv2EE,cAAA,KAGA,UADA,OjBi2ED,SAAA,SiBr2EC,QAAS,MhBg3ET,WAAY,KgBx2EV,cAAA,KAGA,gBADA,aAEA,WAAA,KjBi2EH,aAAA,KiB91EC,cAAe,EhBy2Ef,YAAa,IACb,OAAQ,QgBp2ER,+BjBg2ED,sCiBl2EC,yBACA,gCAIA,SAAU,ShBw2EV,WAAY,MgBt2EZ,YAAA,MAIF,oBAAA,cAEE,WAAA,KAGA,iBADA,cAEA,SAAA,SACA,QAAA,aACA,aAAA,KjB61ED,cAAA,EiB31EC,YAAa,IhBs2Eb,eAAgB,OgBp2EhB,OAAA,QAUA,kCjBo1ED,4BCWC,WAAY,EACZ,YAAa,KgBv1Eb,wCAAA,qCjBm1ED,8BCOD,+BgBh2EI,2BhB+1EJ,4BAME,OAAQ,YDNT,0BiBv1EG,uBAMF,oCAAA,iChB61EA,OAAQ,YDNT,yBiBp1EK,sBAaJ,mCAFF,gCAGE,OAAA,YAGA,qBjBy0ED,WAAA,KiBv0EC,YAAA,IhBk1EA,eAAgB,IgBh1Ed,cAAA,EjB00EH,8BiB5zED,8BCnQE,cAAA,EACA,aAAA,EAEA,UACA,OAAA,KlBkkFD,QAAA,IAAA,KkBhkFC,UAAA,KACE,YAAA,IACA,cAAA,IAGF,gBjB0kFA,OAAQ,KiBxkFN,YAAA,KD2PA,0BAFJ,kBAGI,OAAA,KAEA,6BACA,OAAA,KjBy0EH,QAAA,IAAA,KiB/0EC,UAAW,KAST,YAAA,IACA,cAAA,IAVJ,mChB81EE,OAAQ,KgBh1EN,YAAA,KAGA,6CAjBJ,qCAkBI,OAAA,KAEA,oCACA,OAAA,KjBy0EH,WAAA,KiBr0EC,QAAS,IAAI,KC/Rb,UAAA,KACA,YAAA,IAEA,UACA,OAAA,KlBumFD,QAAA,KAAA,KkBrmFC,UAAA,KACE,YAAA,UACA,cAAA,IAGF,gBjB+mFA,OAAQ,KiB7mFN,YAAA,KDuRA,0BAFJ,kBAGI,OAAA,KAEA,6BACA,OAAA,KjBk1EH,QAAA,KAAA,KiBx1EC,UAAW,KAST,YAAA,UACA,cAAA,IAVJ,mChBu2EE,OAAQ,KgBz1EN,YAAA,KAGA,6CAjBJ,qCAkBI,OAAA,KAEA,oCACA,OAAA,KjBk1EH,WAAA,KiBz0EC,QAAS,KAAK,KAEd,UAAA,KjB00ED,YAAA,UiBt0EG,cjBy0EH,SAAA,SiBp0EC,4BACA,cAAA,OAEA,uBACA,SAAA,SACA,IAAA,EACA,MAAA,EACA,QAAA,EACA,QAAA,MACA,MAAA,KjBu0ED,OAAA,KiBr0EC,YAAa,KhBg1Eb,WAAY,OACZ,eAAgB,KDLjB,oDiBv0EC,uCADA,iCAGA,MAAO,KhBg1EP,OAAQ,KACR,YAAa,KDLd,oDiBv0EC,uCADA,iCAKA,MAAO,KhB80EP,OAAQ,KACR,YAAa,KAKf,uBAEA,8BAJA,4BADA,yBAEA,oBAEA,2BDNC,4BkBruFG,mCAJA,yBD0ZJ,gCbvWE,MAAA,QJ2rFD,2BkBxuFG,aAAA,QACE,mBAAA,MAAA,EAAA,IAAA,IAAA,iBd4CJ,WAAA,MAAA,EAAA,IAAA,IAAA,iBJgsFD,iCiBz1EC,aAAc,QC5YZ,mBAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,QACA,WAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,QlByuFH,gCiB91EC,MAAO,QCtYL,iBAAA,QlBuuFH,aAAA,QCWD,oCACE,MAAO,QAKT,uBAEA,8BAJA,4BADA,yBAEA,oBAEA,2BDNC,4BkBnwFG,mCAJA,yBD6ZJ,gCb1WE,MAAA,QJytFD,2BkBtwFG,aAAA,QACE,mBAAA,MAAA,EAAA,IAAA,IAAA,iBd4CJ,WAAA,MAAA,EAAA,IAAA,IAAA,iBJ8tFD,iCiBp3EC,aAAc,QC/YZ,mBAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,QACA,WAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,QlBuwFH,gCiBz3EC,MAAO,QCzYL,iBAAA,QlBqwFH,aAAA,QCWD,oCACE,MAAO,QAKT,qBAEA,4BAJA,0BADA,uBAEA,kBAEA,yBDNC,0BkBjyFG,iCAJA,uBDgaJ,8Bb7WE,MAAA,QJuvFD,yBkBpyFG,aAAA,QACE,mBAAA,MAAA,EAAA,IAAA,IAAA,iBd4CJ,WAAA,MAAA,EAAA,IAAA,IAAA,iBJ4vFD,+BiB/4EC,aAAc,QClZZ,mBAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,QACA,WAAA,MAAA,EAAA,IAAA,IAAA,iBAAA,EAAA,EAAA,IAAA,QlBqyFH,8BiBp5EC,MAAO,QC5YL,iBAAA,QlBmyFH,aAAA,QiB/4EG,kCjBk5EH,MAAA,QiB/4EG,2CjBk5EH,IAAA,KiBv4EC,mDACA,IAAA,EAEA,YjB04ED,QAAA,MiBvzEC,WAAY,IAwEZ,cAAe,KAtIX,MAAA,QAEA,yBjBy3EH,yBiBrvEC,QAAS,aA/HP,cAAA,EACA,eAAA,OjBw3EH,2BiB1vEC,QAAS,aAxHP,MAAA,KjBq3EH,eAAA,OiBj3EG,kCACA,QAAA,aAmHJ,0BhB4wEE,QAAS,aACT,eAAgB,OgBr3Ed,wCjB82EH,6CiBtwED,2CjBywEC,MAAA,KiB72EG,wCACA,MAAA,KAmGJ,4BhBwxEE,cAAe,EgBp3Eb,eAAA,OAGA,uBADA,oBjB82EH,QAAA,aiBpxEC,WAAY,EhB+xEZ,cAAe,EgBr3EX,eAAA,OAsFN,6BAAA,0BAjFI,aAAA,EAiFJ,4CjB6xEC,sCiBx2EG,SAAA,SjB22EH,YAAA,EiBh2ED,kDhB42EE,IAAK,GgBl2EL,2BjB+1EH,kCiBh2EG,wBAEA,+BAXF,YAAa,IhBo3Eb,WAAY,EgBn2EV,cAAA,EJviBF,2BIshBF,wBJrhBE,WAAA,KI4jBA,6BAyBA,aAAc,MAnCV,YAAA,MAEA,yBjBw1EH,gCACF,YAAA,IiBx3EG,cAAe,EAwCf,WAAA,OAwBJ,sDAdQ,MAAA,KjB80EL,yBACF,+CiBn0EC,YAAA,KAEE,UAAW,MjBs0EZ,yBACF,+CmBp6FG,YAAa,IACf,UAAA,MAGA,KACA,QAAA,aACA,QAAA,IAAA,KAAA,cAAA,EACA,UAAA,KACA,YAAA,IACA,YAAA,WACA,WAAA,OC0CA,YAAA,OACA,eAAA,OACA,iBAAA,aACA,aAAA,ahB+JA,OAAA,QACG,oBAAA,KACC,iBAAA,KACI,gBAAA,KJ+tFT,YAAA,KmBv6FG,iBAAA,KlBm7FF,OAAQ,IAAI,MAAM,YAClB,cAAe,IkB96Ff,kBdzBA,kBACA,WLk8FD,kBCOD,kBADA,WAME,QAAS,IAAI,KAAK,yBAClB,eAAgB,KkBh7FhB,WnBy6FD,WmB56FG,WlBw7FF,MAAO,KkBn7FL,gBAAA,Kf6BM,YADR,YJk5FD,iBAAA,KmBz6FC,QAAA,ElBq7FA,mBAAoB,MAAM,EAAE,IAAI,IAAI,iBAC5B,WAAY,MAAM,EAAE,IAAI,IAAI,iBoBh+FpC,cAGA,ejB8DA,wBACQ,OAAA,YJ05FT,OAAA,kBmBz6FG,mBAAA,KlBq7FM,WAAY,KkBn7FhB,QAAA,IASN,eC3DE,yBACA,eAAA,KpBi+FD,aoB99FC,MAAA,KnB0+FA,iBAAkB,KmBx+FhB,aAAA,KpBk+FH,mBoBh+FO,mBAEN,MAAA,KACE,iBAAA,QACA,aAAA,QpBi+FH,mBoB99FC,MAAA,KnB0+FA,iBAAkB,QAClB,aAAc,QmBt+FR,oBADJ,oBpBi+FH,mCoB99FG,MAAA,KnB0+FF,iBAAkB,QAClB,aAAc,QmBt+FN,0BnB4+FV,0BAHA,0BmB1+FM,0BnB4+FN,0BAHA,0BDFC,yCoBx+FK,yCnB4+FN,yCmBv+FE,MAAA,KnB++FA,iBAAkB,QAClB,aAAc,QmBx+FZ,oBpBg+FH,oBoBh+FG,mCnB6+FF,iBAAkB,KmBz+FV,4BnB8+FV,4BAHA,4BDHC,6BCOD,6BAHA,6BkB39FA,sCClBM,sCnB8+FN,sCmBx+FI,iBAAA,KACA,aAAA,KDcJ,oBC9DE,MAAA,KACA,iBAAA,KpB0hGD,aoBvhGC,MAAA,KnBmiGA,iBAAkB,QmBjiGhB,aAAA,QpB2hGH,mBoBzhGO,mBAEN,MAAA,KACE,iBAAA,QACA,aAAA,QpB0hGH,mBoBvhGC,MAAA,KnBmiGA,iBAAkB,QAClB,aAAc,QmB/hGR,oBADJ,oBpB0hGH,mCoBvhGG,MAAA,KnBmiGF,iBAAkB,QAClB,aAAc,QmB/hGN,0BnBqiGV,0BAHA,0BmBniGM,0BnBqiGN,0BAHA,0BDFC,yCoBjiGK,yCnBqiGN,yCmBhiGE,MAAA,KnBwiGA,iBAAkB,QAClB,aAAc,QmBjiGZ,oBpByhGH,oBoBzhGG,mCnBsiGF,iBAAkB,KmBliGV,4BnBuiGV,4BAHA,4BDHC,6BCOD,6BAHA,6BkBjhGA,sCCrBM,sCnBuiGN,sCmBjiGI,iBAAA,QACA,aAAA,QDkBJ,oBClEE,MAAA,QACA,iBAAA,KpBmlGD,aoBhlGC,MAAA,KnB4lGA,iBAAkB,QmB1lGhB,aAAA,QpBolGH,mBoBllGO,mBAEN,MAAA,KACE,iBAAA,QACA,aAAA,QpBmlGH,mBoBhlGC,MAAA,KnB4lGA,iBAAkB,QAClB,aAAc,QmBxlGR,oBADJ,oBpBmlGH,mCoBhlGG,MAAA,KnB4lGF,iBAAkB,QAClB,aAAc,QmBxlGN,0BnB8lGV,0BAHA,0BmB5lGM,0BnB8lGN,0BAHA,0BDFC,yCoB1lGK,yCnB8lGN,yCmBzlGE,MAAA,KnBimGA,iBAAkB,QAClB,aAAc,QmB1lGZ,oBpBklGH,oBoBllGG,mCnB+lGF,iBAAkB,KmB3lGV,4BnBgmGV,4BAHA,4BDHC,6BCOD,6BAHA,6BkBtkGA,sCCzBM,sCnBgmGN,sCmB1lGI,iBAAA,QACA,aAAA,QDsBJ,oBCtEE,MAAA,QACA,iBAAA,KpB4oGD,UoBzoGC,MAAA,KnBqpGA,iBAAkB,QmBnpGhB,aAAA,QpB6oGH,gBoB3oGO,gBAEN,MAAA,KACE,iBAAA,QACA,aAAA,QpB4oGH,gBoBzoGC,MAAA,KnBqpGA,iBAAkB,QAClB,aAAc,QmBjpGR,iBADJ,iBpB4oGH,gCoBzoGG,MAAA,KnBqpGF,iBAAkB,QAClB,aAAc,QmBjpGN,uBnBupGV,uBAHA,uBmBrpGM,uBnBupGN,uBAHA,uBDFC,sCoBnpGK,sCnBupGN,sCmBlpGE,MAAA,KnB0pGA,iBAAkB,QAClB,aAAc,QmBnpGZ,iBpB2oGH,iBoB3oGG,gCnBwpGF,iBAAkB,KmBppGV,yBnBypGV,yBAHA,yBDHC,0BCOD,0BAHA,0BkB3nGA,mCC7BM,mCnBypGN,mCmBnpGI,iBAAA,QACA,aAAA,QD0BJ,iBC1EE,MAAA,QACA,iBAAA,KpBqsGD,aoBlsGC,MAAA,KnB8sGA,iBAAkB,QmB5sGhB,aAAA,QpBssGH,mBoBpsGO,mBAEN,MAAA,KACE,iBAAA,QACA,aAAA,QpBqsGH,mBoBlsGC,MAAA,KnB8sGA,iBAAkB,QAClB,aAAc,QmB1sGR,oBADJ,oBpBqsGH,mCoBlsGG,MAAA,KnB8sGF,iBAAkB,QAClB,aAAc,QmB1sGN,0BnBgtGV,0BAHA,0BmB9sGM,0BnBgtGN,0BAHA,0BDFC,yCoB5sGK,yCnBgtGN,yCmB3sGE,MAAA,KnBmtGA,iBAAkB,QAClB,aAAc,QmB5sGZ,oBpBosGH,oBoBpsGG,mCnBitGF,iBAAkB,KmB7sGV,4BnBktGV,4BAHA,4BDHC,6BCOD,6BAHA,6BkBhrGA,sCCjCM,sCnBktGN,sCmB5sGI,iBAAA,QACA,aAAA,QD8BJ,oBC9EE,MAAA,QACA,iBAAA,KpB8vGD,YoB3vGC,MAAA,KnBuwGA,iBAAkB,QmBrwGhB,aAAA,QpB+vGH,kBoB7vGO,kBAEN,MAAA,KACE,iBAAA,QACA,aAAA,QpB8vGH,kBoB3vGC,MAAA,KnBuwGA,iBAAkB,QAClB,aAAc,QmBnwGR,mBADJ,mBpB8vGH,kCoB3vGG,MAAA,KnBuwGF,iBAAkB,QAClB,aAAc,QmBnwGN,yBnBywGV,yBAHA,yBmBvwGM,yBnBywGN,yBAHA,yBDFC,wCoBrwGK,wCnBywGN,wCmBpwGE,MAAA,KnB4wGA,iBAAkB,QAClB,aAAc,QmBrwGZ,mBpB6vGH,mBoB7vGG,kCnB0wGF,iBAAkB,KmBtwGV,2BnB2wGV,2BAHA,2BDHC,4BCOD,4BAHA,4BkBruGA,qCCrCM,qCnB2wGN,qCmBrwGI,iBAAA,QACA,aAAA,QDuCJ,mBACE,MAAA,QACA,iBAAA,KnB+tGD,UmB5tGC,YAAA,IlBwuGA,MAAO,QACP,cAAe,EAEjB,UGzwGE,iBemCE,iBflCM,oBJkwGT,6BmB7tGC,iBAAA,YlByuGA,mBAAoB,KACZ,WAAY,KkBtuGlB,UAEF,iBAAA,gBnB6tGD,gBmB3tGG,aAAA,YnBiuGH,gBmB/tGG,gBAIA,MAAA,QlBuuGF,gBAAiB,UACjB,iBAAkB,YDNnB,0BmBhuGK,0BAUN,mCATM,mClB2uGJ,MAAO,KmB1yGP,gBAAA,KAGA,mBADA,QpBmyGD,QAAA,KAAA,KmBztGC,UAAW,KlBquGX,YAAa,UmBjzGb,cAAA,IAGA,mBADA,QpB0yGD,QAAA,IAAA,KmB5tGC,UAAW,KlBwuGX,YAAa,ImBxzGb,cAAA,IAGA,mBADA,QpBizGD,QAAA,IAAA,ImB3tGC,UAAW,KACX,YAAA,IACA,cAAA,IAIF,WACE,QAAA,MnB2tGD,MAAA,KCYD,sBACE,WAAY,IqBz3GZ,6BADF,4BtBk3GC,6BI7rGC,MAAA,KAEQ,MJisGT,QAAA,EsBr3GC,mBAAA,QAAA,KAAA,OACE,cAAA,QAAA,KAAA,OtBu3GH,WAAA,QAAA,KAAA,OsBl3GC,StBq3GD,QAAA,EsBn3Ga,UtBs3Gb,QAAA,KsBr3Ga,atBw3Gb,QAAA,MsBv3Ga,etB03Gb,QAAA,UsBt3GC,kBACA,QAAA,gBlBwKA,YACQ,SAAA,SAAA,OAAA,EAOR,SAAA,OACQ,mCAAA,KAAA,8BAAA,KAGR,2BAAA,KACQ,4BAAA,KAAA,uBAAA,KJ2sGT,oBAAA,KuBr5GC,4BAA6B,OAAQ,WACrC,uBAAA,OAAA,WACA,oBAAA,OAAA,WAEA,OACA,QAAA,aACA,MAAA,EACA,OAAA,EACA,YAAA,IACA,eAAA,OvBu5GD,WAAA,IAAA,OuBn5GC,WAAY,IAAI,QtBk6GhB,aAAc,IAAI,MAAM,YsBh6GxB,YAAA,IAAA,MAAA,YAKA,UADF,QvBo5GC,SAAA,SuB94GC,uBACA,QAAA,EAEA,eACA,SAAA,SACA,IAAA,KACA,KAAA,EACA,QAAA,KACA,QAAA,KACA,MAAA,KACA,UAAA,MACA,QAAA,IAAA,EACA,OAAA,IAAA,EAAA,EACA,UAAA,KACA,WAAA,KACA,WAAA,KnBsBA,iBAAA,KACQ,wBAAA,YmBrBR,gBAAA,YtB+5GA,OsB/5GA,IAAA,MAAA,KvBk5GD,OAAA,IAAA,MAAA,gBuB74GC,cAAA,IACE,mBAAA,EAAA,IAAA,KAAA,iBACA,WAAA,EAAA,IAAA,KAAA,iBAzBJ,0BCzBE,MAAA,EACA,KAAA,KAEA,wBxBo8GD,OAAA,IuB96GC,OAAQ,IAAI,EAmCV,SAAA,OACA,iBAAA,QAEA,oBACA,QAAA,MACA,QAAA,IAAA,KACA,MAAA,KvB84GH,YAAA,IuBx4GC,YAAA,WtBw5GA,MAAO,KsBt5GL,YAAA,OvB44GH,0BuB14GG,0BAMF,MAAA,QtBo5GA,gBAAiB,KACjB,iBAAkB,QsBj5GhB,yBAEA,+BADA,+BvBu4GH,MAAA,KuB73GC,gBAAA,KtB64GA,iBAAkB,QAClB,QAAS,EDZV,2BuB33GC,iCAAA,iCAEE,MAAA,KEzGF,iCF2GE,iCAEA,gBAAA,KvB63GH,OAAA,YuBx3GC,iBAAkB,YAGhB,iBAAA,KvBw3GH,OAAA,0DuBn3GG,qBvBs3GH,QAAA,MuB72GC,QACA,QAAA,EAQF,qBACE,MAAA,EACA,KAAA,KAIF,oBACE,MAAA,KACA,KAAA,EAEA,iBACA,QAAA,MACA,QAAA,IAAA,KvBw2GD,UAAA,KuBp2GC,YAAa,WACb,MAAA,KACA,YAAA,OAEA,mBACA,SAAA,MACA,IAAA,EvBs2GD,MAAA,EuBl2GC,OAAQ,EACR,KAAA,EACA,QAAA,IAQF,2BtB42GE,MAAO,EsBx2GL,KAAA,KAEA,eACA,sCvB41GH,QAAA,GuBn2GC,WAAY,EtBm3GZ,cAAe,IAAI,OsBx2GjB,cAAA,IAAA,QAEA,uBvB41GH,8CuBv0GC,IAAK,KAXL,OAAA,KApEA,cAAA,IvB25GC,yBuBv1GD,6BA1DA,MAAA,EACA,KAAA,KvBq5GD,kC0BpiHG,MAAO,KzBojHP,KAAM,GyBhjHR,W1BsiHD,oB0B1iHC,SAAU,SzB0jHV,QAAS,ayBpjHP,eAAA,OAGA,yB1BsiHH,gBCgBC,SAAU,SACV,MAAO,KyB7iHT,gC1BsiHC,gCCYD,+BAFA,+ByBhjHA,uBANM,uBzBujHN,sBAFA,sBAQE,QAAS,EyBljHP,qB1BuiHH,2B0BliHD,2BACE,iC1BoiHD,YAAA,KCgBD,aACE,YAAa,KDZd,kB0B1iHD,wBAAA,0BzB2jHE,MAAO,KDZR,kB0B/hHD,wBACE,0B1BiiHD,YAAA,I0B5hHC,yE1B+hHD,cAAA,E2BhlHC,4BACG,YAAA,EDsDL,mEzB6iHE,wBAAyB,E0B5lHzB,2BAAA,E3BilHD,6C0B5hHD,8CACE,uBAAA,E1B8hHD,0BAAA,E0B3hHC,sB1B8hHD,MAAA,KCgBD,8D0B/mHE,cAAA,E3BomHD,mE0B3hHD,oECjEE,wBAAA,EACG,2BAAA,EDqEL,oEzB0iHE,uBAAwB,EyBxiHxB,0BAAA,EAiBF,mCACE,iCACA,QAAA,EAEF,iCACE,cAAA,IACA,aAAA,IAKF,oCtB/CE,cAAA,KACQ,aAAA,KsBkDR,iCtBnDA,mBAAA,MAAA,EAAA,IAAA,IAAA,iBACQ,WAAA,MAAA,EAAA,IAAA,IAAA,iBsByDV,0CACE,mBAAA,K1BugHD,WAAA,K0BngHC,YACA,YAAA,EAGF,eACE,aAAA,IAAA,IAAA,E1BqgHD,oBAAA,ECgBD,uBACE,aAAc,EAAE,IAAI,IyB1gHlB,yBACA,+BACA,oC1B+/GH,QAAA,M0BtgHC,MAAO,KAcH,MAAA,K1B2/GL,UAAA,KCgBD,oCACE,MAAO,KyBpgHL,8BACA,oC1By/GH,oC0Bp/GC,0CACE,WAAA,K1Bs/GH,YAAA,E2B/pHC,4DACC,cAAA,EAQA,sD3B4pHF,uBAAA,I0Bt/GC,wBAAA,IC/KA,2BAAA,EACC,0BAAA,EAQA,sD3BkqHF,uBAAA,E0Bv/GC,wBAAyB,EACzB,2BAAA,I1By/GD,0BAAA,ICgBD,uE0BtrHE,cAAA,E3B2qHD,4E0Bt/GD,6EC7LE,2BAAA,EACC,0BAAA,EDoMH,6EACE,uBAAA,EACA,wBAAA,EAEA,qB1Bo/GD,QAAA,M0Bx/GC,MAAO,KzBwgHP,aAAc,MyBjgHZ,gBAAA,SAEA,0B1Bq/GH,gC0B9/GC,QAAS,WAYP,MAAA,K1Bq/GH,MAAA,G0Bj/GG,qC1Bo/GH,MAAA,KCgBD,+CACE,KAAM,KyB7+GF,gDAFA,6C1Bs+GL,2D0Br+GK,wDEzOJ,SAAU,SACV,KAAA,cACA,eAAA,K5BitHD,a4B7sHC,SAAA,SACE,QAAA,MACA,gBAAA,S5BgtHH,0B4BxtHC,MAAO,KAeL,cAAA,EACA,aAAA,EAOA,2BACA,SAAA,S5BusHH,QAAA,E4BrsHG,MAAA,KACE,MAAA,K5BusHL,cAAA,ECgBD,iCACE,QAAS,EiBnrHT,8BACA,mCACA,sCACA,OAAA,KlBwqHD,QAAA,KAAA,KkBtqHC,UAAA,KjBsrHA,YAAa,UACb,cAAe,IiBrrHb,oClB0qHH,yCkBvqHC,4CjBurHA,OAAQ,KACR,YAAa,KDTd,8C4B/sHD,mDAAA,sD3B0tHA,sCACA,2CiBzrHI,8CjB8rHF,OAAQ,KiB1sHR,8BACA,mCACA,sCACA,OAAA,KlB+rHD,QAAA,IAAA,KkB7rHC,UAAA,KjB6sHA,YAAa,IACb,cAAe,IiB5sHb,oClBisHH,yCkB9rHC,4CjB8sHA,OAAQ,KACR,YAAa,KDTd,8C4B7tHD,mDAAA,sD3BwuHA,sCACA,2CiBhtHI,8CjBqtHF,OAAQ,K2BzuHR,2B5B6tHD,mB4B7tHC,iB3B8uHA,QAAS,W2BzuHX,8D5B6tHC,sD4B7tHD,oDAEE,cAAA,EAEA,mB5B+tHD,iB4B1tHC,MAAO,GACP,YAAA,OACA,eAAA,OAEA,mBACA,QAAA,IAAA,KACA,UAAA,KACA,YAAA,IACA,YAAA,EACA,MAAA,K5B4tHD,WAAA,O4BztHC,iBAAA,KACE,OAAA,IAAA,MAAA,KACA,cAAA,I5B4tHH,4B4BztHC,QAAA,IAAA,KACE,UAAA,KACA,cAAA,I5B4tHH,4B4B/uHC,QAAS,KAAK,K3B+vHd,UAAW,K2BruHT,cAAA,IAKJ,wCAAA,qC3BquHE,WAAY,EAEd,uCACA,+BACA,kC0B70HE,6CACG,8CC4GL,6D5BqtHC,wE4BptHC,wBAAA,E5ButHD,2BAAA,ECgBD,+BACE,aAAc,EAEhB,sCACA,8B2BhuHA,+D5BstHC,oDCWD,iC0Bl1HE,4CACG,6CCiHH,uBAAA,E5BwtHD,0BAAA,E4BltHC,8BAGA,YAAA,E5BotHD,iB4BxtHC,SAAU,SAUR,UAAA,E5BitHH,YAAA,O4B/sHK,sB5BktHL,SAAA,SCgBD,2BACE,YAAa,K2BxtHb,6BAAA,4B5B4sHD,4B4BzsHK,QAAA,EAGJ,kCAAA,wCAGI,aAAA,K5B4sHL,iC6B12HD,uCACE,QAAA,EACA,YAAA,K7B62HD,K6B/2HC,aAAc,EAOZ,cAAA,EACA,WAAA,KARJ,QAWM,SAAA,SACA,QAAA,M7B42HL,U6B12HK,SAAA,S5B03HJ,QAAS,M4Bx3HH,QAAA,KAAA,KAMJ,gB7Bu2HH,gB6Bt2HK,gBAAA,K7By2HL,iBAAA,KCgBD,mB4Br3HQ,MAAA,KAGA,yBADA,yB7B02HP,MAAA,K6Bl2HG,gBAAA,K5Bk3HF,OAAQ,YACR,iBAAkB,Y4B/2Hd,aAzCN,mB7B64HC,mBwBh5HC,iBAAA,KACA,aAAA,QAEA,kBxBm5HD,OAAA,I6Bn5HC,OAAQ,IAAI,EA0DV,SAAA,O7B41HH,iBAAA,Q6Bl1HC,c7Bq1HD,UAAA,K6Bn1HG,UAEA,cAAA,IAAA,MAAA,KALJ,aASM,MAAA,KACA,cAAA,KAEA,e7Bo1HL,aAAA,I6Bn1HK,YAAA,WACE,OAAA,IAAA,MAAA,Y7Bq1HP,cAAA,IAAA,IAAA,EAAA,ECgBD,qBACE,aAAc,KAAK,KAAK,K4B51HlB,sBAEA,4BADA,4BAEA,MAAA,K7Bi1HP,OAAA,Q6B50HC,iBAAA,KAqDA,OAAA,IAAA,MAAA,KA8BA,oBAAA,YAnFA,wBAwDE,MAAA,K7B2xHH,cAAA,E6BzxHK,2BACA,MAAA,KA3DJ,6BAgEE,cAAA,IACA,WAAA,OAYJ,iDA0DE,IAAK,KAjED,KAAA,K7B0xHH,yB6BztHD,2BA9DM,QAAA,W7B0xHL,MAAA,G6Bn2HD,6BAuFE,cAAA,GAvFF,6B5Bw3HA,aAAc,EACd,cAAe,IDZhB,kC6BtuHD,wCA3BA,wCATM,OAAA,IAAA,MAAA,K7B+wHH,yB6B3uHD,6B5B2vHE,cAAe,IAAI,MAAM,KACzB,cAAe,IAAI,IAAI,EAAE,EDZ1B,kC6B92HD,wC7B+2HD,wC6B72HG,oBAAA,MAIE,c7B+2HL,MAAA,K6B52HK,gB7B+2HL,cAAA,ICgBD,iBACE,YAAa,I4Bv3HP,uBAQR,6B7Bo2HC,6B6Bl2HG,MAAA,K7Bq2HH,iBAAA,Q6Bn2HK,gBACA,MAAA,KAYN,mBACE,WAAA,I7B41HD,YAAA,E6Bz1HG,e7B41HH,MAAA,K6B11HK,kBACA,MAAA,KAPN,oBAYI,cAAA,IACA,WAAA,OAYJ,wCA0DE,IAAK,KAjED,KAAA,K7B21HH,yB6B1xHD,kBA9DM,QAAA,W7B21HL,MAAA,G6Bl1HD,oBACA,cAAA,GAIE,oBACA,cAAA,EANJ,yB5B02HE,aAAc,EACd,cAAe,IDZhB,8B6B1yHD,oCA3BA,oCATM,OAAA,IAAA,MAAA,K7Bm1HH,yB6B/yHD,yB5B+zHE,cAAe,IAAI,MAAM,KACzB,cAAe,IAAI,IAAI,EAAE,EDZ1B,8B6Bx0HD,oC7By0HD,oC6Bv0HG,oBAAA,MAGA,uB7B00HH,QAAA,K6B/zHC,qBF3OA,QAAA,M3B+iID,yB8BxiIC,WAAY,KACZ,uBAAA,EACA,wBAAA,EAEA,Q9B0iID,SAAA,S8BliIC,WAAY,KA8nBZ,cAAe,KAhoBb,OAAA,IAAA,MAAA,Y9ByiIH,yB8BzhIC,QAgnBE,cAAe,K9B86GlB,yB8BjhIC,eACA,MAAA,MAGA,iBACA,cAAA,KAAA,aAAA,KAEA,WAAA,Q9BkhID,2BAAA,M8BhhIC,WAAA,IAAA,MAAA,YACE,mBAAA,MAAA,EAAA,IAAA,EAAA,qB9BkhIH,WAAA,MAAA,EAAA,IAAA,EAAA,qB8Bz7GD,oBArlBI,WAAA,KAEA,yBAAA,iB9BkhID,MAAA,K8BhhIC,WAAA,EACE,mBAAA,KACA,WAAA,KAEA,0B9BkhIH,QAAA,gB8B/gIC,OAAA,eACE,eAAA,E9BihIH,SAAA,kBCkBD,oBACE,WAAY,QDZf,sC8B/gIK,mC9B8gIH,oC8BzgIC,cAAe,E7B4hIf,aAAc,G6Bj+GlB,sCAnjBE,mC7ByhIA,WAAY,MDdX,4D8BngID,sC9BogID,mCCkBG,WAAY,O6B3gId,kCANE,gC9BsgIH,4B8BvgIG,0BAuiBF,aAAc,M7Bm/Gd,YAAa,MAEf,yBDZC,kC8B3gIK,gC9B0gIH,4B8B3gIG,0BAcF,aAAc,EAChB,YAAA,GAMF,mBA8gBE,QAAS,KAhhBP,aAAA,EAAA,EAAA,I9BkgIH,yB8B7/HC,mB7B+gIE,cAAe,G6B1gIjB,qBADA,kB9BggID,SAAA,M8Bz/HC,MAAO,EAggBP,KAAM,E7B4gHN,QAAS,KDdR,yB8B7/HD,qB9B8/HD,kB8B7/HC,cAAA,GAGF,kBACE,IAAA,EACA,aAAA,EAAA,EAAA,I9BigID,qB8B1/HC,OAAQ,EACR,cAAA,EACA,aAAA,IAAA,EAAA,EAEA,cACA,MAAA,K9B4/HD,OAAA,K8B1/HC,QAAA,KAAA,K7B4gIA,UAAW,K6B1gIT,YAAA,KAIA,oBAbJ,oB9BwgIC,gBAAA,K8Bv/HG,kB7B0gIF,QAAS,MDdR,yBACF,iC8Bh/HC,uCACA,YAAA,OAGA,eC9LA,SAAA,SACA,MAAA,MD+LA,QAAA,IAAA,KACA,WAAA,IACA,aAAA,KACA,cAAA,I9Bm/HD,iBAAA,Y8B/+HC,iBAAA,KACE,OAAA,IAAA,MAAA,Y9Bi/HH,cAAA,I8B5+HG,qBACA,QAAA,EAEA,yB9B++HH,QAAA,M8BrgIC,MAAO,KAyBL,OAAA,I9B++HH,cAAA,I8BpjHD,mCAvbI,WAAA,I9Bg/HH,yB8Bt+HC,eACA,QAAA,MAGE,YACA,OAAA,MAAA,M9By+HH,iB8B58HC,YAAA,KA2YA,eAAgB,KAjaZ,YAAA,KAEA,yBACA,iCACA,SAAA,OACA,MAAA,KACA,MAAA,KAAA,WAAA,E9Bs+HH,iBAAA,Y8B3kHC,OAAQ,E7B8lHR,mBAAoB,K6Bt/HhB,WAAA,KAGA,kDAqZN,sC9BklHC,QAAA,IAAA,KAAA,IAAA,KCmBD,sC6Bv/HQ,YAAA,KAmBR,4C9Bs9HD,4C8BvlHG,iBAAkB,M9B4lHnB,yB8B5lHD,YAtYI,MAAA,K9Bq+HH,OAAA,E8Bn+HK,eACA,MAAA,K9Bu+HP,iB8B39HG,YAAa,KACf,eAAA,MAGA,aACA,QAAA,KAAA,K1B9NA,WAAA,IACQ,aAAA,M2B/DR,cAAA,IACA,YAAA,M/B4vID,WAAA,IAAA,MAAA,YiBtuHC,cAAe,IAAI,MAAM,YAwEzB,mBAAoB,MAAM,EAAE,IAAI,EAAE,qBAAyB,EAAE,IAAI,EAAE,qBAtI/D,WAAA,MAAA,EAAA,IAAA,EAAA,qBAAA,EAAA,IAAA,EAAA,qBAEA,yBjBwyHH,yBiBpqHC,QAAS,aA/HP,cAAA,EACA,eAAA,OjBuyHH,2BiBzqHC,QAAS,aAxHP,MAAA,KjBoyHH,eAAA,OiBhyHG,kCACA,QAAA,aAmHJ,0BhBmsHE,QAAS,aACT,eAAgB,OgB5yHd,wCjB6xHH,6CiBrrHD,2CjBwrHC,MAAA,KiB5xHG,wCACA,MAAA,KAmGJ,4BhB+sHE,cAAe,EgB3yHb,eAAA,OAGA,uBADA,oBjB6xHH,QAAA,aiBnsHC,WAAY,EhBstHZ,cAAe,EgB5yHX,eAAA,OAsFN,6BAAA,0BAjFI,aAAA,EAiFJ,4CjB4sHC,sCiBvxHG,SAAA,SjB0xHH,YAAA,E8BngID,kDAmWE,IAAK,GAvWH,yBACE,yB9B8gIL,cAAA,I8B5/HD,oCAoVE,cAAe,GA1Vf,yBACA,aACA,MAAA,KACA,YAAA,E1BzPF,eAAA,EACQ,aAAA,EJmwIP,YAAA,EACF,OAAA,E8BngIG,mBAAoB,KACtB,WAAA,M9BugID,8B8BngIC,WAAY,EACZ,uBAAA,EHzUA,wBAAA,EAQA,mDACC,cAAA,E3By0IF,uBAAA,I8B//HC,wBAAyB,IChVzB,2BAAA,EACA,0BAAA,EDkVA,YCnVA,WAAA,IACA,cAAA,IDqVA,mBCtVA,WAAA,KACA,cAAA,KD+VF,mBChWE,WAAA,KACA,cAAA,KDuWF,aAsSE,WAAY,KA1SV,cAAA,KAEA,yB9B+/HD,aACF,MAAA,K8Bl+HG,aAAc,KAhBhB,YAAA,MACA,yBE5WA,aF8WE,MAAA,eAFF,cAKI,MAAA,gB9Bu/HH,aAAA,M8B7+HD,4BACA,aAAA,GADF,gBAKI,iBAAA,Q9Bg/HH,aAAA,QCmBD,8B6BhgIM,MAAA,KARN,oC9B0/HC,oC8B5+HG,MAAA,Q9B++HH,iBAAA,Y8B1+HK,6B9B6+HL,MAAA,KCmBD,iC6B5/HQ,MAAA,KAKF,uC9By+HL,uCCmBC,MAAO,KACP,iBAAkB,Y6Bz/HZ,sCAIF,4C9Bu+HL,4CCmBC,MAAO,KACP,iBAAkB,Q6Bv/HZ,wCAxCR,8C9BihIC,8C8Bn+HG,MAAA,K9Bs+HH,iBAAA,YCmBD,+B6Bt/HM,aAAA,KAGA,qCApDN,qC9B2hIC,iBAAA,KCmBD,yC6Bp/HI,iBAAA,KAOE,iCAAA,6B7Bk/HJ,aAAc,Q6B9+HR,oCAiCN,0C9B+7HD,0C8B3xHC,MAAO,KA7LC,iBAAA,QACA,yB7B8+HR,sD6B5+HU,MAAA,KAKF,4D9By9HP,4DCmBC,MAAO,KACP,iBAAkB,Y6Bz+HV,2DAIF,iE9Bu9HP,iECmBC,MAAO,KACP,iBAAkB,Q6Bv+HV,6D9B09HX,mEADE,mE8B1jIC,MAAO,KA8GP,iBAAA,aAEE,6B9Bi9HL,MAAA,K8B58HG,mC9B+8HH,MAAA,KCmBD,0B6B/9HM,MAAA,KAIA,gCAAA,gC7Bg+HJ,MAAO,K6Bt9HT,0CARQ,0CASN,mD9Bu8HD,mD8Bt8HC,MAAA,KAFF,gBAKI,iBAAA,K9B08HH,aAAA,QCmBD,8B6B19HM,MAAA,QARN,oC9Bo9HC,oC8Bt8HG,MAAA,K9By8HH,iBAAA,Y8Bp8HK,6B9Bu8HL,MAAA,QCmBD,iC6Bt9HQ,MAAA,QAKF,uC9Bm8HL,uCCmBC,MAAO,KACP,iBAAkB,Y6Bn9HZ,sCAIF,4C9Bi8HL,4CCmBC,MAAO,KACP,iBAAkB,Q6Bj9HZ,wCAxCR,8C9B2+HC,8C8B57HG,MAAA,K9B+7HH,iBAAA,YCmBD,+B6B/8HM,aAAA,KAGA,qCArDN,qC9Bq/HC,iBAAA,KCmBD,yC6B78HI,iBAAA,KAME,iCAAA,6B7B48HJ,aAAc,Q6Bx8HR,oCAuCN,0C9Bm5HD,0C8B33HC,MAAO,KAvDC,iBAAA,QAuDV,yBApDU,kE9Bs7HP,aAAA,Q8Bn7HO,0D9Bs7HP,iBAAA,QCmBD,sD6Bt8HU,MAAA,QAKF,4D9Bm7HP,4DCmBC,MAAO,KACP,iBAAkB,Y6Bn8HV,2DAIF,iE9Bi7HP,iECmBC,MAAO,KACP,iBAAkB,Q6Bj8HV,6D9Bo7HX,mEADE,mE8B1hIC,MAAO,KA+GP,iBAAA,aAEE,6B9Bg7HL,MAAA,Q8B36HG,mC9B86HH,MAAA,KCmBD,0B6B97HM,MAAA,QAIA,gCAAA,gC7B+7HJ,MAAO,KgCvkJT,0CH0oBQ,0CGzoBN,mDjCwjJD,mDiCvjJC,MAAA,KAEA,YACA,QAAA,IAAA,KjC2jJD,cAAA,KiChkJC,WAAY,KAQV,iBAAA,QjC2jJH,cAAA,IiCxjJK,eACA,QAAA,ajC4jJL,yBiCxkJC,QAAS,EAAE,IAkBT,MAAA,KjCyjJH,QAAA,SkC5kJC,oBACA,MAAA,KAEA,YlC+kJD,QAAA,akCnlJC,aAAc,EAOZ,OAAA,KAAA,ElC+kJH,cAAA,ICmBD,eiC/lJM,QAAA,OAEA,iBACA,oBACA,SAAA,SACA,MAAA,KACA,QAAA,IAAA,KACA,YAAA,KACA,YAAA,WlCglJL,MAAA,QkC9kJG,gBAAA,KjCimJF,iBAAkB,KiC9lJZ,OAAA,IAAA,MAAA,KPVH,6B3B2lJJ,gCkC7kJG,YAAA,EjCgmJF,uBAAwB,I0BvnJxB,0BAAA,I3BymJD,4BkCxkJG,+BjC2lJF,wBAAyB,IACzB,2BAA4B,IiCxlJxB,uBAFA,uBAGA,0BAFA,0BlC8kJL,QAAA,EkCtkJG,MAAA,QjCylJF,iBAAkB,KAClB,aAAc,KAEhB,sBiCvlJM,4BAFA,4BjC0lJN,yBiCvlJM,+BAFA,+BAGA,QAAA,ElC2kJL,MAAA,KkCloJC,OAAQ,QjCqpJR,iBAAkB,QAClB,aAAc,QiCnlJV,wBAEA,8BADA,8BjColJN,2BiCtlJM,iCjCulJN,iCDZC,MAAA,KkC/jJC,OAAQ,YjCklJR,iBAAkB,KkC7pJd,aAAA,KAEA,oBnC8oJL,uBmC5oJG,QAAA,KAAA,KlC+pJF,UAAW,K0B1pJX,YAAA,U3B4oJD,gCmC3oJG,mClC8pJF,uBAAwB,I0BvqJxB,0BAAA,I3BypJD,+BkC1kJD,kCjC6lJE,wBAAyB,IkC7qJrB,2BAAA,IAEA,oBnC8pJL,uBmC5pJG,QAAA,IAAA,KlC+qJF,UAAW,K0B1qJX,YAAA,I3B4pJD,gCmC3pJG,mClC8qJF,uBAAwB,I0BvrJxB,0BAAA,I3ByqJD,+BoC3qJD,kCACE,wBAAA,IACA,2BAAA,IAEA,OpC6qJD,aAAA,EoCjrJC,OAAQ,KAAK,EAOX,WAAA,OpC6qJH,WAAA,KCmBD,UmC7rJM,QAAA,OAEA,YACA,eACA,QAAA,apC8qJL,QAAA,IAAA,KoC5rJC,iBAAkB,KnC+sJlB,OAAQ,IAAI,MAAM,KmC5rJd,cAAA,KAnBN,kBpCisJC,kBCmBC,gBAAiB,KmCzrJb,iBAAA,KA3BN,eAAA,kBAkCM,MAAA,MAlCN,mBAAA,sBnC6tJE,MAAO,KmClrJH,mBAEA,yBADA,yBpCqqJL,sBqCltJC,MAAO,KACP,OAAA,YACA,iBAAA,KAEA,OACA,QAAA,OACA,QAAA,KAAA,KAAA,KACA,UAAA,IACA,YAAA,IACA,YAAA,EACA,MAAA,KrCotJD,WAAA,OqChtJG,YAAA,OpCmuJF,eAAgB,SoCjuJZ,cAAA,MrCotJL,cqCltJK,cAKJ,MAAA,KACE,gBAAA,KrC+sJH,OAAA,QqC1sJG,aACA,QAAA,KAOJ,YCtCE,SAAA,StC+uJD,IAAA,KCmBD,eqC7vJM,iBAAA,KALJ,2BD0CF,2BrC4sJC,iBAAA,QCmBD,eqCpwJM,iBAAA,QALJ,2BD8CF,2BrC+sJC,iBAAA,QCmBD,eqC3wJM,iBAAA,QALJ,2BDkDF,2BrCktJC,iBAAA,QCmBD,YqClxJM,iBAAA,QALJ,wBDsDF,wBrCqtJC,iBAAA,QCmBD,eqCzxJM,iBAAA,QALJ,2BD0DF,2BrCwtJC,iBAAA,QCmBD,cqChyJM,iBAAA,QCDJ,0BADF,0BAEE,iBAAA,QAEA,OACA,QAAA,aACA,UAAA,KACA,QAAA,IAAA,IACA,UAAA,KACA,YAAA,IACA,YAAA,EACA,MAAA,KACA,WAAA,OvCqxJD,YAAA,OuClxJC,eAAA,OACE,iBAAA,KvCoxJH,cAAA,KuC/wJG,aACA,QAAA,KAGF,YtCkyJA,SAAU,SsChyJR,IAAA,KAMA,0BvC4wJH,eCmBC,IAAK,EsC7xJD,QAAA,IAAA,IvCgxJL,cuC9wJK,cAKJ,MAAA,KtC4xJA,gBAAiB,KsC1xJf,OAAA,QvC4wJH,+BuCxwJC,4BACE,MAAA,QvC0wJH,iBAAA,KuCtwJG,wBvCywJH,MAAA,MuCrwJG,+BvCwwJH,aAAA,IwCj0JC,uBACA,YAAA,IAEA,WACA,YAAA,KxCo0JD,eAAA,KwCz0JC,cAAe,KvC41Jf,MAAO,QuCn1JL,iBAAA,KAIA,eAbJ,cAcI,MAAA,QxCo0JH,awCl1JC,cAAe,KAmBb,UAAA,KxCk0JH,YAAA,ICmBD,cuCh1JI,iBAAA,QAEA,sBxCi0JH,4BwC31JC,cAAe,KA8Bb,aAAA,KxCg0JH,cAAA,IwC7yJD,sBAfI,UAAA,KxCi0JD,oCwC9zJC,WvCi1JA,YAAa,KuC/0JX,eAAA,KxCi0JH,sBwCvzJD,4BvC00JE,cAAe,KuC90Jb,aAAA,KC5CJ,ezC42JD,cyC32JC,UAAA,MAGA,WACA,QAAA,MACA,QAAA,IACA,cAAA,KrCiLA,YAAA,WACK,iBAAA,KACG,OAAA,IAAA,MAAA,KJ8rJT,cAAA,IyCx3JC,mBAAoB,OAAO,IAAI,YxC24J1B,cAAe,OAAO,IAAI,YwC93J7B,WAAA,OAAA,IAAA,YAKF,iBzC22JD,eCmBC,aAAc,KACd,YAAa,KwCv3JX,mBA1BJ,kBzCk4JC,kByCv2JG,aAAA,QCzBJ,oBACE,QAAA,IACA,MAAA,KAEA,O1Cs4JD,QAAA,K0C14JC,cAAe,KAQb,OAAA,IAAA,MAAA,YAEA,cAAA,IAVJ,UAeI,WAAA,E1Ck4JH,MAAA,QCmBD,mByC/4JI,YAAA,IArBJ,SAyBI,U1C+3JH,cAAA,ECmBD,WyCx4JE,WAAA,IAFF,mBAAA,mBAMI,cAAA,KAEA,0BACA,0B1Cy3JH,SAAA,S0Cj3JC,IAAK,KCvDL,MAAA,MACA,MAAA,Q3C46JD,e0Ct3JC,MAAO,QClDL,iBAAA,Q3C26JH,aAAA,Q2Cx6JG,kB3C26JH,iBAAA,Q2Cn7JC,2BACA,MAAA,Q3Cu7JD,Y0C73JC,MAAO,QCtDL,iBAAA,Q3Cs7JH,aAAA,Q2Cn7JG,e3Cs7JH,iBAAA,Q2C97JC,wBACA,MAAA,Q3Ck8JD,e0Cp4JC,MAAO,QC1DL,iBAAA,Q3Ci8JH,aAAA,Q2C97JG,kB3Ci8JH,iBAAA,Q2Cz8JC,2BACA,MAAA,Q3C68JD,c0C34JC,MAAO,QC9DL,iBAAA,Q3C48JH,aAAA,Q2Cz8JG,iB3C48JH,iBAAA,Q4C78JC,0BAAQ,MAAA,QACR,wCAAQ,K5Cm9JP,oBAAA,KAAA,E4C/8JD,GACA,oBAAA,EAAA,GACA,mCAAQ,K5Cq9JP,oBAAA,KAAA,E4Cv9JD,GACA,oBAAA,EAAA,GACA,gCAAQ,K5Cq9JP,oBAAA,KAAA,E4C78JD,GACA,oBAAA,EAAA,GAGA,UACA,OAAA,KxCsCA,cAAA,KACQ,SAAA,OJ26JT,iBAAA,Q4C78JC,cAAe,IACf,mBAAA,MAAA,EAAA,IAAA,IAAA,eACA,WAAA,MAAA,EAAA,IAAA,IAAA,eAEA,cACA,MAAA,KACA,MAAA,EACA,OAAA,KACA,UAAA,KxCyBA,YAAA,KACQ,MAAA,KAyHR,WAAA,OACK,iBAAA,QACG,mBAAA,MAAA,EAAA,KAAA,EAAA,gBJ+zJT,WAAA,MAAA,EAAA,KAAA,EAAA,gB4C18JC,mBAAoB,MAAM,IAAI,K3Cq+JzB,cAAe,MAAM,IAAI,K4Cp+J5B,WAAA,MAAA,IAAA,KDEF,sBCAE,gCDAF,iBAAA,yK5C88JD,iBAAA,oK4Cv8JC,iBAAiB,iK3Cm+JjB,wBAAyB,KAAK,KG/gK9B,gBAAA,KAAA,KJy/JD,qBIv/JS,+BwCmDR,kBAAmB,qBAAqB,GAAG,OAAO,SErElD,aAAA,qBAAA,GAAA,OAAA,S9C4gKD,UAAA,qBAAA,GAAA,OAAA,S6Cz9JG,sBACA,iBAAA,Q7C69JH,wC4Cx8JC,iBAAkB,yKEzElB,iBAAA,oK9CohKD,iBAAA,iK6Cj+JG,mBACA,iBAAA,Q7Cq+JH,qC4C58JC,iBAAkB,yKE7ElB,iBAAA,oK9C4hKD,iBAAA,iK6Cz+JG,sBACA,iBAAA,Q7C6+JH,wC4Ch9JC,iBAAkB,yKEjFlB,iBAAA,oK9CoiKD,iBAAA,iK6Cj/JG,qBACA,iBAAA,Q7Cq/JH,uC+C5iKC,iBAAkB,yKAElB,iBAAA,oK/C6iKD,iBAAA,iK+C1iKG,O/C6iKH,WAAA,KC4BD,mB8CnkKE,WAAA,E/C4iKD,O+CxiKD,YACE,SAAA,O/C0iKD,KAAA,E+CtiKC,Y/CyiKD,MAAA,Q+CriKG,c/CwiKH,QAAA,MC4BD,4B8C9jKE,UAAA,KAGF,aAAA,mBAEE,aAAA,KAGF,YAAA,kB9C+jKE,cAAe,K8CxjKjB,YAHE,Y/CoiKD,a+ChiKC,QAAA,W/CmiKD,eAAA,I+C/hKC,c/CkiKD,eAAA,O+C7hKC,cACA,eAAA,OAMF,eACE,WAAA,EACA,cAAA,ICvDF,YAEE,aAAA,EACA,WAAA,KAQF,YACE,aAAA,EACA,cAAA,KAGA,iBACA,SAAA,SACA,QAAA,MhD6kKD,QAAA,KAAA,KgD1kKC,cAAA,KrB3BA,iBAAA,KACC,OAAA,IAAA,MAAA,KqB6BD,6BACE,uBAAA,IrBvBF,wBAAA,I3BsmKD,4BgDpkKC,cAAe,E/CgmKf,2BAA4B,I+C9lK5B,0BAAA,IAFF,kBAAA,uBAKI,MAAA,KAIF,2CAAA,gD/CgmKA,MAAO,K+C5lKL,wBAFA,wBhDykKH,6BgDxkKG,6BAKF,MAAO,KACP,gBAAA,KACA,iBAAA,QAKA,uB/C4lKA,MAAO,KACP,WAAY,K+CzlKV,0BhDmkKH,gCgDlkKG,gCALF,MAAA,K/CmmKA,OAAQ,YACR,iBAAkB,KDxBnB,mDgD5kKC,yDAAA,yD/CymKA,MAAO,QDxBR,gDgDhkKC,sDAAA,sD/C6lKA,MAAO,K+CzlKL,wBAEA,8BADA,8BhDmkKH,QAAA,EgDxkKC,MAAA,K/ComKA,iBAAkB,QAClB,aAAc,QAEhB,iDDpBC,wDCuBD,uDADA,uD+CzmKE,8DAYI,6D/C4lKN,uD+CxmKE,8D/C2mKF,6DAKE,MAAO,QDxBR,8CiD1qKG,oDADF,oDAEE,MAAA,QAEA,yBhDusKF,MAAO,QgDrsKH,iBAAA,QAFF,0BAAA,+BAKI,MAAA,QAGF,mDAAA,wDhDwsKJ,MAAO,QDtBR,gCiDhrKO,gCAGF,qCAFE,qChD2sKN,MAAO,QACP,iBAAkB,QAEpB,iCgDvsKQ,uCAFA,uChD0sKR,sCDtBC,4CiDnrKO,4CArBN,MAAA,KACE,iBAAA,QACA,aAAA,QAEA,sBhDouKF,MAAO,QgDluKH,iBAAA,QAFF,uBAAA,4BAKI,MAAA,QAGF,gDAAA,qDhDquKJ,MAAO,QDtBR,6BiD7sKO,6BAGF,kCAFE,kChDwuKN,MAAO,QACP,iBAAkB,QAEpB,8BgDpuKQ,oCAFA,oChDuuKR,mCDtBC,yCiDhtKO,yCArBN,MAAA,KACE,iBAAA,QACA,aAAA,QAEA,yBhDiwKF,MAAO,QgD/vKH,iBAAA,QAFF,0BAAA,+BAKI,MAAA,QAGF,mDAAA,wDhDkwKJ,MAAO,QDtBR,gCiD1uKO,gCAGF,qCAFE,qChDqwKN,MAAO,QACP,iBAAkB,QAEpB,iCgDjwKQ,uCAFA,uChDowKR,sCDtBC,4CiD7uKO,4CArBN,MAAA,KACE,iBAAA,QACA,aAAA,QAEA,wBhD8xKF,MAAO,QgD5xKH,iBAAA,QAFF,yBAAA,8BAKI,MAAA,QAGF,kDAAA,uDhD+xKJ,MAAO,QDtBR,+BiDvwKO,+BAGF,oCAFE,oChDkyKN,MAAO,QACP,iBAAkB,QAEpB,gCgD9xKQ,sCAFA,sChDiyKR,qCDtBC,2CiD1wKO,2CDkGN,MAAO,KACP,iBAAA,QACA,aAAA,QAEF,yBACE,WAAA,EACA,cAAA,IE1HF,sBACE,cAAA,EACA,YAAA,IAEA,O9C0DA,cAAA,KACQ,iBAAA,KJ6uKT,OAAA,IAAA,MAAA,YkDnyKC,cAAe,IACf,mBAAA,EAAA,IAAA,IAAA,gBlDqyKD,WAAA,EAAA,IAAA,IAAA,gBkD/xKC,YACA,QAAA,KvBnBC,e3BuzKF,QAAA,KAAA,KkDtyKC,cAAe,IAAI,MAAM,YAMvB,uBAAA,IlDmyKH,wBAAA,IkD7xKC,0CACA,MAAA,QAEA,alDgyKD,WAAA,EkDpyKC,cAAe,EjDg0Kf,UAAW,KACX,MAAO,QDtBR,oBkD1xKC,sBjDkzKF,eiDxzKI,mBAKJ,qBAEE,MAAA,QvBvCA,cACC,QAAA,KAAA,K3Bs0KF,iBAAA,QkDrxKC,WAAY,IAAI,MAAM,KjDizKtB,2BAA4B,IiD9yK1B,0BAAA,IAHJ,mBAAA,mCAMM,cAAA,ElDwxKL,oCkDnxKG,oDjD+yKF,aAAc,IAAI,EiD7yKZ,cAAA,EvBtEL,4D3B61KF,4EkDjxKG,WAAA,EjD6yKF,uBAAwB,IiD3yKlB,wBAAA,IvBtEL,0D3B21KF,0EkD1yKC,cAAe,EvB1Df,2BAAA,IACC,0BAAA,IuB0FH,+EAEI,uBAAA,ElD8wKH,wBAAA,EkD1wKC,wDlD6wKD,iBAAA,EC4BD,0BACE,iBAAkB,EiDlyKpB,8BlD0wKC,ckD1wKD,gCjDuyKE,cAAe,EiDvyKjB,sCAQM,sBlDwwKL,wCC4BC,cAAe,K0Br5Kf,aAAA,KuByGF,wDlDqxKC,0BC4BC,uBAAwB,IACxB,wBAAyB,IiDlzK3B,yFAoBQ,yFlDwwKP,2DkDzwKO,2DjDqyKN,uBAAwB,IACxB,wBAAyB,IAK3B,wGiD9zKA,wGjD4zKA,wGDtBC,wGCuBD,0EiD7zKA,0EjD2zKA,0EiDnyKU,0EjD2yKR,uBAAwB,IAK1B,uGiDx0KA,uGjDs0KA,uGDtBC,uGCuBD,yEiDv0KA,yEjDq0KA,yEiDzyKU,yEvB7HR,wBAAA,IuBiGF,sDlDqzKC,yBC4BC,2BAA4B,IAC5B,0BAA2B,IiDxyKrB,qFA1CR,qFAyCQ,wDlDmxKP,wDC4BC,2BAA4B,IAC5B,0BAA2B,IAG7B,oGDtBC,oGCwBD,oGiD91KA,oGjD21KA,uEiD7yKU,uEjD+yKV,uEiD71KA,uEjDm2KE,0BAA2B,IAG7B,mGDtBC,mGCwBD,mGiDx2KA,mGjDq2KA,sEiDnzKU,sEjDqzKV,sEiDv2KA,sEjD62KE,2BAA4B,IiDlzK1B,0BlD2xKH,qCkDt1KD,0BAAA,qCA+DI,WAAA,IAAA,MAAA,KA/DJ,kDAAA,kDAmEI,WAAA,EAnEJ,uBAAA,yCjD23KE,OAAQ,EiDjzKA,+CjDqzKV,+CiD/3KA,+CjDi4KA,+CAEA,+CANA,+CDjBC,iECoBD,iEiDh4KA,iEjDk4KA,iEAEA,iEANA,iEAWE,YAAa,EiD3zKL,8CjD+zKV,8CiD74KA,8CjD+4KA,8CAEA,8CANA,8CDjBC,gECoBD,gEiD94KA,gEjDg5KA,gEAEA,gEANA,gEAWE,aAAc,EAIhB,+CiD35KA,+CjDy5KA,+CiDl0KU,+CjDq0KV,iEiD55KA,iEjD05KA,iEDtBC,iEC6BC,cAAe,EAEjB,8CiDn0KU,8CjDq0KV,8CiDr6KA,8CjDo6KA,gEDtBC,gECwBD,gEiDh0KI,gEACA,cAAA,EAUJ,yBACE,cAAA,ElDmyKD,OAAA,EkD/xKG,aACA,cAAA,KANJ,oBASM,cAAA,ElDkyKL,cAAA,IkD7xKG,2BlDgyKH,WAAA,IC4BD,4BiDxzKM,cAAA,EAKF,wDAvBJ,wDlDqzKC,WAAA,IAAA,MAAA,KkD5xKK,2BlD+xKL,WAAA,EmDlhLC,uDnDqhLD,cAAA,IAAA,MAAA,KmDlhLG,eACA,aAAA,KnDshLH,8BmDxhLC,MAAA,KAMI,iBAAA,QnDqhLL,aAAA,KmDlhLK,0DACA,iBAAA,KAGJ,qCAEI,MAAA,QnDmhLL,iBAAA,KmDpiLC,yDnDuiLD,oBAAA,KmDpiLG,eACA,aAAA,QnDwiLH,8BmD1iLC,MAAA,KAMI,iBAAA,QnDuiLL,aAAA,QmDpiLK,0DACA,iBAAA,QAGJ,qCAEI,MAAA,QnDqiLL,iBAAA,KmDtjLC,yDnDyjLD,oBAAA,QmDtjLG,eACA,aAAA,QnD0jLH,8BmD5jLC,MAAA,QAMI,iBAAA,QnDyjLL,aAAA,QmDtjLK,0DACA,iBAAA,QAGJ,qCAEI,MAAA,QnDujLL,iBAAA,QmDxkLC,yDnD2kLD,oBAAA,QmDxkLG,YACA,aAAA,QnD4kLH,2BmD9kLC,MAAA,QAMI,iBAAA,QnD2kLL,aAAA,QmDxkLK,uDACA,iBAAA,QAGJ,kCAEI,MAAA,QnDykLL,iBAAA,QmD1lLC,sDnD6lLD,oBAAA,QmD1lLG,eACA,aAAA,QnD8lLH,8BmDhmLC,MAAA,QAMI,iBAAA,QnD6lLL,aAAA,QmD1lLK,0DACA,iBAAA,QAGJ,qCAEI,MAAA,QnD2lLL,iBAAA,QmD5mLC,yDnD+mLD,oBAAA,QmD5mLG,cACA,aAAA,QnDgnLH,6BmDlnLC,MAAA,QAMI,iBAAA,QnD+mLL,aAAA,QmD5mLK,yDACA,iBAAA,QAGJ,oCAEI,MAAA,QnD6mLL,iBAAA,QoD5nLC,wDACA,oBAAA,QAEA,kBACA,SAAA,SpD+nLD,QAAA,MoDpoLC,OAAQ,EnDgqLR,QAAS,EACT,SAAU,OAEZ,yCmDtpLI,wBADA,yBAEA,yBACA,wBACA,SAAA,SACA,IAAA,EACA,OAAA,EpD+nLH,KAAA,EoD1nLC,MAAO,KACP,OAAA,KpD4nLD,OAAA,EoDvnLC,wBpD0nLD,eAAA,OqDppLC,uBACA,eAAA,IAEA,MACA,WAAA,KACA,QAAA,KjDwDA,cAAA,KACQ,iBAAA,QJgmLT,OAAA,IAAA,MAAA,QqD/pLC,cAAe,IASb,mBAAA,MAAA,EAAA,IAAA,IAAA,gBACA,WAAA,MAAA,EAAA,IAAA,IAAA,gBAKJ,iBACE,aAAA,KACA,aAAA,gBAEF,SACE,QAAA,KACA,cAAA,ICtBF,SACE,QAAA,IACA,cAAA,IAEA,OACA,MAAA,MACA,UAAA,KjCRA,YAAA,IAGA,YAAA,ErBqrLD,MAAA,KsD7qLC,YAAA,EAAA,IAAA,EAAA,KrDysLA,OAAQ,kBqDvsLN,QAAA,GjCbF,aiCeE,ajCZF,MAAA,KrB6rLD,gBAAA,KsDzqLC,OAAA,QACE,OAAA,kBACA,QAAA,GAEA,aACA,mBAAA,KtD2qLH,QAAA,EuDhsLC,OAAQ,QACR,WAAA,IvDksLD,OAAA,EuD7rLC,YACA,SAAA,OAEA,OACA,SAAA,MACA,IAAA,EACA,MAAA,EACA,OAAA,EACA,KAAA,EAIA,QAAA,KvD6rLD,QAAA,KuD1rLC,SAAA,OnD+GA,2BAAA,MACI,QAAA,EAEI,0BAkER,mBAAA,kBAAA,IAAA,SAEK,cAAA,aAAA,IAAA,SACG,WAAA,UAAA,IAAA,SJ6gLT,kBAAA,kBuDhsLC,cAAA,kBnD2GA,aAAA,kBACI,UAAA,kBAEI,wBJwlLT,kBAAA,euDpsLK,cAAe,eACnB,aAAA,eACA,UAAA,eAIF,mBACE,WAAA,OACA,WAAA,KvDqsLD,cuDhsLC,SAAU,SACV,MAAA,KACA,OAAA,KAEA,eACA,SAAA,SnDaA,iBAAA,KACQ,wBAAA,YmDZR,gBAAA,YtD4tLA,OsD5tLA,IAAA,MAAA,KAEA,OAAA,IAAA,MAAA,evDksLD,cAAA,IuD9rLC,QAAS,EACT,mBAAA,EAAA,IAAA,IAAA,eACA,WAAA,EAAA,IAAA,IAAA,eAEA,gBACA,SAAA,MACA,IAAA,EACA,MAAA,EvDgsLD,OAAA,EuD9rLC,KAAA,ElCrEA,QAAA,KAGA,iBAAA,KkCmEA,qBlCtEA,OAAA,iBAGA,QAAA,EkCwEF,mBACE,OAAA,kBACA,QAAA,GAIF,cACE,QAAA,KvDgsLD,cAAA,IAAA,MAAA,QuD3rLC,qBACA,WAAA,KAKF,aACE,OAAA,EACA,YAAA,WAIF,YACE,SAAA,SACA,QAAA,KvD0rLD,cuD5rLC,QAAS,KAQP,WAAA,MACA,WAAA,IAAA,MAAA,QATJ,wBAaI,cAAA,EvDsrLH,YAAA,IuDlrLG,mCvDqrLH,YAAA,KuD/qLC,oCACA,YAAA,EAEA,yBACA,SAAA,SvDkrLD,IAAA,QuDhqLC,MAAO,KAZP,OAAA,KACE,SAAA,OvDgrLD,yBuD7qLD,cnDvEA,MAAA,MACQ,OAAA,KAAA,KmD2ER,eAAY,mBAAA,EAAA,IAAA,KAAA,evD+qLX,WAAA,EAAA,IAAA,KAAA,euDzqLD,UAFA,MAAA,OvDirLD,yBwD/zLC,UACA,MAAA,OCNA,SAEA,SAAA,SACA,QAAA,KACA,QAAA,MACA,YAAA,iBAAA,UAAA,MAAA,WACA,UAAA,KACA,WAAA,OACA,YAAA,IACA,YAAA,WACA,WAAA,KACA,WAAA,MACA,gBAAA,KACA,YAAA,KACA,eAAA,KACA,eAAA,ODHA,WAAA,OnCVA,aAAA,OAGA,UAAA,OrBs1LD,YAAA,OwD30LC,OAAA,iBnCdA,QAAA,ErB61LD,WAAA,KwD90LY,YAAmB,OAAA,kBxDk1L/B,QAAA,GwDj1LY,aAAmB,QAAA,IAAA,ExDq1L/B,WAAA,KwDp1LY,eAAmB,QAAA,EAAA,IxDw1L/B,YAAA,IwDv1LY,gBAAmB,QAAA,IAAA,ExD21L/B,WAAA,IwDt1LC,cACA,QAAA,EAAA,IACA,YAAA,KAEA,eACA,UAAA,MxDy1LD,QAAA,IAAA,IwDr1LC,MAAO,KACP,WAAA,OACA,iBAAA,KACA,cAAA,IAEA,exDu1LD,SAAA,SwDn1LC,MAAA,EACE,OAAA,EACA,aAAA,YACA,aAAA,MAEA,4BxDq1LH,OAAA,EwDn1LC,KAAA,IACE,YAAA,KACA,aAAA,IAAA,IAAA,EACA,iBAAA,KAEA,iCxDq1LH,MAAA,IwDn1LC,OAAA,EACE,cAAA,KACA,aAAA,IAAA,IAAA,EACA,iBAAA,KAEA,kCxDq1LH,OAAA,EwDn1LC,KAAA,IACE,cAAA,KACA,aAAA,IAAA,IAAA,EACA,iBAAA,KAEA,8BxDq1LH,IAAA,IwDn1LC,KAAA,EACE,WAAA,KACA,aAAA,IAAA,IAAA,IAAA,EACA,mBAAA,KAEA,6BxDq1LH,IAAA,IwDn1LC,MAAA,EACE,WAAA,KACA,aAAA,IAAA,EAAA,IAAA,IACA,kBAAA,KAEA,+BxDq1LH,IAAA,EwDn1LC,KAAA,IACE,YAAA,KACA,aAAA,EAAA,IAAA,IACA,oBAAA,KAEA,oCxDq1LH,IAAA,EwDn1LC,MAAA,IACE,WAAA,KACA,aAAA,EAAA,IAAA,IACA,oBAAA,KAEA,qCxDq1LH,IAAA,E0Dl7LC,KAAM,IACN,WAAA,KACA,aAAA,EAAA,IAAA,IACA,oBAAA,KAEA,SACA,SAAA,SACA,IAAA,EDXA,KAAA,EAEA,QAAA,KACA,QAAA,KACA,UAAA,MACA,QAAA,IACA,YAAA,iBAAA,UAAA,MAAA,WACA,UAAA,KACA,WAAA,OACA,YAAA,IACA,YAAA,WACA,WAAA,KACA,WAAA,MACA,gBAAA,KACA,YAAA,KACA,eAAA,KCAA,eAAA,OAEA,WAAA,OACA,aAAA,OAAA,UAAA,OACA,YAAA,OACA,iBAAA,KACA,wBAAA,YtD8CA,gBAAA,YACQ,OAAA,IAAA,MAAA,KJk5LT,OAAA,IAAA,MAAA,e0D77LC,cAAA,IAAY,mBAAA,EAAA,IAAA,KAAA,e1Dg8Lb,WAAA,EAAA,IAAA,KAAA,e0D/7La,WAAA,KACZ,aAAY,WAAA,MACZ,eAAY,YAAA,KAGd,gBACE,WAAA,KAEA,cACA,YAAA,MAEA,e1Dq8LD,QAAA,IAAA,K0Dl8LC,OAAQ,EACR,UAAA,K1Do8LD,iBAAA,Q0D57LC,cAAA,IAAA,MAAA,QzDy9LA,cAAe,IAAI,IAAI,EAAE,EyDt9LvB,iBACA,QAAA,IAAA,KAEA,gBACA,sB1D87LH,SAAA,S0D37LC,QAAS,MACT,MAAA,E1D67LD,OAAA,E0D37LC,aAAc,YACd,aAAA,M1D87LD,gB0Dz7LC,aAAA,KAEE,sBACA,QAAA,GACA,aAAA,KAEA,oB1D27LH,OAAA,M0D17LG,KAAA,IACE,YAAA,MACA,iBAAA,KACA,iBAAA,gBACA,oBAAA,E1D67LL,0B0Dz7LC,OAAA,IACE,YAAA,MACA,QAAA,IACA,iBAAA,KACA,oBAAA,EAEA,sB1D27LH,IAAA,I0D17LG,KAAA,MACE,WAAA,MACA,mBAAA,KACA,mBAAA,gBACA,kBAAA,E1D67LL,4B0Dz7LC,OAAA,MACE,KAAA,IACA,QAAA,IACA,mBAAA,KACA,kBAAA,EAEA,uB1D27LH,IAAA,M0D17LG,KAAA,IACE,YAAA,MACA,iBAAA,EACA,oBAAA,KACA,oBAAA,gB1D67LL,6B0Dx7LC,IAAA,IACE,YAAA,MACA,QAAA,IACA,iBAAA,EACA,oBAAA,KAEA,qB1D07LH,IAAA,I0Dz7LG,MAAA,MACE,WAAA,MACA,mBAAA,EACA,kBAAA,KACA,kBAAA,gB1D47LL,2B2DpjMC,MAAO,IACP,OAAA,M3DsjMD,QAAA,I2DnjMC,mBAAoB,EACpB,kBAAA,KAEA,U3DqjMD,SAAA,S2DljMG,gBACA,SAAA,SvD6KF,MAAA,KACK,SAAA,OJ04LN,sB2D/jMC,SAAU,S1D4lMV,QAAS,K0D9kML,mBAAA,IAAA,YAAA,K3DqjML,cAAA,IAAA,YAAA,K2D3hMC,WAAA,IAAA,YAAA,KvDmKK,4BAFL,0BAGQ,YAAA,EA3JA,qDA+GR,sBAEQ,mBAAA,kBAAA,IAAA,YJ86LP,cAAA,aAAA,IAAA,Y2DzjMG,WAAA,UAAA,IAAA,YvDmHJ,4BAAA,OACQ,oBAAA,OuDjHF,oBAAA,O3D4jML,YAAA,OI58LD,mCHs+LA,2BGr+LQ,KAAA,EuD5GF,kBAAA,sB3D6jML,UAAA,sBC2BD,kCADA,2BG5+LA,KAAA,EACQ,kBAAA,uBuDtGF,UAAA,uBArCN,6B3DomMD,gC2DpmMC,iC1D+nME,KAAM,E0DllMN,kBAAA,mB3D4jMH,UAAA,oBAGA,wB2D5mMD,sBAAA,sBAsDI,QAAA,MAEA,wB3D0jMH,KAAA,E2DtjMG,sB3DyjMH,sB2DrnMC,SAAU,SA+DR,IAAA,E3DyjMH,MAAA,KC0BD,sB0D/kMI,KAAA,KAnEJ,sBAuEI,KAAA,MAvEJ,2BA0EI,4B3DwjMH,KAAA,E2D/iMC,6BACA,KAAA,MAEA,8BACA,KAAA,KtC3FA,kBsC6FA,SAAA,SACA,IAAA,EACA,OAAA,EACA,KAAA,EACA,MAAA,I3DmjMD,UAAA,K2D9iMC,MAAA,KdnGE,WAAA,OACA,YAAA,EAAA,IAAA,IAAA,eACA,iBAAA,cAAA,OAAA,kBACA,QAAA,G7CqpMH,uB2DljMC,iBAAA,sEACE,iBAAA,iEACA,iBAAA,uFdxGA,iBAAA,kEACA,OAAA,+GACA,kBAAA,SACA,wBACA,MAAA,E7C6pMH,KAAA,K2DpjMC,iBAAA,sE1DglMA,iBAAiB,iE0D9kMf,iBAAA,uFACA,iBAAA,kEACA,OAAA,+GtCvHF,kBAAA,SsCyFF,wB3DslMC,wBC4BC,MAAO,KACP,gBAAiB,KACjB,OAAQ,kB0D7kMN,QAAA,EACA,QAAA,G3DwjMH,0C2DhmMD,2CA2CI,6BADA,6B1DklMF,SAAU,S0D7kMR,IAAA,IACA,QAAA,E3DqjMH,QAAA,a2DrmMC,WAAY,MAqDV,0CADA,6B3DsjMH,KAAA,I2D1mMC,YAAa,MA0DX,2CADA,6BAEA,MAAA,IACA,aAAA,MAME,6BADF,6B3DmjMH,MAAA,K2D9iMG,OAAA,KACE,YAAA,M3DgjML,YAAA,E2DriMC,oCACA,QAAA,QAEA,oCACA,QAAA,QAEA,qBACA,SAAA,SACA,OAAA,K3DwiMD,KAAA,I2DjjMC,QAAS,GAYP,MAAA,IACA,aAAA,EACA,YAAA,KACA,WAAA,OACA,WAAA,KAEA,wBACA,QAAA,aAWA,MAAA,KACA,OAAA,K3D8hMH,OAAA,I2D7jMC,YAAa,OAkCX,OAAA,QACA,iBAAA,OACA,iBAAA,cACA,OAAA,IAAA,MAAA,K3D8hMH,cAAA,K2DthMC,6BACA,MAAA,KACA,OAAA,KACA,OAAA,EACA,iBAAA,KAEA,kBACA,SAAA,SACA,MAAA,IACA,OAAA,K3DyhMD,KAAA,I2DxhMC,QAAA,GACE,YAAA,K3D0hMH,eAAA,K2Dj/LC,MAAO,KAhCP,WAAA,O1D8iMA,YAAa,EAAE,IAAI,IAAI,eAEzB,uB0D3iMM,YAAA,KAEA,oCACA,0C3DmhMH,2C2D3hMD,6BAAA,6BAYI,MAAA,K3DmhMH,OAAA,K2D/hMD,WAAA,M1D2jME,UAAW,KDxBZ,0C2D9gMD,6BACE,YAAA,MAEA,2C3DghMD,6B2D5gMD,aAAA,M3D+gMC,kBACF,MAAA,I4D7wMC,KAAA,I3DyyME,eAAgB,KAElB,qBACE,OAAQ,MAkBZ,qCADA,sCADA,mBADA,oBAXA,gBADA,iBAOA,uBADA,wBADA,iBADA,kBADA,wBADA,yBASA,mCADA,oC2DpzME,oBAAA,qBAAA,oBAAA,qB3D2zMF,WADA,YAOA,uBADA,wBADA,qBADA,sBADA,cADA,e2D/zMI,a3Dq0MJ,cDvBC,kB4D7yMG,mB3DqzMJ,WADA,YAwBE,QAAS,MACT,QAAS,IASX,qCADA,mBANA,gBAGA,uBADA,iBADA,wBAIA,mCDhBC,oB6D/0MC,oB5Dk2MF,W+B51MA,uBhCo0MC,qB4D5zMG,cChBF,aACA,kB5D+1MF,W+Br1ME,MAAO,KhCy0MR,cgCt0MC,QAAS,MACT,aAAA,KhCw0MD,YAAA,KgC/zMC,YhCk0MD,MAAA,gBgC/zMC,WhCk0MD,MAAA,egC/zMC,MhCk0MD,QAAA,e8Dz1MC,MACA,QAAA,gBAEA,WACA,WAAA,O9B8BF,WACE,KAAA,EAAA,EAAA,EhCg0MD,MAAA,YgCzzMC,YAAa,KACb,iBAAA,YhC2zMD,OAAA,E+D31MC,Q/D81MD,QAAA,eC4BD,OACE,SAAU,M+Dn4MV,chE42MD,MAAA,aC+BD,YADA,YADA,YADA,YAIE,QAAS,e+Dp5MT,kBhEs4MC,mBgEr4MD,yBhEi4MD,kB+Dl1MD,mBA6IA,yB9D4tMA,kBACA,mB8Dj3ME,yB9D62MF,kBACA,mBACA,yB+Dv5MY,QAAA,eACV,yBAAU,YhE04MT,QAAA,gBC4BD,iB+Dp6MU,QAAA,gBhE64MX,c+D51MG,QAAS,oB/Dg2MV,c+Dl2MC,c/Dm2MH,QAAA,sB+D91MG,yB/Dk2MD,kBACF,QAAA,iB+D91MG,yB/Dk2MD,mBACF,QAAA,kBgEh6MC,yBhEo6MC,yBgEn6MD,QAAA,wBACA,+CAAU,YhEw6MT,QAAA,gBC4BD,iB+Dl8MU,QAAA,gBhE26MX,c+Dr2MG,QAAS,oB/Dy2MV,c+D32MC,c/D42MH,QAAA,sB+Dv2MG,+C/D22MD,kBACF,QAAA,iB+Dv2MG,+C/D22MD,mBACF,QAAA,kBgE97MC,+ChEk8MC,yBgEj8MD,QAAA,wBACA,gDAAU,YhEs8MT,QAAA,gBC4BD,iB+Dh+MU,QAAA,gBhEy8MX,c+D92MG,QAAS,oB/Dk3MV,c+Dp3MC,c/Dq3MH,QAAA,sB+Dh3MG,gD/Do3MD,kBACF,QAAA,iB+Dh3MG,gD/Do3MD,mBACF,QAAA,kBgE59MC,gDhEg+MC,yBgE/9MD,QAAA,wBACA,0BAAU,YhEo+MT,QAAA,gBC4BD,iB+D9/MU,QAAA,gBhEu+MX,c+Dv3MG,QAAS,oB/D23MV,c+D73MC,c/D83MH,QAAA,sB+Dz3MG,0B/D63MD,kBACF,QAAA,iB+Dz3MG,0B/D63MD,mBACF,QAAA,kBgEl/MC,0BhEs/MC,yBACF,QAAA,wBgEv/MC,yBhE2/MC,WACF,QAAA,gBgE5/MC,+ChEggNC,WACF,QAAA,gBgEjgNC,gDhEqgNC,WACF,QAAA,gBAGA,0B+Dh3MC,WA4BE,QAAS,gBC5LX,eAAU,QAAA,eACV,aAAU,ehEyhNT,QAAA,gBC4BD,oB+DnjNU,QAAA,gBhE4hNX,iB+D93MG,QAAS,oBAMX,iB/D23MD,iB+Dt2MG,QAAS,sB/D22MZ,qB+D/3MC,QAAS,e/Dk4MV,a+D53MC,qBAcE,QAAS,iB/Dm3MZ,sB+Dh4MC,QAAS,e/Dm4MV,a+D73MC,sBAOE,QAAS,kB/D23MZ,4B+D53MC,QAAS,eCpLT,ahEojNC,4BACF,QAAA,wBC6BD,aACE,cACE,QAAS","sourcesContent":["/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n\n//\n// 1. Set default font family to sans-serif.\n// 2. Prevent iOS and IE text size adjust after device orientation change,\n//    without disabling user zoom.\n//\n\nhtml {\n  font-family: sans-serif; // 1\n  -ms-text-size-adjust: 100%; // 2\n  -webkit-text-size-adjust: 100%; // 2\n}\n\n//\n// Remove default margin.\n//\n\nbody {\n  margin: 0;\n}\n\n// HTML5 display definitions\n// ==========================================================================\n\n//\n// Correct `block` display not defined for any HTML5 element in IE 8/9.\n// Correct `block` display not defined for `details` or `summary` in IE 10/11\n// and Firefox.\n// Correct `block` display not defined for `main` in IE 11.\n//\n\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block;\n}\n\n//\n// 1. Correct `inline-block` display not defined in IE 8/9.\n// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n//\n\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block; // 1\n  vertical-align: baseline; // 2\n}\n\n//\n// Prevent modern browsers from displaying `audio` without controls.\n// Remove excess height in iOS 5 devices.\n//\n\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n\n//\n// Address `[hidden]` styling not present in IE 8/9/10.\n// Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n//\n\n[hidden],\ntemplate {\n  display: none;\n}\n\n// Links\n// ==========================================================================\n\n//\n// Remove the gray background color from active links in IE 10.\n//\n\na {\n  background-color: transparent;\n}\n\n//\n// Improve readability of focused elements when they are also in an\n// active/hover state.\n//\n\na:active,\na:hover {\n  outline: 0;\n}\n\n// Text-level semantics\n// ==========================================================================\n\n//\n// Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n//\n\nabbr[title] {\n  border-bottom: 1px dotted;\n}\n\n//\n// Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n//\n\nb,\nstrong {\n  font-weight: bold;\n}\n\n//\n// Address styling not present in Safari and Chrome.\n//\n\ndfn {\n  font-style: italic;\n}\n\n//\n// Address variable `h1` font-size and margin within `section` and `article`\n// contexts in Firefox 4+, Safari, and Chrome.\n//\n\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0;\n}\n\n//\n// Address styling not present in IE 8/9.\n//\n\nmark {\n  background: #ff0;\n  color: #000;\n}\n\n//\n// Address inconsistent and variable font size in all browsers.\n//\n\nsmall {\n  font-size: 80%;\n}\n\n//\n// Prevent `sub` and `sup` affecting `line-height` in all browsers.\n//\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsup {\n  top: -0.5em;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\n// Embedded content\n// ==========================================================================\n\n//\n// Remove border when inside `a` element in IE 8/9/10.\n//\n\nimg {\n  border: 0;\n}\n\n//\n// Correct overflow not hidden in IE 9/10/11.\n//\n\nsvg:not(:root) {\n  overflow: hidden;\n}\n\n// Grouping content\n// ==========================================================================\n\n//\n// Address margin not present in IE 8/9 and Safari.\n//\n\nfigure {\n  margin: 1em 40px;\n}\n\n//\n// Address differences between Firefox and other browsers.\n//\n\nhr {\n  box-sizing: content-box;\n  height: 0;\n}\n\n//\n// Contain overflow in all browsers.\n//\n\npre {\n  overflow: auto;\n}\n\n//\n// Address odd `em`-unit font size rendering in all browsers.\n//\n\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\n\n// Forms\n// ==========================================================================\n\n//\n// Known limitation: by default, Chrome and Safari on OS X allow very limited\n// styling of `select`, unless a `border` property is set.\n//\n\n//\n// 1. Correct color not being inherited.\n//    Known issue: affects color of disabled elements.\n// 2. Correct font properties not being inherited.\n// 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n//\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit; // 1\n  font: inherit; // 2\n  margin: 0; // 3\n}\n\n//\n// Address `overflow` set to `hidden` in IE 8/9/10/11.\n//\n\nbutton {\n  overflow: visible;\n}\n\n//\n// Address inconsistent `text-transform` inheritance for `button` and `select`.\n// All other form control elements do not inherit `text-transform` values.\n// Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n// Correct `select` style inheritance in Firefox.\n//\n\nbutton,\nselect {\n  text-transform: none;\n}\n\n//\n// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n//    and `video` controls.\n// 2. Correct inability to style clickable `input` types in iOS.\n// 3. Improve usability and consistency of cursor style between image-type\n//    `input` and others.\n//\n\nbutton,\nhtml input[type=\"button\"], // 1\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button; // 2\n  cursor: pointer; // 3\n}\n\n//\n// Re-set default cursor for disabled elements.\n//\n\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default;\n}\n\n//\n// Remove inner padding and border in Firefox 4+.\n//\n\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0;\n}\n\n//\n// Address Firefox 4+ setting `line-height` on `input` using `!important` in\n// the UA stylesheet.\n//\n\ninput {\n  line-height: normal;\n}\n\n//\n// It's recommended that you don't attempt to style these elements.\n// Firefox's implementation doesn't respect box-sizing, padding, or width.\n//\n// 1. Address box sizing set to `content-box` in IE 8/9/10.\n// 2. Remove excess padding in IE 8/9/10.\n//\n\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box; // 1\n  padding: 0; // 2\n}\n\n//\n// Fix the cursor style for Chrome's increment/decrement buttons. For certain\n// `font-size` values of the `input`, it causes the cursor style of the\n// decrement button to change from `default` to `text`.\n//\n\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n//\n// 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n// 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n//\n\ninput[type=\"search\"] {\n  -webkit-appearance: textfield; // 1\n  box-sizing: content-box; //2\n}\n\n//\n// Remove inner padding and search cancel button in Safari and Chrome on OS X.\n// Safari (but not Chrome) clips the cancel button when the search input has\n// padding (and `textfield` appearance).\n//\n\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n//\n// Define consistent border, margin, and padding.\n//\n\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em;\n}\n\n//\n// 1. Correct `color` not being inherited in IE 8/9/10/11.\n// 2. Remove padding so people aren't caught out if they zero out fieldsets.\n//\n\nlegend {\n  border: 0; // 1\n  padding: 0; // 2\n}\n\n//\n// Remove default vertical scrollbar in IE 8/9/10/11.\n//\n\ntextarea {\n  overflow: auto;\n}\n\n//\n// Don't inherit the `font-weight` (applied by a rule above).\n// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n//\n\noptgroup {\n  font-weight: bold;\n}\n\n// Tables\n// ==========================================================================\n\n//\n// Remove most spacing between table cells.\n//\n\ntable {\n  border-collapse: collapse;\n  border-spacing: 0;\n}\n\ntd,\nth {\n  padding: 0;\n}\n","/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */\n\n// ==========================================================================\n// Print styles.\n// Inlined to avoid the additional HTTP request: h5bp.com/r\n// ==========================================================================\n\n@media print {\n    *,\n    *:before,\n    *:after {\n        background: transparent !important;\n        color: #000 !important; // Black prints faster: h5bp.com/s\n        box-shadow: none !important;\n        text-shadow: none !important;\n    }\n\n    a,\n    a:visited {\n        text-decoration: underline;\n    }\n\n    a[href]:after {\n        content: \" (\" attr(href) \")\";\n    }\n\n    abbr[title]:after {\n        content: \" (\" attr(title) \")\";\n    }\n\n    // Don't show links that are fragment identifiers,\n    // or use the `javascript:` pseudo protocol\n    a[href^=\"#\"]:after,\n    a[href^=\"javascript:\"]:after {\n        content: \"\";\n    }\n\n    pre,\n    blockquote {\n        border: 1px solid #999;\n        page-break-inside: avoid;\n    }\n\n    thead {\n        display: table-header-group; // h5bp.com/t\n    }\n\n    tr,\n    img {\n        page-break-inside: avoid;\n    }\n\n    img {\n        max-width: 100% !important;\n    }\n\n    p,\n    h2,\n    h3 {\n        orphans: 3;\n        widows: 3;\n    }\n\n    h2,\n    h3 {\n        page-break-after: avoid;\n    }\n\n    // Bootstrap specific changes start\n\n    // Bootstrap components\n    .navbar {\n        display: none;\n    }\n    .btn,\n    .dropup > .btn {\n        > .caret {\n            border-top-color: #000 !important;\n        }\n    }\n    .label {\n        border: 1px solid #000;\n    }\n\n    .table {\n        border-collapse: collapse !important;\n\n        td,\n        th {\n            background-color: #fff !important;\n        }\n    }\n    .table-bordered {\n        th,\n        td {\n            border: 1px solid #ddd !important;\n        }\n    }\n\n    // Bootstrap specific changes end\n}\n","/*!\n * Bootstrap v3.3.7 (http://getbootstrap.com)\n * Copyright 2011-2016 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\nhtml {\n  font-family: sans-serif;\n  -ms-text-size-adjust: 100%;\n  -webkit-text-size-adjust: 100%;\n}\nbody {\n  margin: 0;\n}\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block;\n}\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  vertical-align: baseline;\n}\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n[hidden],\ntemplate {\n  display: none;\n}\na {\n  background-color: transparent;\n}\na:active,\na:hover {\n  outline: 0;\n}\nabbr[title] {\n  border-bottom: 1px dotted;\n}\nb,\nstrong {\n  font-weight: bold;\n}\ndfn {\n  font-style: italic;\n}\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0;\n}\nmark {\n  background: #ff0;\n  color: #000;\n}\nsmall {\n  font-size: 80%;\n}\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\nsup {\n  top: -0.5em;\n}\nsub {\n  bottom: -0.25em;\n}\nimg {\n  border: 0;\n}\nsvg:not(:root) {\n  overflow: hidden;\n}\nfigure {\n  margin: 1em 40px;\n}\nhr {\n  box-sizing: content-box;\n  height: 0;\n}\npre {\n  overflow: auto;\n}\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  font: inherit;\n  margin: 0;\n}\nbutton {\n  overflow: visible;\n}\nbutton,\nselect {\n  text-transform: none;\n}\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  cursor: pointer;\n}\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default;\n}\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0;\n}\ninput {\n  line-height: normal;\n}\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  padding: 0;\n}\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  box-sizing: content-box;\n}\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em;\n}\nlegend {\n  border: 0;\n  padding: 0;\n}\ntextarea {\n  overflow: auto;\n}\noptgroup {\n  font-weight: bold;\n}\ntable {\n  border-collapse: collapse;\n  border-spacing: 0;\n}\ntd,\nth {\n  padding: 0;\n}\n/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */\n@media print {\n  *,\n  *:before,\n  *:after {\n    background: transparent !important;\n    color: #000 !important;\n    box-shadow: none !important;\n    text-shadow: none !important;\n  }\n  a,\n  a:visited {\n    text-decoration: underline;\n  }\n  a[href]:after {\n    content: \" (\" attr(href) \")\";\n  }\n  abbr[title]:after {\n    content: \" (\" attr(title) \")\";\n  }\n  a[href^=\"#\"]:after,\n  a[href^=\"javascript:\"]:after {\n    content: \"\";\n  }\n  pre,\n  blockquote {\n    border: 1px solid #999;\n    page-break-inside: avoid;\n  }\n  thead {\n    display: table-header-group;\n  }\n  tr,\n  img {\n    page-break-inside: avoid;\n  }\n  img {\n    max-width: 100% !important;\n  }\n  p,\n  h2,\n  h3 {\n    orphans: 3;\n    widows: 3;\n  }\n  h2,\n  h3 {\n    page-break-after: avoid;\n  }\n  .navbar {\n    display: none;\n  }\n  .btn > .caret,\n  .dropup > .btn > .caret {\n    border-top-color: #000 !important;\n  }\n  .label {\n    border: 1px solid #000;\n  }\n  .table {\n    border-collapse: collapse !important;\n  }\n  .table td,\n  .table th {\n    background-color: #fff !important;\n  }\n  .table-bordered th,\n  .table-bordered td {\n    border: 1px solid #ddd !important;\n  }\n}\n@font-face {\n  font-family: 'Glyphicons Halflings';\n  src: url('../fonts/glyphicons-halflings-regular.eot');\n  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');\n}\n.glyphicon {\n  position: relative;\n  top: 1px;\n  display: inline-block;\n  font-family: 'Glyphicons Halflings';\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n.glyphicon-asterisk:before {\n  content: \"\\002a\";\n}\n.glyphicon-plus:before {\n  content: \"\\002b\";\n}\n.glyphicon-euro:before,\n.glyphicon-eur:before {\n  content: \"\\20ac\";\n}\n.glyphicon-minus:before {\n  content: \"\\2212\";\n}\n.glyphicon-cloud:before {\n  content: \"\\2601\";\n}\n.glyphicon-envelope:before {\n  content: \"\\2709\";\n}\n.glyphicon-pencil:before {\n  content: \"\\270f\";\n}\n.glyphicon-glass:before {\n  content: \"\\e001\";\n}\n.glyphicon-music:before {\n  content: \"\\e002\";\n}\n.glyphicon-search:before {\n  content: \"\\e003\";\n}\n.glyphicon-heart:before {\n  content: \"\\e005\";\n}\n.glyphicon-star:before {\n  content: \"\\e006\";\n}\n.glyphicon-star-empty:before {\n  content: \"\\e007\";\n}\n.glyphicon-user:before {\n  content: \"\\e008\";\n}\n.glyphicon-film:before {\n  content: \"\\e009\";\n}\n.glyphicon-th-large:before {\n  content: \"\\e010\";\n}\n.glyphicon-th:before {\n  content: \"\\e011\";\n}\n.glyphicon-th-list:before {\n  content: \"\\e012\";\n}\n.glyphicon-ok:before {\n  content: \"\\e013\";\n}\n.glyphicon-remove:before {\n  content: \"\\e014\";\n}\n.glyphicon-zoom-in:before {\n  content: \"\\e015\";\n}\n.glyphicon-zoom-out:before {\n  content: \"\\e016\";\n}\n.glyphicon-off:before {\n  content: \"\\e017\";\n}\n.glyphicon-signal:before {\n  content: \"\\e018\";\n}\n.glyphicon-cog:before {\n  content: \"\\e019\";\n}\n.glyphicon-trash:before {\n  content: \"\\e020\";\n}\n.glyphicon-home:before {\n  content: \"\\e021\";\n}\n.glyphicon-file:before {\n  content: \"\\e022\";\n}\n.glyphicon-time:before {\n  content: \"\\e023\";\n}\n.glyphicon-road:before {\n  content: \"\\e024\";\n}\n.glyphicon-download-alt:before {\n  content: \"\\e025\";\n}\n.glyphicon-download:before {\n  content: \"\\e026\";\n}\n.glyphicon-upload:before {\n  content: \"\\e027\";\n}\n.glyphicon-inbox:before {\n  content: \"\\e028\";\n}\n.glyphicon-play-circle:before {\n  content: \"\\e029\";\n}\n.glyphicon-repeat:before {\n  content: \"\\e030\";\n}\n.glyphicon-refresh:before {\n  content: \"\\e031\";\n}\n.glyphicon-list-alt:before {\n  content: \"\\e032\";\n}\n.glyphicon-lock:before {\n  content: \"\\e033\";\n}\n.glyphicon-flag:before {\n  content: \"\\e034\";\n}\n.glyphicon-headphones:before {\n  content: \"\\e035\";\n}\n.glyphicon-volume-off:before {\n  content: \"\\e036\";\n}\n.glyphicon-volume-down:before {\n  content: \"\\e037\";\n}\n.glyphicon-volume-up:before {\n  content: \"\\e038\";\n}\n.glyphicon-qrcode:before {\n  content: \"\\e039\";\n}\n.glyphicon-barcode:before {\n  content: \"\\e040\";\n}\n.glyphicon-tag:before {\n  content: \"\\e041\";\n}\n.glyphicon-tags:before {\n  content: \"\\e042\";\n}\n.glyphicon-book:before {\n  content: \"\\e043\";\n}\n.glyphicon-bookmark:before {\n  content: \"\\e044\";\n}\n.glyphicon-print:before {\n  content: \"\\e045\";\n}\n.glyphicon-camera:before {\n  content: \"\\e046\";\n}\n.glyphicon-font:before {\n  content: \"\\e047\";\n}\n.glyphicon-bold:before {\n  content: \"\\e048\";\n}\n.glyphicon-italic:before {\n  content: \"\\e049\";\n}\n.glyphicon-text-height:before {\n  content: \"\\e050\";\n}\n.glyphicon-text-width:before {\n  content: \"\\e051\";\n}\n.glyphicon-align-left:before {\n  content: \"\\e052\";\n}\n.glyphicon-align-center:before {\n  content: \"\\e053\";\n}\n.glyphicon-align-right:before {\n  content: \"\\e054\";\n}\n.glyphicon-align-justify:before {\n  content: \"\\e055\";\n}\n.glyphicon-list:before {\n  content: \"\\e056\";\n}\n.glyphicon-indent-left:before {\n  content: \"\\e057\";\n}\n.glyphicon-indent-right:before {\n  content: \"\\e058\";\n}\n.glyphicon-facetime-video:before {\n  content: \"\\e059\";\n}\n.glyphicon-picture:before {\n  content: \"\\e060\";\n}\n.glyphicon-map-marker:before {\n  content: \"\\e062\";\n}\n.glyphicon-adjust:before {\n  content: \"\\e063\";\n}\n.glyphicon-tint:before {\n  content: \"\\e064\";\n}\n.glyphicon-edit:before {\n  content: \"\\e065\";\n}\n.glyphicon-share:before {\n  content: \"\\e066\";\n}\n.glyphicon-check:before {\n  content: \"\\e067\";\n}\n.glyphicon-move:before {\n  content: \"\\e068\";\n}\n.glyphicon-step-backward:before {\n  content: \"\\e069\";\n}\n.glyphicon-fast-backward:before {\n  content: \"\\e070\";\n}\n.glyphicon-backward:before {\n  content: \"\\e071\";\n}\n.glyphicon-play:before {\n  content: \"\\e072\";\n}\n.glyphicon-pause:before {\n  content: \"\\e073\";\n}\n.glyphicon-stop:before {\n  content: \"\\e074\";\n}\n.glyphicon-forward:before {\n  content: \"\\e075\";\n}\n.glyphicon-fast-forward:before {\n  content: \"\\e076\";\n}\n.glyphicon-step-forward:before {\n  content: \"\\e077\";\n}\n.glyphicon-eject:before {\n  content: \"\\e078\";\n}\n.glyphicon-chevron-left:before {\n  content: \"\\e079\";\n}\n.glyphicon-chevron-right:before {\n  content: \"\\e080\";\n}\n.glyphicon-plus-sign:before {\n  content: \"\\e081\";\n}\n.glyphicon-minus-sign:before {\n  content: \"\\e082\";\n}\n.glyphicon-remove-sign:before {\n  content: \"\\e083\";\n}\n.glyphicon-ok-sign:before {\n  content: \"\\e084\";\n}\n.glyphicon-question-sign:before {\n  content: \"\\e085\";\n}\n.glyphicon-info-sign:before {\n  content: \"\\e086\";\n}\n.glyphicon-screenshot:before {\n  content: \"\\e087\";\n}\n.glyphicon-remove-circle:before {\n  content: \"\\e088\";\n}\n.glyphicon-ok-circle:before {\n  content: \"\\e089\";\n}\n.glyphicon-ban-circle:before {\n  content: \"\\e090\";\n}\n.glyphicon-arrow-left:before {\n  content: \"\\e091\";\n}\n.glyphicon-arrow-right:before {\n  content: \"\\e092\";\n}\n.glyphicon-arrow-up:before {\n  content: \"\\e093\";\n}\n.glyphicon-arrow-down:before {\n  content: \"\\e094\";\n}\n.glyphicon-share-alt:before {\n  content: \"\\e095\";\n}\n.glyphicon-resize-full:before {\n  content: \"\\e096\";\n}\n.glyphicon-resize-small:before {\n  content: \"\\e097\";\n}\n.glyphicon-exclamation-sign:before {\n  content: \"\\e101\";\n}\n.glyphicon-gift:before {\n  content: \"\\e102\";\n}\n.glyphicon-leaf:before {\n  content: \"\\e103\";\n}\n.glyphicon-fire:before {\n  content: \"\\e104\";\n}\n.glyphicon-eye-open:before {\n  content: \"\\e105\";\n}\n.glyphicon-eye-close:before {\n  content: \"\\e106\";\n}\n.glyphicon-warning-sign:before {\n  content: \"\\e107\";\n}\n.glyphicon-plane:before {\n  content: \"\\e108\";\n}\n.glyphicon-calendar:before {\n  content: \"\\e109\";\n}\n.glyphicon-random:before {\n  content: \"\\e110\";\n}\n.glyphicon-comment:before {\n  content: \"\\e111\";\n}\n.glyphicon-magnet:before {\n  content: \"\\e112\";\n}\n.glyphicon-chevron-up:before {\n  content: \"\\e113\";\n}\n.glyphicon-chevron-down:before {\n  content: \"\\e114\";\n}\n.glyphicon-retweet:before {\n  content: \"\\e115\";\n}\n.glyphicon-shopping-cart:before {\n  content: \"\\e116\";\n}\n.glyphicon-folder-close:before {\n  content: \"\\e117\";\n}\n.glyphicon-folder-open:before {\n  content: \"\\e118\";\n}\n.glyphicon-resize-vertical:before {\n  content: \"\\e119\";\n}\n.glyphicon-resize-horizontal:before {\n  content: \"\\e120\";\n}\n.glyphicon-hdd:before {\n  content: \"\\e121\";\n}\n.glyphicon-bullhorn:before {\n  content: \"\\e122\";\n}\n.glyphicon-bell:before {\n  content: \"\\e123\";\n}\n.glyphicon-certificate:before {\n  content: \"\\e124\";\n}\n.glyphicon-thumbs-up:before {\n  content: \"\\e125\";\n}\n.glyphicon-thumbs-down:before {\n  content: \"\\e126\";\n}\n.glyphicon-hand-right:before {\n  content: \"\\e127\";\n}\n.glyphicon-hand-left:before {\n  content: \"\\e128\";\n}\n.glyphicon-hand-up:before {\n  content: \"\\e129\";\n}\n.glyphicon-hand-down:before {\n  content: \"\\e130\";\n}\n.glyphicon-circle-arrow-right:before {\n  content: \"\\e131\";\n}\n.glyphicon-circle-arrow-left:before {\n  content: \"\\e132\";\n}\n.glyphicon-circle-arrow-up:before {\n  content: \"\\e133\";\n}\n.glyphicon-circle-arrow-down:before {\n  content: \"\\e134\";\n}\n.glyphicon-globe:before {\n  content: \"\\e135\";\n}\n.glyphicon-wrench:before {\n  content: \"\\e136\";\n}\n.glyphicon-tasks:before {\n  content: \"\\e137\";\n}\n.glyphicon-filter:before {\n  content: \"\\e138\";\n}\n.glyphicon-briefcase:before {\n  content: \"\\e139\";\n}\n.glyphicon-fullscreen:before {\n  content: \"\\e140\";\n}\n.glyphicon-dashboard:before {\n  content: \"\\e141\";\n}\n.glyphicon-paperclip:before {\n  content: \"\\e142\";\n}\n.glyphicon-heart-empty:before {\n  content: \"\\e143\";\n}\n.glyphicon-link:before {\n  content: \"\\e144\";\n}\n.glyphicon-phone:before {\n  content: \"\\e145\";\n}\n.glyphicon-pushpin:before {\n  content: \"\\e146\";\n}\n.glyphicon-usd:before {\n  content: \"\\e148\";\n}\n.glyphicon-gbp:before {\n  content: \"\\e149\";\n}\n.glyphicon-sort:before {\n  content: \"\\e150\";\n}\n.glyphicon-sort-by-alphabet:before {\n  content: \"\\e151\";\n}\n.glyphicon-sort-by-alphabet-alt:before {\n  content: \"\\e152\";\n}\n.glyphicon-sort-by-order:before {\n  content: \"\\e153\";\n}\n.glyphicon-sort-by-order-alt:before {\n  content: \"\\e154\";\n}\n.glyphicon-sort-by-attributes:before {\n  content: \"\\e155\";\n}\n.glyphicon-sort-by-attributes-alt:before {\n  content: \"\\e156\";\n}\n.glyphicon-unchecked:before {\n  content: \"\\e157\";\n}\n.glyphicon-expand:before {\n  content: \"\\e158\";\n}\n.glyphicon-collapse-down:before {\n  content: \"\\e159\";\n}\n.glyphicon-collapse-up:before {\n  content: \"\\e160\";\n}\n.glyphicon-log-in:before {\n  content: \"\\e161\";\n}\n.glyphicon-flash:before {\n  content: \"\\e162\";\n}\n.glyphicon-log-out:before {\n  content: \"\\e163\";\n}\n.glyphicon-new-window:before {\n  content: \"\\e164\";\n}\n.glyphicon-record:before {\n  content: \"\\e165\";\n}\n.glyphicon-save:before {\n  content: \"\\e166\";\n}\n.glyphicon-open:before {\n  content: \"\\e167\";\n}\n.glyphicon-saved:before {\n  content: \"\\e168\";\n}\n.glyphicon-import:before {\n  content: \"\\e169\";\n}\n.glyphicon-export:before {\n  content: \"\\e170\";\n}\n.glyphicon-send:before {\n  content: \"\\e171\";\n}\n.glyphicon-floppy-disk:before {\n  content: \"\\e172\";\n}\n.glyphicon-floppy-saved:before {\n  content: \"\\e173\";\n}\n.glyphicon-floppy-remove:before {\n  content: \"\\e174\";\n}\n.glyphicon-floppy-save:before {\n  content: \"\\e175\";\n}\n.glyphicon-floppy-open:before {\n  content: \"\\e176\";\n}\n.glyphicon-credit-card:before {\n  content: \"\\e177\";\n}\n.glyphicon-transfer:before {\n  content: \"\\e178\";\n}\n.glyphicon-cutlery:before {\n  content: \"\\e179\";\n}\n.glyphicon-header:before {\n  content: \"\\e180\";\n}\n.glyphicon-compressed:before {\n  content: \"\\e181\";\n}\n.glyphicon-earphone:before {\n  content: \"\\e182\";\n}\n.glyphicon-phone-alt:before {\n  content: \"\\e183\";\n}\n.glyphicon-tower:before {\n  content: \"\\e184\";\n}\n.glyphicon-stats:before {\n  content: \"\\e185\";\n}\n.glyphicon-sd-video:before {\n  content: \"\\e186\";\n}\n.glyphicon-hd-video:before {\n  content: \"\\e187\";\n}\n.glyphicon-subtitles:before {\n  content: \"\\e188\";\n}\n.glyphicon-sound-stereo:before {\n  content: \"\\e189\";\n}\n.glyphicon-sound-dolby:before {\n  content: \"\\e190\";\n}\n.glyphicon-sound-5-1:before {\n  content: \"\\e191\";\n}\n.glyphicon-sound-6-1:before {\n  content: \"\\e192\";\n}\n.glyphicon-sound-7-1:before {\n  content: \"\\e193\";\n}\n.glyphicon-copyright-mark:before {\n  content: \"\\e194\";\n}\n.glyphicon-registration-mark:before {\n  content: \"\\e195\";\n}\n.glyphicon-cloud-download:before {\n  content: \"\\e197\";\n}\n.glyphicon-cloud-upload:before {\n  content: \"\\e198\";\n}\n.glyphicon-tree-conifer:before {\n  content: \"\\e199\";\n}\n.glyphicon-tree-deciduous:before {\n  content: \"\\e200\";\n}\n.glyphicon-cd:before {\n  content: \"\\e201\";\n}\n.glyphicon-save-file:before {\n  content: \"\\e202\";\n}\n.glyphicon-open-file:before {\n  content: \"\\e203\";\n}\n.glyphicon-level-up:before {\n  content: \"\\e204\";\n}\n.glyphicon-copy:before {\n  content: \"\\e205\";\n}\n.glyphicon-paste:before {\n  content: \"\\e206\";\n}\n.glyphicon-alert:before {\n  content: \"\\e209\";\n}\n.glyphicon-equalizer:before {\n  content: \"\\e210\";\n}\n.glyphicon-king:before {\n  content: \"\\e211\";\n}\n.glyphicon-queen:before {\n  content: \"\\e212\";\n}\n.glyphicon-pawn:before {\n  content: \"\\e213\";\n}\n.glyphicon-bishop:before {\n  content: \"\\e214\";\n}\n.glyphicon-knight:before {\n  content: \"\\e215\";\n}\n.glyphicon-baby-formula:before {\n  content: \"\\e216\";\n}\n.glyphicon-tent:before {\n  content: \"\\26fa\";\n}\n.glyphicon-blackboard:before {\n  content: \"\\e218\";\n}\n.glyphicon-bed:before {\n  content: \"\\e219\";\n}\n.glyphicon-apple:before {\n  content: \"\\f8ff\";\n}\n.glyphicon-erase:before {\n  content: \"\\e221\";\n}\n.glyphicon-hourglass:before {\n  content: \"\\231b\";\n}\n.glyphicon-lamp:before {\n  content: \"\\e223\";\n}\n.glyphicon-duplicate:before {\n  content: \"\\e224\";\n}\n.glyphicon-piggy-bank:before {\n  content: \"\\e225\";\n}\n.glyphicon-scissors:before {\n  content: \"\\e226\";\n}\n.glyphicon-bitcoin:before {\n  content: \"\\e227\";\n}\n.glyphicon-btc:before {\n  content: \"\\e227\";\n}\n.glyphicon-xbt:before {\n  content: \"\\e227\";\n}\n.glyphicon-yen:before {\n  content: \"\\00a5\";\n}\n.glyphicon-jpy:before {\n  content: \"\\00a5\";\n}\n.glyphicon-ruble:before {\n  content: \"\\20bd\";\n}\n.glyphicon-rub:before {\n  content: \"\\20bd\";\n}\n.glyphicon-scale:before {\n  content: \"\\e230\";\n}\n.glyphicon-ice-lolly:before {\n  content: \"\\e231\";\n}\n.glyphicon-ice-lolly-tasted:before {\n  content: \"\\e232\";\n}\n.glyphicon-education:before {\n  content: \"\\e233\";\n}\n.glyphicon-option-horizontal:before {\n  content: \"\\e234\";\n}\n.glyphicon-option-vertical:before {\n  content: \"\\e235\";\n}\n.glyphicon-menu-hamburger:before {\n  content: \"\\e236\";\n}\n.glyphicon-modal-window:before {\n  content: \"\\e237\";\n}\n.glyphicon-oil:before {\n  content: \"\\e238\";\n}\n.glyphicon-grain:before {\n  content: \"\\e239\";\n}\n.glyphicon-sunglasses:before {\n  content: \"\\e240\";\n}\n.glyphicon-text-size:before {\n  content: \"\\e241\";\n}\n.glyphicon-text-color:before {\n  content: \"\\e242\";\n}\n.glyphicon-text-background:before {\n  content: \"\\e243\";\n}\n.glyphicon-object-align-top:before {\n  content: \"\\e244\";\n}\n.glyphicon-object-align-bottom:before {\n  content: \"\\e245\";\n}\n.glyphicon-object-align-horizontal:before {\n  content: \"\\e246\";\n}\n.glyphicon-object-align-left:before {\n  content: \"\\e247\";\n}\n.glyphicon-object-align-vertical:before {\n  content: \"\\e248\";\n}\n.glyphicon-object-align-right:before {\n  content: \"\\e249\";\n}\n.glyphicon-triangle-right:before {\n  content: \"\\e250\";\n}\n.glyphicon-triangle-left:before {\n  content: \"\\e251\";\n}\n.glyphicon-triangle-bottom:before {\n  content: \"\\e252\";\n}\n.glyphicon-triangle-top:before {\n  content: \"\\e253\";\n}\n.glyphicon-console:before {\n  content: \"\\e254\";\n}\n.glyphicon-superscript:before {\n  content: \"\\e255\";\n}\n.glyphicon-subscript:before {\n  content: \"\\e256\";\n}\n.glyphicon-menu-left:before {\n  content: \"\\e257\";\n}\n.glyphicon-menu-right:before {\n  content: \"\\e258\";\n}\n.glyphicon-menu-down:before {\n  content: \"\\e259\";\n}\n.glyphicon-menu-up:before {\n  content: \"\\e260\";\n}\n* {\n  -webkit-box-sizing: border-box;\n  -moz-box-sizing: border-box;\n  box-sizing: border-box;\n}\n*:before,\n*:after {\n  -webkit-box-sizing: border-box;\n  -moz-box-sizing: border-box;\n  box-sizing: border-box;\n}\nhtml {\n  font-size: 10px;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\nbody {\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #333333;\n  background-color: #fff;\n}\ninput,\nbutton,\nselect,\ntextarea {\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\na {\n  color: #337ab7;\n  text-decoration: none;\n}\na:hover,\na:focus {\n  color: #23527c;\n  text-decoration: underline;\n}\na:focus {\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\nfigure {\n  margin: 0;\n}\nimg {\n  vertical-align: middle;\n}\n.img-responsive,\n.thumbnail > img,\n.thumbnail a > img,\n.carousel-inner > .item > img,\n.carousel-inner > .item > a > img {\n  display: block;\n  max-width: 100%;\n  height: auto;\n}\n.img-rounded {\n  border-radius: 6px;\n}\n.img-thumbnail {\n  padding: 4px;\n  line-height: 1.42857143;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 4px;\n  -webkit-transition: all 0.2s ease-in-out;\n  -o-transition: all 0.2s ease-in-out;\n  transition: all 0.2s ease-in-out;\n  display: inline-block;\n  max-width: 100%;\n  height: auto;\n}\n.img-circle {\n  border-radius: 50%;\n}\nhr {\n  margin-top: 20px;\n  margin-bottom: 20px;\n  border: 0;\n  border-top: 1px solid #eeeeee;\n}\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  border: 0;\n}\n.sr-only-focusable:active,\n.sr-only-focusable:focus {\n  position: static;\n  width: auto;\n  height: auto;\n  margin: 0;\n  overflow: visible;\n  clip: auto;\n}\n[role=\"button\"] {\n  cursor: pointer;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\n.h1,\n.h2,\n.h3,\n.h4,\n.h5,\n.h6 {\n  font-family: inherit;\n  font-weight: 500;\n  line-height: 1.1;\n  color: inherit;\n}\nh1 small,\nh2 small,\nh3 small,\nh4 small,\nh5 small,\nh6 small,\n.h1 small,\n.h2 small,\n.h3 small,\n.h4 small,\n.h5 small,\n.h6 small,\nh1 .small,\nh2 .small,\nh3 .small,\nh4 .small,\nh5 .small,\nh6 .small,\n.h1 .small,\n.h2 .small,\n.h3 .small,\n.h4 .small,\n.h5 .small,\n.h6 .small {\n  font-weight: normal;\n  line-height: 1;\n  color: #777777;\n}\nh1,\n.h1,\nh2,\n.h2,\nh3,\n.h3 {\n  margin-top: 20px;\n  margin-bottom: 10px;\n}\nh1 small,\n.h1 small,\nh2 small,\n.h2 small,\nh3 small,\n.h3 small,\nh1 .small,\n.h1 .small,\nh2 .small,\n.h2 .small,\nh3 .small,\n.h3 .small {\n  font-size: 65%;\n}\nh4,\n.h4,\nh5,\n.h5,\nh6,\n.h6 {\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\nh4 small,\n.h4 small,\nh5 small,\n.h5 small,\nh6 small,\n.h6 small,\nh4 .small,\n.h4 .small,\nh5 .small,\n.h5 .small,\nh6 .small,\n.h6 .small {\n  font-size: 75%;\n}\nh1,\n.h1 {\n  font-size: 36px;\n}\nh2,\n.h2 {\n  font-size: 30px;\n}\nh3,\n.h3 {\n  font-size: 24px;\n}\nh4,\n.h4 {\n  font-size: 18px;\n}\nh5,\n.h5 {\n  font-size: 14px;\n}\nh6,\n.h6 {\n  font-size: 12px;\n}\np {\n  margin: 0 0 10px;\n}\n.lead {\n  margin-bottom: 20px;\n  font-size: 16px;\n  font-weight: 300;\n  line-height: 1.4;\n}\n@media (min-width: 768px) {\n  .lead {\n    font-size: 21px;\n  }\n}\nsmall,\n.small {\n  font-size: 85%;\n}\nmark,\n.mark {\n  background-color: #fcf8e3;\n  padding: .2em;\n}\n.text-left {\n  text-align: left;\n}\n.text-right {\n  text-align: right;\n}\n.text-center {\n  text-align: center;\n}\n.text-justify {\n  text-align: justify;\n}\n.text-nowrap {\n  white-space: nowrap;\n}\n.text-lowercase {\n  text-transform: lowercase;\n}\n.text-uppercase {\n  text-transform: uppercase;\n}\n.text-capitalize {\n  text-transform: capitalize;\n}\n.text-muted {\n  color: #777777;\n}\n.text-primary {\n  color: #337ab7;\n}\na.text-primary:hover,\na.text-primary:focus {\n  color: #286090;\n}\n.text-success {\n  color: #3c763d;\n}\na.text-success:hover,\na.text-success:focus {\n  color: #2b542c;\n}\n.text-info {\n  color: #31708f;\n}\na.text-info:hover,\na.text-info:focus {\n  color: #245269;\n}\n.text-warning {\n  color: #8a6d3b;\n}\na.text-warning:hover,\na.text-warning:focus {\n  color: #66512c;\n}\n.text-danger {\n  color: #a94442;\n}\na.text-danger:hover,\na.text-danger:focus {\n  color: #843534;\n}\n.bg-primary {\n  color: #fff;\n  background-color: #337ab7;\n}\na.bg-primary:hover,\na.bg-primary:focus {\n  background-color: #286090;\n}\n.bg-success {\n  background-color: #dff0d8;\n}\na.bg-success:hover,\na.bg-success:focus {\n  background-color: #c1e2b3;\n}\n.bg-info {\n  background-color: #d9edf7;\n}\na.bg-info:hover,\na.bg-info:focus {\n  background-color: #afd9ee;\n}\n.bg-warning {\n  background-color: #fcf8e3;\n}\na.bg-warning:hover,\na.bg-warning:focus {\n  background-color: #f7ecb5;\n}\n.bg-danger {\n  background-color: #f2dede;\n}\na.bg-danger:hover,\na.bg-danger:focus {\n  background-color: #e4b9b9;\n}\n.page-header {\n  padding-bottom: 9px;\n  margin: 40px 0 20px;\n  border-bottom: 1px solid #eeeeee;\n}\nul,\nol {\n  margin-top: 0;\n  margin-bottom: 10px;\n}\nul ul,\nol ul,\nul ol,\nol ol {\n  margin-bottom: 0;\n}\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n.list-inline {\n  padding-left: 0;\n  list-style: none;\n  margin-left: -5px;\n}\n.list-inline > li {\n  display: inline-block;\n  padding-left: 5px;\n  padding-right: 5px;\n}\ndl {\n  margin-top: 0;\n  margin-bottom: 20px;\n}\ndt,\ndd {\n  line-height: 1.42857143;\n}\ndt {\n  font-weight: bold;\n}\ndd {\n  margin-left: 0;\n}\n@media (min-width: 768px) {\n  .dl-horizontal dt {\n    float: left;\n    width: 160px;\n    clear: left;\n    text-align: right;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .dl-horizontal dd {\n    margin-left: 180px;\n  }\n}\nabbr[title],\nabbr[data-original-title] {\n  cursor: help;\n  border-bottom: 1px dotted #777777;\n}\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\nblockquote {\n  padding: 10px 20px;\n  margin: 0 0 20px;\n  font-size: 17.5px;\n  border-left: 5px solid #eeeeee;\n}\nblockquote p:last-child,\nblockquote ul:last-child,\nblockquote ol:last-child {\n  margin-bottom: 0;\n}\nblockquote footer,\nblockquote small,\nblockquote .small {\n  display: block;\n  font-size: 80%;\n  line-height: 1.42857143;\n  color: #777777;\n}\nblockquote footer:before,\nblockquote small:before,\nblockquote .small:before {\n  content: '\\2014 \\00A0';\n}\n.blockquote-reverse,\nblockquote.pull-right {\n  padding-right: 15px;\n  padding-left: 0;\n  border-right: 5px solid #eeeeee;\n  border-left: 0;\n  text-align: right;\n}\n.blockquote-reverse footer:before,\nblockquote.pull-right footer:before,\n.blockquote-reverse small:before,\nblockquote.pull-right small:before,\n.blockquote-reverse .small:before,\nblockquote.pull-right .small:before {\n  content: '';\n}\n.blockquote-reverse footer:after,\nblockquote.pull-right footer:after,\n.blockquote-reverse small:after,\nblockquote.pull-right small:after,\n.blockquote-reverse .small:after,\nblockquote.pull-right .small:after {\n  content: '\\00A0 \\2014';\n}\naddress {\n  margin-bottom: 20px;\n  font-style: normal;\n  line-height: 1.42857143;\n}\ncode,\nkbd,\npre,\nsamp {\n  font-family: Menlo, Monaco, Consolas, \"Courier New\", monospace;\n}\ncode {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: #c7254e;\n  background-color: #f9f2f4;\n  border-radius: 4px;\n}\nkbd {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: #fff;\n  background-color: #333;\n  border-radius: 3px;\n  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);\n}\nkbd kbd {\n  padding: 0;\n  font-size: 100%;\n  font-weight: bold;\n  box-shadow: none;\n}\npre {\n  display: block;\n  padding: 9.5px;\n  margin: 0 0 10px;\n  font-size: 13px;\n  line-height: 1.42857143;\n  word-break: break-all;\n  word-wrap: break-word;\n  color: #333333;\n  background-color: #f5f5f5;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n}\npre code {\n  padding: 0;\n  font-size: inherit;\n  color: inherit;\n  white-space: pre-wrap;\n  background-color: transparent;\n  border-radius: 0;\n}\n.pre-scrollable {\n  max-height: 340px;\n  overflow-y: scroll;\n}\n.container {\n  margin-right: auto;\n  margin-left: auto;\n  padding-left: 15px;\n  padding-right: 15px;\n}\n@media (min-width: 768px) {\n  .container {\n    width: 750px;\n  }\n}\n@media (min-width: 992px) {\n  .container {\n    width: 970px;\n  }\n}\n@media (min-width: 1200px) {\n  .container {\n    width: 1170px;\n  }\n}\n.container-fluid {\n  margin-right: auto;\n  margin-left: auto;\n  padding-left: 15px;\n  padding-right: 15px;\n}\n.row {\n  margin-left: -15px;\n  margin-right: -15px;\n}\n.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {\n  position: relative;\n  min-height: 1px;\n  padding-left: 15px;\n  padding-right: 15px;\n}\n.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {\n  float: left;\n}\n.col-xs-12 {\n  width: 100%;\n}\n.col-xs-11 {\n  width: 91.66666667%;\n}\n.col-xs-10 {\n  width: 83.33333333%;\n}\n.col-xs-9 {\n  width: 75%;\n}\n.col-xs-8 {\n  width: 66.66666667%;\n}\n.col-xs-7 {\n  width: 58.33333333%;\n}\n.col-xs-6 {\n  width: 50%;\n}\n.col-xs-5 {\n  width: 41.66666667%;\n}\n.col-xs-4 {\n  width: 33.33333333%;\n}\n.col-xs-3 {\n  width: 25%;\n}\n.col-xs-2 {\n  width: 16.66666667%;\n}\n.col-xs-1 {\n  width: 8.33333333%;\n}\n.col-xs-pull-12 {\n  right: 100%;\n}\n.col-xs-pull-11 {\n  right: 91.66666667%;\n}\n.col-xs-pull-10 {\n  right: 83.33333333%;\n}\n.col-xs-pull-9 {\n  right: 75%;\n}\n.col-xs-pull-8 {\n  right: 66.66666667%;\n}\n.col-xs-pull-7 {\n  right: 58.33333333%;\n}\n.col-xs-pull-6 {\n  right: 50%;\n}\n.col-xs-pull-5 {\n  right: 41.66666667%;\n}\n.col-xs-pull-4 {\n  right: 33.33333333%;\n}\n.col-xs-pull-3 {\n  right: 25%;\n}\n.col-xs-pull-2 {\n  right: 16.66666667%;\n}\n.col-xs-pull-1 {\n  right: 8.33333333%;\n}\n.col-xs-pull-0 {\n  right: auto;\n}\n.col-xs-push-12 {\n  left: 100%;\n}\n.col-xs-push-11 {\n  left: 91.66666667%;\n}\n.col-xs-push-10 {\n  left: 83.33333333%;\n}\n.col-xs-push-9 {\n  left: 75%;\n}\n.col-xs-push-8 {\n  left: 66.66666667%;\n}\n.col-xs-push-7 {\n  left: 58.33333333%;\n}\n.col-xs-push-6 {\n  left: 50%;\n}\n.col-xs-push-5 {\n  left: 41.66666667%;\n}\n.col-xs-push-4 {\n  left: 33.33333333%;\n}\n.col-xs-push-3 {\n  left: 25%;\n}\n.col-xs-push-2 {\n  left: 16.66666667%;\n}\n.col-xs-push-1 {\n  left: 8.33333333%;\n}\n.col-xs-push-0 {\n  left: auto;\n}\n.col-xs-offset-12 {\n  margin-left: 100%;\n}\n.col-xs-offset-11 {\n  margin-left: 91.66666667%;\n}\n.col-xs-offset-10 {\n  margin-left: 83.33333333%;\n}\n.col-xs-offset-9 {\n  margin-left: 75%;\n}\n.col-xs-offset-8 {\n  margin-left: 66.66666667%;\n}\n.col-xs-offset-7 {\n  margin-left: 58.33333333%;\n}\n.col-xs-offset-6 {\n  margin-left: 50%;\n}\n.col-xs-offset-5 {\n  margin-left: 41.66666667%;\n}\n.col-xs-offset-4 {\n  margin-left: 33.33333333%;\n}\n.col-xs-offset-3 {\n  margin-left: 25%;\n}\n.col-xs-offset-2 {\n  margin-left: 16.66666667%;\n}\n.col-xs-offset-1 {\n  margin-left: 8.33333333%;\n}\n.col-xs-offset-0 {\n  margin-left: 0%;\n}\n@media (min-width: 768px) {\n  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {\n    float: left;\n  }\n  .col-sm-12 {\n    width: 100%;\n  }\n  .col-sm-11 {\n    width: 91.66666667%;\n  }\n  .col-sm-10 {\n    width: 83.33333333%;\n  }\n  .col-sm-9 {\n    width: 75%;\n  }\n  .col-sm-8 {\n    width: 66.66666667%;\n  }\n  .col-sm-7 {\n    width: 58.33333333%;\n  }\n  .col-sm-6 {\n    width: 50%;\n  }\n  .col-sm-5 {\n    width: 41.66666667%;\n  }\n  .col-sm-4 {\n    width: 33.33333333%;\n  }\n  .col-sm-3 {\n    width: 25%;\n  }\n  .col-sm-2 {\n    width: 16.66666667%;\n  }\n  .col-sm-1 {\n    width: 8.33333333%;\n  }\n  .col-sm-pull-12 {\n    right: 100%;\n  }\n  .col-sm-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-sm-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-sm-pull-9 {\n    right: 75%;\n  }\n  .col-sm-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-sm-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-sm-pull-6 {\n    right: 50%;\n  }\n  .col-sm-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-sm-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-sm-pull-3 {\n    right: 25%;\n  }\n  .col-sm-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-sm-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-sm-pull-0 {\n    right: auto;\n  }\n  .col-sm-push-12 {\n    left: 100%;\n  }\n  .col-sm-push-11 {\n    left: 91.66666667%;\n  }\n  .col-sm-push-10 {\n    left: 83.33333333%;\n  }\n  .col-sm-push-9 {\n    left: 75%;\n  }\n  .col-sm-push-8 {\n    left: 66.66666667%;\n  }\n  .col-sm-push-7 {\n    left: 58.33333333%;\n  }\n  .col-sm-push-6 {\n    left: 50%;\n  }\n  .col-sm-push-5 {\n    left: 41.66666667%;\n  }\n  .col-sm-push-4 {\n    left: 33.33333333%;\n  }\n  .col-sm-push-3 {\n    left: 25%;\n  }\n  .col-sm-push-2 {\n    left: 16.66666667%;\n  }\n  .col-sm-push-1 {\n    left: 8.33333333%;\n  }\n  .col-sm-push-0 {\n    left: auto;\n  }\n  .col-sm-offset-12 {\n    margin-left: 100%;\n  }\n  .col-sm-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-sm-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-sm-offset-9 {\n    margin-left: 75%;\n  }\n  .col-sm-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-sm-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-sm-offset-6 {\n    margin-left: 50%;\n  }\n  .col-sm-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-sm-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-sm-offset-3 {\n    margin-left: 25%;\n  }\n  .col-sm-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-sm-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-sm-offset-0 {\n    margin-left: 0%;\n  }\n}\n@media (min-width: 992px) {\n  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {\n    float: left;\n  }\n  .col-md-12 {\n    width: 100%;\n  }\n  .col-md-11 {\n    width: 91.66666667%;\n  }\n  .col-md-10 {\n    width: 83.33333333%;\n  }\n  .col-md-9 {\n    width: 75%;\n  }\n  .col-md-8 {\n    width: 66.66666667%;\n  }\n  .col-md-7 {\n    width: 58.33333333%;\n  }\n  .col-md-6 {\n    width: 50%;\n  }\n  .col-md-5 {\n    width: 41.66666667%;\n  }\n  .col-md-4 {\n    width: 33.33333333%;\n  }\n  .col-md-3 {\n    width: 25%;\n  }\n  .col-md-2 {\n    width: 16.66666667%;\n  }\n  .col-md-1 {\n    width: 8.33333333%;\n  }\n  .col-md-pull-12 {\n    right: 100%;\n  }\n  .col-md-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-md-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-md-pull-9 {\n    right: 75%;\n  }\n  .col-md-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-md-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-md-pull-6 {\n    right: 50%;\n  }\n  .col-md-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-md-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-md-pull-3 {\n    right: 25%;\n  }\n  .col-md-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-md-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-md-pull-0 {\n    right: auto;\n  }\n  .col-md-push-12 {\n    left: 100%;\n  }\n  .col-md-push-11 {\n    left: 91.66666667%;\n  }\n  .col-md-push-10 {\n    left: 83.33333333%;\n  }\n  .col-md-push-9 {\n    left: 75%;\n  }\n  .col-md-push-8 {\n    left: 66.66666667%;\n  }\n  .col-md-push-7 {\n    left: 58.33333333%;\n  }\n  .col-md-push-6 {\n    left: 50%;\n  }\n  .col-md-push-5 {\n    left: 41.66666667%;\n  }\n  .col-md-push-4 {\n    left: 33.33333333%;\n  }\n  .col-md-push-3 {\n    left: 25%;\n  }\n  .col-md-push-2 {\n    left: 16.66666667%;\n  }\n  .col-md-push-1 {\n    left: 8.33333333%;\n  }\n  .col-md-push-0 {\n    left: auto;\n  }\n  .col-md-offset-12 {\n    margin-left: 100%;\n  }\n  .col-md-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-md-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-md-offset-9 {\n    margin-left: 75%;\n  }\n  .col-md-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-md-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-md-offset-6 {\n    margin-left: 50%;\n  }\n  .col-md-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-md-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-md-offset-3 {\n    margin-left: 25%;\n  }\n  .col-md-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-md-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-md-offset-0 {\n    margin-left: 0%;\n  }\n}\n@media (min-width: 1200px) {\n  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {\n    float: left;\n  }\n  .col-lg-12 {\n    width: 100%;\n  }\n  .col-lg-11 {\n    width: 91.66666667%;\n  }\n  .col-lg-10 {\n    width: 83.33333333%;\n  }\n  .col-lg-9 {\n    width: 75%;\n  }\n  .col-lg-8 {\n    width: 66.66666667%;\n  }\n  .col-lg-7 {\n    width: 58.33333333%;\n  }\n  .col-lg-6 {\n    width: 50%;\n  }\n  .col-lg-5 {\n    width: 41.66666667%;\n  }\n  .col-lg-4 {\n    width: 33.33333333%;\n  }\n  .col-lg-3 {\n    width: 25%;\n  }\n  .col-lg-2 {\n    width: 16.66666667%;\n  }\n  .col-lg-1 {\n    width: 8.33333333%;\n  }\n  .col-lg-pull-12 {\n    right: 100%;\n  }\n  .col-lg-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-lg-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-lg-pull-9 {\n    right: 75%;\n  }\n  .col-lg-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-lg-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-lg-pull-6 {\n    right: 50%;\n  }\n  .col-lg-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-lg-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-lg-pull-3 {\n    right: 25%;\n  }\n  .col-lg-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-lg-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-lg-pull-0 {\n    right: auto;\n  }\n  .col-lg-push-12 {\n    left: 100%;\n  }\n  .col-lg-push-11 {\n    left: 91.66666667%;\n  }\n  .col-lg-push-10 {\n    left: 83.33333333%;\n  }\n  .col-lg-push-9 {\n    left: 75%;\n  }\n  .col-lg-push-8 {\n    left: 66.66666667%;\n  }\n  .col-lg-push-7 {\n    left: 58.33333333%;\n  }\n  .col-lg-push-6 {\n    left: 50%;\n  }\n  .col-lg-push-5 {\n    left: 41.66666667%;\n  }\n  .col-lg-push-4 {\n    left: 33.33333333%;\n  }\n  .col-lg-push-3 {\n    left: 25%;\n  }\n  .col-lg-push-2 {\n    left: 16.66666667%;\n  }\n  .col-lg-push-1 {\n    left: 8.33333333%;\n  }\n  .col-lg-push-0 {\n    left: auto;\n  }\n  .col-lg-offset-12 {\n    margin-left: 100%;\n  }\n  .col-lg-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-lg-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-lg-offset-9 {\n    margin-left: 75%;\n  }\n  .col-lg-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-lg-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-lg-offset-6 {\n    margin-left: 50%;\n  }\n  .col-lg-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-lg-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-lg-offset-3 {\n    margin-left: 25%;\n  }\n  .col-lg-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-lg-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-lg-offset-0 {\n    margin-left: 0%;\n  }\n}\ntable {\n  background-color: transparent;\n}\ncaption {\n  padding-top: 8px;\n  padding-bottom: 8px;\n  color: #777777;\n  text-align: left;\n}\nth {\n  text-align: left;\n}\n.table {\n  width: 100%;\n  max-width: 100%;\n  margin-bottom: 20px;\n}\n.table > thead > tr > th,\n.table > tbody > tr > th,\n.table > tfoot > tr > th,\n.table > thead > tr > td,\n.table > tbody > tr > td,\n.table > tfoot > tr > td {\n  padding: 8px;\n  line-height: 1.42857143;\n  vertical-align: top;\n  border-top: 1px solid #ddd;\n}\n.table > thead > tr > th {\n  vertical-align: bottom;\n  border-bottom: 2px solid #ddd;\n}\n.table > caption + thead > tr:first-child > th,\n.table > colgroup + thead > tr:first-child > th,\n.table > thead:first-child > tr:first-child > th,\n.table > caption + thead > tr:first-child > td,\n.table > colgroup + thead > tr:first-child > td,\n.table > thead:first-child > tr:first-child > td {\n  border-top: 0;\n}\n.table > tbody + tbody {\n  border-top: 2px solid #ddd;\n}\n.table .table {\n  background-color: #fff;\n}\n.table-condensed > thead > tr > th,\n.table-condensed > tbody > tr > th,\n.table-condensed > tfoot > tr > th,\n.table-condensed > thead > tr > td,\n.table-condensed > tbody > tr > td,\n.table-condensed > tfoot > tr > td {\n  padding: 5px;\n}\n.table-bordered {\n  border: 1px solid #ddd;\n}\n.table-bordered > thead > tr > th,\n.table-bordered > tbody > tr > th,\n.table-bordered > tfoot > tr > th,\n.table-bordered > thead > tr > td,\n.table-bordered > tbody > tr > td,\n.table-bordered > tfoot > tr > td {\n  border: 1px solid #ddd;\n}\n.table-bordered > thead > tr > th,\n.table-bordered > thead > tr > td {\n  border-bottom-width: 2px;\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: #f9f9f9;\n}\n.table-hover > tbody > tr:hover {\n  background-color: #f5f5f5;\n}\ntable col[class*=\"col-\"] {\n  position: static;\n  float: none;\n  display: table-column;\n}\ntable td[class*=\"col-\"],\ntable th[class*=\"col-\"] {\n  position: static;\n  float: none;\n  display: table-cell;\n}\n.table > thead > tr > td.active,\n.table > tbody > tr > td.active,\n.table > tfoot > tr > td.active,\n.table > thead > tr > th.active,\n.table > tbody > tr > th.active,\n.table > tfoot > tr > th.active,\n.table > thead > tr.active > td,\n.table > tbody > tr.active > td,\n.table > tfoot > tr.active > td,\n.table > thead > tr.active > th,\n.table > tbody > tr.active > th,\n.table > tfoot > tr.active > th {\n  background-color: #f5f5f5;\n}\n.table-hover > tbody > tr > td.active:hover,\n.table-hover > tbody > tr > th.active:hover,\n.table-hover > tbody > tr.active:hover > td,\n.table-hover > tbody > tr:hover > .active,\n.table-hover > tbody > tr.active:hover > th {\n  background-color: #e8e8e8;\n}\n.table > thead > tr > td.success,\n.table > tbody > tr > td.success,\n.table > tfoot > tr > td.success,\n.table > thead > tr > th.success,\n.table > tbody > tr > th.success,\n.table > tfoot > tr > th.success,\n.table > thead > tr.success > td,\n.table > tbody > tr.success > td,\n.table > tfoot > tr.success > td,\n.table > thead > tr.success > th,\n.table > tbody > tr.success > th,\n.table > tfoot > tr.success > th {\n  background-color: #dff0d8;\n}\n.table-hover > tbody > tr > td.success:hover,\n.table-hover > tbody > tr > th.success:hover,\n.table-hover > tbody > tr.success:hover > td,\n.table-hover > tbody > tr:hover > .success,\n.table-hover > tbody > tr.success:hover > th {\n  background-color: #d0e9c6;\n}\n.table > thead > tr > td.info,\n.table > tbody > tr > td.info,\n.table > tfoot > tr > td.info,\n.table > thead > tr > th.info,\n.table > tbody > tr > th.info,\n.table > tfoot > tr > th.info,\n.table > thead > tr.info > td,\n.table > tbody > tr.info > td,\n.table > tfoot > tr.info > td,\n.table > thead > tr.info > th,\n.table > tbody > tr.info > th,\n.table > tfoot > tr.info > th {\n  background-color: #d9edf7;\n}\n.table-hover > tbody > tr > td.info:hover,\n.table-hover > tbody > tr > th.info:hover,\n.table-hover > tbody > tr.info:hover > td,\n.table-hover > tbody > tr:hover > .info,\n.table-hover > tbody > tr.info:hover > th {\n  background-color: #c4e3f3;\n}\n.table > thead > tr > td.warning,\n.table > tbody > tr > td.warning,\n.table > tfoot > tr > td.warning,\n.table > thead > tr > th.warning,\n.table > tbody > tr > th.warning,\n.table > tfoot > tr > th.warning,\n.table > thead > tr.warning > td,\n.table > tbody > tr.warning > td,\n.table > tfoot > tr.warning > td,\n.table > thead > tr.warning > th,\n.table > tbody > tr.warning > th,\n.table > tfoot > tr.warning > th {\n  background-color: #fcf8e3;\n}\n.table-hover > tbody > tr > td.warning:hover,\n.table-hover > tbody > tr > th.warning:hover,\n.table-hover > tbody > tr.warning:hover > td,\n.table-hover > tbody > tr:hover > .warning,\n.table-hover > tbody > tr.warning:hover > th {\n  background-color: #faf2cc;\n}\n.table > thead > tr > td.danger,\n.table > tbody > tr > td.danger,\n.table > tfoot > tr > td.danger,\n.table > thead > tr > th.danger,\n.table > tbody > tr > th.danger,\n.table > tfoot > tr > th.danger,\n.table > thead > tr.danger > td,\n.table > tbody > tr.danger > td,\n.table > tfoot > tr.danger > td,\n.table > thead > tr.danger > th,\n.table > tbody > tr.danger > th,\n.table > tfoot > tr.danger > th {\n  background-color: #f2dede;\n}\n.table-hover > tbody > tr > td.danger:hover,\n.table-hover > tbody > tr > th.danger:hover,\n.table-hover > tbody > tr.danger:hover > td,\n.table-hover > tbody > tr:hover > .danger,\n.table-hover > tbody > tr.danger:hover > th {\n  background-color: #ebcccc;\n}\n.table-responsive {\n  overflow-x: auto;\n  min-height: 0.01%;\n}\n@media screen and (max-width: 767px) {\n  .table-responsive {\n    width: 100%;\n    margin-bottom: 15px;\n    overflow-y: hidden;\n    -ms-overflow-style: -ms-autohiding-scrollbar;\n    border: 1px solid #ddd;\n  }\n  .table-responsive > .table {\n    margin-bottom: 0;\n  }\n  .table-responsive > .table > thead > tr > th,\n  .table-responsive > .table > tbody > tr > th,\n  .table-responsive > .table > tfoot > tr > th,\n  .table-responsive > .table > thead > tr > td,\n  .table-responsive > .table > tbody > tr > td,\n  .table-responsive > .table > tfoot > tr > td {\n    white-space: nowrap;\n  }\n  .table-responsive > .table-bordered {\n    border: 0;\n  }\n  .table-responsive > .table-bordered > thead > tr > th:first-child,\n  .table-responsive > .table-bordered > tbody > tr > th:first-child,\n  .table-responsive > .table-bordered > tfoot > tr > th:first-child,\n  .table-responsive > .table-bordered > thead > tr > td:first-child,\n  .table-responsive > .table-bordered > tbody > tr > td:first-child,\n  .table-responsive > .table-bordered > tfoot > tr > td:first-child {\n    border-left: 0;\n  }\n  .table-responsive > .table-bordered > thead > tr > th:last-child,\n  .table-responsive > .table-bordered > tbody > tr > th:last-child,\n  .table-responsive > .table-bordered > tfoot > tr > th:last-child,\n  .table-responsive > .table-bordered > thead > tr > td:last-child,\n  .table-responsive > .table-bordered > tbody > tr > td:last-child,\n  .table-responsive > .table-bordered > tfoot > tr > td:last-child {\n    border-right: 0;\n  }\n  .table-responsive > .table-bordered > tbody > tr:last-child > th,\n  .table-responsive > .table-bordered > tfoot > tr:last-child > th,\n  .table-responsive > .table-bordered > tbody > tr:last-child > td,\n  .table-responsive > .table-bordered > tfoot > tr:last-child > td {\n    border-bottom: 0;\n  }\n}\nfieldset {\n  padding: 0;\n  margin: 0;\n  border: 0;\n  min-width: 0;\n}\nlegend {\n  display: block;\n  width: 100%;\n  padding: 0;\n  margin-bottom: 20px;\n  font-size: 21px;\n  line-height: inherit;\n  color: #333333;\n  border: 0;\n  border-bottom: 1px solid #e5e5e5;\n}\nlabel {\n  display: inline-block;\n  max-width: 100%;\n  margin-bottom: 5px;\n  font-weight: bold;\n}\ninput[type=\"search\"] {\n  -webkit-box-sizing: border-box;\n  -moz-box-sizing: border-box;\n  box-sizing: border-box;\n}\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  margin: 4px 0 0;\n  margin-top: 1px \\9;\n  line-height: normal;\n}\ninput[type=\"file\"] {\n  display: block;\n}\ninput[type=\"range\"] {\n  display: block;\n  width: 100%;\n}\nselect[multiple],\nselect[size] {\n  height: auto;\n}\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\noutput {\n  display: block;\n  padding-top: 7px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #555555;\n}\n.form-control {\n  display: block;\n  width: 100%;\n  height: 34px;\n  padding: 6px 12px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #555555;\n  background-color: #fff;\n  background-image: none;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n}\n.form-control:focus {\n  border-color: #66afe9;\n  outline: 0;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);\n  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);\n}\n.form-control::-moz-placeholder {\n  color: #999;\n  opacity: 1;\n}\n.form-control:-ms-input-placeholder {\n  color: #999;\n}\n.form-control::-webkit-input-placeholder {\n  color: #999;\n}\n.form-control::-ms-expand {\n  border: 0;\n  background-color: transparent;\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: #eeeeee;\n  opacity: 1;\n}\n.form-control[disabled],\nfieldset[disabled] .form-control {\n  cursor: not-allowed;\n}\ntextarea.form-control {\n  height: auto;\n}\ninput[type=\"search\"] {\n  -webkit-appearance: none;\n}\n@media screen and (-webkit-min-device-pixel-ratio: 0) {\n  input[type=\"date\"].form-control,\n  input[type=\"time\"].form-control,\n  input[type=\"datetime-local\"].form-control,\n  input[type=\"month\"].form-control {\n    line-height: 34px;\n  }\n  input[type=\"date\"].input-sm,\n  input[type=\"time\"].input-sm,\n  input[type=\"datetime-local\"].input-sm,\n  input[type=\"month\"].input-sm,\n  .input-group-sm input[type=\"date\"],\n  .input-group-sm input[type=\"time\"],\n  .input-group-sm input[type=\"datetime-local\"],\n  .input-group-sm input[type=\"month\"] {\n    line-height: 30px;\n  }\n  input[type=\"date\"].input-lg,\n  input[type=\"time\"].input-lg,\n  input[type=\"datetime-local\"].input-lg,\n  input[type=\"month\"].input-lg,\n  .input-group-lg input[type=\"date\"],\n  .input-group-lg input[type=\"time\"],\n  .input-group-lg input[type=\"datetime-local\"],\n  .input-group-lg input[type=\"month\"] {\n    line-height: 46px;\n  }\n}\n.form-group {\n  margin-bottom: 15px;\n}\n.radio,\n.checkbox {\n  position: relative;\n  display: block;\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\n.radio label,\n.checkbox label {\n  min-height: 20px;\n  padding-left: 20px;\n  margin-bottom: 0;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n  position: absolute;\n  margin-left: -20px;\n  margin-top: 4px \\9;\n}\n.radio + .radio,\n.checkbox + .checkbox {\n  margin-top: -5px;\n}\n.radio-inline,\n.checkbox-inline {\n  position: relative;\n  display: inline-block;\n  padding-left: 20px;\n  margin-bottom: 0;\n  vertical-align: middle;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n  margin-top: 0;\n  margin-left: 10px;\n}\ninput[type=\"radio\"][disabled],\ninput[type=\"checkbox\"][disabled],\ninput[type=\"radio\"].disabled,\ninput[type=\"checkbox\"].disabled,\nfieldset[disabled] input[type=\"radio\"],\nfieldset[disabled] input[type=\"checkbox\"] {\n  cursor: not-allowed;\n}\n.radio-inline.disabled,\n.checkbox-inline.disabled,\nfieldset[disabled] .radio-inline,\nfieldset[disabled] .checkbox-inline {\n  cursor: not-allowed;\n}\n.radio.disabled label,\n.checkbox.disabled label,\nfieldset[disabled] .radio label,\nfieldset[disabled] .checkbox label {\n  cursor: not-allowed;\n}\n.form-control-static {\n  padding-top: 7px;\n  padding-bottom: 7px;\n  margin-bottom: 0;\n  min-height: 34px;\n}\n.form-control-static.input-lg,\n.form-control-static.input-sm {\n  padding-left: 0;\n  padding-right: 0;\n}\n.input-sm {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.input-sm {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.input-sm,\nselect[multiple].input-sm {\n  height: auto;\n}\n.form-group-sm .form-control {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.form-group-sm select.form-control {\n  height: 30px;\n  line-height: 30px;\n}\n.form-group-sm textarea.form-control,\n.form-group-sm select[multiple].form-control {\n  height: auto;\n}\n.form-group-sm .form-control-static {\n  height: 30px;\n  min-height: 32px;\n  padding: 6px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n}\n.input-lg {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.input-lg {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.input-lg,\nselect[multiple].input-lg {\n  height: auto;\n}\n.form-group-lg .form-control {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\n.form-group-lg select.form-control {\n  height: 46px;\n  line-height: 46px;\n}\n.form-group-lg textarea.form-control,\n.form-group-lg select[multiple].form-control {\n  height: auto;\n}\n.form-group-lg .form-control-static {\n  height: 46px;\n  min-height: 38px;\n  padding: 11px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n}\n.has-feedback {\n  position: relative;\n}\n.has-feedback .form-control {\n  padding-right: 42.5px;\n}\n.form-control-feedback {\n  position: absolute;\n  top: 0;\n  right: 0;\n  z-index: 2;\n  display: block;\n  width: 34px;\n  height: 34px;\n  line-height: 34px;\n  text-align: center;\n  pointer-events: none;\n}\n.input-lg + .form-control-feedback,\n.input-group-lg + .form-control-feedback,\n.form-group-lg .form-control + .form-control-feedback {\n  width: 46px;\n  height: 46px;\n  line-height: 46px;\n}\n.input-sm + .form-control-feedback,\n.input-group-sm + .form-control-feedback,\n.form-group-sm .form-control + .form-control-feedback {\n  width: 30px;\n  height: 30px;\n  line-height: 30px;\n}\n.has-success .help-block,\n.has-success .control-label,\n.has-success .radio,\n.has-success .checkbox,\n.has-success .radio-inline,\n.has-success .checkbox-inline,\n.has-success.radio label,\n.has-success.checkbox label,\n.has-success.radio-inline label,\n.has-success.checkbox-inline label {\n  color: #3c763d;\n}\n.has-success .form-control {\n  border-color: #3c763d;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n}\n.has-success .form-control:focus {\n  border-color: #2b542c;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;\n}\n.has-success .input-group-addon {\n  color: #3c763d;\n  border-color: #3c763d;\n  background-color: #dff0d8;\n}\n.has-success .form-control-feedback {\n  color: #3c763d;\n}\n.has-warning .help-block,\n.has-warning .control-label,\n.has-warning .radio,\n.has-warning .checkbox,\n.has-warning .radio-inline,\n.has-warning .checkbox-inline,\n.has-warning.radio label,\n.has-warning.checkbox label,\n.has-warning.radio-inline label,\n.has-warning.checkbox-inline label {\n  color: #8a6d3b;\n}\n.has-warning .form-control {\n  border-color: #8a6d3b;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n}\n.has-warning .form-control:focus {\n  border-color: #66512c;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;\n}\n.has-warning .input-group-addon {\n  color: #8a6d3b;\n  border-color: #8a6d3b;\n  background-color: #fcf8e3;\n}\n.has-warning .form-control-feedback {\n  color: #8a6d3b;\n}\n.has-error .help-block,\n.has-error .control-label,\n.has-error .radio,\n.has-error .checkbox,\n.has-error .radio-inline,\n.has-error .checkbox-inline,\n.has-error.radio label,\n.has-error.checkbox label,\n.has-error.radio-inline label,\n.has-error.checkbox-inline label {\n  color: #a94442;\n}\n.has-error .form-control {\n  border-color: #a94442;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);\n}\n.has-error .form-control:focus {\n  border-color: #843534;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;\n}\n.has-error .input-group-addon {\n  color: #a94442;\n  border-color: #a94442;\n  background-color: #f2dede;\n}\n.has-error .form-control-feedback {\n  color: #a94442;\n}\n.has-feedback label ~ .form-control-feedback {\n  top: 25px;\n}\n.has-feedback label.sr-only ~ .form-control-feedback {\n  top: 0;\n}\n.help-block {\n  display: block;\n  margin-top: 5px;\n  margin-bottom: 10px;\n  color: #737373;\n}\n@media (min-width: 768px) {\n  .form-inline .form-group {\n    display: inline-block;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .form-inline .form-control-static {\n    display: inline-block;\n  }\n  .form-inline .input-group {\n    display: inline-table;\n    vertical-align: middle;\n  }\n  .form-inline .input-group .input-group-addon,\n  .form-inline .input-group .input-group-btn,\n  .form-inline .input-group .form-control {\n    width: auto;\n  }\n  .form-inline .input-group > .form-control {\n    width: 100%;\n  }\n  .form-inline .control-label {\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .radio,\n  .form-inline .checkbox {\n    display: inline-block;\n    margin-top: 0;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .radio label,\n  .form-inline .checkbox label {\n    padding-left: 0;\n  }\n  .form-inline .radio input[type=\"radio\"],\n  .form-inline .checkbox input[type=\"checkbox\"] {\n    position: relative;\n    margin-left: 0;\n  }\n  .form-inline .has-feedback .form-control-feedback {\n    top: 0;\n  }\n}\n.form-horizontal .radio,\n.form-horizontal .checkbox,\n.form-horizontal .radio-inline,\n.form-horizontal .checkbox-inline {\n  margin-top: 0;\n  margin-bottom: 0;\n  padding-top: 7px;\n}\n.form-horizontal .radio,\n.form-horizontal .checkbox {\n  min-height: 27px;\n}\n.form-horizontal .form-group {\n  margin-left: -15px;\n  margin-right: -15px;\n}\n@media (min-width: 768px) {\n  .form-horizontal .control-label {\n    text-align: right;\n    margin-bottom: 0;\n    padding-top: 7px;\n  }\n}\n.form-horizontal .has-feedback .form-control-feedback {\n  right: 15px;\n}\n@media (min-width: 768px) {\n  .form-horizontal .form-group-lg .control-label {\n    padding-top: 11px;\n    font-size: 18px;\n  }\n}\n@media (min-width: 768px) {\n  .form-horizontal .form-group-sm .control-label {\n    padding-top: 6px;\n    font-size: 12px;\n  }\n}\n.btn {\n  display: inline-block;\n  margin-bottom: 0;\n  font-weight: normal;\n  text-align: center;\n  vertical-align: middle;\n  touch-action: manipulation;\n  cursor: pointer;\n  background-image: none;\n  border: 1px solid transparent;\n  white-space: nowrap;\n  padding: 6px 12px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  border-radius: 4px;\n  -webkit-user-select: none;\n  -moz-user-select: none;\n  -ms-user-select: none;\n  user-select: none;\n}\n.btn:focus,\n.btn:active:focus,\n.btn.active:focus,\n.btn.focus,\n.btn:active.focus,\n.btn.active.focus {\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n.btn:hover,\n.btn:focus,\n.btn.focus {\n  color: #333;\n  text-decoration: none;\n}\n.btn:active,\n.btn.active {\n  outline: 0;\n  background-image: none;\n  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);\n  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);\n}\n.btn.disabled,\n.btn[disabled],\nfieldset[disabled] .btn {\n  cursor: not-allowed;\n  opacity: 0.65;\n  filter: alpha(opacity=65);\n  -webkit-box-shadow: none;\n  box-shadow: none;\n}\na.btn.disabled,\nfieldset[disabled] a.btn {\n  pointer-events: none;\n}\n.btn-default {\n  color: #333;\n  background-color: #fff;\n  border-color: #ccc;\n}\n.btn-default:focus,\n.btn-default.focus {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #8c8c8c;\n}\n.btn-default:hover {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #adadad;\n}\n.btn-default:active,\n.btn-default.active,\n.open > .dropdown-toggle.btn-default {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #adadad;\n}\n.btn-default:active:hover,\n.btn-default.active:hover,\n.open > .dropdown-toggle.btn-default:hover,\n.btn-default:active:focus,\n.btn-default.active:focus,\n.open > .dropdown-toggle.btn-default:focus,\n.btn-default:active.focus,\n.btn-default.active.focus,\n.open > .dropdown-toggle.btn-default.focus {\n  color: #333;\n  background-color: #d4d4d4;\n  border-color: #8c8c8c;\n}\n.btn-default:active,\n.btn-default.active,\n.open > .dropdown-toggle.btn-default {\n  background-image: none;\n}\n.btn-default.disabled:hover,\n.btn-default[disabled]:hover,\nfieldset[disabled] .btn-default:hover,\n.btn-default.disabled:focus,\n.btn-default[disabled]:focus,\nfieldset[disabled] .btn-default:focus,\n.btn-default.disabled.focus,\n.btn-default[disabled].focus,\nfieldset[disabled] .btn-default.focus {\n  background-color: #fff;\n  border-color: #ccc;\n}\n.btn-default .badge {\n  color: #fff;\n  background-color: #333;\n}\n.btn-primary {\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #2e6da4;\n}\n.btn-primary:focus,\n.btn-primary.focus {\n  color: #fff;\n  background-color: #286090;\n  border-color: #122b40;\n}\n.btn-primary:hover {\n  color: #fff;\n  background-color: #286090;\n  border-color: #204d74;\n}\n.btn-primary:active,\n.btn-primary.active,\n.open > .dropdown-toggle.btn-primary {\n  color: #fff;\n  background-color: #286090;\n  border-color: #204d74;\n}\n.btn-primary:active:hover,\n.btn-primary.active:hover,\n.open > .dropdown-toggle.btn-primary:hover,\n.btn-primary:active:focus,\n.btn-primary.active:focus,\n.open > .dropdown-toggle.btn-primary:focus,\n.btn-primary:active.focus,\n.btn-primary.active.focus,\n.open > .dropdown-toggle.btn-primary.focus {\n  color: #fff;\n  background-color: #204d74;\n  border-color: #122b40;\n}\n.btn-primary:active,\n.btn-primary.active,\n.open > .dropdown-toggle.btn-primary {\n  background-image: none;\n}\n.btn-primary.disabled:hover,\n.btn-primary[disabled]:hover,\nfieldset[disabled] .btn-primary:hover,\n.btn-primary.disabled:focus,\n.btn-primary[disabled]:focus,\nfieldset[disabled] .btn-primary:focus,\n.btn-primary.disabled.focus,\n.btn-primary[disabled].focus,\nfieldset[disabled] .btn-primary.focus {\n  background-color: #337ab7;\n  border-color: #2e6da4;\n}\n.btn-primary .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.btn-success {\n  color: #fff;\n  background-color: #5cb85c;\n  border-color: #4cae4c;\n}\n.btn-success:focus,\n.btn-success.focus {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #255625;\n}\n.btn-success:hover {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #398439;\n}\n.btn-success:active,\n.btn-success.active,\n.open > .dropdown-toggle.btn-success {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #398439;\n}\n.btn-success:active:hover,\n.btn-success.active:hover,\n.open > .dropdown-toggle.btn-success:hover,\n.btn-success:active:focus,\n.btn-success.active:focus,\n.open > .dropdown-toggle.btn-success:focus,\n.btn-success:active.focus,\n.btn-success.active.focus,\n.open > .dropdown-toggle.btn-success.focus {\n  color: #fff;\n  background-color: #398439;\n  border-color: #255625;\n}\n.btn-success:active,\n.btn-success.active,\n.open > .dropdown-toggle.btn-success {\n  background-image: none;\n}\n.btn-success.disabled:hover,\n.btn-success[disabled]:hover,\nfieldset[disabled] .btn-success:hover,\n.btn-success.disabled:focus,\n.btn-success[disabled]:focus,\nfieldset[disabled] .btn-success:focus,\n.btn-success.disabled.focus,\n.btn-success[disabled].focus,\nfieldset[disabled] .btn-success.focus {\n  background-color: #5cb85c;\n  border-color: #4cae4c;\n}\n.btn-success .badge {\n  color: #5cb85c;\n  background-color: #fff;\n}\n.btn-info {\n  color: #fff;\n  background-color: #5bc0de;\n  border-color: #46b8da;\n}\n.btn-info:focus,\n.btn-info.focus {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #1b6d85;\n}\n.btn-info:hover {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #269abc;\n}\n.btn-info:active,\n.btn-info.active,\n.open > .dropdown-toggle.btn-info {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #269abc;\n}\n.btn-info:active:hover,\n.btn-info.active:hover,\n.open > .dropdown-toggle.btn-info:hover,\n.btn-info:active:focus,\n.btn-info.active:focus,\n.open > .dropdown-toggle.btn-info:focus,\n.btn-info:active.focus,\n.btn-info.active.focus,\n.open > .dropdown-toggle.btn-info.focus {\n  color: #fff;\n  background-color: #269abc;\n  border-color: #1b6d85;\n}\n.btn-info:active,\n.btn-info.active,\n.open > .dropdown-toggle.btn-info {\n  background-image: none;\n}\n.btn-info.disabled:hover,\n.btn-info[disabled]:hover,\nfieldset[disabled] .btn-info:hover,\n.btn-info.disabled:focus,\n.btn-info[disabled]:focus,\nfieldset[disabled] .btn-info:focus,\n.btn-info.disabled.focus,\n.btn-info[disabled].focus,\nfieldset[disabled] .btn-info.focus {\n  background-color: #5bc0de;\n  border-color: #46b8da;\n}\n.btn-info .badge {\n  color: #5bc0de;\n  background-color: #fff;\n}\n.btn-warning {\n  color: #fff;\n  background-color: #f0ad4e;\n  border-color: #eea236;\n}\n.btn-warning:focus,\n.btn-warning.focus {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #985f0d;\n}\n.btn-warning:hover {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #d58512;\n}\n.btn-warning:active,\n.btn-warning.active,\n.open > .dropdown-toggle.btn-warning {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #d58512;\n}\n.btn-warning:active:hover,\n.btn-warning.active:hover,\n.open > .dropdown-toggle.btn-warning:hover,\n.btn-warning:active:focus,\n.btn-warning.active:focus,\n.open > .dropdown-toggle.btn-warning:focus,\n.btn-warning:active.focus,\n.btn-warning.active.focus,\n.open > .dropdown-toggle.btn-warning.focus {\n  color: #fff;\n  background-color: #d58512;\n  border-color: #985f0d;\n}\n.btn-warning:active,\n.btn-warning.active,\n.open > .dropdown-toggle.btn-warning {\n  background-image: none;\n}\n.btn-warning.disabled:hover,\n.btn-warning[disabled]:hover,\nfieldset[disabled] .btn-warning:hover,\n.btn-warning.disabled:focus,\n.btn-warning[disabled]:focus,\nfieldset[disabled] .btn-warning:focus,\n.btn-warning.disabled.focus,\n.btn-warning[disabled].focus,\nfieldset[disabled] .btn-warning.focus {\n  background-color: #f0ad4e;\n  border-color: #eea236;\n}\n.btn-warning .badge {\n  color: #f0ad4e;\n  background-color: #fff;\n}\n.btn-danger {\n  color: #fff;\n  background-color: #d9534f;\n  border-color: #d43f3a;\n}\n.btn-danger:focus,\n.btn-danger.focus {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #761c19;\n}\n.btn-danger:hover {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #ac2925;\n}\n.btn-danger:active,\n.btn-danger.active,\n.open > .dropdown-toggle.btn-danger {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #ac2925;\n}\n.btn-danger:active:hover,\n.btn-danger.active:hover,\n.open > .dropdown-toggle.btn-danger:hover,\n.btn-danger:active:focus,\n.btn-danger.active:focus,\n.open > .dropdown-toggle.btn-danger:focus,\n.btn-danger:active.focus,\n.btn-danger.active.focus,\n.open > .dropdown-toggle.btn-danger.focus {\n  color: #fff;\n  background-color: #ac2925;\n  border-color: #761c19;\n}\n.btn-danger:active,\n.btn-danger.active,\n.open > .dropdown-toggle.btn-danger {\n  background-image: none;\n}\n.btn-danger.disabled:hover,\n.btn-danger[disabled]:hover,\nfieldset[disabled] .btn-danger:hover,\n.btn-danger.disabled:focus,\n.btn-danger[disabled]:focus,\nfieldset[disabled] .btn-danger:focus,\n.btn-danger.disabled.focus,\n.btn-danger[disabled].focus,\nfieldset[disabled] .btn-danger.focus {\n  background-color: #d9534f;\n  border-color: #d43f3a;\n}\n.btn-danger .badge {\n  color: #d9534f;\n  background-color: #fff;\n}\n.btn-link {\n  color: #337ab7;\n  font-weight: normal;\n  border-radius: 0;\n}\n.btn-link,\n.btn-link:active,\n.btn-link.active,\n.btn-link[disabled],\nfieldset[disabled] .btn-link {\n  background-color: transparent;\n  -webkit-box-shadow: none;\n  box-shadow: none;\n}\n.btn-link,\n.btn-link:hover,\n.btn-link:focus,\n.btn-link:active {\n  border-color: transparent;\n}\n.btn-link:hover,\n.btn-link:focus {\n  color: #23527c;\n  text-decoration: underline;\n  background-color: transparent;\n}\n.btn-link[disabled]:hover,\nfieldset[disabled] .btn-link:hover,\n.btn-link[disabled]:focus,\nfieldset[disabled] .btn-link:focus {\n  color: #777777;\n  text-decoration: none;\n}\n.btn-lg,\n.btn-group-lg > .btn {\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\n.btn-sm,\n.btn-group-sm > .btn {\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.btn-xs,\n.btn-group-xs > .btn {\n  padding: 1px 5px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.btn-block {\n  display: block;\n  width: 100%;\n}\n.btn-block + .btn-block {\n  margin-top: 5px;\n}\ninput[type=\"submit\"].btn-block,\ninput[type=\"reset\"].btn-block,\ninput[type=\"button\"].btn-block {\n  width: 100%;\n}\n.fade {\n  opacity: 0;\n  -webkit-transition: opacity 0.15s linear;\n  -o-transition: opacity 0.15s linear;\n  transition: opacity 0.15s linear;\n}\n.fade.in {\n  opacity: 1;\n}\n.collapse {\n  display: none;\n}\n.collapse.in {\n  display: block;\n}\ntr.collapse.in {\n  display: table-row;\n}\ntbody.collapse.in {\n  display: table-row-group;\n}\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  -webkit-transition-property: height, visibility;\n  transition-property: height, visibility;\n  -webkit-transition-duration: 0.35s;\n  transition-duration: 0.35s;\n  -webkit-transition-timing-function: ease;\n  transition-timing-function: ease;\n}\n.caret {\n  display: inline-block;\n  width: 0;\n  height: 0;\n  margin-left: 2px;\n  vertical-align: middle;\n  border-top: 4px dashed;\n  border-top: 4px solid \\9;\n  border-right: 4px solid transparent;\n  border-left: 4px solid transparent;\n}\n.dropup,\n.dropdown {\n  position: relative;\n}\n.dropdown-toggle:focus {\n  outline: 0;\n}\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: 1000;\n  display: none;\n  float: left;\n  min-width: 160px;\n  padding: 5px 0;\n  margin: 2px 0 0;\n  list-style: none;\n  font-size: 14px;\n  text-align: left;\n  background-color: #fff;\n  border: 1px solid #ccc;\n  border: 1px solid rgba(0, 0, 0, 0.15);\n  border-radius: 4px;\n  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);\n  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);\n  background-clip: padding-box;\n}\n.dropdown-menu.pull-right {\n  right: 0;\n  left: auto;\n}\n.dropdown-menu .divider {\n  height: 1px;\n  margin: 9px 0;\n  overflow: hidden;\n  background-color: #e5e5e5;\n}\n.dropdown-menu > li > a {\n  display: block;\n  padding: 3px 20px;\n  clear: both;\n  font-weight: normal;\n  line-height: 1.42857143;\n  color: #333333;\n  white-space: nowrap;\n}\n.dropdown-menu > li > a:hover,\n.dropdown-menu > li > a:focus {\n  text-decoration: none;\n  color: #262626;\n  background-color: #f5f5f5;\n}\n.dropdown-menu > .active > a,\n.dropdown-menu > .active > a:hover,\n.dropdown-menu > .active > a:focus {\n  color: #fff;\n  text-decoration: none;\n  outline: 0;\n  background-color: #337ab7;\n}\n.dropdown-menu > .disabled > a,\n.dropdown-menu > .disabled > a:hover,\n.dropdown-menu > .disabled > a:focus {\n  color: #777777;\n}\n.dropdown-menu > .disabled > a:hover,\n.dropdown-menu > .disabled > a:focus {\n  text-decoration: none;\n  background-color: transparent;\n  background-image: none;\n  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);\n  cursor: not-allowed;\n}\n.open > .dropdown-menu {\n  display: block;\n}\n.open > a {\n  outline: 0;\n}\n.dropdown-menu-right {\n  left: auto;\n  right: 0;\n}\n.dropdown-menu-left {\n  left: 0;\n  right: auto;\n}\n.dropdown-header {\n  display: block;\n  padding: 3px 20px;\n  font-size: 12px;\n  line-height: 1.42857143;\n  color: #777777;\n  white-space: nowrap;\n}\n.dropdown-backdrop {\n  position: fixed;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  top: 0;\n  z-index: 990;\n}\n.pull-right > .dropdown-menu {\n  right: 0;\n  left: auto;\n}\n.dropup .caret,\n.navbar-fixed-bottom .dropdown .caret {\n  border-top: 0;\n  border-bottom: 4px dashed;\n  border-bottom: 4px solid \\9;\n  content: \"\";\n}\n.dropup .dropdown-menu,\n.navbar-fixed-bottom .dropdown .dropdown-menu {\n  top: auto;\n  bottom: 100%;\n  margin-bottom: 2px;\n}\n@media (min-width: 768px) {\n  .navbar-right .dropdown-menu {\n    left: auto;\n    right: 0;\n  }\n  .navbar-right .dropdown-menu-left {\n    left: 0;\n    right: auto;\n  }\n}\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-block;\n  vertical-align: middle;\n}\n.btn-group > .btn,\n.btn-group-vertical > .btn {\n  position: relative;\n  float: left;\n}\n.btn-group > .btn:hover,\n.btn-group-vertical > .btn:hover,\n.btn-group > .btn:focus,\n.btn-group-vertical > .btn:focus,\n.btn-group > .btn:active,\n.btn-group-vertical > .btn:active,\n.btn-group > .btn.active,\n.btn-group-vertical > .btn.active {\n  z-index: 2;\n}\n.btn-group .btn + .btn,\n.btn-group .btn + .btn-group,\n.btn-group .btn-group + .btn,\n.btn-group .btn-group + .btn-group {\n  margin-left: -1px;\n}\n.btn-toolbar {\n  margin-left: -5px;\n}\n.btn-toolbar .btn,\n.btn-toolbar .btn-group,\n.btn-toolbar .input-group {\n  float: left;\n}\n.btn-toolbar > .btn,\n.btn-toolbar > .btn-group,\n.btn-toolbar > .input-group {\n  margin-left: 5px;\n}\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n  border-radius: 0;\n}\n.btn-group > .btn:first-child {\n  margin-left: 0;\n}\n.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {\n  border-bottom-right-radius: 0;\n  border-top-right-radius: 0;\n}\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n  border-bottom-left-radius: 0;\n  border-top-left-radius: 0;\n}\n.btn-group > .btn-group {\n  float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,\n.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {\n  border-bottom-right-radius: 0;\n  border-top-right-radius: 0;\n}\n.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  border-bottom-left-radius: 0;\n  border-top-left-radius: 0;\n}\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n  outline: 0;\n}\n.btn-group > .btn + .dropdown-toggle {\n  padding-left: 8px;\n  padding-right: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n  padding-left: 12px;\n  padding-right: 12px;\n}\n.btn-group.open .dropdown-toggle {\n  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);\n  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);\n}\n.btn-group.open .dropdown-toggle.btn-link {\n  -webkit-box-shadow: none;\n  box-shadow: none;\n}\n.btn .caret {\n  margin-left: 0;\n}\n.btn-lg .caret {\n  border-width: 5px 5px 0;\n  border-bottom-width: 0;\n}\n.dropup .btn-lg .caret {\n  border-width: 0 5px 5px;\n}\n.btn-group-vertical > .btn,\n.btn-group-vertical > .btn-group,\n.btn-group-vertical > .btn-group > .btn {\n  display: block;\n  float: none;\n  width: 100%;\n  max-width: 100%;\n}\n.btn-group-vertical > .btn-group > .btn {\n  float: none;\n}\n.btn-group-vertical > .btn + .btn,\n.btn-group-vertical > .btn + .btn-group,\n.btn-group-vertical > .btn-group + .btn,\n.btn-group-vertical > .btn-group + .btn-group {\n  margin-top: -1px;\n  margin-left: 0;\n}\n.btn-group-vertical > .btn:not(:first-child):not(:last-child) {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn:first-child:not(:last-child) {\n  border-top-right-radius: 4px;\n  border-top-left-radius: 4px;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group-vertical > .btn:last-child:not(:first-child) {\n  border-top-right-radius: 0;\n  border-top-left-radius: 0;\n  border-bottom-right-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,\n.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  border-top-right-radius: 0;\n  border-top-left-radius: 0;\n}\n.btn-group-justified {\n  display: table;\n  width: 100%;\n  table-layout: fixed;\n  border-collapse: separate;\n}\n.btn-group-justified > .btn,\n.btn-group-justified > .btn-group {\n  float: none;\n  display: table-cell;\n  width: 1%;\n}\n.btn-group-justified > .btn-group .btn {\n  width: 100%;\n}\n.btn-group-justified > .btn-group .dropdown-menu {\n  left: auto;\n}\n[data-toggle=\"buttons\"] > .btn input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn-group > .btn input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn input[type=\"checkbox\"],\n[data-toggle=\"buttons\"] > .btn-group > .btn input[type=\"checkbox\"] {\n  position: absolute;\n  clip: rect(0, 0, 0, 0);\n  pointer-events: none;\n}\n.input-group {\n  position: relative;\n  display: table;\n  border-collapse: separate;\n}\n.input-group[class*=\"col-\"] {\n  float: none;\n  padding-left: 0;\n  padding-right: 0;\n}\n.input-group .form-control {\n  position: relative;\n  z-index: 2;\n  float: left;\n  width: 100%;\n  margin-bottom: 0;\n}\n.input-group .form-control:focus {\n  z-index: 3;\n}\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.input-group-lg > .form-control,\nselect.input-group-lg > .input-group-addon,\nselect.input-group-lg > .input-group-btn > .btn {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.input-group-lg > .form-control,\ntextarea.input-group-lg > .input-group-addon,\ntextarea.input-group-lg > .input-group-btn > .btn,\nselect[multiple].input-group-lg > .form-control,\nselect[multiple].input-group-lg > .input-group-addon,\nselect[multiple].input-group-lg > .input-group-btn > .btn {\n  height: auto;\n}\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.input-group-sm > .form-control,\nselect.input-group-sm > .input-group-addon,\nselect.input-group-sm > .input-group-btn > .btn {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.input-group-sm > .form-control,\ntextarea.input-group-sm > .input-group-addon,\ntextarea.input-group-sm > .input-group-btn > .btn,\nselect[multiple].input-group-sm > .form-control,\nselect[multiple].input-group-sm > .input-group-addon,\nselect[multiple].input-group-sm > .input-group-btn > .btn {\n  height: auto;\n}\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n  display: table-cell;\n}\n.input-group-addon:not(:first-child):not(:last-child),\n.input-group-btn:not(:first-child):not(:last-child),\n.input-group .form-control:not(:first-child):not(:last-child) {\n  border-radius: 0;\n}\n.input-group-addon,\n.input-group-btn {\n  width: 1%;\n  white-space: nowrap;\n  vertical-align: middle;\n}\n.input-group-addon {\n  padding: 6px 12px;\n  font-size: 14px;\n  font-weight: normal;\n  line-height: 1;\n  color: #555555;\n  text-align: center;\n  background-color: #eeeeee;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n}\n.input-group-addon.input-sm {\n  padding: 5px 10px;\n  font-size: 12px;\n  border-radius: 3px;\n}\n.input-group-addon.input-lg {\n  padding: 10px 16px;\n  font-size: 18px;\n  border-radius: 6px;\n}\n.input-group-addon input[type=\"radio\"],\n.input-group-addon input[type=\"checkbox\"] {\n  margin-top: 0;\n}\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n  border-bottom-right-radius: 0;\n  border-top-right-radius: 0;\n}\n.input-group-addon:first-child {\n  border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n  border-bottom-left-radius: 0;\n  border-top-left-radius: 0;\n}\n.input-group-addon:last-child {\n  border-left: 0;\n}\n.input-group-btn {\n  position: relative;\n  font-size: 0;\n  white-space: nowrap;\n}\n.input-group-btn > .btn {\n  position: relative;\n}\n.input-group-btn > .btn + .btn {\n  margin-left: -1px;\n}\n.input-group-btn > .btn:hover,\n.input-group-btn > .btn:focus,\n.input-group-btn > .btn:active {\n  z-index: 2;\n}\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group {\n  margin-right: -1px;\n}\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group {\n  z-index: 2;\n  margin-left: -1px;\n}\n.nav {\n  margin-bottom: 0;\n  padding-left: 0;\n  list-style: none;\n}\n.nav > li {\n  position: relative;\n  display: block;\n}\n.nav > li > a {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n}\n.nav > li > a:hover,\n.nav > li > a:focus {\n  text-decoration: none;\n  background-color: #eeeeee;\n}\n.nav > li.disabled > a {\n  color: #777777;\n}\n.nav > li.disabled > a:hover,\n.nav > li.disabled > a:focus {\n  color: #777777;\n  text-decoration: none;\n  background-color: transparent;\n  cursor: not-allowed;\n}\n.nav .open > a,\n.nav .open > a:hover,\n.nav .open > a:focus {\n  background-color: #eeeeee;\n  border-color: #337ab7;\n}\n.nav .nav-divider {\n  height: 1px;\n  margin: 9px 0;\n  overflow: hidden;\n  background-color: #e5e5e5;\n}\n.nav > li > a > img {\n  max-width: none;\n}\n.nav-tabs {\n  border-bottom: 1px solid #ddd;\n}\n.nav-tabs > li {\n  float: left;\n  margin-bottom: -1px;\n}\n.nav-tabs > li > a {\n  margin-right: 2px;\n  line-height: 1.42857143;\n  border: 1px solid transparent;\n  border-radius: 4px 4px 0 0;\n}\n.nav-tabs > li > a:hover {\n  border-color: #eeeeee #eeeeee #ddd;\n}\n.nav-tabs > li.active > a,\n.nav-tabs > li.active > a:hover,\n.nav-tabs > li.active > a:focus {\n  color: #555555;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-bottom-color: transparent;\n  cursor: default;\n}\n.nav-tabs.nav-justified {\n  width: 100%;\n  border-bottom: 0;\n}\n.nav-tabs.nav-justified > li {\n  float: none;\n}\n.nav-tabs.nav-justified > li > a {\n  text-align: center;\n  margin-bottom: 5px;\n}\n.nav-tabs.nav-justified > .dropdown .dropdown-menu {\n  top: auto;\n  left: auto;\n}\n@media (min-width: 768px) {\n  .nav-tabs.nav-justified > li {\n    display: table-cell;\n    width: 1%;\n  }\n  .nav-tabs.nav-justified > li > a {\n    margin-bottom: 0;\n  }\n}\n.nav-tabs.nav-justified > li > a {\n  margin-right: 0;\n  border-radius: 4px;\n}\n.nav-tabs.nav-justified > .active > a,\n.nav-tabs.nav-justified > .active > a:hover,\n.nav-tabs.nav-justified > .active > a:focus {\n  border: 1px solid #ddd;\n}\n@media (min-width: 768px) {\n  .nav-tabs.nav-justified > li > a {\n    border-bottom: 1px solid #ddd;\n    border-radius: 4px 4px 0 0;\n  }\n  .nav-tabs.nav-justified > .active > a,\n  .nav-tabs.nav-justified > .active > a:hover,\n  .nav-tabs.nav-justified > .active > a:focus {\n    border-bottom-color: #fff;\n  }\n}\n.nav-pills > li {\n  float: left;\n}\n.nav-pills > li > a {\n  border-radius: 4px;\n}\n.nav-pills > li + li {\n  margin-left: 2px;\n}\n.nav-pills > li.active > a,\n.nav-pills > li.active > a:hover,\n.nav-pills > li.active > a:focus {\n  color: #fff;\n  background-color: #337ab7;\n}\n.nav-stacked > li {\n  float: none;\n}\n.nav-stacked > li + li {\n  margin-top: 2px;\n  margin-left: 0;\n}\n.nav-justified {\n  width: 100%;\n}\n.nav-justified > li {\n  float: none;\n}\n.nav-justified > li > a {\n  text-align: center;\n  margin-bottom: 5px;\n}\n.nav-justified > .dropdown .dropdown-menu {\n  top: auto;\n  left: auto;\n}\n@media (min-width: 768px) {\n  .nav-justified > li {\n    display: table-cell;\n    width: 1%;\n  }\n  .nav-justified > li > a {\n    margin-bottom: 0;\n  }\n}\n.nav-tabs-justified {\n  border-bottom: 0;\n}\n.nav-tabs-justified > li > a {\n  margin-right: 0;\n  border-radius: 4px;\n}\n.nav-tabs-justified > .active > a,\n.nav-tabs-justified > .active > a:hover,\n.nav-tabs-justified > .active > a:focus {\n  border: 1px solid #ddd;\n}\n@media (min-width: 768px) {\n  .nav-tabs-justified > li > a {\n    border-bottom: 1px solid #ddd;\n    border-radius: 4px 4px 0 0;\n  }\n  .nav-tabs-justified > .active > a,\n  .nav-tabs-justified > .active > a:hover,\n  .nav-tabs-justified > .active > a:focus {\n    border-bottom-color: #fff;\n  }\n}\n.tab-content > .tab-pane {\n  display: none;\n}\n.tab-content > .active {\n  display: block;\n}\n.nav-tabs .dropdown-menu {\n  margin-top: -1px;\n  border-top-right-radius: 0;\n  border-top-left-radius: 0;\n}\n.navbar {\n  position: relative;\n  min-height: 50px;\n  margin-bottom: 20px;\n  border: 1px solid transparent;\n}\n@media (min-width: 768px) {\n  .navbar {\n    border-radius: 4px;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-header {\n    float: left;\n  }\n}\n.navbar-collapse {\n  overflow-x: visible;\n  padding-right: 15px;\n  padding-left: 15px;\n  border-top: 1px solid transparent;\n  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);\n  -webkit-overflow-scrolling: touch;\n}\n.navbar-collapse.in {\n  overflow-y: auto;\n}\n@media (min-width: 768px) {\n  .navbar-collapse {\n    width: auto;\n    border-top: 0;\n    box-shadow: none;\n  }\n  .navbar-collapse.collapse {\n    display: block !important;\n    height: auto !important;\n    padding-bottom: 0;\n    overflow: visible !important;\n  }\n  .navbar-collapse.in {\n    overflow-y: visible;\n  }\n  .navbar-fixed-top .navbar-collapse,\n  .navbar-static-top .navbar-collapse,\n  .navbar-fixed-bottom .navbar-collapse {\n    padding-left: 0;\n    padding-right: 0;\n  }\n}\n.navbar-fixed-top .navbar-collapse,\n.navbar-fixed-bottom .navbar-collapse {\n  max-height: 340px;\n}\n@media (max-device-width: 480px) and (orientation: landscape) {\n  .navbar-fixed-top .navbar-collapse,\n  .navbar-fixed-bottom .navbar-collapse {\n    max-height: 200px;\n  }\n}\n.container > .navbar-header,\n.container-fluid > .navbar-header,\n.container > .navbar-collapse,\n.container-fluid > .navbar-collapse {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n@media (min-width: 768px) {\n  .container > .navbar-header,\n  .container-fluid > .navbar-header,\n  .container > .navbar-collapse,\n  .container-fluid > .navbar-collapse {\n    margin-right: 0;\n    margin-left: 0;\n  }\n}\n.navbar-static-top {\n  z-index: 1000;\n  border-width: 0 0 1px;\n}\n@media (min-width: 768px) {\n  .navbar-static-top {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  position: fixed;\n  right: 0;\n  left: 0;\n  z-index: 1030;\n}\n@media (min-width: 768px) {\n  .navbar-fixed-top,\n  .navbar-fixed-bottom {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top {\n  top: 0;\n  border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n  bottom: 0;\n  margin-bottom: 0;\n  border-width: 1px 0 0;\n}\n.navbar-brand {\n  float: left;\n  padding: 15px 15px;\n  font-size: 18px;\n  line-height: 20px;\n  height: 50px;\n}\n.navbar-brand:hover,\n.navbar-brand:focus {\n  text-decoration: none;\n}\n.navbar-brand > img {\n  display: block;\n}\n@media (min-width: 768px) {\n  .navbar > .container .navbar-brand,\n  .navbar > .container-fluid .navbar-brand {\n    margin-left: -15px;\n  }\n}\n.navbar-toggle {\n  position: relative;\n  float: right;\n  margin-right: 15px;\n  padding: 9px 10px;\n  margin-top: 8px;\n  margin-bottom: 8px;\n  background-color: transparent;\n  background-image: none;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.navbar-toggle:focus {\n  outline: 0;\n}\n.navbar-toggle .icon-bar {\n  display: block;\n  width: 22px;\n  height: 2px;\n  border-radius: 1px;\n}\n.navbar-toggle .icon-bar + .icon-bar {\n  margin-top: 4px;\n}\n@media (min-width: 768px) {\n  .navbar-toggle {\n    display: none;\n  }\n}\n.navbar-nav {\n  margin: 7.5px -15px;\n}\n.navbar-nav > li > a {\n  padding-top: 10px;\n  padding-bottom: 10px;\n  line-height: 20px;\n}\n@media (max-width: 767px) {\n  .navbar-nav .open .dropdown-menu {\n    position: static;\n    float: none;\n    width: auto;\n    margin-top: 0;\n    background-color: transparent;\n    border: 0;\n    box-shadow: none;\n  }\n  .navbar-nav .open .dropdown-menu > li > a,\n  .navbar-nav .open .dropdown-menu .dropdown-header {\n    padding: 5px 15px 5px 25px;\n  }\n  .navbar-nav .open .dropdown-menu > li > a {\n    line-height: 20px;\n  }\n  .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-nav .open .dropdown-menu > li > a:focus {\n    background-image: none;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-nav {\n    float: left;\n    margin: 0;\n  }\n  .navbar-nav > li {\n    float: left;\n  }\n  .navbar-nav > li > a {\n    padding-top: 15px;\n    padding-bottom: 15px;\n  }\n}\n.navbar-form {\n  margin-left: -15px;\n  margin-right: -15px;\n  padding: 10px 15px;\n  border-top: 1px solid transparent;\n  border-bottom: 1px solid transparent;\n  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);\n  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);\n  margin-top: 8px;\n  margin-bottom: 8px;\n}\n@media (min-width: 768px) {\n  .navbar-form .form-group {\n    display: inline-block;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .navbar-form .form-control-static {\n    display: inline-block;\n  }\n  .navbar-form .input-group {\n    display: inline-table;\n    vertical-align: middle;\n  }\n  .navbar-form .input-group .input-group-addon,\n  .navbar-form .input-group .input-group-btn,\n  .navbar-form .input-group .form-control {\n    width: auto;\n  }\n  .navbar-form .input-group > .form-control {\n    width: 100%;\n  }\n  .navbar-form .control-label {\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .radio,\n  .navbar-form .checkbox {\n    display: inline-block;\n    margin-top: 0;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .radio label,\n  .navbar-form .checkbox label {\n    padding-left: 0;\n  }\n  .navbar-form .radio input[type=\"radio\"],\n  .navbar-form .checkbox input[type=\"checkbox\"] {\n    position: relative;\n    margin-left: 0;\n  }\n  .navbar-form .has-feedback .form-control-feedback {\n    top: 0;\n  }\n}\n@media (max-width: 767px) {\n  .navbar-form .form-group {\n    margin-bottom: 5px;\n  }\n  .navbar-form .form-group:last-child {\n    margin-bottom: 0;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-form {\n    width: auto;\n    border: 0;\n    margin-left: 0;\n    margin-right: 0;\n    padding-top: 0;\n    padding-bottom: 0;\n    -webkit-box-shadow: none;\n    box-shadow: none;\n  }\n}\n.navbar-nav > li > .dropdown-menu {\n  margin-top: 0;\n  border-top-right-radius: 0;\n  border-top-left-radius: 0;\n}\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n  margin-bottom: 0;\n  border-top-right-radius: 4px;\n  border-top-left-radius: 4px;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.navbar-btn {\n  margin-top: 8px;\n  margin-bottom: 8px;\n}\n.navbar-btn.btn-sm {\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\n.navbar-btn.btn-xs {\n  margin-top: 14px;\n  margin-bottom: 14px;\n}\n.navbar-text {\n  margin-top: 15px;\n  margin-bottom: 15px;\n}\n@media (min-width: 768px) {\n  .navbar-text {\n    float: left;\n    margin-left: 15px;\n    margin-right: 15px;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-left {\n    float: left !important;\n  }\n  .navbar-right {\n    float: right !important;\n    margin-right: -15px;\n  }\n  .navbar-right ~ .navbar-right {\n    margin-right: 0;\n  }\n}\n.navbar-default {\n  background-color: #f8f8f8;\n  border-color: #e7e7e7;\n}\n.navbar-default .navbar-brand {\n  color: #777;\n}\n.navbar-default .navbar-brand:hover,\n.navbar-default .navbar-brand:focus {\n  color: #5e5e5e;\n  background-color: transparent;\n}\n.navbar-default .navbar-text {\n  color: #777;\n}\n.navbar-default .navbar-nav > li > a {\n  color: #777;\n}\n.navbar-default .navbar-nav > li > a:hover,\n.navbar-default .navbar-nav > li > a:focus {\n  color: #333;\n  background-color: transparent;\n}\n.navbar-default .navbar-nav > .active > a,\n.navbar-default .navbar-nav > .active > a:hover,\n.navbar-default .navbar-nav > .active > a:focus {\n  color: #555;\n  background-color: #e7e7e7;\n}\n.navbar-default .navbar-nav > .disabled > a,\n.navbar-default .navbar-nav > .disabled > a:hover,\n.navbar-default .navbar-nav > .disabled > a:focus {\n  color: #ccc;\n  background-color: transparent;\n}\n.navbar-default .navbar-toggle {\n  border-color: #ddd;\n}\n.navbar-default .navbar-toggle:hover,\n.navbar-default .navbar-toggle:focus {\n  background-color: #ddd;\n}\n.navbar-default .navbar-toggle .icon-bar {\n  background-color: #888;\n}\n.navbar-default .navbar-collapse,\n.navbar-default .navbar-form {\n  border-color: #e7e7e7;\n}\n.navbar-default .navbar-nav > .open > a,\n.navbar-default .navbar-nav > .open > a:hover,\n.navbar-default .navbar-nav > .open > a:focus {\n  background-color: #e7e7e7;\n  color: #555;\n}\n@media (max-width: 767px) {\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a {\n    color: #777;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {\n    color: #333;\n    background-color: transparent;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {\n    color: #555;\n    background-color: #e7e7e7;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {\n    color: #ccc;\n    background-color: transparent;\n  }\n}\n.navbar-default .navbar-link {\n  color: #777;\n}\n.navbar-default .navbar-link:hover {\n  color: #333;\n}\n.navbar-default .btn-link {\n  color: #777;\n}\n.navbar-default .btn-link:hover,\n.navbar-default .btn-link:focus {\n  color: #333;\n}\n.navbar-default .btn-link[disabled]:hover,\nfieldset[disabled] .navbar-default .btn-link:hover,\n.navbar-default .btn-link[disabled]:focus,\nfieldset[disabled] .navbar-default .btn-link:focus {\n  color: #ccc;\n}\n.navbar-inverse {\n  background-color: #222;\n  border-color: #080808;\n}\n.navbar-inverse .navbar-brand {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-brand:hover,\n.navbar-inverse .navbar-brand:focus {\n  color: #fff;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-text {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-nav > li > a {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-nav > li > a:hover,\n.navbar-inverse .navbar-nav > li > a:focus {\n  color: #fff;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-nav > .active > a,\n.navbar-inverse .navbar-nav > .active > a:hover,\n.navbar-inverse .navbar-nav > .active > a:focus {\n  color: #fff;\n  background-color: #080808;\n}\n.navbar-inverse .navbar-nav > .disabled > a,\n.navbar-inverse .navbar-nav > .disabled > a:hover,\n.navbar-inverse .navbar-nav > .disabled > a:focus {\n  color: #444;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-toggle {\n  border-color: #333;\n}\n.navbar-inverse .navbar-toggle:hover,\n.navbar-inverse .navbar-toggle:focus {\n  background-color: #333;\n}\n.navbar-inverse .navbar-toggle .icon-bar {\n  background-color: #fff;\n}\n.navbar-inverse .navbar-collapse,\n.navbar-inverse .navbar-form {\n  border-color: #101010;\n}\n.navbar-inverse .navbar-nav > .open > a,\n.navbar-inverse .navbar-nav > .open > a:hover,\n.navbar-inverse .navbar-nav > .open > a:focus {\n  background-color: #080808;\n  color: #fff;\n}\n@media (max-width: 767px) {\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {\n    border-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {\n    background-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {\n    color: #9d9d9d;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {\n    color: #fff;\n    background-color: transparent;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {\n    color: #fff;\n    background-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {\n    color: #444;\n    background-color: transparent;\n  }\n}\n.navbar-inverse .navbar-link {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-link:hover {\n  color: #fff;\n}\n.navbar-inverse .btn-link {\n  color: #9d9d9d;\n}\n.navbar-inverse .btn-link:hover,\n.navbar-inverse .btn-link:focus {\n  color: #fff;\n}\n.navbar-inverse .btn-link[disabled]:hover,\nfieldset[disabled] .navbar-inverse .btn-link:hover,\n.navbar-inverse .btn-link[disabled]:focus,\nfieldset[disabled] .navbar-inverse .btn-link:focus {\n  color: #444;\n}\n.breadcrumb {\n  padding: 8px 15px;\n  margin-bottom: 20px;\n  list-style: none;\n  background-color: #f5f5f5;\n  border-radius: 4px;\n}\n.breadcrumb > li {\n  display: inline-block;\n}\n.breadcrumb > li + li:before {\n  content: \"/\\00a0\";\n  padding: 0 5px;\n  color: #ccc;\n}\n.breadcrumb > .active {\n  color: #777777;\n}\n.pagination {\n  display: inline-block;\n  padding-left: 0;\n  margin: 20px 0;\n  border-radius: 4px;\n}\n.pagination > li {\n  display: inline;\n}\n.pagination > li > a,\n.pagination > li > span {\n  position: relative;\n  float: left;\n  padding: 6px 12px;\n  line-height: 1.42857143;\n  text-decoration: none;\n  color: #337ab7;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  margin-left: -1px;\n}\n.pagination > li:first-child > a,\n.pagination > li:first-child > span {\n  margin-left: 0;\n  border-bottom-left-radius: 4px;\n  border-top-left-radius: 4px;\n}\n.pagination > li:last-child > a,\n.pagination > li:last-child > span {\n  border-bottom-right-radius: 4px;\n  border-top-right-radius: 4px;\n}\n.pagination > li > a:hover,\n.pagination > li > span:hover,\n.pagination > li > a:focus,\n.pagination > li > span:focus {\n  z-index: 2;\n  color: #23527c;\n  background-color: #eeeeee;\n  border-color: #ddd;\n}\n.pagination > .active > a,\n.pagination > .active > span,\n.pagination > .active > a:hover,\n.pagination > .active > span:hover,\n.pagination > .active > a:focus,\n.pagination > .active > span:focus {\n  z-index: 3;\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n  cursor: default;\n}\n.pagination > .disabled > span,\n.pagination > .disabled > span:hover,\n.pagination > .disabled > span:focus,\n.pagination > .disabled > a,\n.pagination > .disabled > a:hover,\n.pagination > .disabled > a:focus {\n  color: #777777;\n  background-color: #fff;\n  border-color: #ddd;\n  cursor: not-allowed;\n}\n.pagination-lg > li > a,\n.pagination-lg > li > span {\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n}\n.pagination-lg > li:first-child > a,\n.pagination-lg > li:first-child > span {\n  border-bottom-left-radius: 6px;\n  border-top-left-radius: 6px;\n}\n.pagination-lg > li:last-child > a,\n.pagination-lg > li:last-child > span {\n  border-bottom-right-radius: 6px;\n  border-top-right-radius: 6px;\n}\n.pagination-sm > li > a,\n.pagination-sm > li > span {\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n}\n.pagination-sm > li:first-child > a,\n.pagination-sm > li:first-child > span {\n  border-bottom-left-radius: 3px;\n  border-top-left-radius: 3px;\n}\n.pagination-sm > li:last-child > a,\n.pagination-sm > li:last-child > span {\n  border-bottom-right-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.pager {\n  padding-left: 0;\n  margin: 20px 0;\n  list-style: none;\n  text-align: center;\n}\n.pager li {\n  display: inline;\n}\n.pager li > a,\n.pager li > span {\n  display: inline-block;\n  padding: 5px 14px;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 15px;\n}\n.pager li > a:hover,\n.pager li > a:focus {\n  text-decoration: none;\n  background-color: #eeeeee;\n}\n.pager .next > a,\n.pager .next > span {\n  float: right;\n}\n.pager .previous > a,\n.pager .previous > span {\n  float: left;\n}\n.pager .disabled > a,\n.pager .disabled > a:hover,\n.pager .disabled > a:focus,\n.pager .disabled > span {\n  color: #777777;\n  background-color: #fff;\n  cursor: not-allowed;\n}\n.label {\n  display: inline;\n  padding: .2em .6em .3em;\n  font-size: 75%;\n  font-weight: bold;\n  line-height: 1;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: .25em;\n}\na.label:hover,\na.label:focus {\n  color: #fff;\n  text-decoration: none;\n  cursor: pointer;\n}\n.label:empty {\n  display: none;\n}\n.btn .label {\n  position: relative;\n  top: -1px;\n}\n.label-default {\n  background-color: #777777;\n}\n.label-default[href]:hover,\n.label-default[href]:focus {\n  background-color: #5e5e5e;\n}\n.label-primary {\n  background-color: #337ab7;\n}\n.label-primary[href]:hover,\n.label-primary[href]:focus {\n  background-color: #286090;\n}\n.label-success {\n  background-color: #5cb85c;\n}\n.label-success[href]:hover,\n.label-success[href]:focus {\n  background-color: #449d44;\n}\n.label-info {\n  background-color: #5bc0de;\n}\n.label-info[href]:hover,\n.label-info[href]:focus {\n  background-color: #31b0d5;\n}\n.label-warning {\n  background-color: #f0ad4e;\n}\n.label-warning[href]:hover,\n.label-warning[href]:focus {\n  background-color: #ec971f;\n}\n.label-danger {\n  background-color: #d9534f;\n}\n.label-danger[href]:hover,\n.label-danger[href]:focus {\n  background-color: #c9302c;\n}\n.badge {\n  display: inline-block;\n  min-width: 10px;\n  padding: 3px 7px;\n  font-size: 12px;\n  font-weight: bold;\n  color: #fff;\n  line-height: 1;\n  vertical-align: middle;\n  white-space: nowrap;\n  text-align: center;\n  background-color: #777777;\n  border-radius: 10px;\n}\n.badge:empty {\n  display: none;\n}\n.btn .badge {\n  position: relative;\n  top: -1px;\n}\n.btn-xs .badge,\n.btn-group-xs > .btn .badge {\n  top: 0;\n  padding: 1px 5px;\n}\na.badge:hover,\na.badge:focus {\n  color: #fff;\n  text-decoration: none;\n  cursor: pointer;\n}\n.list-group-item.active > .badge,\n.nav-pills > .active > a > .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.list-group-item > .badge {\n  float: right;\n}\n.list-group-item > .badge + .badge {\n  margin-right: 5px;\n}\n.nav-pills > li > a > .badge {\n  margin-left: 3px;\n}\n.jumbotron {\n  padding-top: 30px;\n  padding-bottom: 30px;\n  margin-bottom: 30px;\n  color: inherit;\n  background-color: #eeeeee;\n}\n.jumbotron h1,\n.jumbotron .h1 {\n  color: inherit;\n}\n.jumbotron p {\n  margin-bottom: 15px;\n  font-size: 21px;\n  font-weight: 200;\n}\n.jumbotron > hr {\n  border-top-color: #d5d5d5;\n}\n.container .jumbotron,\n.container-fluid .jumbotron {\n  border-radius: 6px;\n  padding-left: 15px;\n  padding-right: 15px;\n}\n.jumbotron .container {\n  max-width: 100%;\n}\n@media screen and (min-width: 768px) {\n  .jumbotron {\n    padding-top: 48px;\n    padding-bottom: 48px;\n  }\n  .container .jumbotron,\n  .container-fluid .jumbotron {\n    padding-left: 60px;\n    padding-right: 60px;\n  }\n  .jumbotron h1,\n  .jumbotron .h1 {\n    font-size: 63px;\n  }\n}\n.thumbnail {\n  display: block;\n  padding: 4px;\n  margin-bottom: 20px;\n  line-height: 1.42857143;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 4px;\n  -webkit-transition: border 0.2s ease-in-out;\n  -o-transition: border 0.2s ease-in-out;\n  transition: border 0.2s ease-in-out;\n}\n.thumbnail > img,\n.thumbnail a > img {\n  margin-left: auto;\n  margin-right: auto;\n}\na.thumbnail:hover,\na.thumbnail:focus,\na.thumbnail.active {\n  border-color: #337ab7;\n}\n.thumbnail .caption {\n  padding: 9px;\n  color: #333333;\n}\n.alert {\n  padding: 15px;\n  margin-bottom: 20px;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.alert h4 {\n  margin-top: 0;\n  color: inherit;\n}\n.alert .alert-link {\n  font-weight: bold;\n}\n.alert > p,\n.alert > ul {\n  margin-bottom: 0;\n}\n.alert > p + p {\n  margin-top: 5px;\n}\n.alert-dismissable,\n.alert-dismissible {\n  padding-right: 35px;\n}\n.alert-dismissable .close,\n.alert-dismissible .close {\n  position: relative;\n  top: -2px;\n  right: -21px;\n  color: inherit;\n}\n.alert-success {\n  background-color: #dff0d8;\n  border-color: #d6e9c6;\n  color: #3c763d;\n}\n.alert-success hr {\n  border-top-color: #c9e2b3;\n}\n.alert-success .alert-link {\n  color: #2b542c;\n}\n.alert-info {\n  background-color: #d9edf7;\n  border-color: #bce8f1;\n  color: #31708f;\n}\n.alert-info hr {\n  border-top-color: #a6e1ec;\n}\n.alert-info .alert-link {\n  color: #245269;\n}\n.alert-warning {\n  background-color: #fcf8e3;\n  border-color: #faebcc;\n  color: #8a6d3b;\n}\n.alert-warning hr {\n  border-top-color: #f7e1b5;\n}\n.alert-warning .alert-link {\n  color: #66512c;\n}\n.alert-danger {\n  background-color: #f2dede;\n  border-color: #ebccd1;\n  color: #a94442;\n}\n.alert-danger hr {\n  border-top-color: #e4b9c0;\n}\n.alert-danger .alert-link {\n  color: #843534;\n}\n@-webkit-keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n@keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n.progress {\n  overflow: hidden;\n  height: 20px;\n  margin-bottom: 20px;\n  background-color: #f5f5f5;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);\n  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);\n}\n.progress-bar {\n  float: left;\n  width: 0%;\n  height: 100%;\n  font-size: 12px;\n  line-height: 20px;\n  color: #fff;\n  text-align: center;\n  background-color: #337ab7;\n  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);\n  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);\n  -webkit-transition: width 0.6s ease;\n  -o-transition: width 0.6s ease;\n  transition: width 0.6s ease;\n}\n.progress-striped .progress-bar,\n.progress-bar-striped {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-size: 40px 40px;\n}\n.progress.active .progress-bar,\n.progress-bar.active {\n  -webkit-animation: progress-bar-stripes 2s linear infinite;\n  -o-animation: progress-bar-stripes 2s linear infinite;\n  animation: progress-bar-stripes 2s linear infinite;\n}\n.progress-bar-success {\n  background-color: #5cb85c;\n}\n.progress-striped .progress-bar-success {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n}\n.progress-bar-info {\n  background-color: #5bc0de;\n}\n.progress-striped .progress-bar-info {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n}\n.progress-bar-warning {\n  background-color: #f0ad4e;\n}\n.progress-striped .progress-bar-warning {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n}\n.progress-bar-danger {\n  background-color: #d9534f;\n}\n.progress-striped .progress-bar-danger {\n  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n}\n.media {\n  margin-top: 15px;\n}\n.media:first-child {\n  margin-top: 0;\n}\n.media,\n.media-body {\n  zoom: 1;\n  overflow: hidden;\n}\n.media-body {\n  width: 10000px;\n}\n.media-object {\n  display: block;\n}\n.media-object.img-thumbnail {\n  max-width: none;\n}\n.media-right,\n.media > .pull-right {\n  padding-left: 10px;\n}\n.media-left,\n.media > .pull-left {\n  padding-right: 10px;\n}\n.media-left,\n.media-right,\n.media-body {\n  display: table-cell;\n  vertical-align: top;\n}\n.media-middle {\n  vertical-align: middle;\n}\n.media-bottom {\n  vertical-align: bottom;\n}\n.media-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.media-list {\n  padding-left: 0;\n  list-style: none;\n}\n.list-group {\n  margin-bottom: 20px;\n  padding-left: 0;\n}\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n  margin-bottom: -1px;\n  background-color: #fff;\n  border: 1px solid #ddd;\n}\n.list-group-item:first-child {\n  border-top-right-radius: 4px;\n  border-top-left-radius: 4px;\n}\n.list-group-item:last-child {\n  margin-bottom: 0;\n  border-bottom-right-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\na.list-group-item,\nbutton.list-group-item {\n  color: #555;\n}\na.list-group-item .list-group-item-heading,\nbutton.list-group-item .list-group-item-heading {\n  color: #333;\n}\na.list-group-item:hover,\nbutton.list-group-item:hover,\na.list-group-item:focus,\nbutton.list-group-item:focus {\n  text-decoration: none;\n  color: #555;\n  background-color: #f5f5f5;\n}\nbutton.list-group-item {\n  width: 100%;\n  text-align: left;\n}\n.list-group-item.disabled,\n.list-group-item.disabled:hover,\n.list-group-item.disabled:focus {\n  background-color: #eeeeee;\n  color: #777777;\n  cursor: not-allowed;\n}\n.list-group-item.disabled .list-group-item-heading,\n.list-group-item.disabled:hover .list-group-item-heading,\n.list-group-item.disabled:focus .list-group-item-heading {\n  color: inherit;\n}\n.list-group-item.disabled .list-group-item-text,\n.list-group-item.disabled:hover .list-group-item-text,\n.list-group-item.disabled:focus .list-group-item-text {\n  color: #777777;\n}\n.list-group-item.active,\n.list-group-item.active:hover,\n.list-group-item.active:focus {\n  z-index: 2;\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.list-group-item.active .list-group-item-heading,\n.list-group-item.active:hover .list-group-item-heading,\n.list-group-item.active:focus .list-group-item-heading,\n.list-group-item.active .list-group-item-heading > small,\n.list-group-item.active:hover .list-group-item-heading > small,\n.list-group-item.active:focus .list-group-item-heading > small,\n.list-group-item.active .list-group-item-heading > .small,\n.list-group-item.active:hover .list-group-item-heading > .small,\n.list-group-item.active:focus .list-group-item-heading > .small {\n  color: inherit;\n}\n.list-group-item.active .list-group-item-text,\n.list-group-item.active:hover .list-group-item-text,\n.list-group-item.active:focus .list-group-item-text {\n  color: #c7ddef;\n}\n.list-group-item-success {\n  color: #3c763d;\n  background-color: #dff0d8;\n}\na.list-group-item-success,\nbutton.list-group-item-success {\n  color: #3c763d;\n}\na.list-group-item-success .list-group-item-heading,\nbutton.list-group-item-success .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-success:hover,\nbutton.list-group-item-success:hover,\na.list-group-item-success:focus,\nbutton.list-group-item-success:focus {\n  color: #3c763d;\n  background-color: #d0e9c6;\n}\na.list-group-item-success.active,\nbutton.list-group-item-success.active,\na.list-group-item-success.active:hover,\nbutton.list-group-item-success.active:hover,\na.list-group-item-success.active:focus,\nbutton.list-group-item-success.active:focus {\n  color: #fff;\n  background-color: #3c763d;\n  border-color: #3c763d;\n}\n.list-group-item-info {\n  color: #31708f;\n  background-color: #d9edf7;\n}\na.list-group-item-info,\nbutton.list-group-item-info {\n  color: #31708f;\n}\na.list-group-item-info .list-group-item-heading,\nbutton.list-group-item-info .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-info:hover,\nbutton.list-group-item-info:hover,\na.list-group-item-info:focus,\nbutton.list-group-item-info:focus {\n  color: #31708f;\n  background-color: #c4e3f3;\n}\na.list-group-item-info.active,\nbutton.list-group-item-info.active,\na.list-group-item-info.active:hover,\nbutton.list-group-item-info.active:hover,\na.list-group-item-info.active:focus,\nbutton.list-group-item-info.active:focus {\n  color: #fff;\n  background-color: #31708f;\n  border-color: #31708f;\n}\n.list-group-item-warning {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n}\na.list-group-item-warning,\nbutton.list-group-item-warning {\n  color: #8a6d3b;\n}\na.list-group-item-warning .list-group-item-heading,\nbutton.list-group-item-warning .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-warning:hover,\nbutton.list-group-item-warning:hover,\na.list-group-item-warning:focus,\nbutton.list-group-item-warning:focus {\n  color: #8a6d3b;\n  background-color: #faf2cc;\n}\na.list-group-item-warning.active,\nbutton.list-group-item-warning.active,\na.list-group-item-warning.active:hover,\nbutton.list-group-item-warning.active:hover,\na.list-group-item-warning.active:focus,\nbutton.list-group-item-warning.active:focus {\n  color: #fff;\n  background-color: #8a6d3b;\n  border-color: #8a6d3b;\n}\n.list-group-item-danger {\n  color: #a94442;\n  background-color: #f2dede;\n}\na.list-group-item-danger,\nbutton.list-group-item-danger {\n  color: #a94442;\n}\na.list-group-item-danger .list-group-item-heading,\nbutton.list-group-item-danger .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-danger:hover,\nbutton.list-group-item-danger:hover,\na.list-group-item-danger:focus,\nbutton.list-group-item-danger:focus {\n  color: #a94442;\n  background-color: #ebcccc;\n}\na.list-group-item-danger.active,\nbutton.list-group-item-danger.active,\na.list-group-item-danger.active:hover,\nbutton.list-group-item-danger.active:hover,\na.list-group-item-danger.active:focus,\nbutton.list-group-item-danger.active:focus {\n  color: #fff;\n  background-color: #a94442;\n  border-color: #a94442;\n}\n.list-group-item-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.list-group-item-text {\n  margin-bottom: 0;\n  line-height: 1.3;\n}\n.panel {\n  margin-bottom: 20px;\n  background-color: #fff;\n  border: 1px solid transparent;\n  border-radius: 4px;\n  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);\n  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);\n}\n.panel-body {\n  padding: 15px;\n}\n.panel-heading {\n  padding: 10px 15px;\n  border-bottom: 1px solid transparent;\n  border-top-right-radius: 3px;\n  border-top-left-radius: 3px;\n}\n.panel-heading > .dropdown .dropdown-toggle {\n  color: inherit;\n}\n.panel-title {\n  margin-top: 0;\n  margin-bottom: 0;\n  font-size: 16px;\n  color: inherit;\n}\n.panel-title > a,\n.panel-title > small,\n.panel-title > .small,\n.panel-title > small > a,\n.panel-title > .small > a {\n  color: inherit;\n}\n.panel-footer {\n  padding: 10px 15px;\n  background-color: #f5f5f5;\n  border-top: 1px solid #ddd;\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .list-group,\n.panel > .panel-collapse > .list-group {\n  margin-bottom: 0;\n}\n.panel > .list-group .list-group-item,\n.panel > .panel-collapse > .list-group .list-group-item {\n  border-width: 1px 0;\n  border-radius: 0;\n}\n.panel > .list-group:first-child .list-group-item:first-child,\n.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {\n  border-top: 0;\n  border-top-right-radius: 3px;\n  border-top-left-radius: 3px;\n}\n.panel > .list-group:last-child .list-group-item:last-child,\n.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {\n  border-bottom: 0;\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child {\n  border-top-right-radius: 0;\n  border-top-left-radius: 0;\n}\n.panel-heading + .list-group .list-group-item:first-child {\n  border-top-width: 0;\n}\n.list-group + .panel-footer {\n  border-top-width: 0;\n}\n.panel > .table,\n.panel > .table-responsive > .table,\n.panel > .panel-collapse > .table {\n  margin-bottom: 0;\n}\n.panel > .table caption,\n.panel > .table-responsive > .table caption,\n.panel > .panel-collapse > .table caption {\n  padding-left: 15px;\n  padding-right: 15px;\n}\n.panel > .table:first-child,\n.panel > .table-responsive:first-child > .table:first-child {\n  border-top-right-radius: 3px;\n  border-top-left-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,\n.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {\n  border-top-left-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,\n.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {\n  border-top-right-radius: 3px;\n}\n.panel > .table:last-child,\n.panel > .table-responsive:last-child > .table:last-child {\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {\n  border-bottom-left-radius: 3px;\n  border-bottom-right-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,\n.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,\n.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {\n  border-bottom-right-radius: 3px;\n}\n.panel > .panel-body + .table,\n.panel > .panel-body + .table-responsive,\n.panel > .table + .panel-body,\n.panel > .table-responsive + .panel-body {\n  border-top: 1px solid #ddd;\n}\n.panel > .table > tbody:first-child > tr:first-child th,\n.panel > .table > tbody:first-child > tr:first-child td {\n  border-top: 0;\n}\n.panel > .table-bordered,\n.panel > .table-responsive > .table-bordered {\n  border: 0;\n}\n.panel > .table-bordered > thead > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,\n.panel > .table-bordered > tbody > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,\n.panel > .table-bordered > tfoot > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,\n.panel > .table-bordered > thead > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,\n.panel > .table-bordered > tbody > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,\n.panel > .table-bordered > tfoot > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {\n  border-left: 0;\n}\n.panel > .table-bordered > thead > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,\n.panel > .table-bordered > tbody > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,\n.panel > .table-bordered > tfoot > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,\n.panel > .table-bordered > thead > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,\n.panel > .table-bordered > tbody > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,\n.panel > .table-bordered > tfoot > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {\n  border-right: 0;\n}\n.panel > .table-bordered > thead > tr:first-child > td,\n.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,\n.panel > .table-bordered > tbody > tr:first-child > td,\n.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,\n.panel > .table-bordered > thead > tr:first-child > th,\n.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,\n.panel > .table-bordered > tbody > tr:first-child > th,\n.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {\n  border-bottom: 0;\n}\n.panel > .table-bordered > tbody > tr:last-child > td,\n.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,\n.panel > .table-bordered > tfoot > tr:last-child > td,\n.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,\n.panel > .table-bordered > tbody > tr:last-child > th,\n.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,\n.panel > .table-bordered > tfoot > tr:last-child > th,\n.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {\n  border-bottom: 0;\n}\n.panel > .table-responsive {\n  border: 0;\n  margin-bottom: 0;\n}\n.panel-group {\n  margin-bottom: 20px;\n}\n.panel-group .panel {\n  margin-bottom: 0;\n  border-radius: 4px;\n}\n.panel-group .panel + .panel {\n  margin-top: 5px;\n}\n.panel-group .panel-heading {\n  border-bottom: 0;\n}\n.panel-group .panel-heading + .panel-collapse > .panel-body,\n.panel-group .panel-heading + .panel-collapse > .list-group {\n  border-top: 1px solid #ddd;\n}\n.panel-group .panel-footer {\n  border-top: 0;\n}\n.panel-group .panel-footer + .panel-collapse .panel-body {\n  border-bottom: 1px solid #ddd;\n}\n.panel-default {\n  border-color: #ddd;\n}\n.panel-default > .panel-heading {\n  color: #333333;\n  background-color: #f5f5f5;\n  border-color: #ddd;\n}\n.panel-default > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #ddd;\n}\n.panel-default > .panel-heading .badge {\n  color: #f5f5f5;\n  background-color: #333333;\n}\n.panel-default > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #ddd;\n}\n.panel-primary {\n  border-color: #337ab7;\n}\n.panel-primary > .panel-heading {\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.panel-primary > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #337ab7;\n}\n.panel-primary > .panel-heading .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.panel-primary > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #337ab7;\n}\n.panel-success {\n  border-color: #d6e9c6;\n}\n.panel-success > .panel-heading {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #d6e9c6;\n}\n.panel-success > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #d6e9c6;\n}\n.panel-success > .panel-heading .badge {\n  color: #dff0d8;\n  background-color: #3c763d;\n}\n.panel-success > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #d6e9c6;\n}\n.panel-info {\n  border-color: #bce8f1;\n}\n.panel-info > .panel-heading {\n  color: #31708f;\n  background-color: #d9edf7;\n  border-color: #bce8f1;\n}\n.panel-info > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #bce8f1;\n}\n.panel-info > .panel-heading .badge {\n  color: #d9edf7;\n  background-color: #31708f;\n}\n.panel-info > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #bce8f1;\n}\n.panel-warning {\n  border-color: #faebcc;\n}\n.panel-warning > .panel-heading {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #faebcc;\n}\n.panel-warning > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #faebcc;\n}\n.panel-warning > .panel-heading .badge {\n  color: #fcf8e3;\n  background-color: #8a6d3b;\n}\n.panel-warning > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #faebcc;\n}\n.panel-danger {\n  border-color: #ebccd1;\n}\n.panel-danger > .panel-heading {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #ebccd1;\n}\n.panel-danger > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #ebccd1;\n}\n.panel-danger > .panel-heading .badge {\n  color: #f2dede;\n  background-color: #a94442;\n}\n.panel-danger > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #ebccd1;\n}\n.embed-responsive {\n  position: relative;\n  display: block;\n  height: 0;\n  padding: 0;\n  overflow: hidden;\n}\n.embed-responsive .embed-responsive-item,\n.embed-responsive iframe,\n.embed-responsive embed,\n.embed-responsive object,\n.embed-responsive video {\n  position: absolute;\n  top: 0;\n  left: 0;\n  bottom: 0;\n  height: 100%;\n  width: 100%;\n  border: 0;\n}\n.embed-responsive-16by9 {\n  padding-bottom: 56.25%;\n}\n.embed-responsive-4by3 {\n  padding-bottom: 75%;\n}\n.well {\n  min-height: 20px;\n  padding: 19px;\n  margin-bottom: 20px;\n  background-color: #f5f5f5;\n  border: 1px solid #e3e3e3;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);\n  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);\n}\n.well blockquote {\n  border-color: #ddd;\n  border-color: rgba(0, 0, 0, 0.15);\n}\n.well-lg {\n  padding: 24px;\n  border-radius: 6px;\n}\n.well-sm {\n  padding: 9px;\n  border-radius: 3px;\n}\n.close {\n  float: right;\n  font-size: 21px;\n  font-weight: bold;\n  line-height: 1;\n  color: #000;\n  text-shadow: 0 1px 0 #fff;\n  opacity: 0.2;\n  filter: alpha(opacity=20);\n}\n.close:hover,\n.close:focus {\n  color: #000;\n  text-decoration: none;\n  cursor: pointer;\n  opacity: 0.5;\n  filter: alpha(opacity=50);\n}\nbutton.close {\n  padding: 0;\n  cursor: pointer;\n  background: transparent;\n  border: 0;\n  -webkit-appearance: none;\n}\n.modal-open {\n  overflow: hidden;\n}\n.modal {\n  display: none;\n  overflow: hidden;\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1050;\n  -webkit-overflow-scrolling: touch;\n  outline: 0;\n}\n.modal.fade .modal-dialog {\n  -webkit-transform: translate(0, -25%);\n  -ms-transform: translate(0, -25%);\n  -o-transform: translate(0, -25%);\n  transform: translate(0, -25%);\n  -webkit-transition: -webkit-transform 0.3s ease-out;\n  -moz-transition: -moz-transform 0.3s ease-out;\n  -o-transition: -o-transform 0.3s ease-out;\n  transition: transform 0.3s ease-out;\n}\n.modal.in .modal-dialog {\n  -webkit-transform: translate(0, 0);\n  -ms-transform: translate(0, 0);\n  -o-transform: translate(0, 0);\n  transform: translate(0, 0);\n}\n.modal-open .modal {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 10px;\n}\n.modal-content {\n  position: relative;\n  background-color: #fff;\n  border: 1px solid #999;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  border-radius: 6px;\n  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);\n  box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);\n  background-clip: padding-box;\n  outline: 0;\n}\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1040;\n  background-color: #000;\n}\n.modal-backdrop.fade {\n  opacity: 0;\n  filter: alpha(opacity=0);\n}\n.modal-backdrop.in {\n  opacity: 0.5;\n  filter: alpha(opacity=50);\n}\n.modal-header {\n  padding: 15px;\n  border-bottom: 1px solid #e5e5e5;\n}\n.modal-header .close {\n  margin-top: -2px;\n}\n.modal-title {\n  margin: 0;\n  line-height: 1.42857143;\n}\n.modal-body {\n  position: relative;\n  padding: 15px;\n}\n.modal-footer {\n  padding: 15px;\n  text-align: right;\n  border-top: 1px solid #e5e5e5;\n}\n.modal-footer .btn + .btn {\n  margin-left: 5px;\n  margin-bottom: 0;\n}\n.modal-footer .btn-group .btn + .btn {\n  margin-left: -1px;\n}\n.modal-footer .btn-block + .btn-block {\n  margin-left: 0;\n}\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n@media (min-width: 768px) {\n  .modal-dialog {\n    width: 600px;\n    margin: 30px auto;\n  }\n  .modal-content {\n    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);\n    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);\n  }\n  .modal-sm {\n    width: 300px;\n  }\n}\n@media (min-width: 992px) {\n  .modal-lg {\n    width: 900px;\n  }\n}\n.tooltip {\n  position: absolute;\n  z-index: 1070;\n  display: block;\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-style: normal;\n  font-weight: normal;\n  letter-spacing: normal;\n  line-break: auto;\n  line-height: 1.42857143;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  white-space: normal;\n  word-break: normal;\n  word-spacing: normal;\n  word-wrap: normal;\n  font-size: 12px;\n  opacity: 0;\n  filter: alpha(opacity=0);\n}\n.tooltip.in {\n  opacity: 0.9;\n  filter: alpha(opacity=90);\n}\n.tooltip.top {\n  margin-top: -3px;\n  padding: 5px 0;\n}\n.tooltip.right {\n  margin-left: 3px;\n  padding: 0 5px;\n}\n.tooltip.bottom {\n  margin-top: 3px;\n  padding: 5px 0;\n}\n.tooltip.left {\n  margin-left: -3px;\n  padding: 0 5px;\n}\n.tooltip-inner {\n  max-width: 200px;\n  padding: 3px 8px;\n  color: #fff;\n  text-align: center;\n  background-color: #000;\n  border-radius: 4px;\n}\n.tooltip-arrow {\n  position: absolute;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.tooltip.top .tooltip-arrow {\n  bottom: 0;\n  left: 50%;\n  margin-left: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.top-left .tooltip-arrow {\n  bottom: 0;\n  right: 5px;\n  margin-bottom: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.top-right .tooltip-arrow {\n  bottom: 0;\n  left: 5px;\n  margin-bottom: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.right .tooltip-arrow {\n  top: 50%;\n  left: 0;\n  margin-top: -5px;\n  border-width: 5px 5px 5px 0;\n  border-right-color: #000;\n}\n.tooltip.left .tooltip-arrow {\n  top: 50%;\n  right: 0;\n  margin-top: -5px;\n  border-width: 5px 0 5px 5px;\n  border-left-color: #000;\n}\n.tooltip.bottom .tooltip-arrow {\n  top: 0;\n  left: 50%;\n  margin-left: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.tooltip.bottom-left .tooltip-arrow {\n  top: 0;\n  right: 5px;\n  margin-top: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.tooltip.bottom-right .tooltip-arrow {\n  top: 0;\n  left: 5px;\n  margin-top: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: 1060;\n  display: none;\n  max-width: 276px;\n  padding: 1px;\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-style: normal;\n  font-weight: normal;\n  letter-spacing: normal;\n  line-break: auto;\n  line-height: 1.42857143;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  white-space: normal;\n  word-break: normal;\n  word-spacing: normal;\n  word-wrap: normal;\n  font-size: 14px;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid #ccc;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  border-radius: 6px;\n  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\n  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\n}\n.popover.top {\n  margin-top: -10px;\n}\n.popover.right {\n  margin-left: 10px;\n}\n.popover.bottom {\n  margin-top: 10px;\n}\n.popover.left {\n  margin-left: -10px;\n}\n.popover-title {\n  margin: 0;\n  padding: 8px 14px;\n  font-size: 14px;\n  background-color: #f7f7f7;\n  border-bottom: 1px solid #ebebeb;\n  border-radius: 5px 5px 0 0;\n}\n.popover-content {\n  padding: 9px 14px;\n}\n.popover > .arrow,\n.popover > .arrow:after {\n  position: absolute;\n  display: block;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.popover > .arrow {\n  border-width: 11px;\n}\n.popover > .arrow:after {\n  border-width: 10px;\n  content: \"\";\n}\n.popover.top > .arrow {\n  left: 50%;\n  margin-left: -11px;\n  border-bottom-width: 0;\n  border-top-color: #999999;\n  border-top-color: rgba(0, 0, 0, 0.25);\n  bottom: -11px;\n}\n.popover.top > .arrow:after {\n  content: \" \";\n  bottom: 1px;\n  margin-left: -10px;\n  border-bottom-width: 0;\n  border-top-color: #fff;\n}\n.popover.right > .arrow {\n  top: 50%;\n  left: -11px;\n  margin-top: -11px;\n  border-left-width: 0;\n  border-right-color: #999999;\n  border-right-color: rgba(0, 0, 0, 0.25);\n}\n.popover.right > .arrow:after {\n  content: \" \";\n  left: 1px;\n  bottom: -10px;\n  border-left-width: 0;\n  border-right-color: #fff;\n}\n.popover.bottom > .arrow {\n  left: 50%;\n  margin-left: -11px;\n  border-top-width: 0;\n  border-bottom-color: #999999;\n  border-bottom-color: rgba(0, 0, 0, 0.25);\n  top: -11px;\n}\n.popover.bottom > .arrow:after {\n  content: \" \";\n  top: 1px;\n  margin-left: -10px;\n  border-top-width: 0;\n  border-bottom-color: #fff;\n}\n.popover.left > .arrow {\n  top: 50%;\n  right: -11px;\n  margin-top: -11px;\n  border-right-width: 0;\n  border-left-color: #999999;\n  border-left-color: rgba(0, 0, 0, 0.25);\n}\n.popover.left > .arrow:after {\n  content: \" \";\n  right: 1px;\n  border-right-width: 0;\n  border-left-color: #fff;\n  bottom: -10px;\n}\n.carousel {\n  position: relative;\n}\n.carousel-inner {\n  position: relative;\n  overflow: hidden;\n  width: 100%;\n}\n.carousel-inner > .item {\n  display: none;\n  position: relative;\n  -webkit-transition: 0.6s ease-in-out left;\n  -o-transition: 0.6s ease-in-out left;\n  transition: 0.6s ease-in-out left;\n}\n.carousel-inner > .item > img,\n.carousel-inner > .item > a > img {\n  line-height: 1;\n}\n@media all and (transform-3d), (-webkit-transform-3d) {\n  .carousel-inner > .item {\n    -webkit-transition: -webkit-transform 0.6s ease-in-out;\n    -moz-transition: -moz-transform 0.6s ease-in-out;\n    -o-transition: -o-transform 0.6s ease-in-out;\n    transition: transform 0.6s ease-in-out;\n    -webkit-backface-visibility: hidden;\n    -moz-backface-visibility: hidden;\n    backface-visibility: hidden;\n    -webkit-perspective: 1000px;\n    -moz-perspective: 1000px;\n    perspective: 1000px;\n  }\n  .carousel-inner > .item.next,\n  .carousel-inner > .item.active.right {\n    -webkit-transform: translate3d(100%, 0, 0);\n    transform: translate3d(100%, 0, 0);\n    left: 0;\n  }\n  .carousel-inner > .item.prev,\n  .carousel-inner > .item.active.left {\n    -webkit-transform: translate3d(-100%, 0, 0);\n    transform: translate3d(-100%, 0, 0);\n    left: 0;\n  }\n  .carousel-inner > .item.next.left,\n  .carousel-inner > .item.prev.right,\n  .carousel-inner > .item.active {\n    -webkit-transform: translate3d(0, 0, 0);\n    transform: translate3d(0, 0, 0);\n    left: 0;\n  }\n}\n.carousel-inner > .active,\n.carousel-inner > .next,\n.carousel-inner > .prev {\n  display: block;\n}\n.carousel-inner > .active {\n  left: 0;\n}\n.carousel-inner > .next,\n.carousel-inner > .prev {\n  position: absolute;\n  top: 0;\n  width: 100%;\n}\n.carousel-inner > .next {\n  left: 100%;\n}\n.carousel-inner > .prev {\n  left: -100%;\n}\n.carousel-inner > .next.left,\n.carousel-inner > .prev.right {\n  left: 0;\n}\n.carousel-inner > .active.left {\n  left: -100%;\n}\n.carousel-inner > .active.right {\n  left: 100%;\n}\n.carousel-control {\n  position: absolute;\n  top: 0;\n  left: 0;\n  bottom: 0;\n  width: 15%;\n  opacity: 0.5;\n  filter: alpha(opacity=50);\n  font-size: 20px;\n  color: #fff;\n  text-align: center;\n  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);\n  background-color: rgba(0, 0, 0, 0);\n}\n.carousel-control.left {\n  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);\n  background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);\n  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);\n  background-repeat: repeat-x;\n  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);\n}\n.carousel-control.right {\n  left: auto;\n  right: 0;\n  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);\n  background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);\n  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);\n  background-repeat: repeat-x;\n  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);\n}\n.carousel-control:hover,\n.carousel-control:focus {\n  outline: 0;\n  color: #fff;\n  text-decoration: none;\n  opacity: 0.9;\n  filter: alpha(opacity=90);\n}\n.carousel-control .icon-prev,\n.carousel-control .icon-next,\n.carousel-control .glyphicon-chevron-left,\n.carousel-control .glyphicon-chevron-right {\n  position: absolute;\n  top: 50%;\n  margin-top: -10px;\n  z-index: 5;\n  display: inline-block;\n}\n.carousel-control .icon-prev,\n.carousel-control .glyphicon-chevron-left {\n  left: 50%;\n  margin-left: -10px;\n}\n.carousel-control .icon-next,\n.carousel-control .glyphicon-chevron-right {\n  right: 50%;\n  margin-right: -10px;\n}\n.carousel-control .icon-prev,\n.carousel-control .icon-next {\n  width: 20px;\n  height: 20px;\n  line-height: 1;\n  font-family: serif;\n}\n.carousel-control .icon-prev:before {\n  content: '\\2039';\n}\n.carousel-control .icon-next:before {\n  content: '\\203a';\n}\n.carousel-indicators {\n  position: absolute;\n  bottom: 10px;\n  left: 50%;\n  z-index: 15;\n  width: 60%;\n  margin-left: -30%;\n  padding-left: 0;\n  list-style: none;\n  text-align: center;\n}\n.carousel-indicators li {\n  display: inline-block;\n  width: 10px;\n  height: 10px;\n  margin: 1px;\n  text-indent: -999px;\n  border: 1px solid #fff;\n  border-radius: 10px;\n  cursor: pointer;\n  background-color: #000 \\9;\n  background-color: rgba(0, 0, 0, 0);\n}\n.carousel-indicators .active {\n  margin: 0;\n  width: 12px;\n  height: 12px;\n  background-color: #fff;\n}\n.carousel-caption {\n  position: absolute;\n  left: 15%;\n  right: 15%;\n  bottom: 20px;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: #fff;\n  text-align: center;\n  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);\n}\n.carousel-caption .btn {\n  text-shadow: none;\n}\n@media screen and (min-width: 768px) {\n  .carousel-control .glyphicon-chevron-left,\n  .carousel-control .glyphicon-chevron-right,\n  .carousel-control .icon-prev,\n  .carousel-control .icon-next {\n    width: 30px;\n    height: 30px;\n    margin-top: -10px;\n    font-size: 30px;\n  }\n  .carousel-control .glyphicon-chevron-left,\n  .carousel-control .icon-prev {\n    margin-left: -10px;\n  }\n  .carousel-control .glyphicon-chevron-right,\n  .carousel-control .icon-next {\n    margin-right: -10px;\n  }\n  .carousel-caption {\n    left: 20%;\n    right: 20%;\n    padding-bottom: 30px;\n  }\n  .carousel-indicators {\n    bottom: 20px;\n  }\n}\n.clearfix:before,\n.clearfix:after,\n.dl-horizontal dd:before,\n.dl-horizontal dd:after,\n.container:before,\n.container:after,\n.container-fluid:before,\n.container-fluid:after,\n.row:before,\n.row:after,\n.form-horizontal .form-group:before,\n.form-horizontal .form-group:after,\n.btn-toolbar:before,\n.btn-toolbar:after,\n.btn-group-vertical > .btn-group:before,\n.btn-group-vertical > .btn-group:after,\n.nav:before,\n.nav:after,\n.navbar:before,\n.navbar:after,\n.navbar-header:before,\n.navbar-header:after,\n.navbar-collapse:before,\n.navbar-collapse:after,\n.pager:before,\n.pager:after,\n.panel-body:before,\n.panel-body:after,\n.modal-header:before,\n.modal-header:after,\n.modal-footer:before,\n.modal-footer:after {\n  content: \" \";\n  display: table;\n}\n.clearfix:after,\n.dl-horizontal dd:after,\n.container:after,\n.container-fluid:after,\n.row:after,\n.form-horizontal .form-group:after,\n.btn-toolbar:after,\n.btn-group-vertical > .btn-group:after,\n.nav:after,\n.navbar:after,\n.navbar-header:after,\n.navbar-collapse:after,\n.pager:after,\n.panel-body:after,\n.modal-header:after,\n.modal-footer:after {\n  clear: both;\n}\n.center-block {\n  display: block;\n  margin-left: auto;\n  margin-right: auto;\n}\n.pull-right {\n  float: right !important;\n}\n.pull-left {\n  float: left !important;\n}\n.hide {\n  display: none !important;\n}\n.show {\n  display: block !important;\n}\n.invisible {\n  visibility: hidden;\n}\n.text-hide {\n  font: 0/0 a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n.hidden {\n  display: none !important;\n}\n.affix {\n  position: fixed;\n}\n@-ms-viewport {\n  width: device-width;\n}\n.visible-xs,\n.visible-sm,\n.visible-md,\n.visible-lg {\n  display: none !important;\n}\n.visible-xs-block,\n.visible-xs-inline,\n.visible-xs-inline-block,\n.visible-sm-block,\n.visible-sm-inline,\n.visible-sm-inline-block,\n.visible-md-block,\n.visible-md-inline,\n.visible-md-inline-block,\n.visible-lg-block,\n.visible-lg-inline,\n.visible-lg-inline-block {\n  display: none !important;\n}\n@media (max-width: 767px) {\n  .visible-xs {\n    display: block !important;\n  }\n  table.visible-xs {\n    display: table !important;\n  }\n  tr.visible-xs {\n    display: table-row !important;\n  }\n  th.visible-xs,\n  td.visible-xs {\n    display: table-cell !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-block {\n    display: block !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-inline {\n    display: inline !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm {\n    display: block !important;\n  }\n  table.visible-sm {\n    display: table !important;\n  }\n  tr.visible-sm {\n    display: table-row !important;\n  }\n  th.visible-sm,\n  td.visible-sm {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-block {\n    display: block !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md {\n    display: block !important;\n  }\n  table.visible-md {\n    display: table !important;\n  }\n  tr.visible-md {\n    display: table-row !important;\n  }\n  th.visible-md,\n  td.visible-md {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-block {\n    display: block !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg {\n    display: block !important;\n  }\n  table.visible-lg {\n    display: table !important;\n  }\n  tr.visible-lg {\n    display: table-row !important;\n  }\n  th.visible-lg,\n  td.visible-lg {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-block {\n    display: block !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (max-width: 767px) {\n  .hidden-xs {\n    display: none !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .hidden-sm {\n    display: none !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .hidden-md {\n    display: none !important;\n  }\n}\n@media (min-width: 1200px) {\n  .hidden-lg {\n    display: none !important;\n  }\n}\n.visible-print {\n  display: none !important;\n}\n@media print {\n  .visible-print {\n    display: block !important;\n  }\n  table.visible-print {\n    display: table !important;\n  }\n  tr.visible-print {\n    display: table-row !important;\n  }\n  th.visible-print,\n  td.visible-print {\n    display: table-cell !important;\n  }\n}\n.visible-print-block {\n  display: none !important;\n}\n@media print {\n  .visible-print-block {\n    display: block !important;\n  }\n}\n.visible-print-inline {\n  display: none !important;\n}\n@media print {\n  .visible-print-inline {\n    display: inline !important;\n  }\n}\n.visible-print-inline-block {\n  display: none !important;\n}\n@media print {\n  .visible-print-inline-block {\n    display: inline-block !important;\n  }\n}\n@media print {\n  .hidden-print {\n    display: none !important;\n  }\n}\n/*# sourceMappingURL=bootstrap.css.map */","/*!\n * Bootstrap v3.3.7 (http://getbootstrap.com)\n * Copyright 2011-2016 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\nhtml {\n  font-family: sans-serif;\n  -webkit-text-size-adjust: 100%;\n      -ms-text-size-adjust: 100%;\n}\nbody {\n  margin: 0;\n}\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block;\n}\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  vertical-align: baseline;\n}\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n[hidden],\ntemplate {\n  display: none;\n}\na {\n  background-color: transparent;\n}\na:active,\na:hover {\n  outline: 0;\n}\nabbr[title] {\n  border-bottom: 1px dotted;\n}\nb,\nstrong {\n  font-weight: bold;\n}\ndfn {\n  font-style: italic;\n}\nh1 {\n  margin: .67em 0;\n  font-size: 2em;\n}\nmark {\n  color: #000;\n  background: #ff0;\n}\nsmall {\n  font-size: 80%;\n}\nsub,\nsup {\n  position: relative;\n  font-size: 75%;\n  line-height: 0;\n  vertical-align: baseline;\n}\nsup {\n  top: -.5em;\n}\nsub {\n  bottom: -.25em;\n}\nimg {\n  border: 0;\n}\nsvg:not(:root) {\n  overflow: hidden;\n}\nfigure {\n  margin: 1em 40px;\n}\nhr {\n  height: 0;\n  -webkit-box-sizing: content-box;\n     -moz-box-sizing: content-box;\n          box-sizing: content-box;\n}\npre {\n  overflow: auto;\n}\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  margin: 0;\n  font: inherit;\n  color: inherit;\n}\nbutton {\n  overflow: visible;\n}\nbutton,\nselect {\n  text-transform: none;\n}\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  cursor: pointer;\n}\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default;\n}\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  padding: 0;\n  border: 0;\n}\ninput {\n  line-height: normal;\n}\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n  padding: 0;\n}\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\ninput[type=\"search\"] {\n  -webkit-box-sizing: content-box;\n     -moz-box-sizing: content-box;\n          box-sizing: content-box;\n  -webkit-appearance: textfield;\n}\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\nfieldset {\n  padding: .35em .625em .75em;\n  margin: 0 2px;\n  border: 1px solid #c0c0c0;\n}\nlegend {\n  padding: 0;\n  border: 0;\n}\ntextarea {\n  overflow: auto;\n}\noptgroup {\n  font-weight: bold;\n}\ntable {\n  border-spacing: 0;\n  border-collapse: collapse;\n}\ntd,\nth {\n  padding: 0;\n}\n/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */\n@media print {\n  *,\n  *:before,\n  *:after {\n    color: #000 !important;\n    text-shadow: none !important;\n    background: transparent !important;\n    -webkit-box-shadow: none !important;\n            box-shadow: none !important;\n  }\n  a,\n  a:visited {\n    text-decoration: underline;\n  }\n  a[href]:after {\n    content: \" (\" attr(href) \")\";\n  }\n  abbr[title]:after {\n    content: \" (\" attr(title) \")\";\n  }\n  a[href^=\"#\"]:after,\n  a[href^=\"javascript:\"]:after {\n    content: \"\";\n  }\n  pre,\n  blockquote {\n    border: 1px solid #999;\n\n    page-break-inside: avoid;\n  }\n  thead {\n    display: table-header-group;\n  }\n  tr,\n  img {\n    page-break-inside: avoid;\n  }\n  img {\n    max-width: 100% !important;\n  }\n  p,\n  h2,\n  h3 {\n    orphans: 3;\n    widows: 3;\n  }\n  h2,\n  h3 {\n    page-break-after: avoid;\n  }\n  .navbar {\n    display: none;\n  }\n  .btn > .caret,\n  .dropup > .btn > .caret {\n    border-top-color: #000 !important;\n  }\n  .label {\n    border: 1px solid #000;\n  }\n  .table {\n    border-collapse: collapse !important;\n  }\n  .table td,\n  .table th {\n    background-color: #fff !important;\n  }\n  .table-bordered th,\n  .table-bordered td {\n    border: 1px solid #ddd !important;\n  }\n}\n@font-face {\n  font-family: 'Glyphicons Halflings';\n\n  src: url('../fonts/glyphicons-halflings-regular.eot');\n  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');\n}\n.glyphicon {\n  position: relative;\n  top: 1px;\n  display: inline-block;\n  font-family: 'Glyphicons Halflings';\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1;\n\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n.glyphicon-asterisk:before {\n  content: \"\\002a\";\n}\n.glyphicon-plus:before {\n  content: \"\\002b\";\n}\n.glyphicon-euro:before,\n.glyphicon-eur:before {\n  content: \"\\20ac\";\n}\n.glyphicon-minus:before {\n  content: \"\\2212\";\n}\n.glyphicon-cloud:before {\n  content: \"\\2601\";\n}\n.glyphicon-envelope:before {\n  content: \"\\2709\";\n}\n.glyphicon-pencil:before {\n  content: \"\\270f\";\n}\n.glyphicon-glass:before {\n  content: \"\\e001\";\n}\n.glyphicon-music:before {\n  content: \"\\e002\";\n}\n.glyphicon-search:before {\n  content: \"\\e003\";\n}\n.glyphicon-heart:before {\n  content: \"\\e005\";\n}\n.glyphicon-star:before {\n  content: \"\\e006\";\n}\n.glyphicon-star-empty:before {\n  content: \"\\e007\";\n}\n.glyphicon-user:before {\n  content: \"\\e008\";\n}\n.glyphicon-film:before {\n  content: \"\\e009\";\n}\n.glyphicon-th-large:before {\n  content: \"\\e010\";\n}\n.glyphicon-th:before {\n  content: \"\\e011\";\n}\n.glyphicon-th-list:before {\n  content: \"\\e012\";\n}\n.glyphicon-ok:before {\n  content: \"\\e013\";\n}\n.glyphicon-remove:before {\n  content: \"\\e014\";\n}\n.glyphicon-zoom-in:before {\n  content: \"\\e015\";\n}\n.glyphicon-zoom-out:before {\n  content: \"\\e016\";\n}\n.glyphicon-off:before {\n  content: \"\\e017\";\n}\n.glyphicon-signal:before {\n  content: \"\\e018\";\n}\n.glyphicon-cog:before {\n  content: \"\\e019\";\n}\n.glyphicon-trash:before {\n  content: \"\\e020\";\n}\n.glyphicon-home:before {\n  content: \"\\e021\";\n}\n.glyphicon-file:before {\n  content: \"\\e022\";\n}\n.glyphicon-time:before {\n  content: \"\\e023\";\n}\n.glyphicon-road:before {\n  content: \"\\e024\";\n}\n.glyphicon-download-alt:before {\n  content: \"\\e025\";\n}\n.glyphicon-download:before {\n  content: \"\\e026\";\n}\n.glyphicon-upload:before {\n  content: \"\\e027\";\n}\n.glyphicon-inbox:before {\n  content: \"\\e028\";\n}\n.glyphicon-play-circle:before {\n  content: \"\\e029\";\n}\n.glyphicon-repeat:before {\n  content: \"\\e030\";\n}\n.glyphicon-refresh:before {\n  content: \"\\e031\";\n}\n.glyphicon-list-alt:before {\n  content: \"\\e032\";\n}\n.glyphicon-lock:before {\n  content: \"\\e033\";\n}\n.glyphicon-flag:before {\n  content: \"\\e034\";\n}\n.glyphicon-headphones:before {\n  content: \"\\e035\";\n}\n.glyphicon-volume-off:before {\n  content: \"\\e036\";\n}\n.glyphicon-volume-down:before {\n  content: \"\\e037\";\n}\n.glyphicon-volume-up:before {\n  content: \"\\e038\";\n}\n.glyphicon-qrcode:before {\n  content: \"\\e039\";\n}\n.glyphicon-barcode:before {\n  content: \"\\e040\";\n}\n.glyphicon-tag:before {\n  content: \"\\e041\";\n}\n.glyphicon-tags:before {\n  content: \"\\e042\";\n}\n.glyphicon-book:before {\n  content: \"\\e043\";\n}\n.glyphicon-bookmark:before {\n  content: \"\\e044\";\n}\n.glyphicon-print:before {\n  content: \"\\e045\";\n}\n.glyphicon-camera:before {\n  content: \"\\e046\";\n}\n.glyphicon-font:before {\n  content: \"\\e047\";\n}\n.glyphicon-bold:before {\n  content: \"\\e048\";\n}\n.glyphicon-italic:before {\n  content: \"\\e049\";\n}\n.glyphicon-text-height:before {\n  content: \"\\e050\";\n}\n.glyphicon-text-width:before {\n  content: \"\\e051\";\n}\n.glyphicon-align-left:before {\n  content: \"\\e052\";\n}\n.glyphicon-align-center:before {\n  content: \"\\e053\";\n}\n.glyphicon-align-right:before {\n  content: \"\\e054\";\n}\n.glyphicon-align-justify:before {\n  content: \"\\e055\";\n}\n.glyphicon-list:before {\n  content: \"\\e056\";\n}\n.glyphicon-indent-left:before {\n  content: \"\\e057\";\n}\n.glyphicon-indent-right:before {\n  content: \"\\e058\";\n}\n.glyphicon-facetime-video:before {\n  content: \"\\e059\";\n}\n.glyphicon-picture:before {\n  content: \"\\e060\";\n}\n.glyphicon-map-marker:before {\n  content: \"\\e062\";\n}\n.glyphicon-adjust:before {\n  content: \"\\e063\";\n}\n.glyphicon-tint:before {\n  content: \"\\e064\";\n}\n.glyphicon-edit:before {\n  content: \"\\e065\";\n}\n.glyphicon-share:before {\n  content: \"\\e066\";\n}\n.glyphicon-check:before {\n  content: \"\\e067\";\n}\n.glyphicon-move:before {\n  content: \"\\e068\";\n}\n.glyphicon-step-backward:before {\n  content: \"\\e069\";\n}\n.glyphicon-fast-backward:before {\n  content: \"\\e070\";\n}\n.glyphicon-backward:before {\n  content: \"\\e071\";\n}\n.glyphicon-play:before {\n  content: \"\\e072\";\n}\n.glyphicon-pause:before {\n  content: \"\\e073\";\n}\n.glyphicon-stop:before {\n  content: \"\\e074\";\n}\n.glyphicon-forward:before {\n  content: \"\\e075\";\n}\n.glyphicon-fast-forward:before {\n  content: \"\\e076\";\n}\n.glyphicon-step-forward:before {\n  content: \"\\e077\";\n}\n.glyphicon-eject:before {\n  content: \"\\e078\";\n}\n.glyphicon-chevron-left:before {\n  content: \"\\e079\";\n}\n.glyphicon-chevron-right:before {\n  content: \"\\e080\";\n}\n.glyphicon-plus-sign:before {\n  content: \"\\e081\";\n}\n.glyphicon-minus-sign:before {\n  content: \"\\e082\";\n}\n.glyphicon-remove-sign:before {\n  content: \"\\e083\";\n}\n.glyphicon-ok-sign:before {\n  content: \"\\e084\";\n}\n.glyphicon-question-sign:before {\n  content: \"\\e085\";\n}\n.glyphicon-info-sign:before {\n  content: \"\\e086\";\n}\n.glyphicon-screenshot:before {\n  content: \"\\e087\";\n}\n.glyphicon-remove-circle:before {\n  content: \"\\e088\";\n}\n.glyphicon-ok-circle:before {\n  content: \"\\e089\";\n}\n.glyphicon-ban-circle:before {\n  content: \"\\e090\";\n}\n.glyphicon-arrow-left:before {\n  content: \"\\e091\";\n}\n.glyphicon-arrow-right:before {\n  content: \"\\e092\";\n}\n.glyphicon-arrow-up:before {\n  content: \"\\e093\";\n}\n.glyphicon-arrow-down:before {\n  content: \"\\e094\";\n}\n.glyphicon-share-alt:before {\n  content: \"\\e095\";\n}\n.glyphicon-resize-full:before {\n  content: \"\\e096\";\n}\n.glyphicon-resize-small:before {\n  content: \"\\e097\";\n}\n.glyphicon-exclamation-sign:before {\n  content: \"\\e101\";\n}\n.glyphicon-gift:before {\n  content: \"\\e102\";\n}\n.glyphicon-leaf:before {\n  content: \"\\e103\";\n}\n.glyphicon-fire:before {\n  content: \"\\e104\";\n}\n.glyphicon-eye-open:before {\n  content: \"\\e105\";\n}\n.glyphicon-eye-close:before {\n  content: \"\\e106\";\n}\n.glyphicon-warning-sign:before {\n  content: \"\\e107\";\n}\n.glyphicon-plane:before {\n  content: \"\\e108\";\n}\n.glyphicon-calendar:before {\n  content: \"\\e109\";\n}\n.glyphicon-random:before {\n  content: \"\\e110\";\n}\n.glyphicon-comment:before {\n  content: \"\\e111\";\n}\n.glyphicon-magnet:before {\n  content: \"\\e112\";\n}\n.glyphicon-chevron-up:before {\n  content: \"\\e113\";\n}\n.glyphicon-chevron-down:before {\n  content: \"\\e114\";\n}\n.glyphicon-retweet:before {\n  content: \"\\e115\";\n}\n.glyphicon-shopping-cart:before {\n  content: \"\\e116\";\n}\n.glyphicon-folder-close:before {\n  content: \"\\e117\";\n}\n.glyphicon-folder-open:before {\n  content: \"\\e118\";\n}\n.glyphicon-resize-vertical:before {\n  content: \"\\e119\";\n}\n.glyphicon-resize-horizontal:before {\n  content: \"\\e120\";\n}\n.glyphicon-hdd:before {\n  content: \"\\e121\";\n}\n.glyphicon-bullhorn:before {\n  content: \"\\e122\";\n}\n.glyphicon-bell:before {\n  content: \"\\e123\";\n}\n.glyphicon-certificate:before {\n  content: \"\\e124\";\n}\n.glyphicon-thumbs-up:before {\n  content: \"\\e125\";\n}\n.glyphicon-thumbs-down:before {\n  content: \"\\e126\";\n}\n.glyphicon-hand-right:before {\n  content: \"\\e127\";\n}\n.glyphicon-hand-left:before {\n  content: \"\\e128\";\n}\n.glyphicon-hand-up:before {\n  content: \"\\e129\";\n}\n.glyphicon-hand-down:before {\n  content: \"\\e130\";\n}\n.glyphicon-circle-arrow-right:before {\n  content: \"\\e131\";\n}\n.glyphicon-circle-arrow-left:before {\n  content: \"\\e132\";\n}\n.glyphicon-circle-arrow-up:before {\n  content: \"\\e133\";\n}\n.glyphicon-circle-arrow-down:before {\n  content: \"\\e134\";\n}\n.glyphicon-globe:before {\n  content: \"\\e135\";\n}\n.glyphicon-wrench:before {\n  content: \"\\e136\";\n}\n.glyphicon-tasks:before {\n  content: \"\\e137\";\n}\n.glyphicon-filter:before {\n  content: \"\\e138\";\n}\n.glyphicon-briefcase:before {\n  content: \"\\e139\";\n}\n.glyphicon-fullscreen:before {\n  content: \"\\e140\";\n}\n.glyphicon-dashboard:before {\n  content: \"\\e141\";\n}\n.glyphicon-paperclip:before {\n  content: \"\\e142\";\n}\n.glyphicon-heart-empty:before {\n  content: \"\\e143\";\n}\n.glyphicon-link:before {\n  content: \"\\e144\";\n}\n.glyphicon-phone:before {\n  content: \"\\e145\";\n}\n.glyphicon-pushpin:before {\n  content: \"\\e146\";\n}\n.glyphicon-usd:before {\n  content: \"\\e148\";\n}\n.glyphicon-gbp:before {\n  content: \"\\e149\";\n}\n.glyphicon-sort:before {\n  content: \"\\e150\";\n}\n.glyphicon-sort-by-alphabet:before {\n  content: \"\\e151\";\n}\n.glyphicon-sort-by-alphabet-alt:before {\n  content: \"\\e152\";\n}\n.glyphicon-sort-by-order:before {\n  content: \"\\e153\";\n}\n.glyphicon-sort-by-order-alt:before {\n  content: \"\\e154\";\n}\n.glyphicon-sort-by-attributes:before {\n  content: \"\\e155\";\n}\n.glyphicon-sort-by-attributes-alt:before {\n  content: \"\\e156\";\n}\n.glyphicon-unchecked:before {\n  content: \"\\e157\";\n}\n.glyphicon-expand:before {\n  content: \"\\e158\";\n}\n.glyphicon-collapse-down:before {\n  content: \"\\e159\";\n}\n.glyphicon-collapse-up:before {\n  content: \"\\e160\";\n}\n.glyphicon-log-in:before {\n  content: \"\\e161\";\n}\n.glyphicon-flash:before {\n  content: \"\\e162\";\n}\n.glyphicon-log-out:before {\n  content: \"\\e163\";\n}\n.glyphicon-new-window:before {\n  content: \"\\e164\";\n}\n.glyphicon-record:before {\n  content: \"\\e165\";\n}\n.glyphicon-save:before {\n  content: \"\\e166\";\n}\n.glyphicon-open:before {\n  content: \"\\e167\";\n}\n.glyphicon-saved:before {\n  content: \"\\e168\";\n}\n.glyphicon-import:before {\n  content: \"\\e169\";\n}\n.glyphicon-export:before {\n  content: \"\\e170\";\n}\n.glyphicon-send:before {\n  content: \"\\e171\";\n}\n.glyphicon-floppy-disk:before {\n  content: \"\\e172\";\n}\n.glyphicon-floppy-saved:before {\n  content: \"\\e173\";\n}\n.glyphicon-floppy-remove:before {\n  content: \"\\e174\";\n}\n.glyphicon-floppy-save:before {\n  content: \"\\e175\";\n}\n.glyphicon-floppy-open:before {\n  content: \"\\e176\";\n}\n.glyphicon-credit-card:before {\n  content: \"\\e177\";\n}\n.glyphicon-transfer:before {\n  content: \"\\e178\";\n}\n.glyphicon-cutlery:before {\n  content: \"\\e179\";\n}\n.glyphicon-header:before {\n  content: \"\\e180\";\n}\n.glyphicon-compressed:before {\n  content: \"\\e181\";\n}\n.glyphicon-earphone:before {\n  content: \"\\e182\";\n}\n.glyphicon-phone-alt:before {\n  content: \"\\e183\";\n}\n.glyphicon-tower:before {\n  content: \"\\e184\";\n}\n.glyphicon-stats:before {\n  content: \"\\e185\";\n}\n.glyphicon-sd-video:before {\n  content: \"\\e186\";\n}\n.glyphicon-hd-video:before {\n  content: \"\\e187\";\n}\n.glyphicon-subtitles:before {\n  content: \"\\e188\";\n}\n.glyphicon-sound-stereo:before {\n  content: \"\\e189\";\n}\n.glyphicon-sound-dolby:before {\n  content: \"\\e190\";\n}\n.glyphicon-sound-5-1:before {\n  content: \"\\e191\";\n}\n.glyphicon-sound-6-1:before {\n  content: \"\\e192\";\n}\n.glyphicon-sound-7-1:before {\n  content: \"\\e193\";\n}\n.glyphicon-copyright-mark:before {\n  content: \"\\e194\";\n}\n.glyphicon-registration-mark:before {\n  content: \"\\e195\";\n}\n.glyphicon-cloud-download:before {\n  content: \"\\e197\";\n}\n.glyphicon-cloud-upload:before {\n  content: \"\\e198\";\n}\n.glyphicon-tree-conifer:before {\n  content: \"\\e199\";\n}\n.glyphicon-tree-deciduous:before {\n  content: \"\\e200\";\n}\n.glyphicon-cd:before {\n  content: \"\\e201\";\n}\n.glyphicon-save-file:before {\n  content: \"\\e202\";\n}\n.glyphicon-open-file:before {\n  content: \"\\e203\";\n}\n.glyphicon-level-up:before {\n  content: \"\\e204\";\n}\n.glyphicon-copy:before {\n  content: \"\\e205\";\n}\n.glyphicon-paste:before {\n  content: \"\\e206\";\n}\n.glyphicon-alert:before {\n  content: \"\\e209\";\n}\n.glyphicon-equalizer:before {\n  content: \"\\e210\";\n}\n.glyphicon-king:before {\n  content: \"\\e211\";\n}\n.glyphicon-queen:before {\n  content: \"\\e212\";\n}\n.glyphicon-pawn:before {\n  content: \"\\e213\";\n}\n.glyphicon-bishop:before {\n  content: \"\\e214\";\n}\n.glyphicon-knight:before {\n  content: \"\\e215\";\n}\n.glyphicon-baby-formula:before {\n  content: \"\\e216\";\n}\n.glyphicon-tent:before {\n  content: \"\\26fa\";\n}\n.glyphicon-blackboard:before {\n  content: \"\\e218\";\n}\n.glyphicon-bed:before {\n  content: \"\\e219\";\n}\n.glyphicon-apple:before {\n  content: \"\\f8ff\";\n}\n.glyphicon-erase:before {\n  content: \"\\e221\";\n}\n.glyphicon-hourglass:before {\n  content: \"\\231b\";\n}\n.glyphicon-lamp:before {\n  content: \"\\e223\";\n}\n.glyphicon-duplicate:before {\n  content: \"\\e224\";\n}\n.glyphicon-piggy-bank:before {\n  content: \"\\e225\";\n}\n.glyphicon-scissors:before {\n  content: \"\\e226\";\n}\n.glyphicon-bitcoin:before {\n  content: \"\\e227\";\n}\n.glyphicon-btc:before {\n  content: \"\\e227\";\n}\n.glyphicon-xbt:before {\n  content: \"\\e227\";\n}\n.glyphicon-yen:before {\n  content: \"\\00a5\";\n}\n.glyphicon-jpy:before {\n  content: \"\\00a5\";\n}\n.glyphicon-ruble:before {\n  content: \"\\20bd\";\n}\n.glyphicon-rub:before {\n  content: \"\\20bd\";\n}\n.glyphicon-scale:before {\n  content: \"\\e230\";\n}\n.glyphicon-ice-lolly:before {\n  content: \"\\e231\";\n}\n.glyphicon-ice-lolly-tasted:before {\n  content: \"\\e232\";\n}\n.glyphicon-education:before {\n  content: \"\\e233\";\n}\n.glyphicon-option-horizontal:before {\n  content: \"\\e234\";\n}\n.glyphicon-option-vertical:before {\n  content: \"\\e235\";\n}\n.glyphicon-menu-hamburger:before {\n  content: \"\\e236\";\n}\n.glyphicon-modal-window:before {\n  content: \"\\e237\";\n}\n.glyphicon-oil:before {\n  content: \"\\e238\";\n}\n.glyphicon-grain:before {\n  content: \"\\e239\";\n}\n.glyphicon-sunglasses:before {\n  content: \"\\e240\";\n}\n.glyphicon-text-size:before {\n  content: \"\\e241\";\n}\n.glyphicon-text-color:before {\n  content: \"\\e242\";\n}\n.glyphicon-text-background:before {\n  content: \"\\e243\";\n}\n.glyphicon-object-align-top:before {\n  content: \"\\e244\";\n}\n.glyphicon-object-align-bottom:before {\n  content: \"\\e245\";\n}\n.glyphicon-object-align-horizontal:before {\n  content: \"\\e246\";\n}\n.glyphicon-object-align-left:before {\n  content: \"\\e247\";\n}\n.glyphicon-object-align-vertical:before {\n  content: \"\\e248\";\n}\n.glyphicon-object-align-right:before {\n  content: \"\\e249\";\n}\n.glyphicon-triangle-right:before {\n  content: \"\\e250\";\n}\n.glyphicon-triangle-left:before {\n  content: \"\\e251\";\n}\n.glyphicon-triangle-bottom:before {\n  content: \"\\e252\";\n}\n.glyphicon-triangle-top:before {\n  content: \"\\e253\";\n}\n.glyphicon-console:before {\n  content: \"\\e254\";\n}\n.glyphicon-superscript:before {\n  content: \"\\e255\";\n}\n.glyphicon-subscript:before {\n  content: \"\\e256\";\n}\n.glyphicon-menu-left:before {\n  content: \"\\e257\";\n}\n.glyphicon-menu-right:before {\n  content: \"\\e258\";\n}\n.glyphicon-menu-down:before {\n  content: \"\\e259\";\n}\n.glyphicon-menu-up:before {\n  content: \"\\e260\";\n}\n* {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n}\n*:before,\n*:after {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n}\nhtml {\n  font-size: 10px;\n\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\nbody {\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #333;\n  background-color: #fff;\n}\ninput,\nbutton,\nselect,\ntextarea {\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\na {\n  color: #337ab7;\n  text-decoration: none;\n}\na:hover,\na:focus {\n  color: #23527c;\n  text-decoration: underline;\n}\na:focus {\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\nfigure {\n  margin: 0;\n}\nimg {\n  vertical-align: middle;\n}\n.img-responsive,\n.thumbnail > img,\n.thumbnail a > img,\n.carousel-inner > .item > img,\n.carousel-inner > .item > a > img {\n  display: block;\n  max-width: 100%;\n  height: auto;\n}\n.img-rounded {\n  border-radius: 6px;\n}\n.img-thumbnail {\n  display: inline-block;\n  max-width: 100%;\n  height: auto;\n  padding: 4px;\n  line-height: 1.42857143;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 4px;\n  -webkit-transition: all .2s ease-in-out;\n       -o-transition: all .2s ease-in-out;\n          transition: all .2s ease-in-out;\n}\n.img-circle {\n  border-radius: 50%;\n}\nhr {\n  margin-top: 20px;\n  margin-bottom: 20px;\n  border: 0;\n  border-top: 1px solid #eee;\n}\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  padding: 0;\n  margin: -1px;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  border: 0;\n}\n.sr-only-focusable:active,\n.sr-only-focusable:focus {\n  position: static;\n  width: auto;\n  height: auto;\n  margin: 0;\n  overflow: visible;\n  clip: auto;\n}\n[role=\"button\"] {\n  cursor: pointer;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\n.h1,\n.h2,\n.h3,\n.h4,\n.h5,\n.h6 {\n  font-family: inherit;\n  font-weight: 500;\n  line-height: 1.1;\n  color: inherit;\n}\nh1 small,\nh2 small,\nh3 small,\nh4 small,\nh5 small,\nh6 small,\n.h1 small,\n.h2 small,\n.h3 small,\n.h4 small,\n.h5 small,\n.h6 small,\nh1 .small,\nh2 .small,\nh3 .small,\nh4 .small,\nh5 .small,\nh6 .small,\n.h1 .small,\n.h2 .small,\n.h3 .small,\n.h4 .small,\n.h5 .small,\n.h6 .small {\n  font-weight: normal;\n  line-height: 1;\n  color: #777;\n}\nh1,\n.h1,\nh2,\n.h2,\nh3,\n.h3 {\n  margin-top: 20px;\n  margin-bottom: 10px;\n}\nh1 small,\n.h1 small,\nh2 small,\n.h2 small,\nh3 small,\n.h3 small,\nh1 .small,\n.h1 .small,\nh2 .small,\n.h2 .small,\nh3 .small,\n.h3 .small {\n  font-size: 65%;\n}\nh4,\n.h4,\nh5,\n.h5,\nh6,\n.h6 {\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\nh4 small,\n.h4 small,\nh5 small,\n.h5 small,\nh6 small,\n.h6 small,\nh4 .small,\n.h4 .small,\nh5 .small,\n.h5 .small,\nh6 .small,\n.h6 .small {\n  font-size: 75%;\n}\nh1,\n.h1 {\n  font-size: 36px;\n}\nh2,\n.h2 {\n  font-size: 30px;\n}\nh3,\n.h3 {\n  font-size: 24px;\n}\nh4,\n.h4 {\n  font-size: 18px;\n}\nh5,\n.h5 {\n  font-size: 14px;\n}\nh6,\n.h6 {\n  font-size: 12px;\n}\np {\n  margin: 0 0 10px;\n}\n.lead {\n  margin-bottom: 20px;\n  font-size: 16px;\n  font-weight: 300;\n  line-height: 1.4;\n}\n@media (min-width: 768px) {\n  .lead {\n    font-size: 21px;\n  }\n}\nsmall,\n.small {\n  font-size: 85%;\n}\nmark,\n.mark {\n  padding: .2em;\n  background-color: #fcf8e3;\n}\n.text-left {\n  text-align: left;\n}\n.text-right {\n  text-align: right;\n}\n.text-center {\n  text-align: center;\n}\n.text-justify {\n  text-align: justify;\n}\n.text-nowrap {\n  white-space: nowrap;\n}\n.text-lowercase {\n  text-transform: lowercase;\n}\n.text-uppercase {\n  text-transform: uppercase;\n}\n.text-capitalize {\n  text-transform: capitalize;\n}\n.text-muted {\n  color: #777;\n}\n.text-primary {\n  color: #337ab7;\n}\na.text-primary:hover,\na.text-primary:focus {\n  color: #286090;\n}\n.text-success {\n  color: #3c763d;\n}\na.text-success:hover,\na.text-success:focus {\n  color: #2b542c;\n}\n.text-info {\n  color: #31708f;\n}\na.text-info:hover,\na.text-info:focus {\n  color: #245269;\n}\n.text-warning {\n  color: #8a6d3b;\n}\na.text-warning:hover,\na.text-warning:focus {\n  color: #66512c;\n}\n.text-danger {\n  color: #a94442;\n}\na.text-danger:hover,\na.text-danger:focus {\n  color: #843534;\n}\n.bg-primary {\n  color: #fff;\n  background-color: #337ab7;\n}\na.bg-primary:hover,\na.bg-primary:focus {\n  background-color: #286090;\n}\n.bg-success {\n  background-color: #dff0d8;\n}\na.bg-success:hover,\na.bg-success:focus {\n  background-color: #c1e2b3;\n}\n.bg-info {\n  background-color: #d9edf7;\n}\na.bg-info:hover,\na.bg-info:focus {\n  background-color: #afd9ee;\n}\n.bg-warning {\n  background-color: #fcf8e3;\n}\na.bg-warning:hover,\na.bg-warning:focus {\n  background-color: #f7ecb5;\n}\n.bg-danger {\n  background-color: #f2dede;\n}\na.bg-danger:hover,\na.bg-danger:focus {\n  background-color: #e4b9b9;\n}\n.page-header {\n  padding-bottom: 9px;\n  margin: 40px 0 20px;\n  border-bottom: 1px solid #eee;\n}\nul,\nol {\n  margin-top: 0;\n  margin-bottom: 10px;\n}\nul ul,\nol ul,\nul ol,\nol ol {\n  margin-bottom: 0;\n}\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n.list-inline {\n  padding-left: 0;\n  margin-left: -5px;\n  list-style: none;\n}\n.list-inline > li {\n  display: inline-block;\n  padding-right: 5px;\n  padding-left: 5px;\n}\ndl {\n  margin-top: 0;\n  margin-bottom: 20px;\n}\ndt,\ndd {\n  line-height: 1.42857143;\n}\ndt {\n  font-weight: bold;\n}\ndd {\n  margin-left: 0;\n}\n@media (min-width: 768px) {\n  .dl-horizontal dt {\n    float: left;\n    width: 160px;\n    overflow: hidden;\n    clear: left;\n    text-align: right;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .dl-horizontal dd {\n    margin-left: 180px;\n  }\n}\nabbr[title],\nabbr[data-original-title] {\n  cursor: help;\n  border-bottom: 1px dotted #777;\n}\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\nblockquote {\n  padding: 10px 20px;\n  margin: 0 0 20px;\n  font-size: 17.5px;\n  border-left: 5px solid #eee;\n}\nblockquote p:last-child,\nblockquote ul:last-child,\nblockquote ol:last-child {\n  margin-bottom: 0;\n}\nblockquote footer,\nblockquote small,\nblockquote .small {\n  display: block;\n  font-size: 80%;\n  line-height: 1.42857143;\n  color: #777;\n}\nblockquote footer:before,\nblockquote small:before,\nblockquote .small:before {\n  content: '\\2014 \\00A0';\n}\n.blockquote-reverse,\nblockquote.pull-right {\n  padding-right: 15px;\n  padding-left: 0;\n  text-align: right;\n  border-right: 5px solid #eee;\n  border-left: 0;\n}\n.blockquote-reverse footer:before,\nblockquote.pull-right footer:before,\n.blockquote-reverse small:before,\nblockquote.pull-right small:before,\n.blockquote-reverse .small:before,\nblockquote.pull-right .small:before {\n  content: '';\n}\n.blockquote-reverse footer:after,\nblockquote.pull-right footer:after,\n.blockquote-reverse small:after,\nblockquote.pull-right small:after,\n.blockquote-reverse .small:after,\nblockquote.pull-right .small:after {\n  content: '\\00A0 \\2014';\n}\naddress {\n  margin-bottom: 20px;\n  font-style: normal;\n  line-height: 1.42857143;\n}\ncode,\nkbd,\npre,\nsamp {\n  font-family: Menlo, Monaco, Consolas, \"Courier New\", monospace;\n}\ncode {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: #c7254e;\n  background-color: #f9f2f4;\n  border-radius: 4px;\n}\nkbd {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: #fff;\n  background-color: #333;\n  border-radius: 3px;\n  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);\n          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);\n}\nkbd kbd {\n  padding: 0;\n  font-size: 100%;\n  font-weight: bold;\n  -webkit-box-shadow: none;\n          box-shadow: none;\n}\npre {\n  display: block;\n  padding: 9.5px;\n  margin: 0 0 10px;\n  font-size: 13px;\n  line-height: 1.42857143;\n  color: #333;\n  word-break: break-all;\n  word-wrap: break-word;\n  background-color: #f5f5f5;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n}\npre code {\n  padding: 0;\n  font-size: inherit;\n  color: inherit;\n  white-space: pre-wrap;\n  background-color: transparent;\n  border-radius: 0;\n}\n.pre-scrollable {\n  max-height: 340px;\n  overflow-y: scroll;\n}\n.container {\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n@media (min-width: 768px) {\n  .container {\n    width: 750px;\n  }\n}\n@media (min-width: 992px) {\n  .container {\n    width: 970px;\n  }\n}\n@media (min-width: 1200px) {\n  .container {\n    width: 1170px;\n  }\n}\n.container-fluid {\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n.row {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {\n  position: relative;\n  min-height: 1px;\n  padding-right: 15px;\n  padding-left: 15px;\n}\n.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {\n  float: left;\n}\n.col-xs-12 {\n  width: 100%;\n}\n.col-xs-11 {\n  width: 91.66666667%;\n}\n.col-xs-10 {\n  width: 83.33333333%;\n}\n.col-xs-9 {\n  width: 75%;\n}\n.col-xs-8 {\n  width: 66.66666667%;\n}\n.col-xs-7 {\n  width: 58.33333333%;\n}\n.col-xs-6 {\n  width: 50%;\n}\n.col-xs-5 {\n  width: 41.66666667%;\n}\n.col-xs-4 {\n  width: 33.33333333%;\n}\n.col-xs-3 {\n  width: 25%;\n}\n.col-xs-2 {\n  width: 16.66666667%;\n}\n.col-xs-1 {\n  width: 8.33333333%;\n}\n.col-xs-pull-12 {\n  right: 100%;\n}\n.col-xs-pull-11 {\n  right: 91.66666667%;\n}\n.col-xs-pull-10 {\n  right: 83.33333333%;\n}\n.col-xs-pull-9 {\n  right: 75%;\n}\n.col-xs-pull-8 {\n  right: 66.66666667%;\n}\n.col-xs-pull-7 {\n  right: 58.33333333%;\n}\n.col-xs-pull-6 {\n  right: 50%;\n}\n.col-xs-pull-5 {\n  right: 41.66666667%;\n}\n.col-xs-pull-4 {\n  right: 33.33333333%;\n}\n.col-xs-pull-3 {\n  right: 25%;\n}\n.col-xs-pull-2 {\n  right: 16.66666667%;\n}\n.col-xs-pull-1 {\n  right: 8.33333333%;\n}\n.col-xs-pull-0 {\n  right: auto;\n}\n.col-xs-push-12 {\n  left: 100%;\n}\n.col-xs-push-11 {\n  left: 91.66666667%;\n}\n.col-xs-push-10 {\n  left: 83.33333333%;\n}\n.col-xs-push-9 {\n  left: 75%;\n}\n.col-xs-push-8 {\n  left: 66.66666667%;\n}\n.col-xs-push-7 {\n  left: 58.33333333%;\n}\n.col-xs-push-6 {\n  left: 50%;\n}\n.col-xs-push-5 {\n  left: 41.66666667%;\n}\n.col-xs-push-4 {\n  left: 33.33333333%;\n}\n.col-xs-push-3 {\n  left: 25%;\n}\n.col-xs-push-2 {\n  left: 16.66666667%;\n}\n.col-xs-push-1 {\n  left: 8.33333333%;\n}\n.col-xs-push-0 {\n  left: auto;\n}\n.col-xs-offset-12 {\n  margin-left: 100%;\n}\n.col-xs-offset-11 {\n  margin-left: 91.66666667%;\n}\n.col-xs-offset-10 {\n  margin-left: 83.33333333%;\n}\n.col-xs-offset-9 {\n  margin-left: 75%;\n}\n.col-xs-offset-8 {\n  margin-left: 66.66666667%;\n}\n.col-xs-offset-7 {\n  margin-left: 58.33333333%;\n}\n.col-xs-offset-6 {\n  margin-left: 50%;\n}\n.col-xs-offset-5 {\n  margin-left: 41.66666667%;\n}\n.col-xs-offset-4 {\n  margin-left: 33.33333333%;\n}\n.col-xs-offset-3 {\n  margin-left: 25%;\n}\n.col-xs-offset-2 {\n  margin-left: 16.66666667%;\n}\n.col-xs-offset-1 {\n  margin-left: 8.33333333%;\n}\n.col-xs-offset-0 {\n  margin-left: 0;\n}\n@media (min-width: 768px) {\n  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {\n    float: left;\n  }\n  .col-sm-12 {\n    width: 100%;\n  }\n  .col-sm-11 {\n    width: 91.66666667%;\n  }\n  .col-sm-10 {\n    width: 83.33333333%;\n  }\n  .col-sm-9 {\n    width: 75%;\n  }\n  .col-sm-8 {\n    width: 66.66666667%;\n  }\n  .col-sm-7 {\n    width: 58.33333333%;\n  }\n  .col-sm-6 {\n    width: 50%;\n  }\n  .col-sm-5 {\n    width: 41.66666667%;\n  }\n  .col-sm-4 {\n    width: 33.33333333%;\n  }\n  .col-sm-3 {\n    width: 25%;\n  }\n  .col-sm-2 {\n    width: 16.66666667%;\n  }\n  .col-sm-1 {\n    width: 8.33333333%;\n  }\n  .col-sm-pull-12 {\n    right: 100%;\n  }\n  .col-sm-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-sm-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-sm-pull-9 {\n    right: 75%;\n  }\n  .col-sm-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-sm-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-sm-pull-6 {\n    right: 50%;\n  }\n  .col-sm-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-sm-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-sm-pull-3 {\n    right: 25%;\n  }\n  .col-sm-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-sm-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-sm-pull-0 {\n    right: auto;\n  }\n  .col-sm-push-12 {\n    left: 100%;\n  }\n  .col-sm-push-11 {\n    left: 91.66666667%;\n  }\n  .col-sm-push-10 {\n    left: 83.33333333%;\n  }\n  .col-sm-push-9 {\n    left: 75%;\n  }\n  .col-sm-push-8 {\n    left: 66.66666667%;\n  }\n  .col-sm-push-7 {\n    left: 58.33333333%;\n  }\n  .col-sm-push-6 {\n    left: 50%;\n  }\n  .col-sm-push-5 {\n    left: 41.66666667%;\n  }\n  .col-sm-push-4 {\n    left: 33.33333333%;\n  }\n  .col-sm-push-3 {\n    left: 25%;\n  }\n  .col-sm-push-2 {\n    left: 16.66666667%;\n  }\n  .col-sm-push-1 {\n    left: 8.33333333%;\n  }\n  .col-sm-push-0 {\n    left: auto;\n  }\n  .col-sm-offset-12 {\n    margin-left: 100%;\n  }\n  .col-sm-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-sm-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-sm-offset-9 {\n    margin-left: 75%;\n  }\n  .col-sm-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-sm-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-sm-offset-6 {\n    margin-left: 50%;\n  }\n  .col-sm-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-sm-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-sm-offset-3 {\n    margin-left: 25%;\n  }\n  .col-sm-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-sm-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-sm-offset-0 {\n    margin-left: 0;\n  }\n}\n@media (min-width: 992px) {\n  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {\n    float: left;\n  }\n  .col-md-12 {\n    width: 100%;\n  }\n  .col-md-11 {\n    width: 91.66666667%;\n  }\n  .col-md-10 {\n    width: 83.33333333%;\n  }\n  .col-md-9 {\n    width: 75%;\n  }\n  .col-md-8 {\n    width: 66.66666667%;\n  }\n  .col-md-7 {\n    width: 58.33333333%;\n  }\n  .col-md-6 {\n    width: 50%;\n  }\n  .col-md-5 {\n    width: 41.66666667%;\n  }\n  .col-md-4 {\n    width: 33.33333333%;\n  }\n  .col-md-3 {\n    width: 25%;\n  }\n  .col-md-2 {\n    width: 16.66666667%;\n  }\n  .col-md-1 {\n    width: 8.33333333%;\n  }\n  .col-md-pull-12 {\n    right: 100%;\n  }\n  .col-md-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-md-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-md-pull-9 {\n    right: 75%;\n  }\n  .col-md-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-md-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-md-pull-6 {\n    right: 50%;\n  }\n  .col-md-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-md-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-md-pull-3 {\n    right: 25%;\n  }\n  .col-md-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-md-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-md-pull-0 {\n    right: auto;\n  }\n  .col-md-push-12 {\n    left: 100%;\n  }\n  .col-md-push-11 {\n    left: 91.66666667%;\n  }\n  .col-md-push-10 {\n    left: 83.33333333%;\n  }\n  .col-md-push-9 {\n    left: 75%;\n  }\n  .col-md-push-8 {\n    left: 66.66666667%;\n  }\n  .col-md-push-7 {\n    left: 58.33333333%;\n  }\n  .col-md-push-6 {\n    left: 50%;\n  }\n  .col-md-push-5 {\n    left: 41.66666667%;\n  }\n  .col-md-push-4 {\n    left: 33.33333333%;\n  }\n  .col-md-push-3 {\n    left: 25%;\n  }\n  .col-md-push-2 {\n    left: 16.66666667%;\n  }\n  .col-md-push-1 {\n    left: 8.33333333%;\n  }\n  .col-md-push-0 {\n    left: auto;\n  }\n  .col-md-offset-12 {\n    margin-left: 100%;\n  }\n  .col-md-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-md-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-md-offset-9 {\n    margin-left: 75%;\n  }\n  .col-md-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-md-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-md-offset-6 {\n    margin-left: 50%;\n  }\n  .col-md-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-md-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-md-offset-3 {\n    margin-left: 25%;\n  }\n  .col-md-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-md-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-md-offset-0 {\n    margin-left: 0;\n  }\n}\n@media (min-width: 1200px) {\n  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {\n    float: left;\n  }\n  .col-lg-12 {\n    width: 100%;\n  }\n  .col-lg-11 {\n    width: 91.66666667%;\n  }\n  .col-lg-10 {\n    width: 83.33333333%;\n  }\n  .col-lg-9 {\n    width: 75%;\n  }\n  .col-lg-8 {\n    width: 66.66666667%;\n  }\n  .col-lg-7 {\n    width: 58.33333333%;\n  }\n  .col-lg-6 {\n    width: 50%;\n  }\n  .col-lg-5 {\n    width: 41.66666667%;\n  }\n  .col-lg-4 {\n    width: 33.33333333%;\n  }\n  .col-lg-3 {\n    width: 25%;\n  }\n  .col-lg-2 {\n    width: 16.66666667%;\n  }\n  .col-lg-1 {\n    width: 8.33333333%;\n  }\n  .col-lg-pull-12 {\n    right: 100%;\n  }\n  .col-lg-pull-11 {\n    right: 91.66666667%;\n  }\n  .col-lg-pull-10 {\n    right: 83.33333333%;\n  }\n  .col-lg-pull-9 {\n    right: 75%;\n  }\n  .col-lg-pull-8 {\n    right: 66.66666667%;\n  }\n  .col-lg-pull-7 {\n    right: 58.33333333%;\n  }\n  .col-lg-pull-6 {\n    right: 50%;\n  }\n  .col-lg-pull-5 {\n    right: 41.66666667%;\n  }\n  .col-lg-pull-4 {\n    right: 33.33333333%;\n  }\n  .col-lg-pull-3 {\n    right: 25%;\n  }\n  .col-lg-pull-2 {\n    right: 16.66666667%;\n  }\n  .col-lg-pull-1 {\n    right: 8.33333333%;\n  }\n  .col-lg-pull-0 {\n    right: auto;\n  }\n  .col-lg-push-12 {\n    left: 100%;\n  }\n  .col-lg-push-11 {\n    left: 91.66666667%;\n  }\n  .col-lg-push-10 {\n    left: 83.33333333%;\n  }\n  .col-lg-push-9 {\n    left: 75%;\n  }\n  .col-lg-push-8 {\n    left: 66.66666667%;\n  }\n  .col-lg-push-7 {\n    left: 58.33333333%;\n  }\n  .col-lg-push-6 {\n    left: 50%;\n  }\n  .col-lg-push-5 {\n    left: 41.66666667%;\n  }\n  .col-lg-push-4 {\n    left: 33.33333333%;\n  }\n  .col-lg-push-3 {\n    left: 25%;\n  }\n  .col-lg-push-2 {\n    left: 16.66666667%;\n  }\n  .col-lg-push-1 {\n    left: 8.33333333%;\n  }\n  .col-lg-push-0 {\n    left: auto;\n  }\n  .col-lg-offset-12 {\n    margin-left: 100%;\n  }\n  .col-lg-offset-11 {\n    margin-left: 91.66666667%;\n  }\n  .col-lg-offset-10 {\n    margin-left: 83.33333333%;\n  }\n  .col-lg-offset-9 {\n    margin-left: 75%;\n  }\n  .col-lg-offset-8 {\n    margin-left: 66.66666667%;\n  }\n  .col-lg-offset-7 {\n    margin-left: 58.33333333%;\n  }\n  .col-lg-offset-6 {\n    margin-left: 50%;\n  }\n  .col-lg-offset-5 {\n    margin-left: 41.66666667%;\n  }\n  .col-lg-offset-4 {\n    margin-left: 33.33333333%;\n  }\n  .col-lg-offset-3 {\n    margin-left: 25%;\n  }\n  .col-lg-offset-2 {\n    margin-left: 16.66666667%;\n  }\n  .col-lg-offset-1 {\n    margin-left: 8.33333333%;\n  }\n  .col-lg-offset-0 {\n    margin-left: 0;\n  }\n}\ntable {\n  background-color: transparent;\n}\ncaption {\n  padding-top: 8px;\n  padding-bottom: 8px;\n  color: #777;\n  text-align: left;\n}\nth {\n  text-align: left;\n}\n.table {\n  width: 100%;\n  max-width: 100%;\n  margin-bottom: 20px;\n}\n.table > thead > tr > th,\n.table > tbody > tr > th,\n.table > tfoot > tr > th,\n.table > thead > tr > td,\n.table > tbody > tr > td,\n.table > tfoot > tr > td {\n  padding: 8px;\n  line-height: 1.42857143;\n  vertical-align: top;\n  border-top: 1px solid #ddd;\n}\n.table > thead > tr > th {\n  vertical-align: bottom;\n  border-bottom: 2px solid #ddd;\n}\n.table > caption + thead > tr:first-child > th,\n.table > colgroup + thead > tr:first-child > th,\n.table > thead:first-child > tr:first-child > th,\n.table > caption + thead > tr:first-child > td,\n.table > colgroup + thead > tr:first-child > td,\n.table > thead:first-child > tr:first-child > td {\n  border-top: 0;\n}\n.table > tbody + tbody {\n  border-top: 2px solid #ddd;\n}\n.table .table {\n  background-color: #fff;\n}\n.table-condensed > thead > tr > th,\n.table-condensed > tbody > tr > th,\n.table-condensed > tfoot > tr > th,\n.table-condensed > thead > tr > td,\n.table-condensed > tbody > tr > td,\n.table-condensed > tfoot > tr > td {\n  padding: 5px;\n}\n.table-bordered {\n  border: 1px solid #ddd;\n}\n.table-bordered > thead > tr > th,\n.table-bordered > tbody > tr > th,\n.table-bordered > tfoot > tr > th,\n.table-bordered > thead > tr > td,\n.table-bordered > tbody > tr > td,\n.table-bordered > tfoot > tr > td {\n  border: 1px solid #ddd;\n}\n.table-bordered > thead > tr > th,\n.table-bordered > thead > tr > td {\n  border-bottom-width: 2px;\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: #f9f9f9;\n}\n.table-hover > tbody > tr:hover {\n  background-color: #f5f5f5;\n}\ntable col[class*=\"col-\"] {\n  position: static;\n  display: table-column;\n  float: none;\n}\ntable td[class*=\"col-\"],\ntable th[class*=\"col-\"] {\n  position: static;\n  display: table-cell;\n  float: none;\n}\n.table > thead > tr > td.active,\n.table > tbody > tr > td.active,\n.table > tfoot > tr > td.active,\n.table > thead > tr > th.active,\n.table > tbody > tr > th.active,\n.table > tfoot > tr > th.active,\n.table > thead > tr.active > td,\n.table > tbody > tr.active > td,\n.table > tfoot > tr.active > td,\n.table > thead > tr.active > th,\n.table > tbody > tr.active > th,\n.table > tfoot > tr.active > th {\n  background-color: #f5f5f5;\n}\n.table-hover > tbody > tr > td.active:hover,\n.table-hover > tbody > tr > th.active:hover,\n.table-hover > tbody > tr.active:hover > td,\n.table-hover > tbody > tr:hover > .active,\n.table-hover > tbody > tr.active:hover > th {\n  background-color: #e8e8e8;\n}\n.table > thead > tr > td.success,\n.table > tbody > tr > td.success,\n.table > tfoot > tr > td.success,\n.table > thead > tr > th.success,\n.table > tbody > tr > th.success,\n.table > tfoot > tr > th.success,\n.table > thead > tr.success > td,\n.table > tbody > tr.success > td,\n.table > tfoot > tr.success > td,\n.table > thead > tr.success > th,\n.table > tbody > tr.success > th,\n.table > tfoot > tr.success > th {\n  background-color: #dff0d8;\n}\n.table-hover > tbody > tr > td.success:hover,\n.table-hover > tbody > tr > th.success:hover,\n.table-hover > tbody > tr.success:hover > td,\n.table-hover > tbody > tr:hover > .success,\n.table-hover > tbody > tr.success:hover > th {\n  background-color: #d0e9c6;\n}\n.table > thead > tr > td.info,\n.table > tbody > tr > td.info,\n.table > tfoot > tr > td.info,\n.table > thead > tr > th.info,\n.table > tbody > tr > th.info,\n.table > tfoot > tr > th.info,\n.table > thead > tr.info > td,\n.table > tbody > tr.info > td,\n.table > tfoot > tr.info > td,\n.table > thead > tr.info > th,\n.table > tbody > tr.info > th,\n.table > tfoot > tr.info > th {\n  background-color: #d9edf7;\n}\n.table-hover > tbody > tr > td.info:hover,\n.table-hover > tbody > tr > th.info:hover,\n.table-hover > tbody > tr.info:hover > td,\n.table-hover > tbody > tr:hover > .info,\n.table-hover > tbody > tr.info:hover > th {\n  background-color: #c4e3f3;\n}\n.table > thead > tr > td.warning,\n.table > tbody > tr > td.warning,\n.table > tfoot > tr > td.warning,\n.table > thead > tr > th.warning,\n.table > tbody > tr > th.warning,\n.table > tfoot > tr > th.warning,\n.table > thead > tr.warning > td,\n.table > tbody > tr.warning > td,\n.table > tfoot > tr.warning > td,\n.table > thead > tr.warning > th,\n.table > tbody > tr.warning > th,\n.table > tfoot > tr.warning > th {\n  background-color: #fcf8e3;\n}\n.table-hover > tbody > tr > td.warning:hover,\n.table-hover > tbody > tr > th.warning:hover,\n.table-hover > tbody > tr.warning:hover > td,\n.table-hover > tbody > tr:hover > .warning,\n.table-hover > tbody > tr.warning:hover > th {\n  background-color: #faf2cc;\n}\n.table > thead > tr > td.danger,\n.table > tbody > tr > td.danger,\n.table > tfoot > tr > td.danger,\n.table > thead > tr > th.danger,\n.table > tbody > tr > th.danger,\n.table > tfoot > tr > th.danger,\n.table > thead > tr.danger > td,\n.table > tbody > tr.danger > td,\n.table > tfoot > tr.danger > td,\n.table > thead > tr.danger > th,\n.table > tbody > tr.danger > th,\n.table > tfoot > tr.danger > th {\n  background-color: #f2dede;\n}\n.table-hover > tbody > tr > td.danger:hover,\n.table-hover > tbody > tr > th.danger:hover,\n.table-hover > tbody > tr.danger:hover > td,\n.table-hover > tbody > tr:hover > .danger,\n.table-hover > tbody > tr.danger:hover > th {\n  background-color: #ebcccc;\n}\n.table-responsive {\n  min-height: .01%;\n  overflow-x: auto;\n}\n@media screen and (max-width: 767px) {\n  .table-responsive {\n    width: 100%;\n    margin-bottom: 15px;\n    overflow-y: hidden;\n    -ms-overflow-style: -ms-autohiding-scrollbar;\n    border: 1px solid #ddd;\n  }\n  .table-responsive > .table {\n    margin-bottom: 0;\n  }\n  .table-responsive > .table > thead > tr > th,\n  .table-responsive > .table > tbody > tr > th,\n  .table-responsive > .table > tfoot > tr > th,\n  .table-responsive > .table > thead > tr > td,\n  .table-responsive > .table > tbody > tr > td,\n  .table-responsive > .table > tfoot > tr > td {\n    white-space: nowrap;\n  }\n  .table-responsive > .table-bordered {\n    border: 0;\n  }\n  .table-responsive > .table-bordered > thead > tr > th:first-child,\n  .table-responsive > .table-bordered > tbody > tr > th:first-child,\n  .table-responsive > .table-bordered > tfoot > tr > th:first-child,\n  .table-responsive > .table-bordered > thead > tr > td:first-child,\n  .table-responsive > .table-bordered > tbody > tr > td:first-child,\n  .table-responsive > .table-bordered > tfoot > tr > td:first-child {\n    border-left: 0;\n  }\n  .table-responsive > .table-bordered > thead > tr > th:last-child,\n  .table-responsive > .table-bordered > tbody > tr > th:last-child,\n  .table-responsive > .table-bordered > tfoot > tr > th:last-child,\n  .table-responsive > .table-bordered > thead > tr > td:last-child,\n  .table-responsive > .table-bordered > tbody > tr > td:last-child,\n  .table-responsive > .table-bordered > tfoot > tr > td:last-child {\n    border-right: 0;\n  }\n  .table-responsive > .table-bordered > tbody > tr:last-child > th,\n  .table-responsive > .table-bordered > tfoot > tr:last-child > th,\n  .table-responsive > .table-bordered > tbody > tr:last-child > td,\n  .table-responsive > .table-bordered > tfoot > tr:last-child > td {\n    border-bottom: 0;\n  }\n}\nfieldset {\n  min-width: 0;\n  padding: 0;\n  margin: 0;\n  border: 0;\n}\nlegend {\n  display: block;\n  width: 100%;\n  padding: 0;\n  margin-bottom: 20px;\n  font-size: 21px;\n  line-height: inherit;\n  color: #333;\n  border: 0;\n  border-bottom: 1px solid #e5e5e5;\n}\nlabel {\n  display: inline-block;\n  max-width: 100%;\n  margin-bottom: 5px;\n  font-weight: bold;\n}\ninput[type=\"search\"] {\n  -webkit-box-sizing: border-box;\n     -moz-box-sizing: border-box;\n          box-sizing: border-box;\n}\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  margin: 4px 0 0;\n  margin-top: 1px \\9;\n  line-height: normal;\n}\ninput[type=\"file\"] {\n  display: block;\n}\ninput[type=\"range\"] {\n  display: block;\n  width: 100%;\n}\nselect[multiple],\nselect[size] {\n  height: auto;\n}\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\noutput {\n  display: block;\n  padding-top: 7px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #555;\n}\n.form-control {\n  display: block;\n  width: 100%;\n  height: 34px;\n  padding: 6px 12px;\n  font-size: 14px;\n  line-height: 1.42857143;\n  color: #555;\n  background-color: #fff;\n  background-image: none;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;\n       -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;\n}\n.form-control:focus {\n  border-color: #66afe9;\n  outline: 0;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);\n          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);\n}\n.form-control::-moz-placeholder {\n  color: #999;\n  opacity: 1;\n}\n.form-control:-ms-input-placeholder {\n  color: #999;\n}\n.form-control::-webkit-input-placeholder {\n  color: #999;\n}\n.form-control::-ms-expand {\n  background-color: transparent;\n  border: 0;\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: #eee;\n  opacity: 1;\n}\n.form-control[disabled],\nfieldset[disabled] .form-control {\n  cursor: not-allowed;\n}\ntextarea.form-control {\n  height: auto;\n}\ninput[type=\"search\"] {\n  -webkit-appearance: none;\n}\n@media screen and (-webkit-min-device-pixel-ratio: 0) {\n  input[type=\"date\"].form-control,\n  input[type=\"time\"].form-control,\n  input[type=\"datetime-local\"].form-control,\n  input[type=\"month\"].form-control {\n    line-height: 34px;\n  }\n  input[type=\"date\"].input-sm,\n  input[type=\"time\"].input-sm,\n  input[type=\"datetime-local\"].input-sm,\n  input[type=\"month\"].input-sm,\n  .input-group-sm input[type=\"date\"],\n  .input-group-sm input[type=\"time\"],\n  .input-group-sm input[type=\"datetime-local\"],\n  .input-group-sm input[type=\"month\"] {\n    line-height: 30px;\n  }\n  input[type=\"date\"].input-lg,\n  input[type=\"time\"].input-lg,\n  input[type=\"datetime-local\"].input-lg,\n  input[type=\"month\"].input-lg,\n  .input-group-lg input[type=\"date\"],\n  .input-group-lg input[type=\"time\"],\n  .input-group-lg input[type=\"datetime-local\"],\n  .input-group-lg input[type=\"month\"] {\n    line-height: 46px;\n  }\n}\n.form-group {\n  margin-bottom: 15px;\n}\n.radio,\n.checkbox {\n  position: relative;\n  display: block;\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\n.radio label,\n.checkbox label {\n  min-height: 20px;\n  padding-left: 20px;\n  margin-bottom: 0;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n  position: absolute;\n  margin-top: 4px \\9;\n  margin-left: -20px;\n}\n.radio + .radio,\n.checkbox + .checkbox {\n  margin-top: -5px;\n}\n.radio-inline,\n.checkbox-inline {\n  position: relative;\n  display: inline-block;\n  padding-left: 20px;\n  margin-bottom: 0;\n  font-weight: normal;\n  vertical-align: middle;\n  cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n  margin-top: 0;\n  margin-left: 10px;\n}\ninput[type=\"radio\"][disabled],\ninput[type=\"checkbox\"][disabled],\ninput[type=\"radio\"].disabled,\ninput[type=\"checkbox\"].disabled,\nfieldset[disabled] input[type=\"radio\"],\nfieldset[disabled] input[type=\"checkbox\"] {\n  cursor: not-allowed;\n}\n.radio-inline.disabled,\n.checkbox-inline.disabled,\nfieldset[disabled] .radio-inline,\nfieldset[disabled] .checkbox-inline {\n  cursor: not-allowed;\n}\n.radio.disabled label,\n.checkbox.disabled label,\nfieldset[disabled] .radio label,\nfieldset[disabled] .checkbox label {\n  cursor: not-allowed;\n}\n.form-control-static {\n  min-height: 34px;\n  padding-top: 7px;\n  padding-bottom: 7px;\n  margin-bottom: 0;\n}\n.form-control-static.input-lg,\n.form-control-static.input-sm {\n  padding-right: 0;\n  padding-left: 0;\n}\n.input-sm {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.input-sm {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.input-sm,\nselect[multiple].input-sm {\n  height: auto;\n}\n.form-group-sm .form-control {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.form-group-sm select.form-control {\n  height: 30px;\n  line-height: 30px;\n}\n.form-group-sm textarea.form-control,\n.form-group-sm select[multiple].form-control {\n  height: auto;\n}\n.form-group-sm .form-control-static {\n  height: 30px;\n  min-height: 32px;\n  padding: 6px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n}\n.input-lg {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.input-lg {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.input-lg,\nselect[multiple].input-lg {\n  height: auto;\n}\n.form-group-lg .form-control {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\n.form-group-lg select.form-control {\n  height: 46px;\n  line-height: 46px;\n}\n.form-group-lg textarea.form-control,\n.form-group-lg select[multiple].form-control {\n  height: auto;\n}\n.form-group-lg .form-control-static {\n  height: 46px;\n  min-height: 38px;\n  padding: 11px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n}\n.has-feedback {\n  position: relative;\n}\n.has-feedback .form-control {\n  padding-right: 42.5px;\n}\n.form-control-feedback {\n  position: absolute;\n  top: 0;\n  right: 0;\n  z-index: 2;\n  display: block;\n  width: 34px;\n  height: 34px;\n  line-height: 34px;\n  text-align: center;\n  pointer-events: none;\n}\n.input-lg + .form-control-feedback,\n.input-group-lg + .form-control-feedback,\n.form-group-lg .form-control + .form-control-feedback {\n  width: 46px;\n  height: 46px;\n  line-height: 46px;\n}\n.input-sm + .form-control-feedback,\n.input-group-sm + .form-control-feedback,\n.form-group-sm .form-control + .form-control-feedback {\n  width: 30px;\n  height: 30px;\n  line-height: 30px;\n}\n.has-success .help-block,\n.has-success .control-label,\n.has-success .radio,\n.has-success .checkbox,\n.has-success .radio-inline,\n.has-success .checkbox-inline,\n.has-success.radio label,\n.has-success.checkbox label,\n.has-success.radio-inline label,\n.has-success.checkbox-inline label {\n  color: #3c763d;\n}\n.has-success .form-control {\n  border-color: #3c763d;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n}\n.has-success .form-control:focus {\n  border-color: #2b542c;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;\n}\n.has-success .input-group-addon {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #3c763d;\n}\n.has-success .form-control-feedback {\n  color: #3c763d;\n}\n.has-warning .help-block,\n.has-warning .control-label,\n.has-warning .radio,\n.has-warning .checkbox,\n.has-warning .radio-inline,\n.has-warning .checkbox-inline,\n.has-warning.radio label,\n.has-warning.checkbox label,\n.has-warning.radio-inline label,\n.has-warning.checkbox-inline label {\n  color: #8a6d3b;\n}\n.has-warning .form-control {\n  border-color: #8a6d3b;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n}\n.has-warning .form-control:focus {\n  border-color: #66512c;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;\n}\n.has-warning .input-group-addon {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #8a6d3b;\n}\n.has-warning .form-control-feedback {\n  color: #8a6d3b;\n}\n.has-error .help-block,\n.has-error .control-label,\n.has-error .radio,\n.has-error .checkbox,\n.has-error .radio-inline,\n.has-error .checkbox-inline,\n.has-error.radio label,\n.has-error.checkbox label,\n.has-error.radio-inline label,\n.has-error.checkbox-inline label {\n  color: #a94442;\n}\n.has-error .form-control {\n  border-color: #a94442;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);\n}\n.has-error .form-control:focus {\n  border-color: #843534;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;\n}\n.has-error .input-group-addon {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #a94442;\n}\n.has-error .form-control-feedback {\n  color: #a94442;\n}\n.has-feedback label ~ .form-control-feedback {\n  top: 25px;\n}\n.has-feedback label.sr-only ~ .form-control-feedback {\n  top: 0;\n}\n.help-block {\n  display: block;\n  margin-top: 5px;\n  margin-bottom: 10px;\n  color: #737373;\n}\n@media (min-width: 768px) {\n  .form-inline .form-group {\n    display: inline-block;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .form-inline .form-control-static {\n    display: inline-block;\n  }\n  .form-inline .input-group {\n    display: inline-table;\n    vertical-align: middle;\n  }\n  .form-inline .input-group .input-group-addon,\n  .form-inline .input-group .input-group-btn,\n  .form-inline .input-group .form-control {\n    width: auto;\n  }\n  .form-inline .input-group > .form-control {\n    width: 100%;\n  }\n  .form-inline .control-label {\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .radio,\n  .form-inline .checkbox {\n    display: inline-block;\n    margin-top: 0;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .form-inline .radio label,\n  .form-inline .checkbox label {\n    padding-left: 0;\n  }\n  .form-inline .radio input[type=\"radio\"],\n  .form-inline .checkbox input[type=\"checkbox\"] {\n    position: relative;\n    margin-left: 0;\n  }\n  .form-inline .has-feedback .form-control-feedback {\n    top: 0;\n  }\n}\n.form-horizontal .radio,\n.form-horizontal .checkbox,\n.form-horizontal .radio-inline,\n.form-horizontal .checkbox-inline {\n  padding-top: 7px;\n  margin-top: 0;\n  margin-bottom: 0;\n}\n.form-horizontal .radio,\n.form-horizontal .checkbox {\n  min-height: 27px;\n}\n.form-horizontal .form-group {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n@media (min-width: 768px) {\n  .form-horizontal .control-label {\n    padding-top: 7px;\n    margin-bottom: 0;\n    text-align: right;\n  }\n}\n.form-horizontal .has-feedback .form-control-feedback {\n  right: 15px;\n}\n@media (min-width: 768px) {\n  .form-horizontal .form-group-lg .control-label {\n    padding-top: 11px;\n    font-size: 18px;\n  }\n}\n@media (min-width: 768px) {\n  .form-horizontal .form-group-sm .control-label {\n    padding-top: 6px;\n    font-size: 12px;\n  }\n}\n.btn {\n  display: inline-block;\n  padding: 6px 12px;\n  margin-bottom: 0;\n  font-size: 14px;\n  font-weight: normal;\n  line-height: 1.42857143;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: middle;\n  -ms-touch-action: manipulation;\n      touch-action: manipulation;\n  cursor: pointer;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n      -ms-user-select: none;\n          user-select: none;\n  background-image: none;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.btn:focus,\n.btn:active:focus,\n.btn.active:focus,\n.btn.focus,\n.btn:active.focus,\n.btn.active.focus {\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n.btn:hover,\n.btn:focus,\n.btn.focus {\n  color: #333;\n  text-decoration: none;\n}\n.btn:active,\n.btn.active {\n  background-image: none;\n  outline: 0;\n  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n}\n.btn.disabled,\n.btn[disabled],\nfieldset[disabled] .btn {\n  cursor: not-allowed;\n  filter: alpha(opacity=65);\n  -webkit-box-shadow: none;\n          box-shadow: none;\n  opacity: .65;\n}\na.btn.disabled,\nfieldset[disabled] a.btn {\n  pointer-events: none;\n}\n.btn-default {\n  color: #333;\n  background-color: #fff;\n  border-color: #ccc;\n}\n.btn-default:focus,\n.btn-default.focus {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #8c8c8c;\n}\n.btn-default:hover {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #adadad;\n}\n.btn-default:active,\n.btn-default.active,\n.open > .dropdown-toggle.btn-default {\n  color: #333;\n  background-color: #e6e6e6;\n  border-color: #adadad;\n}\n.btn-default:active:hover,\n.btn-default.active:hover,\n.open > .dropdown-toggle.btn-default:hover,\n.btn-default:active:focus,\n.btn-default.active:focus,\n.open > .dropdown-toggle.btn-default:focus,\n.btn-default:active.focus,\n.btn-default.active.focus,\n.open > .dropdown-toggle.btn-default.focus {\n  color: #333;\n  background-color: #d4d4d4;\n  border-color: #8c8c8c;\n}\n.btn-default:active,\n.btn-default.active,\n.open > .dropdown-toggle.btn-default {\n  background-image: none;\n}\n.btn-default.disabled:hover,\n.btn-default[disabled]:hover,\nfieldset[disabled] .btn-default:hover,\n.btn-default.disabled:focus,\n.btn-default[disabled]:focus,\nfieldset[disabled] .btn-default:focus,\n.btn-default.disabled.focus,\n.btn-default[disabled].focus,\nfieldset[disabled] .btn-default.focus {\n  background-color: #fff;\n  border-color: #ccc;\n}\n.btn-default .badge {\n  color: #fff;\n  background-color: #333;\n}\n.btn-primary {\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #2e6da4;\n}\n.btn-primary:focus,\n.btn-primary.focus {\n  color: #fff;\n  background-color: #286090;\n  border-color: #122b40;\n}\n.btn-primary:hover {\n  color: #fff;\n  background-color: #286090;\n  border-color: #204d74;\n}\n.btn-primary:active,\n.btn-primary.active,\n.open > .dropdown-toggle.btn-primary {\n  color: #fff;\n  background-color: #286090;\n  border-color: #204d74;\n}\n.btn-primary:active:hover,\n.btn-primary.active:hover,\n.open > .dropdown-toggle.btn-primary:hover,\n.btn-primary:active:focus,\n.btn-primary.active:focus,\n.open > .dropdown-toggle.btn-primary:focus,\n.btn-primary:active.focus,\n.btn-primary.active.focus,\n.open > .dropdown-toggle.btn-primary.focus {\n  color: #fff;\n  background-color: #204d74;\n  border-color: #122b40;\n}\n.btn-primary:active,\n.btn-primary.active,\n.open > .dropdown-toggle.btn-primary {\n  background-image: none;\n}\n.btn-primary.disabled:hover,\n.btn-primary[disabled]:hover,\nfieldset[disabled] .btn-primary:hover,\n.btn-primary.disabled:focus,\n.btn-primary[disabled]:focus,\nfieldset[disabled] .btn-primary:focus,\n.btn-primary.disabled.focus,\n.btn-primary[disabled].focus,\nfieldset[disabled] .btn-primary.focus {\n  background-color: #337ab7;\n  border-color: #2e6da4;\n}\n.btn-primary .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.btn-success {\n  color: #fff;\n  background-color: #5cb85c;\n  border-color: #4cae4c;\n}\n.btn-success:focus,\n.btn-success.focus {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #255625;\n}\n.btn-success:hover {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #398439;\n}\n.btn-success:active,\n.btn-success.active,\n.open > .dropdown-toggle.btn-success {\n  color: #fff;\n  background-color: #449d44;\n  border-color: #398439;\n}\n.btn-success:active:hover,\n.btn-success.active:hover,\n.open > .dropdown-toggle.btn-success:hover,\n.btn-success:active:focus,\n.btn-success.active:focus,\n.open > .dropdown-toggle.btn-success:focus,\n.btn-success:active.focus,\n.btn-success.active.focus,\n.open > .dropdown-toggle.btn-success.focus {\n  color: #fff;\n  background-color: #398439;\n  border-color: #255625;\n}\n.btn-success:active,\n.btn-success.active,\n.open > .dropdown-toggle.btn-success {\n  background-image: none;\n}\n.btn-success.disabled:hover,\n.btn-success[disabled]:hover,\nfieldset[disabled] .btn-success:hover,\n.btn-success.disabled:focus,\n.btn-success[disabled]:focus,\nfieldset[disabled] .btn-success:focus,\n.btn-success.disabled.focus,\n.btn-success[disabled].focus,\nfieldset[disabled] .btn-success.focus {\n  background-color: #5cb85c;\n  border-color: #4cae4c;\n}\n.btn-success .badge {\n  color: #5cb85c;\n  background-color: #fff;\n}\n.btn-info {\n  color: #fff;\n  background-color: #5bc0de;\n  border-color: #46b8da;\n}\n.btn-info:focus,\n.btn-info.focus {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #1b6d85;\n}\n.btn-info:hover {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #269abc;\n}\n.btn-info:active,\n.btn-info.active,\n.open > .dropdown-toggle.btn-info {\n  color: #fff;\n  background-color: #31b0d5;\n  border-color: #269abc;\n}\n.btn-info:active:hover,\n.btn-info.active:hover,\n.open > .dropdown-toggle.btn-info:hover,\n.btn-info:active:focus,\n.btn-info.active:focus,\n.open > .dropdown-toggle.btn-info:focus,\n.btn-info:active.focus,\n.btn-info.active.focus,\n.open > .dropdown-toggle.btn-info.focus {\n  color: #fff;\n  background-color: #269abc;\n  border-color: #1b6d85;\n}\n.btn-info:active,\n.btn-info.active,\n.open > .dropdown-toggle.btn-info {\n  background-image: none;\n}\n.btn-info.disabled:hover,\n.btn-info[disabled]:hover,\nfieldset[disabled] .btn-info:hover,\n.btn-info.disabled:focus,\n.btn-info[disabled]:focus,\nfieldset[disabled] .btn-info:focus,\n.btn-info.disabled.focus,\n.btn-info[disabled].focus,\nfieldset[disabled] .btn-info.focus {\n  background-color: #5bc0de;\n  border-color: #46b8da;\n}\n.btn-info .badge {\n  color: #5bc0de;\n  background-color: #fff;\n}\n.btn-warning {\n  color: #fff;\n  background-color: #f0ad4e;\n  border-color: #eea236;\n}\n.btn-warning:focus,\n.btn-warning.focus {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #985f0d;\n}\n.btn-warning:hover {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #d58512;\n}\n.btn-warning:active,\n.btn-warning.active,\n.open > .dropdown-toggle.btn-warning {\n  color: #fff;\n  background-color: #ec971f;\n  border-color: #d58512;\n}\n.btn-warning:active:hover,\n.btn-warning.active:hover,\n.open > .dropdown-toggle.btn-warning:hover,\n.btn-warning:active:focus,\n.btn-warning.active:focus,\n.open > .dropdown-toggle.btn-warning:focus,\n.btn-warning:active.focus,\n.btn-warning.active.focus,\n.open > .dropdown-toggle.btn-warning.focus {\n  color: #fff;\n  background-color: #d58512;\n  border-color: #985f0d;\n}\n.btn-warning:active,\n.btn-warning.active,\n.open > .dropdown-toggle.btn-warning {\n  background-image: none;\n}\n.btn-warning.disabled:hover,\n.btn-warning[disabled]:hover,\nfieldset[disabled] .btn-warning:hover,\n.btn-warning.disabled:focus,\n.btn-warning[disabled]:focus,\nfieldset[disabled] .btn-warning:focus,\n.btn-warning.disabled.focus,\n.btn-warning[disabled].focus,\nfieldset[disabled] .btn-warning.focus {\n  background-color: #f0ad4e;\n  border-color: #eea236;\n}\n.btn-warning .badge {\n  color: #f0ad4e;\n  background-color: #fff;\n}\n.btn-danger {\n  color: #fff;\n  background-color: #d9534f;\n  border-color: #d43f3a;\n}\n.btn-danger:focus,\n.btn-danger.focus {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #761c19;\n}\n.btn-danger:hover {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #ac2925;\n}\n.btn-danger:active,\n.btn-danger.active,\n.open > .dropdown-toggle.btn-danger {\n  color: #fff;\n  background-color: #c9302c;\n  border-color: #ac2925;\n}\n.btn-danger:active:hover,\n.btn-danger.active:hover,\n.open > .dropdown-toggle.btn-danger:hover,\n.btn-danger:active:focus,\n.btn-danger.active:focus,\n.open > .dropdown-toggle.btn-danger:focus,\n.btn-danger:active.focus,\n.btn-danger.active.focus,\n.open > .dropdown-toggle.btn-danger.focus {\n  color: #fff;\n  background-color: #ac2925;\n  border-color: #761c19;\n}\n.btn-danger:active,\n.btn-danger.active,\n.open > .dropdown-toggle.btn-danger {\n  background-image: none;\n}\n.btn-danger.disabled:hover,\n.btn-danger[disabled]:hover,\nfieldset[disabled] .btn-danger:hover,\n.btn-danger.disabled:focus,\n.btn-danger[disabled]:focus,\nfieldset[disabled] .btn-danger:focus,\n.btn-danger.disabled.focus,\n.btn-danger[disabled].focus,\nfieldset[disabled] .btn-danger.focus {\n  background-color: #d9534f;\n  border-color: #d43f3a;\n}\n.btn-danger .badge {\n  color: #d9534f;\n  background-color: #fff;\n}\n.btn-link {\n  font-weight: normal;\n  color: #337ab7;\n  border-radius: 0;\n}\n.btn-link,\n.btn-link:active,\n.btn-link.active,\n.btn-link[disabled],\nfieldset[disabled] .btn-link {\n  background-color: transparent;\n  -webkit-box-shadow: none;\n          box-shadow: none;\n}\n.btn-link,\n.btn-link:hover,\n.btn-link:focus,\n.btn-link:active {\n  border-color: transparent;\n}\n.btn-link:hover,\n.btn-link:focus {\n  color: #23527c;\n  text-decoration: underline;\n  background-color: transparent;\n}\n.btn-link[disabled]:hover,\nfieldset[disabled] .btn-link:hover,\n.btn-link[disabled]:focus,\nfieldset[disabled] .btn-link:focus {\n  color: #777;\n  text-decoration: none;\n}\n.btn-lg,\n.btn-group-lg > .btn {\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\n.btn-sm,\n.btn-group-sm > .btn {\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.btn-xs,\n.btn-group-xs > .btn {\n  padding: 1px 5px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\n.btn-block {\n  display: block;\n  width: 100%;\n}\n.btn-block + .btn-block {\n  margin-top: 5px;\n}\ninput[type=\"submit\"].btn-block,\ninput[type=\"reset\"].btn-block,\ninput[type=\"button\"].btn-block {\n  width: 100%;\n}\n.fade {\n  opacity: 0;\n  -webkit-transition: opacity .15s linear;\n       -o-transition: opacity .15s linear;\n          transition: opacity .15s linear;\n}\n.fade.in {\n  opacity: 1;\n}\n.collapse {\n  display: none;\n}\n.collapse.in {\n  display: block;\n}\ntr.collapse.in {\n  display: table-row;\n}\ntbody.collapse.in {\n  display: table-row-group;\n}\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  -webkit-transition-timing-function: ease;\n       -o-transition-timing-function: ease;\n          transition-timing-function: ease;\n  -webkit-transition-duration: .35s;\n       -o-transition-duration: .35s;\n          transition-duration: .35s;\n  -webkit-transition-property: height, visibility;\n       -o-transition-property: height, visibility;\n          transition-property: height, visibility;\n}\n.caret {\n  display: inline-block;\n  width: 0;\n  height: 0;\n  margin-left: 2px;\n  vertical-align: middle;\n  border-top: 4px dashed;\n  border-top: 4px solid \\9;\n  border-right: 4px solid transparent;\n  border-left: 4px solid transparent;\n}\n.dropup,\n.dropdown {\n  position: relative;\n}\n.dropdown-toggle:focus {\n  outline: 0;\n}\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: 1000;\n  display: none;\n  float: left;\n  min-width: 160px;\n  padding: 5px 0;\n  margin: 2px 0 0;\n  font-size: 14px;\n  text-align: left;\n  list-style: none;\n  background-color: #fff;\n  -webkit-background-clip: padding-box;\n          background-clip: padding-box;\n  border: 1px solid #ccc;\n  border: 1px solid rgba(0, 0, 0, .15);\n  border-radius: 4px;\n  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);\n          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);\n}\n.dropdown-menu.pull-right {\n  right: 0;\n  left: auto;\n}\n.dropdown-menu .divider {\n  height: 1px;\n  margin: 9px 0;\n  overflow: hidden;\n  background-color: #e5e5e5;\n}\n.dropdown-menu > li > a {\n  display: block;\n  padding: 3px 20px;\n  clear: both;\n  font-weight: normal;\n  line-height: 1.42857143;\n  color: #333;\n  white-space: nowrap;\n}\n.dropdown-menu > li > a:hover,\n.dropdown-menu > li > a:focus {\n  color: #262626;\n  text-decoration: none;\n  background-color: #f5f5f5;\n}\n.dropdown-menu > .active > a,\n.dropdown-menu > .active > a:hover,\n.dropdown-menu > .active > a:focus {\n  color: #fff;\n  text-decoration: none;\n  background-color: #337ab7;\n  outline: 0;\n}\n.dropdown-menu > .disabled > a,\n.dropdown-menu > .disabled > a:hover,\n.dropdown-menu > .disabled > a:focus {\n  color: #777;\n}\n.dropdown-menu > .disabled > a:hover,\n.dropdown-menu > .disabled > a:focus {\n  text-decoration: none;\n  cursor: not-allowed;\n  background-color: transparent;\n  background-image: none;\n  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);\n}\n.open > .dropdown-menu {\n  display: block;\n}\n.open > a {\n  outline: 0;\n}\n.dropdown-menu-right {\n  right: 0;\n  left: auto;\n}\n.dropdown-menu-left {\n  right: auto;\n  left: 0;\n}\n.dropdown-header {\n  display: block;\n  padding: 3px 20px;\n  font-size: 12px;\n  line-height: 1.42857143;\n  color: #777;\n  white-space: nowrap;\n}\n.dropdown-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 990;\n}\n.pull-right > .dropdown-menu {\n  right: 0;\n  left: auto;\n}\n.dropup .caret,\n.navbar-fixed-bottom .dropdown .caret {\n  content: \"\";\n  border-top: 0;\n  border-bottom: 4px dashed;\n  border-bottom: 4px solid \\9;\n}\n.dropup .dropdown-menu,\n.navbar-fixed-bottom .dropdown .dropdown-menu {\n  top: auto;\n  bottom: 100%;\n  margin-bottom: 2px;\n}\n@media (min-width: 768px) {\n  .navbar-right .dropdown-menu {\n    right: 0;\n    left: auto;\n  }\n  .navbar-right .dropdown-menu-left {\n    right: auto;\n    left: 0;\n  }\n}\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-block;\n  vertical-align: middle;\n}\n.btn-group > .btn,\n.btn-group-vertical > .btn {\n  position: relative;\n  float: left;\n}\n.btn-group > .btn:hover,\n.btn-group-vertical > .btn:hover,\n.btn-group > .btn:focus,\n.btn-group-vertical > .btn:focus,\n.btn-group > .btn:active,\n.btn-group-vertical > .btn:active,\n.btn-group > .btn.active,\n.btn-group-vertical > .btn.active {\n  z-index: 2;\n}\n.btn-group .btn + .btn,\n.btn-group .btn + .btn-group,\n.btn-group .btn-group + .btn,\n.btn-group .btn-group + .btn-group {\n  margin-left: -1px;\n}\n.btn-toolbar {\n  margin-left: -5px;\n}\n.btn-toolbar .btn,\n.btn-toolbar .btn-group,\n.btn-toolbar .input-group {\n  float: left;\n}\n.btn-toolbar > .btn,\n.btn-toolbar > .btn-group,\n.btn-toolbar > .input-group {\n  margin-left: 5px;\n}\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n  border-radius: 0;\n}\n.btn-group > .btn:first-child {\n  margin-left: 0;\n}\n.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group > .btn-group {\n  float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,\n.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n  outline: 0;\n}\n.btn-group > .btn + .dropdown-toggle {\n  padding-right: 8px;\n  padding-left: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n  padding-right: 12px;\n  padding-left: 12px;\n}\n.btn-group.open .dropdown-toggle {\n  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);\n}\n.btn-group.open .dropdown-toggle.btn-link {\n  -webkit-box-shadow: none;\n          box-shadow: none;\n}\n.btn .caret {\n  margin-left: 0;\n}\n.btn-lg .caret {\n  border-width: 5px 5px 0;\n  border-bottom-width: 0;\n}\n.dropup .btn-lg .caret {\n  border-width: 0 5px 5px;\n}\n.btn-group-vertical > .btn,\n.btn-group-vertical > .btn-group,\n.btn-group-vertical > .btn-group > .btn {\n  display: block;\n  float: none;\n  width: 100%;\n  max-width: 100%;\n}\n.btn-group-vertical > .btn-group > .btn {\n  float: none;\n}\n.btn-group-vertical > .btn + .btn,\n.btn-group-vertical > .btn + .btn-group,\n.btn-group-vertical > .btn-group + .btn,\n.btn-group-vertical > .btn-group + .btn-group {\n  margin-top: -1px;\n  margin-left: 0;\n}\n.btn-group-vertical > .btn:not(:first-child):not(:last-child) {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn:first-child:not(:last-child) {\n  border-top-left-radius: 4px;\n  border-top-right-radius: 4px;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group-vertical > .btn:last-child:not(:first-child) {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,\n.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.btn-group-justified {\n  display: table;\n  width: 100%;\n  table-layout: fixed;\n  border-collapse: separate;\n}\n.btn-group-justified > .btn,\n.btn-group-justified > .btn-group {\n  display: table-cell;\n  float: none;\n  width: 1%;\n}\n.btn-group-justified > .btn-group .btn {\n  width: 100%;\n}\n.btn-group-justified > .btn-group .dropdown-menu {\n  left: auto;\n}\n[data-toggle=\"buttons\"] > .btn input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn-group > .btn input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn input[type=\"checkbox\"],\n[data-toggle=\"buttons\"] > .btn-group > .btn input[type=\"checkbox\"] {\n  position: absolute;\n  clip: rect(0, 0, 0, 0);\n  pointer-events: none;\n}\n.input-group {\n  position: relative;\n  display: table;\n  border-collapse: separate;\n}\n.input-group[class*=\"col-\"] {\n  float: none;\n  padding-right: 0;\n  padding-left: 0;\n}\n.input-group .form-control {\n  position: relative;\n  z-index: 2;\n  float: left;\n  width: 100%;\n  margin-bottom: 0;\n}\n.input-group .form-control:focus {\n  z-index: 3;\n}\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn {\n  height: 46px;\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n  border-radius: 6px;\n}\nselect.input-group-lg > .form-control,\nselect.input-group-lg > .input-group-addon,\nselect.input-group-lg > .input-group-btn > .btn {\n  height: 46px;\n  line-height: 46px;\n}\ntextarea.input-group-lg > .form-control,\ntextarea.input-group-lg > .input-group-addon,\ntextarea.input-group-lg > .input-group-btn > .btn,\nselect[multiple].input-group-lg > .form-control,\nselect[multiple].input-group-lg > .input-group-addon,\nselect[multiple].input-group-lg > .input-group-btn > .btn {\n  height: auto;\n}\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn {\n  height: 30px;\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n  border-radius: 3px;\n}\nselect.input-group-sm > .form-control,\nselect.input-group-sm > .input-group-addon,\nselect.input-group-sm > .input-group-btn > .btn {\n  height: 30px;\n  line-height: 30px;\n}\ntextarea.input-group-sm > .form-control,\ntextarea.input-group-sm > .input-group-addon,\ntextarea.input-group-sm > .input-group-btn > .btn,\nselect[multiple].input-group-sm > .form-control,\nselect[multiple].input-group-sm > .input-group-addon,\nselect[multiple].input-group-sm > .input-group-btn > .btn {\n  height: auto;\n}\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n  display: table-cell;\n}\n.input-group-addon:not(:first-child):not(:last-child),\n.input-group-btn:not(:first-child):not(:last-child),\n.input-group .form-control:not(:first-child):not(:last-child) {\n  border-radius: 0;\n}\n.input-group-addon,\n.input-group-btn {\n  width: 1%;\n  white-space: nowrap;\n  vertical-align: middle;\n}\n.input-group-addon {\n  padding: 6px 12px;\n  font-size: 14px;\n  font-weight: normal;\n  line-height: 1;\n  color: #555;\n  text-align: center;\n  background-color: #eee;\n  border: 1px solid #ccc;\n  border-radius: 4px;\n}\n.input-group-addon.input-sm {\n  padding: 5px 10px;\n  font-size: 12px;\n  border-radius: 3px;\n}\n.input-group-addon.input-lg {\n  padding: 10px 16px;\n  font-size: 18px;\n  border-radius: 6px;\n}\n.input-group-addon input[type=\"radio\"],\n.input-group-addon input[type=\"checkbox\"] {\n  margin-top: 0;\n}\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n.input-group-addon:first-child {\n  border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.input-group-addon:last-child {\n  border-left: 0;\n}\n.input-group-btn {\n  position: relative;\n  font-size: 0;\n  white-space: nowrap;\n}\n.input-group-btn > .btn {\n  position: relative;\n}\n.input-group-btn > .btn + .btn {\n  margin-left: -1px;\n}\n.input-group-btn > .btn:hover,\n.input-group-btn > .btn:focus,\n.input-group-btn > .btn:active {\n  z-index: 2;\n}\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group {\n  margin-right: -1px;\n}\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group {\n  z-index: 2;\n  margin-left: -1px;\n}\n.nav {\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n.nav > li {\n  position: relative;\n  display: block;\n}\n.nav > li > a {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n}\n.nav > li > a:hover,\n.nav > li > a:focus {\n  text-decoration: none;\n  background-color: #eee;\n}\n.nav > li.disabled > a {\n  color: #777;\n}\n.nav > li.disabled > a:hover,\n.nav > li.disabled > a:focus {\n  color: #777;\n  text-decoration: none;\n  cursor: not-allowed;\n  background-color: transparent;\n}\n.nav .open > a,\n.nav .open > a:hover,\n.nav .open > a:focus {\n  background-color: #eee;\n  border-color: #337ab7;\n}\n.nav .nav-divider {\n  height: 1px;\n  margin: 9px 0;\n  overflow: hidden;\n  background-color: #e5e5e5;\n}\n.nav > li > a > img {\n  max-width: none;\n}\n.nav-tabs {\n  border-bottom: 1px solid #ddd;\n}\n.nav-tabs > li {\n  float: left;\n  margin-bottom: -1px;\n}\n.nav-tabs > li > a {\n  margin-right: 2px;\n  line-height: 1.42857143;\n  border: 1px solid transparent;\n  border-radius: 4px 4px 0 0;\n}\n.nav-tabs > li > a:hover {\n  border-color: #eee #eee #ddd;\n}\n.nav-tabs > li.active > a,\n.nav-tabs > li.active > a:hover,\n.nav-tabs > li.active > a:focus {\n  color: #555;\n  cursor: default;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-bottom-color: transparent;\n}\n.nav-tabs.nav-justified {\n  width: 100%;\n  border-bottom: 0;\n}\n.nav-tabs.nav-justified > li {\n  float: none;\n}\n.nav-tabs.nav-justified > li > a {\n  margin-bottom: 5px;\n  text-align: center;\n}\n.nav-tabs.nav-justified > .dropdown .dropdown-menu {\n  top: auto;\n  left: auto;\n}\n@media (min-width: 768px) {\n  .nav-tabs.nav-justified > li {\n    display: table-cell;\n    width: 1%;\n  }\n  .nav-tabs.nav-justified > li > a {\n    margin-bottom: 0;\n  }\n}\n.nav-tabs.nav-justified > li > a {\n  margin-right: 0;\n  border-radius: 4px;\n}\n.nav-tabs.nav-justified > .active > a,\n.nav-tabs.nav-justified > .active > a:hover,\n.nav-tabs.nav-justified > .active > a:focus {\n  border: 1px solid #ddd;\n}\n@media (min-width: 768px) {\n  .nav-tabs.nav-justified > li > a {\n    border-bottom: 1px solid #ddd;\n    border-radius: 4px 4px 0 0;\n  }\n  .nav-tabs.nav-justified > .active > a,\n  .nav-tabs.nav-justified > .active > a:hover,\n  .nav-tabs.nav-justified > .active > a:focus {\n    border-bottom-color: #fff;\n  }\n}\n.nav-pills > li {\n  float: left;\n}\n.nav-pills > li > a {\n  border-radius: 4px;\n}\n.nav-pills > li + li {\n  margin-left: 2px;\n}\n.nav-pills > li.active > a,\n.nav-pills > li.active > a:hover,\n.nav-pills > li.active > a:focus {\n  color: #fff;\n  background-color: #337ab7;\n}\n.nav-stacked > li {\n  float: none;\n}\n.nav-stacked > li + li {\n  margin-top: 2px;\n  margin-left: 0;\n}\n.nav-justified {\n  width: 100%;\n}\n.nav-justified > li {\n  float: none;\n}\n.nav-justified > li > a {\n  margin-bottom: 5px;\n  text-align: center;\n}\n.nav-justified > .dropdown .dropdown-menu {\n  top: auto;\n  left: auto;\n}\n@media (min-width: 768px) {\n  .nav-justified > li {\n    display: table-cell;\n    width: 1%;\n  }\n  .nav-justified > li > a {\n    margin-bottom: 0;\n  }\n}\n.nav-tabs-justified {\n  border-bottom: 0;\n}\n.nav-tabs-justified > li > a {\n  margin-right: 0;\n  border-radius: 4px;\n}\n.nav-tabs-justified > .active > a,\n.nav-tabs-justified > .active > a:hover,\n.nav-tabs-justified > .active > a:focus {\n  border: 1px solid #ddd;\n}\n@media (min-width: 768px) {\n  .nav-tabs-justified > li > a {\n    border-bottom: 1px solid #ddd;\n    border-radius: 4px 4px 0 0;\n  }\n  .nav-tabs-justified > .active > a,\n  .nav-tabs-justified > .active > a:hover,\n  .nav-tabs-justified > .active > a:focus {\n    border-bottom-color: #fff;\n  }\n}\n.tab-content > .tab-pane {\n  display: none;\n}\n.tab-content > .active {\n  display: block;\n}\n.nav-tabs .dropdown-menu {\n  margin-top: -1px;\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.navbar {\n  position: relative;\n  min-height: 50px;\n  margin-bottom: 20px;\n  border: 1px solid transparent;\n}\n@media (min-width: 768px) {\n  .navbar {\n    border-radius: 4px;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-header {\n    float: left;\n  }\n}\n.navbar-collapse {\n  padding-right: 15px;\n  padding-left: 15px;\n  overflow-x: visible;\n  -webkit-overflow-scrolling: touch;\n  border-top: 1px solid transparent;\n  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);\n          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);\n}\n.navbar-collapse.in {\n  overflow-y: auto;\n}\n@media (min-width: 768px) {\n  .navbar-collapse {\n    width: auto;\n    border-top: 0;\n    -webkit-box-shadow: none;\n            box-shadow: none;\n  }\n  .navbar-collapse.collapse {\n    display: block !important;\n    height: auto !important;\n    padding-bottom: 0;\n    overflow: visible !important;\n  }\n  .navbar-collapse.in {\n    overflow-y: visible;\n  }\n  .navbar-fixed-top .navbar-collapse,\n  .navbar-static-top .navbar-collapse,\n  .navbar-fixed-bottom .navbar-collapse {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n.navbar-fixed-top .navbar-collapse,\n.navbar-fixed-bottom .navbar-collapse {\n  max-height: 340px;\n}\n@media (max-device-width: 480px) and (orientation: landscape) {\n  .navbar-fixed-top .navbar-collapse,\n  .navbar-fixed-bottom .navbar-collapse {\n    max-height: 200px;\n  }\n}\n.container > .navbar-header,\n.container-fluid > .navbar-header,\n.container > .navbar-collapse,\n.container-fluid > .navbar-collapse {\n  margin-right: -15px;\n  margin-left: -15px;\n}\n@media (min-width: 768px) {\n  .container > .navbar-header,\n  .container-fluid > .navbar-header,\n  .container > .navbar-collapse,\n  .container-fluid > .navbar-collapse {\n    margin-right: 0;\n    margin-left: 0;\n  }\n}\n.navbar-static-top {\n  z-index: 1000;\n  border-width: 0 0 1px;\n}\n@media (min-width: 768px) {\n  .navbar-static-top {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  position: fixed;\n  right: 0;\n  left: 0;\n  z-index: 1030;\n}\n@media (min-width: 768px) {\n  .navbar-fixed-top,\n  .navbar-fixed-bottom {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top {\n  top: 0;\n  border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n  bottom: 0;\n  margin-bottom: 0;\n  border-width: 1px 0 0;\n}\n.navbar-brand {\n  float: left;\n  height: 50px;\n  padding: 15px 15px;\n  font-size: 18px;\n  line-height: 20px;\n}\n.navbar-brand:hover,\n.navbar-brand:focus {\n  text-decoration: none;\n}\n.navbar-brand > img {\n  display: block;\n}\n@media (min-width: 768px) {\n  .navbar > .container .navbar-brand,\n  .navbar > .container-fluid .navbar-brand {\n    margin-left: -15px;\n  }\n}\n.navbar-toggle {\n  position: relative;\n  float: right;\n  padding: 9px 10px;\n  margin-top: 8px;\n  margin-right: 15px;\n  margin-bottom: 8px;\n  background-color: transparent;\n  background-image: none;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.navbar-toggle:focus {\n  outline: 0;\n}\n.navbar-toggle .icon-bar {\n  display: block;\n  width: 22px;\n  height: 2px;\n  border-radius: 1px;\n}\n.navbar-toggle .icon-bar + .icon-bar {\n  margin-top: 4px;\n}\n@media (min-width: 768px) {\n  .navbar-toggle {\n    display: none;\n  }\n}\n.navbar-nav {\n  margin: 7.5px -15px;\n}\n.navbar-nav > li > a {\n  padding-top: 10px;\n  padding-bottom: 10px;\n  line-height: 20px;\n}\n@media (max-width: 767px) {\n  .navbar-nav .open .dropdown-menu {\n    position: static;\n    float: none;\n    width: auto;\n    margin-top: 0;\n    background-color: transparent;\n    border: 0;\n    -webkit-box-shadow: none;\n            box-shadow: none;\n  }\n  .navbar-nav .open .dropdown-menu > li > a,\n  .navbar-nav .open .dropdown-menu .dropdown-header {\n    padding: 5px 15px 5px 25px;\n  }\n  .navbar-nav .open .dropdown-menu > li > a {\n    line-height: 20px;\n  }\n  .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-nav .open .dropdown-menu > li > a:focus {\n    background-image: none;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-nav {\n    float: left;\n    margin: 0;\n  }\n  .navbar-nav > li {\n    float: left;\n  }\n  .navbar-nav > li > a {\n    padding-top: 15px;\n    padding-bottom: 15px;\n  }\n}\n.navbar-form {\n  padding: 10px 15px;\n  margin-top: 8px;\n  margin-right: -15px;\n  margin-bottom: 8px;\n  margin-left: -15px;\n  border-top: 1px solid transparent;\n  border-bottom: 1px solid transparent;\n  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);\n          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);\n}\n@media (min-width: 768px) {\n  .navbar-form .form-group {\n    display: inline-block;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .navbar-form .form-control-static {\n    display: inline-block;\n  }\n  .navbar-form .input-group {\n    display: inline-table;\n    vertical-align: middle;\n  }\n  .navbar-form .input-group .input-group-addon,\n  .navbar-form .input-group .input-group-btn,\n  .navbar-form .input-group .form-control {\n    width: auto;\n  }\n  .navbar-form .input-group > .form-control {\n    width: 100%;\n  }\n  .navbar-form .control-label {\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .radio,\n  .navbar-form .checkbox {\n    display: inline-block;\n    margin-top: 0;\n    margin-bottom: 0;\n    vertical-align: middle;\n  }\n  .navbar-form .radio label,\n  .navbar-form .checkbox label {\n    padding-left: 0;\n  }\n  .navbar-form .radio input[type=\"radio\"],\n  .navbar-form .checkbox input[type=\"checkbox\"] {\n    position: relative;\n    margin-left: 0;\n  }\n  .navbar-form .has-feedback .form-control-feedback {\n    top: 0;\n  }\n}\n@media (max-width: 767px) {\n  .navbar-form .form-group {\n    margin-bottom: 5px;\n  }\n  .navbar-form .form-group:last-child {\n    margin-bottom: 0;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-form {\n    width: auto;\n    padding-top: 0;\n    padding-bottom: 0;\n    margin-right: 0;\n    margin-left: 0;\n    border: 0;\n    -webkit-box-shadow: none;\n            box-shadow: none;\n  }\n}\n.navbar-nav > li > .dropdown-menu {\n  margin-top: 0;\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n  margin-bottom: 0;\n  border-top-left-radius: 4px;\n  border-top-right-radius: 4px;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n.navbar-btn {\n  margin-top: 8px;\n  margin-bottom: 8px;\n}\n.navbar-btn.btn-sm {\n  margin-top: 10px;\n  margin-bottom: 10px;\n}\n.navbar-btn.btn-xs {\n  margin-top: 14px;\n  margin-bottom: 14px;\n}\n.navbar-text {\n  margin-top: 15px;\n  margin-bottom: 15px;\n}\n@media (min-width: 768px) {\n  .navbar-text {\n    float: left;\n    margin-right: 15px;\n    margin-left: 15px;\n  }\n}\n@media (min-width: 768px) {\n  .navbar-left {\n    float: left !important;\n  }\n  .navbar-right {\n    float: right !important;\n    margin-right: -15px;\n  }\n  .navbar-right ~ .navbar-right {\n    margin-right: 0;\n  }\n}\n.navbar-default {\n  background-color: #f8f8f8;\n  border-color: #e7e7e7;\n}\n.navbar-default .navbar-brand {\n  color: #777;\n}\n.navbar-default .navbar-brand:hover,\n.navbar-default .navbar-brand:focus {\n  color: #5e5e5e;\n  background-color: transparent;\n}\n.navbar-default .navbar-text {\n  color: #777;\n}\n.navbar-default .navbar-nav > li > a {\n  color: #777;\n}\n.navbar-default .navbar-nav > li > a:hover,\n.navbar-default .navbar-nav > li > a:focus {\n  color: #333;\n  background-color: transparent;\n}\n.navbar-default .navbar-nav > .active > a,\n.navbar-default .navbar-nav > .active > a:hover,\n.navbar-default .navbar-nav > .active > a:focus {\n  color: #555;\n  background-color: #e7e7e7;\n}\n.navbar-default .navbar-nav > .disabled > a,\n.navbar-default .navbar-nav > .disabled > a:hover,\n.navbar-default .navbar-nav > .disabled > a:focus {\n  color: #ccc;\n  background-color: transparent;\n}\n.navbar-default .navbar-toggle {\n  border-color: #ddd;\n}\n.navbar-default .navbar-toggle:hover,\n.navbar-default .navbar-toggle:focus {\n  background-color: #ddd;\n}\n.navbar-default .navbar-toggle .icon-bar {\n  background-color: #888;\n}\n.navbar-default .navbar-collapse,\n.navbar-default .navbar-form {\n  border-color: #e7e7e7;\n}\n.navbar-default .navbar-nav > .open > a,\n.navbar-default .navbar-nav > .open > a:hover,\n.navbar-default .navbar-nav > .open > a:focus {\n  color: #555;\n  background-color: #e7e7e7;\n}\n@media (max-width: 767px) {\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a {\n    color: #777;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {\n    color: #333;\n    background-color: transparent;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {\n    color: #555;\n    background-color: #e7e7e7;\n  }\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,\n  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {\n    color: #ccc;\n    background-color: transparent;\n  }\n}\n.navbar-default .navbar-link {\n  color: #777;\n}\n.navbar-default .navbar-link:hover {\n  color: #333;\n}\n.navbar-default .btn-link {\n  color: #777;\n}\n.navbar-default .btn-link:hover,\n.navbar-default .btn-link:focus {\n  color: #333;\n}\n.navbar-default .btn-link[disabled]:hover,\nfieldset[disabled] .navbar-default .btn-link:hover,\n.navbar-default .btn-link[disabled]:focus,\nfieldset[disabled] .navbar-default .btn-link:focus {\n  color: #ccc;\n}\n.navbar-inverse {\n  background-color: #222;\n  border-color: #080808;\n}\n.navbar-inverse .navbar-brand {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-brand:hover,\n.navbar-inverse .navbar-brand:focus {\n  color: #fff;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-text {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-nav > li > a {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-nav > li > a:hover,\n.navbar-inverse .navbar-nav > li > a:focus {\n  color: #fff;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-nav > .active > a,\n.navbar-inverse .navbar-nav > .active > a:hover,\n.navbar-inverse .navbar-nav > .active > a:focus {\n  color: #fff;\n  background-color: #080808;\n}\n.navbar-inverse .navbar-nav > .disabled > a,\n.navbar-inverse .navbar-nav > .disabled > a:hover,\n.navbar-inverse .navbar-nav > .disabled > a:focus {\n  color: #444;\n  background-color: transparent;\n}\n.navbar-inverse .navbar-toggle {\n  border-color: #333;\n}\n.navbar-inverse .navbar-toggle:hover,\n.navbar-inverse .navbar-toggle:focus {\n  background-color: #333;\n}\n.navbar-inverse .navbar-toggle .icon-bar {\n  background-color: #fff;\n}\n.navbar-inverse .navbar-collapse,\n.navbar-inverse .navbar-form {\n  border-color: #101010;\n}\n.navbar-inverse .navbar-nav > .open > a,\n.navbar-inverse .navbar-nav > .open > a:hover,\n.navbar-inverse .navbar-nav > .open > a:focus {\n  color: #fff;\n  background-color: #080808;\n}\n@media (max-width: 767px) {\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {\n    border-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {\n    background-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {\n    color: #9d9d9d;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {\n    color: #fff;\n    background-color: transparent;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {\n    color: #fff;\n    background-color: #080808;\n  }\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,\n  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {\n    color: #444;\n    background-color: transparent;\n  }\n}\n.navbar-inverse .navbar-link {\n  color: #9d9d9d;\n}\n.navbar-inverse .navbar-link:hover {\n  color: #fff;\n}\n.navbar-inverse .btn-link {\n  color: #9d9d9d;\n}\n.navbar-inverse .btn-link:hover,\n.navbar-inverse .btn-link:focus {\n  color: #fff;\n}\n.navbar-inverse .btn-link[disabled]:hover,\nfieldset[disabled] .navbar-inverse .btn-link:hover,\n.navbar-inverse .btn-link[disabled]:focus,\nfieldset[disabled] .navbar-inverse .btn-link:focus {\n  color: #444;\n}\n.breadcrumb {\n  padding: 8px 15px;\n  margin-bottom: 20px;\n  list-style: none;\n  background-color: #f5f5f5;\n  border-radius: 4px;\n}\n.breadcrumb > li {\n  display: inline-block;\n}\n.breadcrumb > li + li:before {\n  padding: 0 5px;\n  color: #ccc;\n  content: \"/\\00a0\";\n}\n.breadcrumb > .active {\n  color: #777;\n}\n.pagination {\n  display: inline-block;\n  padding-left: 0;\n  margin: 20px 0;\n  border-radius: 4px;\n}\n.pagination > li {\n  display: inline;\n}\n.pagination > li > a,\n.pagination > li > span {\n  position: relative;\n  float: left;\n  padding: 6px 12px;\n  margin-left: -1px;\n  line-height: 1.42857143;\n  color: #337ab7;\n  text-decoration: none;\n  background-color: #fff;\n  border: 1px solid #ddd;\n}\n.pagination > li:first-child > a,\n.pagination > li:first-child > span {\n  margin-left: 0;\n  border-top-left-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\n.pagination > li:last-child > a,\n.pagination > li:last-child > span {\n  border-top-right-radius: 4px;\n  border-bottom-right-radius: 4px;\n}\n.pagination > li > a:hover,\n.pagination > li > span:hover,\n.pagination > li > a:focus,\n.pagination > li > span:focus {\n  z-index: 2;\n  color: #23527c;\n  background-color: #eee;\n  border-color: #ddd;\n}\n.pagination > .active > a,\n.pagination > .active > span,\n.pagination > .active > a:hover,\n.pagination > .active > span:hover,\n.pagination > .active > a:focus,\n.pagination > .active > span:focus {\n  z-index: 3;\n  color: #fff;\n  cursor: default;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.pagination > .disabled > span,\n.pagination > .disabled > span:hover,\n.pagination > .disabled > span:focus,\n.pagination > .disabled > a,\n.pagination > .disabled > a:hover,\n.pagination > .disabled > a:focus {\n  color: #777;\n  cursor: not-allowed;\n  background-color: #fff;\n  border-color: #ddd;\n}\n.pagination-lg > li > a,\n.pagination-lg > li > span {\n  padding: 10px 16px;\n  font-size: 18px;\n  line-height: 1.3333333;\n}\n.pagination-lg > li:first-child > a,\n.pagination-lg > li:first-child > span {\n  border-top-left-radius: 6px;\n  border-bottom-left-radius: 6px;\n}\n.pagination-lg > li:last-child > a,\n.pagination-lg > li:last-child > span {\n  border-top-right-radius: 6px;\n  border-bottom-right-radius: 6px;\n}\n.pagination-sm > li > a,\n.pagination-sm > li > span {\n  padding: 5px 10px;\n  font-size: 12px;\n  line-height: 1.5;\n}\n.pagination-sm > li:first-child > a,\n.pagination-sm > li:first-child > span {\n  border-top-left-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.pagination-sm > li:last-child > a,\n.pagination-sm > li:last-child > span {\n  border-top-right-radius: 3px;\n  border-bottom-right-radius: 3px;\n}\n.pager {\n  padding-left: 0;\n  margin: 20px 0;\n  text-align: center;\n  list-style: none;\n}\n.pager li {\n  display: inline;\n}\n.pager li > a,\n.pager li > span {\n  display: inline-block;\n  padding: 5px 14px;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 15px;\n}\n.pager li > a:hover,\n.pager li > a:focus {\n  text-decoration: none;\n  background-color: #eee;\n}\n.pager .next > a,\n.pager .next > span {\n  float: right;\n}\n.pager .previous > a,\n.pager .previous > span {\n  float: left;\n}\n.pager .disabled > a,\n.pager .disabled > a:hover,\n.pager .disabled > a:focus,\n.pager .disabled > span {\n  color: #777;\n  cursor: not-allowed;\n  background-color: #fff;\n}\n.label {\n  display: inline;\n  padding: .2em .6em .3em;\n  font-size: 75%;\n  font-weight: bold;\n  line-height: 1;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: .25em;\n}\na.label:hover,\na.label:focus {\n  color: #fff;\n  text-decoration: none;\n  cursor: pointer;\n}\n.label:empty {\n  display: none;\n}\n.btn .label {\n  position: relative;\n  top: -1px;\n}\n.label-default {\n  background-color: #777;\n}\n.label-default[href]:hover,\n.label-default[href]:focus {\n  background-color: #5e5e5e;\n}\n.label-primary {\n  background-color: #337ab7;\n}\n.label-primary[href]:hover,\n.label-primary[href]:focus {\n  background-color: #286090;\n}\n.label-success {\n  background-color: #5cb85c;\n}\n.label-success[href]:hover,\n.label-success[href]:focus {\n  background-color: #449d44;\n}\n.label-info {\n  background-color: #5bc0de;\n}\n.label-info[href]:hover,\n.label-info[href]:focus {\n  background-color: #31b0d5;\n}\n.label-warning {\n  background-color: #f0ad4e;\n}\n.label-warning[href]:hover,\n.label-warning[href]:focus {\n  background-color: #ec971f;\n}\n.label-danger {\n  background-color: #d9534f;\n}\n.label-danger[href]:hover,\n.label-danger[href]:focus {\n  background-color: #c9302c;\n}\n.badge {\n  display: inline-block;\n  min-width: 10px;\n  padding: 3px 7px;\n  font-size: 12px;\n  font-weight: bold;\n  line-height: 1;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: middle;\n  background-color: #777;\n  border-radius: 10px;\n}\n.badge:empty {\n  display: none;\n}\n.btn .badge {\n  position: relative;\n  top: -1px;\n}\n.btn-xs .badge,\n.btn-group-xs > .btn .badge {\n  top: 0;\n  padding: 1px 5px;\n}\na.badge:hover,\na.badge:focus {\n  color: #fff;\n  text-decoration: none;\n  cursor: pointer;\n}\n.list-group-item.active > .badge,\n.nav-pills > .active > a > .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.list-group-item > .badge {\n  float: right;\n}\n.list-group-item > .badge + .badge {\n  margin-right: 5px;\n}\n.nav-pills > li > a > .badge {\n  margin-left: 3px;\n}\n.jumbotron {\n  padding-top: 30px;\n  padding-bottom: 30px;\n  margin-bottom: 30px;\n  color: inherit;\n  background-color: #eee;\n}\n.jumbotron h1,\n.jumbotron .h1 {\n  color: inherit;\n}\n.jumbotron p {\n  margin-bottom: 15px;\n  font-size: 21px;\n  font-weight: 200;\n}\n.jumbotron > hr {\n  border-top-color: #d5d5d5;\n}\n.container .jumbotron,\n.container-fluid .jumbotron {\n  padding-right: 15px;\n  padding-left: 15px;\n  border-radius: 6px;\n}\n.jumbotron .container {\n  max-width: 100%;\n}\n@media screen and (min-width: 768px) {\n  .jumbotron {\n    padding-top: 48px;\n    padding-bottom: 48px;\n  }\n  .container .jumbotron,\n  .container-fluid .jumbotron {\n    padding-right: 60px;\n    padding-left: 60px;\n  }\n  .jumbotron h1,\n  .jumbotron .h1 {\n    font-size: 63px;\n  }\n}\n.thumbnail {\n  display: block;\n  padding: 4px;\n  margin-bottom: 20px;\n  line-height: 1.42857143;\n  background-color: #fff;\n  border: 1px solid #ddd;\n  border-radius: 4px;\n  -webkit-transition: border .2s ease-in-out;\n       -o-transition: border .2s ease-in-out;\n          transition: border .2s ease-in-out;\n}\n.thumbnail > img,\n.thumbnail a > img {\n  margin-right: auto;\n  margin-left: auto;\n}\na.thumbnail:hover,\na.thumbnail:focus,\na.thumbnail.active {\n  border-color: #337ab7;\n}\n.thumbnail .caption {\n  padding: 9px;\n  color: #333;\n}\n.alert {\n  padding: 15px;\n  margin-bottom: 20px;\n  border: 1px solid transparent;\n  border-radius: 4px;\n}\n.alert h4 {\n  margin-top: 0;\n  color: inherit;\n}\n.alert .alert-link {\n  font-weight: bold;\n}\n.alert > p,\n.alert > ul {\n  margin-bottom: 0;\n}\n.alert > p + p {\n  margin-top: 5px;\n}\n.alert-dismissable,\n.alert-dismissible {\n  padding-right: 35px;\n}\n.alert-dismissable .close,\n.alert-dismissible .close {\n  position: relative;\n  top: -2px;\n  right: -21px;\n  color: inherit;\n}\n.alert-success {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #d6e9c6;\n}\n.alert-success hr {\n  border-top-color: #c9e2b3;\n}\n.alert-success .alert-link {\n  color: #2b542c;\n}\n.alert-info {\n  color: #31708f;\n  background-color: #d9edf7;\n  border-color: #bce8f1;\n}\n.alert-info hr {\n  border-top-color: #a6e1ec;\n}\n.alert-info .alert-link {\n  color: #245269;\n}\n.alert-warning {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #faebcc;\n}\n.alert-warning hr {\n  border-top-color: #f7e1b5;\n}\n.alert-warning .alert-link {\n  color: #66512c;\n}\n.alert-danger {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #ebccd1;\n}\n.alert-danger hr {\n  border-top-color: #e4b9c0;\n}\n.alert-danger .alert-link {\n  color: #843534;\n}\n@-webkit-keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n@-o-keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n@keyframes progress-bar-stripes {\n  from {\n    background-position: 40px 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n.progress {\n  height: 20px;\n  margin-bottom: 20px;\n  overflow: hidden;\n  background-color: #f5f5f5;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);\n          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);\n}\n.progress-bar {\n  float: left;\n  width: 0;\n  height: 100%;\n  font-size: 12px;\n  line-height: 20px;\n  color: #fff;\n  text-align: center;\n  background-color: #337ab7;\n  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);\n          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);\n  -webkit-transition: width .6s ease;\n       -o-transition: width .6s ease;\n          transition: width .6s ease;\n}\n.progress-striped .progress-bar,\n.progress-bar-striped {\n  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);\n  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);\n  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);\n  -webkit-background-size: 40px 40px;\n          background-size: 40px 40px;\n}\n.progress.active .progress-bar,\n.progress-bar.active {\n  -webkit-animation: progress-bar-stripes 2s linear infinite;\n       -o-animation: progress-bar-stripes 2s linear infinite;\n          animation: progress-bar-stripes 2s linear infinite;\n}\n.progress-bar-success {\n  background-color: #5cb85c;\n}\n.progress-striped .progress-bar-success {\n  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);\n  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);\n  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);\n}\n.progress-bar-info {\n  background-color: #5bc0de;\n}\n.progress-striped .progress-bar-info {\n  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);\n  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);\n  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);\n}\n.progress-bar-warning {\n  background-color: #f0ad4e;\n}\n.progress-striped .progress-bar-warning {\n  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);\n  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);\n  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);\n}\n.progress-bar-danger {\n  background-color: #d9534f;\n}\n.progress-striped .progress-bar-danger {\n  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);\n  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);\n  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);\n}\n.media {\n  margin-top: 15px;\n}\n.media:first-child {\n  margin-top: 0;\n}\n.media,\n.media-body {\n  overflow: hidden;\n  zoom: 1;\n}\n.media-body {\n  width: 10000px;\n}\n.media-object {\n  display: block;\n}\n.media-object.img-thumbnail {\n  max-width: none;\n}\n.media-right,\n.media > .pull-right {\n  padding-left: 10px;\n}\n.media-left,\n.media > .pull-left {\n  padding-right: 10px;\n}\n.media-left,\n.media-right,\n.media-body {\n  display: table-cell;\n  vertical-align: top;\n}\n.media-middle {\n  vertical-align: middle;\n}\n.media-bottom {\n  vertical-align: bottom;\n}\n.media-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.media-list {\n  padding-left: 0;\n  list-style: none;\n}\n.list-group {\n  padding-left: 0;\n  margin-bottom: 20px;\n}\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n  margin-bottom: -1px;\n  background-color: #fff;\n  border: 1px solid #ddd;\n}\n.list-group-item:first-child {\n  border-top-left-radius: 4px;\n  border-top-right-radius: 4px;\n}\n.list-group-item:last-child {\n  margin-bottom: 0;\n  border-bottom-right-radius: 4px;\n  border-bottom-left-radius: 4px;\n}\na.list-group-item,\nbutton.list-group-item {\n  color: #555;\n}\na.list-group-item .list-group-item-heading,\nbutton.list-group-item .list-group-item-heading {\n  color: #333;\n}\na.list-group-item:hover,\nbutton.list-group-item:hover,\na.list-group-item:focus,\nbutton.list-group-item:focus {\n  color: #555;\n  text-decoration: none;\n  background-color: #f5f5f5;\n}\nbutton.list-group-item {\n  width: 100%;\n  text-align: left;\n}\n.list-group-item.disabled,\n.list-group-item.disabled:hover,\n.list-group-item.disabled:focus {\n  color: #777;\n  cursor: not-allowed;\n  background-color: #eee;\n}\n.list-group-item.disabled .list-group-item-heading,\n.list-group-item.disabled:hover .list-group-item-heading,\n.list-group-item.disabled:focus .list-group-item-heading {\n  color: inherit;\n}\n.list-group-item.disabled .list-group-item-text,\n.list-group-item.disabled:hover .list-group-item-text,\n.list-group-item.disabled:focus .list-group-item-text {\n  color: #777;\n}\n.list-group-item.active,\n.list-group-item.active:hover,\n.list-group-item.active:focus {\n  z-index: 2;\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.list-group-item.active .list-group-item-heading,\n.list-group-item.active:hover .list-group-item-heading,\n.list-group-item.active:focus .list-group-item-heading,\n.list-group-item.active .list-group-item-heading > small,\n.list-group-item.active:hover .list-group-item-heading > small,\n.list-group-item.active:focus .list-group-item-heading > small,\n.list-group-item.active .list-group-item-heading > .small,\n.list-group-item.active:hover .list-group-item-heading > .small,\n.list-group-item.active:focus .list-group-item-heading > .small {\n  color: inherit;\n}\n.list-group-item.active .list-group-item-text,\n.list-group-item.active:hover .list-group-item-text,\n.list-group-item.active:focus .list-group-item-text {\n  color: #c7ddef;\n}\n.list-group-item-success {\n  color: #3c763d;\n  background-color: #dff0d8;\n}\na.list-group-item-success,\nbutton.list-group-item-success {\n  color: #3c763d;\n}\na.list-group-item-success .list-group-item-heading,\nbutton.list-group-item-success .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-success:hover,\nbutton.list-group-item-success:hover,\na.list-group-item-success:focus,\nbutton.list-group-item-success:focus {\n  color: #3c763d;\n  background-color: #d0e9c6;\n}\na.list-group-item-success.active,\nbutton.list-group-item-success.active,\na.list-group-item-success.active:hover,\nbutton.list-group-item-success.active:hover,\na.list-group-item-success.active:focus,\nbutton.list-group-item-success.active:focus {\n  color: #fff;\n  background-color: #3c763d;\n  border-color: #3c763d;\n}\n.list-group-item-info {\n  color: #31708f;\n  background-color: #d9edf7;\n}\na.list-group-item-info,\nbutton.list-group-item-info {\n  color: #31708f;\n}\na.list-group-item-info .list-group-item-heading,\nbutton.list-group-item-info .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-info:hover,\nbutton.list-group-item-info:hover,\na.list-group-item-info:focus,\nbutton.list-group-item-info:focus {\n  color: #31708f;\n  background-color: #c4e3f3;\n}\na.list-group-item-info.active,\nbutton.list-group-item-info.active,\na.list-group-item-info.active:hover,\nbutton.list-group-item-info.active:hover,\na.list-group-item-info.active:focus,\nbutton.list-group-item-info.active:focus {\n  color: #fff;\n  background-color: #31708f;\n  border-color: #31708f;\n}\n.list-group-item-warning {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n}\na.list-group-item-warning,\nbutton.list-group-item-warning {\n  color: #8a6d3b;\n}\na.list-group-item-warning .list-group-item-heading,\nbutton.list-group-item-warning .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-warning:hover,\nbutton.list-group-item-warning:hover,\na.list-group-item-warning:focus,\nbutton.list-group-item-warning:focus {\n  color: #8a6d3b;\n  background-color: #faf2cc;\n}\na.list-group-item-warning.active,\nbutton.list-group-item-warning.active,\na.list-group-item-warning.active:hover,\nbutton.list-group-item-warning.active:hover,\na.list-group-item-warning.active:focus,\nbutton.list-group-item-warning.active:focus {\n  color: #fff;\n  background-color: #8a6d3b;\n  border-color: #8a6d3b;\n}\n.list-group-item-danger {\n  color: #a94442;\n  background-color: #f2dede;\n}\na.list-group-item-danger,\nbutton.list-group-item-danger {\n  color: #a94442;\n}\na.list-group-item-danger .list-group-item-heading,\nbutton.list-group-item-danger .list-group-item-heading {\n  color: inherit;\n}\na.list-group-item-danger:hover,\nbutton.list-group-item-danger:hover,\na.list-group-item-danger:focus,\nbutton.list-group-item-danger:focus {\n  color: #a94442;\n  background-color: #ebcccc;\n}\na.list-group-item-danger.active,\nbutton.list-group-item-danger.active,\na.list-group-item-danger.active:hover,\nbutton.list-group-item-danger.active:hover,\na.list-group-item-danger.active:focus,\nbutton.list-group-item-danger.active:focus {\n  color: #fff;\n  background-color: #a94442;\n  border-color: #a94442;\n}\n.list-group-item-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.list-group-item-text {\n  margin-bottom: 0;\n  line-height: 1.3;\n}\n.panel {\n  margin-bottom: 20px;\n  background-color: #fff;\n  border: 1px solid transparent;\n  border-radius: 4px;\n  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);\n          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);\n}\n.panel-body {\n  padding: 15px;\n}\n.panel-heading {\n  padding: 10px 15px;\n  border-bottom: 1px solid transparent;\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel-heading > .dropdown .dropdown-toggle {\n  color: inherit;\n}\n.panel-title {\n  margin-top: 0;\n  margin-bottom: 0;\n  font-size: 16px;\n  color: inherit;\n}\n.panel-title > a,\n.panel-title > small,\n.panel-title > .small,\n.panel-title > small > a,\n.panel-title > .small > a {\n  color: inherit;\n}\n.panel-footer {\n  padding: 10px 15px;\n  background-color: #f5f5f5;\n  border-top: 1px solid #ddd;\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .list-group,\n.panel > .panel-collapse > .list-group {\n  margin-bottom: 0;\n}\n.panel > .list-group .list-group-item,\n.panel > .panel-collapse > .list-group .list-group-item {\n  border-width: 1px 0;\n  border-radius: 0;\n}\n.panel > .list-group:first-child .list-group-item:first-child,\n.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {\n  border-top: 0;\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .list-group:last-child .list-group-item:last-child,\n.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {\n  border-bottom: 0;\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n.panel-heading + .list-group .list-group-item:first-child {\n  border-top-width: 0;\n}\n.list-group + .panel-footer {\n  border-top-width: 0;\n}\n.panel > .table,\n.panel > .table-responsive > .table,\n.panel > .panel-collapse > .table {\n  margin-bottom: 0;\n}\n.panel > .table caption,\n.panel > .table-responsive > .table caption,\n.panel > .panel-collapse > .table caption {\n  padding-right: 15px;\n  padding-left: 15px;\n}\n.panel > .table:first-child,\n.panel > .table-responsive:first-child > .table:first-child {\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {\n  border-top-left-radius: 3px;\n  border-top-right-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,\n.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {\n  border-top-left-radius: 3px;\n}\n.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,\n.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,\n.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,\n.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,\n.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {\n  border-top-right-radius: 3px;\n}\n.panel > .table:last-child,\n.panel > .table-responsive:last-child > .table:last-child {\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {\n  border-bottom-right-radius: 3px;\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,\n.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {\n  border-bottom-left-radius: 3px;\n}\n.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,\n.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,\n.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,\n.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {\n  border-bottom-right-radius: 3px;\n}\n.panel > .panel-body + .table,\n.panel > .panel-body + .table-responsive,\n.panel > .table + .panel-body,\n.panel > .table-responsive + .panel-body {\n  border-top: 1px solid #ddd;\n}\n.panel > .table > tbody:first-child > tr:first-child th,\n.panel > .table > tbody:first-child > tr:first-child td {\n  border-top: 0;\n}\n.panel > .table-bordered,\n.panel > .table-responsive > .table-bordered {\n  border: 0;\n}\n.panel > .table-bordered > thead > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,\n.panel > .table-bordered > tbody > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,\n.panel > .table-bordered > tfoot > tr > th:first-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,\n.panel > .table-bordered > thead > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,\n.panel > .table-bordered > tbody > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,\n.panel > .table-bordered > tfoot > tr > td:first-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {\n  border-left: 0;\n}\n.panel > .table-bordered > thead > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,\n.panel > .table-bordered > tbody > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,\n.panel > .table-bordered > tfoot > tr > th:last-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,\n.panel > .table-bordered > thead > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,\n.panel > .table-bordered > tbody > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,\n.panel > .table-bordered > tfoot > tr > td:last-child,\n.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {\n  border-right: 0;\n}\n.panel > .table-bordered > thead > tr:first-child > td,\n.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,\n.panel > .table-bordered > tbody > tr:first-child > td,\n.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,\n.panel > .table-bordered > thead > tr:first-child > th,\n.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,\n.panel > .table-bordered > tbody > tr:first-child > th,\n.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {\n  border-bottom: 0;\n}\n.panel > .table-bordered > tbody > tr:last-child > td,\n.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,\n.panel > .table-bordered > tfoot > tr:last-child > td,\n.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,\n.panel > .table-bordered > tbody > tr:last-child > th,\n.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,\n.panel > .table-bordered > tfoot > tr:last-child > th,\n.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {\n  border-bottom: 0;\n}\n.panel > .table-responsive {\n  margin-bottom: 0;\n  border: 0;\n}\n.panel-group {\n  margin-bottom: 20px;\n}\n.panel-group .panel {\n  margin-bottom: 0;\n  border-radius: 4px;\n}\n.panel-group .panel + .panel {\n  margin-top: 5px;\n}\n.panel-group .panel-heading {\n  border-bottom: 0;\n}\n.panel-group .panel-heading + .panel-collapse > .panel-body,\n.panel-group .panel-heading + .panel-collapse > .list-group {\n  border-top: 1px solid #ddd;\n}\n.panel-group .panel-footer {\n  border-top: 0;\n}\n.panel-group .panel-footer + .panel-collapse .panel-body {\n  border-bottom: 1px solid #ddd;\n}\n.panel-default {\n  border-color: #ddd;\n}\n.panel-default > .panel-heading {\n  color: #333;\n  background-color: #f5f5f5;\n  border-color: #ddd;\n}\n.panel-default > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #ddd;\n}\n.panel-default > .panel-heading .badge {\n  color: #f5f5f5;\n  background-color: #333;\n}\n.panel-default > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #ddd;\n}\n.panel-primary {\n  border-color: #337ab7;\n}\n.panel-primary > .panel-heading {\n  color: #fff;\n  background-color: #337ab7;\n  border-color: #337ab7;\n}\n.panel-primary > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #337ab7;\n}\n.panel-primary > .panel-heading .badge {\n  color: #337ab7;\n  background-color: #fff;\n}\n.panel-primary > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #337ab7;\n}\n.panel-success {\n  border-color: #d6e9c6;\n}\n.panel-success > .panel-heading {\n  color: #3c763d;\n  background-color: #dff0d8;\n  border-color: #d6e9c6;\n}\n.panel-success > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #d6e9c6;\n}\n.panel-success > .panel-heading .badge {\n  color: #dff0d8;\n  background-color: #3c763d;\n}\n.panel-success > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #d6e9c6;\n}\n.panel-info {\n  border-color: #bce8f1;\n}\n.panel-info > .panel-heading {\n  color: #31708f;\n  background-color: #d9edf7;\n  border-color: #bce8f1;\n}\n.panel-info > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #bce8f1;\n}\n.panel-info > .panel-heading .badge {\n  color: #d9edf7;\n  background-color: #31708f;\n}\n.panel-info > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #bce8f1;\n}\n.panel-warning {\n  border-color: #faebcc;\n}\n.panel-warning > .panel-heading {\n  color: #8a6d3b;\n  background-color: #fcf8e3;\n  border-color: #faebcc;\n}\n.panel-warning > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #faebcc;\n}\n.panel-warning > .panel-heading .badge {\n  color: #fcf8e3;\n  background-color: #8a6d3b;\n}\n.panel-warning > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #faebcc;\n}\n.panel-danger {\n  border-color: #ebccd1;\n}\n.panel-danger > .panel-heading {\n  color: #a94442;\n  background-color: #f2dede;\n  border-color: #ebccd1;\n}\n.panel-danger > .panel-heading + .panel-collapse > .panel-body {\n  border-top-color: #ebccd1;\n}\n.panel-danger > .panel-heading .badge {\n  color: #f2dede;\n  background-color: #a94442;\n}\n.panel-danger > .panel-footer + .panel-collapse > .panel-body {\n  border-bottom-color: #ebccd1;\n}\n.embed-responsive {\n  position: relative;\n  display: block;\n  height: 0;\n  padding: 0;\n  overflow: hidden;\n}\n.embed-responsive .embed-responsive-item,\n.embed-responsive iframe,\n.embed-responsive embed,\n.embed-responsive object,\n.embed-responsive video {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  border: 0;\n}\n.embed-responsive-16by9 {\n  padding-bottom: 56.25%;\n}\n.embed-responsive-4by3 {\n  padding-bottom: 75%;\n}\n.well {\n  min-height: 20px;\n  padding: 19px;\n  margin-bottom: 20px;\n  background-color: #f5f5f5;\n  border: 1px solid #e3e3e3;\n  border-radius: 4px;\n  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);\n          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);\n}\n.well blockquote {\n  border-color: #ddd;\n  border-color: rgba(0, 0, 0, .15);\n}\n.well-lg {\n  padding: 24px;\n  border-radius: 6px;\n}\n.well-sm {\n  padding: 9px;\n  border-radius: 3px;\n}\n.close {\n  float: right;\n  font-size: 21px;\n  font-weight: bold;\n  line-height: 1;\n  color: #000;\n  text-shadow: 0 1px 0 #fff;\n  filter: alpha(opacity=20);\n  opacity: .2;\n}\n.close:hover,\n.close:focus {\n  color: #000;\n  text-decoration: none;\n  cursor: pointer;\n  filter: alpha(opacity=50);\n  opacity: .5;\n}\nbutton.close {\n  -webkit-appearance: none;\n  padding: 0;\n  cursor: pointer;\n  background: transparent;\n  border: 0;\n}\n.modal-open {\n  overflow: hidden;\n}\n.modal {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1050;\n  display: none;\n  overflow: hidden;\n  -webkit-overflow-scrolling: touch;\n  outline: 0;\n}\n.modal.fade .modal-dialog {\n  -webkit-transition: -webkit-transform .3s ease-out;\n       -o-transition:      -o-transform .3s ease-out;\n          transition:         transform .3s ease-out;\n  -webkit-transform: translate(0, -25%);\n      -ms-transform: translate(0, -25%);\n       -o-transform: translate(0, -25%);\n          transform: translate(0, -25%);\n}\n.modal.in .modal-dialog {\n  -webkit-transform: translate(0, 0);\n      -ms-transform: translate(0, 0);\n       -o-transform: translate(0, 0);\n          transform: translate(0, 0);\n}\n.modal-open .modal {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 10px;\n}\n.modal-content {\n  position: relative;\n  background-color: #fff;\n  -webkit-background-clip: padding-box;\n          background-clip: padding-box;\n  border: 1px solid #999;\n  border: 1px solid rgba(0, 0, 0, .2);\n  border-radius: 6px;\n  outline: 0;\n  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);\n          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);\n}\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1040;\n  background-color: #000;\n}\n.modal-backdrop.fade {\n  filter: alpha(opacity=0);\n  opacity: 0;\n}\n.modal-backdrop.in {\n  filter: alpha(opacity=50);\n  opacity: .5;\n}\n.modal-header {\n  padding: 15px;\n  border-bottom: 1px solid #e5e5e5;\n}\n.modal-header .close {\n  margin-top: -2px;\n}\n.modal-title {\n  margin: 0;\n  line-height: 1.42857143;\n}\n.modal-body {\n  position: relative;\n  padding: 15px;\n}\n.modal-footer {\n  padding: 15px;\n  text-align: right;\n  border-top: 1px solid #e5e5e5;\n}\n.modal-footer .btn + .btn {\n  margin-bottom: 0;\n  margin-left: 5px;\n}\n.modal-footer .btn-group .btn + .btn {\n  margin-left: -1px;\n}\n.modal-footer .btn-block + .btn-block {\n  margin-left: 0;\n}\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n@media (min-width: 768px) {\n  .modal-dialog {\n    width: 600px;\n    margin: 30px auto;\n  }\n  .modal-content {\n    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);\n            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);\n  }\n  .modal-sm {\n    width: 300px;\n  }\n}\n@media (min-width: 992px) {\n  .modal-lg {\n    width: 900px;\n  }\n}\n.tooltip {\n  position: absolute;\n  z-index: 1070;\n  display: block;\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 12px;\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1.42857143;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  word-wrap: normal;\n  white-space: normal;\n  filter: alpha(opacity=0);\n  opacity: 0;\n\n  line-break: auto;\n}\n.tooltip.in {\n  filter: alpha(opacity=90);\n  opacity: .9;\n}\n.tooltip.top {\n  padding: 5px 0;\n  margin-top: -3px;\n}\n.tooltip.right {\n  padding: 0 5px;\n  margin-left: 3px;\n}\n.tooltip.bottom {\n  padding: 5px 0;\n  margin-top: 3px;\n}\n.tooltip.left {\n  padding: 0 5px;\n  margin-left: -3px;\n}\n.tooltip-inner {\n  max-width: 200px;\n  padding: 3px 8px;\n  color: #fff;\n  text-align: center;\n  background-color: #000;\n  border-radius: 4px;\n}\n.tooltip-arrow {\n  position: absolute;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.tooltip.top .tooltip-arrow {\n  bottom: 0;\n  left: 50%;\n  margin-left: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.top-left .tooltip-arrow {\n  right: 5px;\n  bottom: 0;\n  margin-bottom: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.top-right .tooltip-arrow {\n  bottom: 0;\n  left: 5px;\n  margin-bottom: -5px;\n  border-width: 5px 5px 0;\n  border-top-color: #000;\n}\n.tooltip.right .tooltip-arrow {\n  top: 50%;\n  left: 0;\n  margin-top: -5px;\n  border-width: 5px 5px 5px 0;\n  border-right-color: #000;\n}\n.tooltip.left .tooltip-arrow {\n  top: 50%;\n  right: 0;\n  margin-top: -5px;\n  border-width: 5px 0 5px 5px;\n  border-left-color: #000;\n}\n.tooltip.bottom .tooltip-arrow {\n  top: 0;\n  left: 50%;\n  margin-left: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.tooltip.bottom-left .tooltip-arrow {\n  top: 0;\n  right: 5px;\n  margin-top: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.tooltip.bottom-right .tooltip-arrow {\n  top: 0;\n  left: 5px;\n  margin-top: -5px;\n  border-width: 0 5px 5px;\n  border-bottom-color: #000;\n}\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: 1060;\n  display: none;\n  max-width: 276px;\n  padding: 1px;\n  font-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  font-size: 14px;\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1.42857143;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  word-wrap: normal;\n  white-space: normal;\n  background-color: #fff;\n  -webkit-background-clip: padding-box;\n          background-clip: padding-box;\n  border: 1px solid #ccc;\n  border: 1px solid rgba(0, 0, 0, .2);\n  border-radius: 6px;\n  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);\n          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);\n\n  line-break: auto;\n}\n.popover.top {\n  margin-top: -10px;\n}\n.popover.right {\n  margin-left: 10px;\n}\n.popover.bottom {\n  margin-top: 10px;\n}\n.popover.left {\n  margin-left: -10px;\n}\n.popover-title {\n  padding: 8px 14px;\n  margin: 0;\n  font-size: 14px;\n  background-color: #f7f7f7;\n  border-bottom: 1px solid #ebebeb;\n  border-radius: 5px 5px 0 0;\n}\n.popover-content {\n  padding: 9px 14px;\n}\n.popover > .arrow,\n.popover > .arrow:after {\n  position: absolute;\n  display: block;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.popover > .arrow {\n  border-width: 11px;\n}\n.popover > .arrow:after {\n  content: \"\";\n  border-width: 10px;\n}\n.popover.top > .arrow {\n  bottom: -11px;\n  left: 50%;\n  margin-left: -11px;\n  border-top-color: #999;\n  border-top-color: rgba(0, 0, 0, .25);\n  border-bottom-width: 0;\n}\n.popover.top > .arrow:after {\n  bottom: 1px;\n  margin-left: -10px;\n  content: \" \";\n  border-top-color: #fff;\n  border-bottom-width: 0;\n}\n.popover.right > .arrow {\n  top: 50%;\n  left: -11px;\n  margin-top: -11px;\n  border-right-color: #999;\n  border-right-color: rgba(0, 0, 0, .25);\n  border-left-width: 0;\n}\n.popover.right > .arrow:after {\n  bottom: -10px;\n  left: 1px;\n  content: \" \";\n  border-right-color: #fff;\n  border-left-width: 0;\n}\n.popover.bottom > .arrow {\n  top: -11px;\n  left: 50%;\n  margin-left: -11px;\n  border-top-width: 0;\n  border-bottom-color: #999;\n  border-bottom-color: rgba(0, 0, 0, .25);\n}\n.popover.bottom > .arrow:after {\n  top: 1px;\n  margin-left: -10px;\n  content: \" \";\n  border-top-width: 0;\n  border-bottom-color: #fff;\n}\n.popover.left > .arrow {\n  top: 50%;\n  right: -11px;\n  margin-top: -11px;\n  border-right-width: 0;\n  border-left-color: #999;\n  border-left-color: rgba(0, 0, 0, .25);\n}\n.popover.left > .arrow:after {\n  right: 1px;\n  bottom: -10px;\n  content: \" \";\n  border-right-width: 0;\n  border-left-color: #fff;\n}\n.carousel {\n  position: relative;\n}\n.carousel-inner {\n  position: relative;\n  width: 100%;\n  overflow: hidden;\n}\n.carousel-inner > .item {\n  position: relative;\n  display: none;\n  -webkit-transition: .6s ease-in-out left;\n       -o-transition: .6s ease-in-out left;\n          transition: .6s ease-in-out left;\n}\n.carousel-inner > .item > img,\n.carousel-inner > .item > a > img {\n  line-height: 1;\n}\n@media all and (transform-3d), (-webkit-transform-3d) {\n  .carousel-inner > .item {\n    -webkit-transition: -webkit-transform .6s ease-in-out;\n         -o-transition:      -o-transform .6s ease-in-out;\n            transition:         transform .6s ease-in-out;\n\n    -webkit-backface-visibility: hidden;\n            backface-visibility: hidden;\n    -webkit-perspective: 1000px;\n            perspective: 1000px;\n  }\n  .carousel-inner > .item.next,\n  .carousel-inner > .item.active.right {\n    left: 0;\n    -webkit-transform: translate3d(100%, 0, 0);\n            transform: translate3d(100%, 0, 0);\n  }\n  .carousel-inner > .item.prev,\n  .carousel-inner > .item.active.left {\n    left: 0;\n    -webkit-transform: translate3d(-100%, 0, 0);\n            transform: translate3d(-100%, 0, 0);\n  }\n  .carousel-inner > .item.next.left,\n  .carousel-inner > .item.prev.right,\n  .carousel-inner > .item.active {\n    left: 0;\n    -webkit-transform: translate3d(0, 0, 0);\n            transform: translate3d(0, 0, 0);\n  }\n}\n.carousel-inner > .active,\n.carousel-inner > .next,\n.carousel-inner > .prev {\n  display: block;\n}\n.carousel-inner > .active {\n  left: 0;\n}\n.carousel-inner > .next,\n.carousel-inner > .prev {\n  position: absolute;\n  top: 0;\n  width: 100%;\n}\n.carousel-inner > .next {\n  left: 100%;\n}\n.carousel-inner > .prev {\n  left: -100%;\n}\n.carousel-inner > .next.left,\n.carousel-inner > .prev.right {\n  left: 0;\n}\n.carousel-inner > .active.left {\n  left: -100%;\n}\n.carousel-inner > .active.right {\n  left: 100%;\n}\n.carousel-control {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  left: 0;\n  width: 15%;\n  font-size: 20px;\n  color: #fff;\n  text-align: center;\n  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);\n  background-color: rgba(0, 0, 0, 0);\n  filter: alpha(opacity=50);\n  opacity: .5;\n}\n.carousel-control.left {\n  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);\n  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);\n  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));\n  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);\n  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);\n  background-repeat: repeat-x;\n}\n.carousel-control.right {\n  right: 0;\n  left: auto;\n  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);\n  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);\n  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));\n  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);\n  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);\n  background-repeat: repeat-x;\n}\n.carousel-control:hover,\n.carousel-control:focus {\n  color: #fff;\n  text-decoration: none;\n  filter: alpha(opacity=90);\n  outline: 0;\n  opacity: .9;\n}\n.carousel-control .icon-prev,\n.carousel-control .icon-next,\n.carousel-control .glyphicon-chevron-left,\n.carousel-control .glyphicon-chevron-right {\n  position: absolute;\n  top: 50%;\n  z-index: 5;\n  display: inline-block;\n  margin-top: -10px;\n}\n.carousel-control .icon-prev,\n.carousel-control .glyphicon-chevron-left {\n  left: 50%;\n  margin-left: -10px;\n}\n.carousel-control .icon-next,\n.carousel-control .glyphicon-chevron-right {\n  right: 50%;\n  margin-right: -10px;\n}\n.carousel-control .icon-prev,\n.carousel-control .icon-next {\n  width: 20px;\n  height: 20px;\n  font-family: serif;\n  line-height: 1;\n}\n.carousel-control .icon-prev:before {\n  content: '\\2039';\n}\n.carousel-control .icon-next:before {\n  content: '\\203a';\n}\n.carousel-indicators {\n  position: absolute;\n  bottom: 10px;\n  left: 50%;\n  z-index: 15;\n  width: 60%;\n  padding-left: 0;\n  margin-left: -30%;\n  text-align: center;\n  list-style: none;\n}\n.carousel-indicators li {\n  display: inline-block;\n  width: 10px;\n  height: 10px;\n  margin: 1px;\n  text-indent: -999px;\n  cursor: pointer;\n  background-color: #000 \\9;\n  background-color: rgba(0, 0, 0, 0);\n  border: 1px solid #fff;\n  border-radius: 10px;\n}\n.carousel-indicators .active {\n  width: 12px;\n  height: 12px;\n  margin: 0;\n  background-color: #fff;\n}\n.carousel-caption {\n  position: absolute;\n  right: 15%;\n  bottom: 20px;\n  left: 15%;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: #fff;\n  text-align: center;\n  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);\n}\n.carousel-caption .btn {\n  text-shadow: none;\n}\n@media screen and (min-width: 768px) {\n  .carousel-control .glyphicon-chevron-left,\n  .carousel-control .glyphicon-chevron-right,\n  .carousel-control .icon-prev,\n  .carousel-control .icon-next {\n    width: 30px;\n    height: 30px;\n    margin-top: -10px;\n    font-size: 30px;\n  }\n  .carousel-control .glyphicon-chevron-left,\n  .carousel-control .icon-prev {\n    margin-left: -10px;\n  }\n  .carousel-control .glyphicon-chevron-right,\n  .carousel-control .icon-next {\n    margin-right: -10px;\n  }\n  .carousel-caption {\n    right: 20%;\n    left: 20%;\n    padding-bottom: 30px;\n  }\n  .carousel-indicators {\n    bottom: 20px;\n  }\n}\n.clearfix:before,\n.clearfix:after,\n.dl-horizontal dd:before,\n.dl-horizontal dd:after,\n.container:before,\n.container:after,\n.container-fluid:before,\n.container-fluid:after,\n.row:before,\n.row:after,\n.form-horizontal .form-group:before,\n.form-horizontal .form-group:after,\n.btn-toolbar:before,\n.btn-toolbar:after,\n.btn-group-vertical > .btn-group:before,\n.btn-group-vertical > .btn-group:after,\n.nav:before,\n.nav:after,\n.navbar:before,\n.navbar:after,\n.navbar-header:before,\n.navbar-header:after,\n.navbar-collapse:before,\n.navbar-collapse:after,\n.pager:before,\n.pager:after,\n.panel-body:before,\n.panel-body:after,\n.modal-header:before,\n.modal-header:after,\n.modal-footer:before,\n.modal-footer:after {\n  display: table;\n  content: \" \";\n}\n.clearfix:after,\n.dl-horizontal dd:after,\n.container:after,\n.container-fluid:after,\n.row:after,\n.form-horizontal .form-group:after,\n.btn-toolbar:after,\n.btn-group-vertical > .btn-group:after,\n.nav:after,\n.navbar:after,\n.navbar-header:after,\n.navbar-collapse:after,\n.pager:after,\n.panel-body:after,\n.modal-header:after,\n.modal-footer:after {\n  clear: both;\n}\n.center-block {\n  display: block;\n  margin-right: auto;\n  margin-left: auto;\n}\n.pull-right {\n  float: right !important;\n}\n.pull-left {\n  float: left !important;\n}\n.hide {\n  display: none !important;\n}\n.show {\n  display: block !important;\n}\n.invisible {\n  visibility: hidden;\n}\n.text-hide {\n  font: 0/0 a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n.hidden {\n  display: none !important;\n}\n.affix {\n  position: fixed;\n}\n@-ms-viewport {\n  width: device-width;\n}\n.visible-xs,\n.visible-sm,\n.visible-md,\n.visible-lg {\n  display: none !important;\n}\n.visible-xs-block,\n.visible-xs-inline,\n.visible-xs-inline-block,\n.visible-sm-block,\n.visible-sm-inline,\n.visible-sm-inline-block,\n.visible-md-block,\n.visible-md-inline,\n.visible-md-inline-block,\n.visible-lg-block,\n.visible-lg-inline,\n.visible-lg-inline-block {\n  display: none !important;\n}\n@media (max-width: 767px) {\n  .visible-xs {\n    display: block !important;\n  }\n  table.visible-xs {\n    display: table !important;\n  }\n  tr.visible-xs {\n    display: table-row !important;\n  }\n  th.visible-xs,\n  td.visible-xs {\n    display: table-cell !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-block {\n    display: block !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-inline {\n    display: inline !important;\n  }\n}\n@media (max-width: 767px) {\n  .visible-xs-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm {\n    display: block !important;\n  }\n  table.visible-sm {\n    display: table !important;\n  }\n  tr.visible-sm {\n    display: table-row !important;\n  }\n  th.visible-sm,\n  td.visible-sm {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-block {\n    display: block !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .visible-sm-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md {\n    display: block !important;\n  }\n  table.visible-md {\n    display: table !important;\n  }\n  tr.visible-md {\n    display: table-row !important;\n  }\n  th.visible-md,\n  td.visible-md {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-block {\n    display: block !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .visible-md-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg {\n    display: block !important;\n  }\n  table.visible-lg {\n    display: table !important;\n  }\n  tr.visible-lg {\n    display: table-row !important;\n  }\n  th.visible-lg,\n  td.visible-lg {\n    display: table-cell !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-block {\n    display: block !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-inline {\n    display: inline !important;\n  }\n}\n@media (min-width: 1200px) {\n  .visible-lg-inline-block {\n    display: inline-block !important;\n  }\n}\n@media (max-width: 767px) {\n  .hidden-xs {\n    display: none !important;\n  }\n}\n@media (min-width: 768px) and (max-width: 991px) {\n  .hidden-sm {\n    display: none !important;\n  }\n}\n@media (min-width: 992px) and (max-width: 1199px) {\n  .hidden-md {\n    display: none !important;\n  }\n}\n@media (min-width: 1200px) {\n  .hidden-lg {\n    display: none !important;\n  }\n}\n.visible-print {\n  display: none !important;\n}\n@media print {\n  .visible-print {\n    display: block !important;\n  }\n  table.visible-print {\n    display: table !important;\n  }\n  tr.visible-print {\n    display: table-row !important;\n  }\n  th.visible-print,\n  td.visible-print {\n    display: table-cell !important;\n  }\n}\n.visible-print-block {\n  display: none !important;\n}\n@media print {\n  .visible-print-block {\n    display: block !important;\n  }\n}\n.visible-print-inline {\n  display: none !important;\n}\n@media print {\n  .visible-print-inline {\n    display: inline !important;\n  }\n}\n.visible-print-inline-block {\n  display: none !important;\n}\n@media print {\n  .visible-print-inline-block {\n    display: inline-block !important;\n  }\n}\n@media print {\n  .hidden-print {\n    display: none !important;\n  }\n}\n/*# sourceMappingURL=bootstrap.css.map */\n","//\n// Glyphicons for Bootstrap\n//\n// Since icons are fonts, they can be placed anywhere text is placed and are\n// thus automatically sized to match the surrounding child. To use, create an\n// inline element with the appropriate classes, like so:\n//\n// <a href=\"#\"><span class=\"glyphicon glyphicon-star\"></span> Star</a>\n\n// Import the fonts\n@font-face {\n  font-family: 'Glyphicons Halflings';\n  src: url('@{icon-font-path}@{icon-font-name}.eot');\n  src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),\n       url('@{icon-font-path}@{icon-font-name}.woff2') format('woff2'),\n       url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),\n       url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),\n       url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');\n}\n\n// Catchall baseclass\n.glyphicon {\n  position: relative;\n  top: 1px;\n  display: inline-block;\n  font-family: 'Glyphicons Halflings';\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n\n// Individual icons\n.glyphicon-asterisk               { &:before { content: \"\\002a\"; } }\n.glyphicon-plus                   { &:before { content: \"\\002b\"; } }\n.glyphicon-euro,\n.glyphicon-eur                    { &:before { content: \"\\20ac\"; } }\n.glyphicon-minus                  { &:before { content: \"\\2212\"; } }\n.glyphicon-cloud                  { &:before { content: \"\\2601\"; } }\n.glyphicon-envelope               { &:before { content: \"\\2709\"; } }\n.glyphicon-pencil                 { &:before { content: \"\\270f\"; } }\n.glyphicon-glass                  { &:before { content: \"\\e001\"; } }\n.glyphicon-music                  { &:before { content: \"\\e002\"; } }\n.glyphicon-search                 { &:before { content: \"\\e003\"; } }\n.glyphicon-heart                  { &:before { content: \"\\e005\"; } }\n.glyphicon-star                   { &:before { content: \"\\e006\"; } }\n.glyphicon-star-empty             { &:before { content: \"\\e007\"; } }\n.glyphicon-user                   { &:before { content: \"\\e008\"; } }\n.glyphicon-film                   { &:before { content: \"\\e009\"; } }\n.glyphicon-th-large               { &:before { content: \"\\e010\"; } }\n.glyphicon-th                     { &:before { content: \"\\e011\"; } }\n.glyphicon-th-list                { &:before { content: \"\\e012\"; } }\n.glyphicon-ok                     { &:before { content: \"\\e013\"; } }\n.glyphicon-remove                 { &:before { content: \"\\e014\"; } }\n.glyphicon-zoom-in                { &:before { content: \"\\e015\"; } }\n.glyphicon-zoom-out               { &:before { content: \"\\e016\"; } }\n.glyphicon-off                    { &:before { content: \"\\e017\"; } }\n.glyphicon-signal                 { &:before { content: \"\\e018\"; } }\n.glyphicon-cog                    { &:before { content: \"\\e019\"; } }\n.glyphicon-trash                  { &:before { content: \"\\e020\"; } }\n.glyphicon-home                   { &:before { content: \"\\e021\"; } }\n.glyphicon-file                   { &:before { content: \"\\e022\"; } }\n.glyphicon-time                   { &:before { content: \"\\e023\"; } }\n.glyphicon-road                   { &:before { content: \"\\e024\"; } }\n.glyphicon-download-alt           { &:before { content: \"\\e025\"; } }\n.glyphicon-download               { &:before { content: \"\\e026\"; } }\n.glyphicon-upload                 { &:before { content: \"\\e027\"; } }\n.glyphicon-inbox                  { &:before { content: \"\\e028\"; } }\n.glyphicon-play-circle            { &:before { content: \"\\e029\"; } }\n.glyphicon-repeat                 { &:before { content: \"\\e030\"; } }\n.glyphicon-refresh                { &:before { content: \"\\e031\"; } }\n.glyphicon-list-alt               { &:before { content: \"\\e032\"; } }\n.glyphicon-lock                   { &:before { content: \"\\e033\"; } }\n.glyphicon-flag                   { &:before { content: \"\\e034\"; } }\n.glyphicon-headphones             { &:before { content: \"\\e035\"; } }\n.glyphicon-volume-off             { &:before { content: \"\\e036\"; } }\n.glyphicon-volume-down            { &:before { content: \"\\e037\"; } }\n.glyphicon-volume-up              { &:before { content: \"\\e038\"; } }\n.glyphicon-qrcode                 { &:before { content: \"\\e039\"; } }\n.glyphicon-barcode                { &:before { content: \"\\e040\"; } }\n.glyphicon-tag                    { &:before { content: \"\\e041\"; } }\n.glyphicon-tags                   { &:before { content: \"\\e042\"; } }\n.glyphicon-book                   { &:before { content: \"\\e043\"; } }\n.glyphicon-bookmark               { &:before { content: \"\\e044\"; } }\n.glyphicon-print                  { &:before { content: \"\\e045\"; } }\n.glyphicon-camera                 { &:before { content: \"\\e046\"; } }\n.glyphicon-font                   { &:before { content: \"\\e047\"; } }\n.glyphicon-bold                   { &:before { content: \"\\e048\"; } }\n.glyphicon-italic                 { &:before { content: \"\\e049\"; } }\n.glyphicon-text-height            { &:before { content: \"\\e050\"; } }\n.glyphicon-text-width             { &:before { content: \"\\e051\"; } }\n.glyphicon-align-left             { &:before { content: \"\\e052\"; } }\n.glyphicon-align-center           { &:before { content: \"\\e053\"; } }\n.glyphicon-align-right            { &:before { content: \"\\e054\"; } }\n.glyphicon-align-justify          { &:before { content: \"\\e055\"; } }\n.glyphicon-list                   { &:before { content: \"\\e056\"; } }\n.glyphicon-indent-left            { &:before { content: \"\\e057\"; } }\n.glyphicon-indent-right           { &:before { content: \"\\e058\"; } }\n.glyphicon-facetime-video         { &:before { content: \"\\e059\"; } }\n.glyphicon-picture                { &:before { content: \"\\e060\"; } }\n.glyphicon-map-marker             { &:before { content: \"\\e062\"; } }\n.glyphicon-adjust                 { &:before { content: \"\\e063\"; } }\n.glyphicon-tint                   { &:before { content: \"\\e064\"; } }\n.glyphicon-edit                   { &:before { content: \"\\e065\"; } }\n.glyphicon-share                  { &:before { content: \"\\e066\"; } }\n.glyphicon-check                  { &:before { content: \"\\e067\"; } }\n.glyphicon-move                   { &:before { content: \"\\e068\"; } }\n.glyphicon-step-backward          { &:before { content: \"\\e069\"; } }\n.glyphicon-fast-backward          { &:before { content: \"\\e070\"; } }\n.glyphicon-backward               { &:before { content: \"\\e071\"; } }\n.glyphicon-play                   { &:before { content: \"\\e072\"; } }\n.glyphicon-pause                  { &:before { content: \"\\e073\"; } }\n.glyphicon-stop                   { &:before { content: \"\\e074\"; } }\n.glyphicon-forward                { &:before { content: \"\\e075\"; } }\n.glyphicon-fast-forward           { &:before { content: \"\\e076\"; } }\n.glyphicon-step-forward           { &:before { content: \"\\e077\"; } }\n.glyphicon-eject                  { &:before { content: \"\\e078\"; } }\n.glyphicon-chevron-left           { &:before { content: \"\\e079\"; } }\n.glyphicon-chevron-right          { &:before { content: \"\\e080\"; } }\n.glyphicon-plus-sign              { &:before { content: \"\\e081\"; } }\n.glyphicon-minus-sign             { &:before { content: \"\\e082\"; } }\n.glyphicon-remove-sign            { &:before { content: \"\\e083\"; } }\n.glyphicon-ok-sign                { &:before { content: \"\\e084\"; } }\n.glyphicon-question-sign          { &:before { content: \"\\e085\"; } }\n.glyphicon-info-sign              { &:before { content: \"\\e086\"; } }\n.glyphicon-screenshot             { &:before { content: \"\\e087\"; } }\n.glyphicon-remove-circle          { &:before { content: \"\\e088\"; } }\n.glyphicon-ok-circle              { &:before { content: \"\\e089\"; } }\n.glyphicon-ban-circle             { &:before { content: \"\\e090\"; } }\n.glyphicon-arrow-left             { &:before { content: \"\\e091\"; } }\n.glyphicon-arrow-right            { &:before { content: \"\\e092\"; } }\n.glyphicon-arrow-up               { &:before { content: \"\\e093\"; } }\n.glyphicon-arrow-down             { &:before { content: \"\\e094\"; } }\n.glyphicon-share-alt              { &:before { content: \"\\e095\"; } }\n.glyphicon-resize-full            { &:before { content: \"\\e096\"; } }\n.glyphicon-resize-small           { &:before { content: \"\\e097\"; } }\n.glyphicon-exclamation-sign       { &:before { content: \"\\e101\"; } }\n.glyphicon-gift                   { &:before { content: \"\\e102\"; } }\n.glyphicon-leaf                   { &:before { content: \"\\e103\"; } }\n.glyphicon-fire                   { &:before { content: \"\\e104\"; } }\n.glyphicon-eye-open               { &:before { content: \"\\e105\"; } }\n.glyphicon-eye-close              { &:before { content: \"\\e106\"; } }\n.glyphicon-warning-sign           { &:before { content: \"\\e107\"; } }\n.glyphicon-plane                  { &:before { content: \"\\e108\"; } }\n.glyphicon-calendar               { &:before { content: \"\\e109\"; } }\n.glyphicon-random                 { &:before { content: \"\\e110\"; } }\n.glyphicon-comment                { &:before { content: \"\\e111\"; } }\n.glyphicon-magnet                 { &:before { content: \"\\e112\"; } }\n.glyphicon-chevron-up             { &:before { content: \"\\e113\"; } }\n.glyphicon-chevron-down           { &:before { content: \"\\e114\"; } }\n.glyphicon-retweet                { &:before { content: \"\\e115\"; } }\n.glyphicon-shopping-cart          { &:before { content: \"\\e116\"; } }\n.glyphicon-folder-close           { &:before { content: \"\\e117\"; } }\n.glyphicon-folder-open            { &:before { content: \"\\e118\"; } }\n.glyphicon-resize-vertical        { &:before { content: \"\\e119\"; } }\n.glyphicon-resize-horizontal      { &:before { content: \"\\e120\"; } }\n.glyphicon-hdd                    { &:before { content: \"\\e121\"; } }\n.glyphicon-bullhorn               { &:before { content: \"\\e122\"; } }\n.glyphicon-bell                   { &:before { content: \"\\e123\"; } }\n.glyphicon-certificate            { &:before { content: \"\\e124\"; } }\n.glyphicon-thumbs-up              { &:before { content: \"\\e125\"; } }\n.glyphicon-thumbs-down            { &:before { content: \"\\e126\"; } }\n.glyphicon-hand-right             { &:before { content: \"\\e127\"; } }\n.glyphicon-hand-left              { &:before { content: \"\\e128\"; } }\n.glyphicon-hand-up                { &:before { content: \"\\e129\"; } }\n.glyphicon-hand-down              { &:before { content: \"\\e130\"; } }\n.glyphicon-circle-arrow-right     { &:before { content: \"\\e131\"; } }\n.glyphicon-circle-arrow-left      { &:before { content: \"\\e132\"; } }\n.glyphicon-circle-arrow-up        { &:before { content: \"\\e133\"; } }\n.glyphicon-circle-arrow-down      { &:before { content: \"\\e134\"; } }\n.glyphicon-globe                  { &:before { content: \"\\e135\"; } }\n.glyphicon-wrench                 { &:before { content: \"\\e136\"; } }\n.glyphicon-tasks                  { &:before { content: \"\\e137\"; } }\n.glyphicon-filter                 { &:before { content: \"\\e138\"; } }\n.glyphicon-briefcase              { &:before { content: \"\\e139\"; } }\n.glyphicon-fullscreen             { &:before { content: \"\\e140\"; } }\n.glyphicon-dashboard              { &:before { content: \"\\e141\"; } }\n.glyphicon-paperclip              { &:before { content: \"\\e142\"; } }\n.glyphicon-heart-empty            { &:before { content: \"\\e143\"; } }\n.glyphicon-link                   { &:before { content: \"\\e144\"; } }\n.glyphicon-phone                  { &:before { content: \"\\e145\"; } }\n.glyphicon-pushpin                { &:before { content: \"\\e146\"; } }\n.glyphicon-usd                    { &:before { content: \"\\e148\"; } }\n.glyphicon-gbp                    { &:before { content: \"\\e149\"; } }\n.glyphicon-sort                   { &:before { content: \"\\e150\"; } }\n.glyphicon-sort-by-alphabet       { &:before { content: \"\\e151\"; } }\n.glyphicon-sort-by-alphabet-alt   { &:before { content: \"\\e152\"; } }\n.glyphicon-sort-by-order          { &:before { content: \"\\e153\"; } }\n.glyphicon-sort-by-order-alt      { &:before { content: \"\\e154\"; } }\n.glyphicon-sort-by-attributes     { &:before { content: \"\\e155\"; } }\n.glyphicon-sort-by-attributes-alt { &:before { content: \"\\e156\"; } }\n.glyphicon-unchecked              { &:before { content: \"\\e157\"; } }\n.glyphicon-expand                 { &:before { content: \"\\e158\"; } }\n.glyphicon-collapse-down          { &:before { content: \"\\e159\"; } }\n.glyphicon-collapse-up            { &:before { content: \"\\e160\"; } }\n.glyphicon-log-in                 { &:before { content: \"\\e161\"; } }\n.glyphicon-flash                  { &:before { content: \"\\e162\"; } }\n.glyphicon-log-out                { &:before { content: \"\\e163\"; } }\n.glyphicon-new-window             { &:before { content: \"\\e164\"; } }\n.glyphicon-record                 { &:before { content: \"\\e165\"; } }\n.glyphicon-save                   { &:before { content: \"\\e166\"; } }\n.glyphicon-open                   { &:before { content: \"\\e167\"; } }\n.glyphicon-saved                  { &:before { content: \"\\e168\"; } }\n.glyphicon-import                 { &:before { content: \"\\e169\"; } }\n.glyphicon-export                 { &:before { content: \"\\e170\"; } }\n.glyphicon-send                   { &:before { content: \"\\e171\"; } }\n.glyphicon-floppy-disk            { &:before { content: \"\\e172\"; } }\n.glyphicon-floppy-saved           { &:before { content: \"\\e173\"; } }\n.glyphicon-floppy-remove          { &:before { content: \"\\e174\"; } }\n.glyphicon-floppy-save            { &:before { content: \"\\e175\"; } }\n.glyphicon-floppy-open            { &:before { content: \"\\e176\"; } }\n.glyphicon-credit-card            { &:before { content: \"\\e177\"; } }\n.glyphicon-transfer               { &:before { content: \"\\e178\"; } }\n.glyphicon-cutlery                { &:before { content: \"\\e179\"; } }\n.glyphicon-header                 { &:before { content: \"\\e180\"; } }\n.glyphicon-compressed             { &:before { content: \"\\e181\"; } }\n.glyphicon-earphone               { &:before { content: \"\\e182\"; } }\n.glyphicon-phone-alt              { &:before { content: \"\\e183\"; } }\n.glyphicon-tower                  { &:before { content: \"\\e184\"; } }\n.glyphicon-stats                  { &:before { content: \"\\e185\"; } }\n.glyphicon-sd-video               { &:before { content: \"\\e186\"; } }\n.glyphicon-hd-video               { &:before { content: \"\\e187\"; } }\n.glyphicon-subtitles              { &:before { content: \"\\e188\"; } }\n.glyphicon-sound-stereo           { &:before { content: \"\\e189\"; } }\n.glyphicon-sound-dolby            { &:before { content: \"\\e190\"; } }\n.glyphicon-sound-5-1              { &:before { content: \"\\e191\"; } }\n.glyphicon-sound-6-1              { &:before { content: \"\\e192\"; } }\n.glyphicon-sound-7-1              { &:before { content: \"\\e193\"; } }\n.glyphicon-copyright-mark         { &:before { content: \"\\e194\"; } }\n.glyphicon-registration-mark      { &:before { content: \"\\e195\"; } }\n.glyphicon-cloud-download         { &:before { content: \"\\e197\"; } }\n.glyphicon-cloud-upload           { &:before { content: \"\\e198\"; } }\n.glyphicon-tree-conifer           { &:before { content: \"\\e199\"; } }\n.glyphicon-tree-deciduous         { &:before { content: \"\\e200\"; } }\n.glyphicon-cd                     { &:before { content: \"\\e201\"; } }\n.glyphicon-save-file              { &:before { content: \"\\e202\"; } }\n.glyphicon-open-file              { &:before { content: \"\\e203\"; } }\n.glyphicon-level-up               { &:before { content: \"\\e204\"; } }\n.glyphicon-copy                   { &:before { content: \"\\e205\"; } }\n.glyphicon-paste                  { &:before { content: \"\\e206\"; } }\n// The following 2 Glyphicons are omitted for the time being because\n// they currently use Unicode codepoints that are outside the\n// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle\n// non-BMP codepoints in CSS string escapes, and thus can't display these two icons.\n// Notably, the bug affects some older versions of the Android Browser.\n// More info: https://github.com/twbs/bootstrap/issues/10106\n// .glyphicon-door                   { &:before { content: \"\\1f6aa\"; } }\n// .glyphicon-key                    { &:before { content: \"\\1f511\"; } }\n.glyphicon-alert                  { &:before { content: \"\\e209\"; } }\n.glyphicon-equalizer              { &:before { content: \"\\e210\"; } }\n.glyphicon-king                   { &:before { content: \"\\e211\"; } }\n.glyphicon-queen                  { &:before { content: \"\\e212\"; } }\n.glyphicon-pawn                   { &:before { content: \"\\e213\"; } }\n.glyphicon-bishop                 { &:before { content: \"\\e214\"; } }\n.glyphicon-knight                 { &:before { content: \"\\e215\"; } }\n.glyphicon-baby-formula           { &:before { content: \"\\e216\"; } }\n.glyphicon-tent                   { &:before { content: \"\\26fa\"; } }\n.glyphicon-blackboard             { &:before { content: \"\\e218\"; } }\n.glyphicon-bed                    { &:before { content: \"\\e219\"; } }\n.glyphicon-apple                  { &:before { content: \"\\f8ff\"; } }\n.glyphicon-erase                  { &:before { content: \"\\e221\"; } }\n.glyphicon-hourglass              { &:before { content: \"\\231b\"; } }\n.glyphicon-lamp                   { &:before { content: \"\\e223\"; } }\n.glyphicon-duplicate              { &:before { content: \"\\e224\"; } }\n.glyphicon-piggy-bank             { &:before { content: \"\\e225\"; } }\n.glyphicon-scissors               { &:before { content: \"\\e226\"; } }\n.glyphicon-bitcoin                { &:before { content: \"\\e227\"; } }\n.glyphicon-btc                    { &:before { content: \"\\e227\"; } }\n.glyphicon-xbt                    { &:before { content: \"\\e227\"; } }\n.glyphicon-yen                    { &:before { content: \"\\00a5\"; } }\n.glyphicon-jpy                    { &:before { content: \"\\00a5\"; } }\n.glyphicon-ruble                  { &:before { content: \"\\20bd\"; } }\n.glyphicon-rub                    { &:before { content: \"\\20bd\"; } }\n.glyphicon-scale                  { &:before { content: \"\\e230\"; } }\n.glyphicon-ice-lolly              { &:before { content: \"\\e231\"; } }\n.glyphicon-ice-lolly-tasted       { &:before { content: \"\\e232\"; } }\n.glyphicon-education              { &:before { content: \"\\e233\"; } }\n.glyphicon-option-horizontal      { &:before { content: \"\\e234\"; } }\n.glyphicon-option-vertical        { &:before { content: \"\\e235\"; } }\n.glyphicon-menu-hamburger         { &:before { content: \"\\e236\"; } }\n.glyphicon-modal-window           { &:before { content: \"\\e237\"; } }\n.glyphicon-oil                    { &:before { content: \"\\e238\"; } }\n.glyphicon-grain                  { &:before { content: \"\\e239\"; } }\n.glyphicon-sunglasses             { &:before { content: \"\\e240\"; } }\n.glyphicon-text-size              { &:before { content: \"\\e241\"; } }\n.glyphicon-text-color             { &:before { content: \"\\e242\"; } }\n.glyphicon-text-background        { &:before { content: \"\\e243\"; } }\n.glyphicon-object-align-top       { &:before { content: \"\\e244\"; } }\n.glyphicon-object-align-bottom    { &:before { content: \"\\e245\"; } }\n.glyphicon-object-align-horizontal{ &:before { content: \"\\e246\"; } }\n.glyphicon-object-align-left      { &:before { content: \"\\e247\"; } }\n.glyphicon-object-align-vertical  { &:before { content: \"\\e248\"; } }\n.glyphicon-object-align-right     { &:before { content: \"\\e249\"; } }\n.glyphicon-triangle-right         { &:before { content: \"\\e250\"; } }\n.glyphicon-triangle-left          { &:before { content: \"\\e251\"; } }\n.glyphicon-triangle-bottom        { &:before { content: \"\\e252\"; } }\n.glyphicon-triangle-top           { &:before { content: \"\\e253\"; } }\n.glyphicon-console                { &:before { content: \"\\e254\"; } }\n.glyphicon-superscript            { &:before { content: \"\\e255\"; } }\n.glyphicon-subscript              { &:before { content: \"\\e256\"; } }\n.glyphicon-menu-left              { &:before { content: \"\\e257\"; } }\n.glyphicon-menu-right             { &:before { content: \"\\e258\"; } }\n.glyphicon-menu-down              { &:before { content: \"\\e259\"; } }\n.glyphicon-menu-up                { &:before { content: \"\\e260\"; } }\n","//\n// Scaffolding\n// --------------------------------------------------\n\n\n// Reset the box-sizing\n//\n// Heads up! This reset may cause conflicts with some third-party widgets.\n// For recommendations on resolving such conflicts, see\n// http://getbootstrap.com/getting-started/#third-box-sizing\n* {\n  .box-sizing(border-box);\n}\n*:before,\n*:after {\n  .box-sizing(border-box);\n}\n\n\n// Body reset\n\nhtml {\n  font-size: 10px;\n  -webkit-tap-highlight-color: rgba(0,0,0,0);\n}\n\nbody {\n  font-family: @font-family-base;\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @text-color;\n  background-color: @body-bg;\n}\n\n// Reset fonts for relevant elements\ninput,\nbutton,\nselect,\ntextarea {\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\n\n\n// Links\n\na {\n  color: @link-color;\n  text-decoration: none;\n\n  &:hover,\n  &:focus {\n    color: @link-hover-color;\n    text-decoration: @link-hover-decoration;\n  }\n\n  &:focus {\n    .tab-focus();\n  }\n}\n\n\n// Figures\n//\n// We reset this here because previously Normalize had no `figure` margins. This\n// ensures we don't break anyone's use of the element.\n\nfigure {\n  margin: 0;\n}\n\n\n// Images\n\nimg {\n  vertical-align: middle;\n}\n\n// Responsive images (ensure images don't scale beyond their parents)\n.img-responsive {\n  .img-responsive();\n}\n\n// Rounded corners\n.img-rounded {\n  border-radius: @border-radius-large;\n}\n\n// Image thumbnails\n//\n// Heads up! This is mixin-ed into thumbnails.less for `.thumbnail`.\n.img-thumbnail {\n  padding: @thumbnail-padding;\n  line-height: @line-height-base;\n  background-color: @thumbnail-bg;\n  border: 1px solid @thumbnail-border;\n  border-radius: @thumbnail-border-radius;\n  .transition(all .2s ease-in-out);\n\n  // Keep them at most 100% wide\n  .img-responsive(inline-block);\n}\n\n// Perfect circle\n.img-circle {\n  border-radius: 50%; // set radius in percents\n}\n\n\n// Horizontal rules\n\nhr {\n  margin-top:    @line-height-computed;\n  margin-bottom: @line-height-computed;\n  border: 0;\n  border-top: 1px solid @hr-border;\n}\n\n\n// Only display content to screen readers\n//\n// See: http://a11yproject.com/posts/how-to-hide-content\n\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0,0,0,0);\n  border: 0;\n}\n\n// Use in conjunction with .sr-only to only display content when it's focused.\n// Useful for \"Skip to main content\" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1\n// Credit: HTML5 Boilerplate\n\n.sr-only-focusable {\n  &:active,\n  &:focus {\n    position: static;\n    width: auto;\n    height: auto;\n    margin: 0;\n    overflow: visible;\n    clip: auto;\n  }\n}\n\n\n// iOS \"clickable elements\" fix for role=\"button\"\n//\n// Fixes \"clickability\" issue (and more generally, the firing of events such as focus as well)\n// for traditionally non-focusable elements with role=\"button\"\n// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile\n\n[role=\"button\"] {\n  cursor: pointer;\n}\n","// Vendor Prefixes\n//\n// All vendor mixins are deprecated as of v3.2.0 due to the introduction of\n// Autoprefixer in our Gruntfile. They have been removed in v4.\n\n// - Animations\n// - Backface visibility\n// - Box shadow\n// - Box sizing\n// - Content columns\n// - Hyphens\n// - Placeholder text\n// - Transformations\n// - Transitions\n// - User Select\n\n\n// Animations\n.animation(@animation) {\n  -webkit-animation: @animation;\n       -o-animation: @animation;\n          animation: @animation;\n}\n.animation-name(@name) {\n  -webkit-animation-name: @name;\n          animation-name: @name;\n}\n.animation-duration(@duration) {\n  -webkit-animation-duration: @duration;\n          animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n  -webkit-animation-timing-function: @timing-function;\n          animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n  -webkit-animation-delay: @delay;\n          animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n  -webkit-animation-iteration-count: @iteration-count;\n          animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n  -webkit-animation-direction: @direction;\n          animation-direction: @direction;\n}\n.animation-fill-mode(@fill-mode) {\n  -webkit-animation-fill-mode: @fill-mode;\n          animation-fill-mode: @fill-mode;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n\n.backface-visibility(@visibility) {\n  -webkit-backface-visibility: @visibility;\n     -moz-backface-visibility: @visibility;\n          backface-visibility: @visibility;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n// supported browsers that have box shadow capabilities now support it.\n\n.box-shadow(@shadow) {\n  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n          box-shadow: @shadow;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n  -webkit-box-sizing: @boxmodel;\n     -moz-box-sizing: @boxmodel;\n          box-sizing: @boxmodel;\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n  -webkit-column-count: @column-count;\n     -moz-column-count: @column-count;\n          column-count: @column-count;\n  -webkit-column-gap: @column-gap;\n     -moz-column-gap: @column-gap;\n          column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n  word-wrap: break-word;\n  -webkit-hyphens: @mode;\n     -moz-hyphens: @mode;\n      -ms-hyphens: @mode; // IE10+\n       -o-hyphens: @mode;\n          hyphens: @mode;\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n  // Firefox\n  &::-moz-placeholder {\n    color: @color;\n    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526\n  }\n  &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+\n  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome\n}\n\n// Transformations\n.scale(@ratio) {\n  -webkit-transform: scale(@ratio);\n      -ms-transform: scale(@ratio); // IE9 only\n       -o-transform: scale(@ratio);\n          transform: scale(@ratio);\n}\n.scale(@ratioX; @ratioY) {\n  -webkit-transform: scale(@ratioX, @ratioY);\n      -ms-transform: scale(@ratioX, @ratioY); // IE9 only\n       -o-transform: scale(@ratioX, @ratioY);\n          transform: scale(@ratioX, @ratioY);\n}\n.scaleX(@ratio) {\n  -webkit-transform: scaleX(@ratio);\n      -ms-transform: scaleX(@ratio); // IE9 only\n       -o-transform: scaleX(@ratio);\n          transform: scaleX(@ratio);\n}\n.scaleY(@ratio) {\n  -webkit-transform: scaleY(@ratio);\n      -ms-transform: scaleY(@ratio); // IE9 only\n       -o-transform: scaleY(@ratio);\n          transform: scaleY(@ratio);\n}\n.skew(@x; @y) {\n  -webkit-transform: skewX(@x) skewY(@y);\n      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n       -o-transform: skewX(@x) skewY(@y);\n          transform: skewX(@x) skewY(@y);\n}\n.translate(@x; @y) {\n  -webkit-transform: translate(@x, @y);\n      -ms-transform: translate(@x, @y); // IE9 only\n       -o-transform: translate(@x, @y);\n          transform: translate(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n  -webkit-transform: translate3d(@x, @y, @z);\n          transform: translate3d(@x, @y, @z);\n}\n.rotate(@degrees) {\n  -webkit-transform: rotate(@degrees);\n      -ms-transform: rotate(@degrees); // IE9 only\n       -o-transform: rotate(@degrees);\n          transform: rotate(@degrees);\n}\n.rotateX(@degrees) {\n  -webkit-transform: rotateX(@degrees);\n      -ms-transform: rotateX(@degrees); // IE9 only\n       -o-transform: rotateX(@degrees);\n          transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n  -webkit-transform: rotateY(@degrees);\n      -ms-transform: rotateY(@degrees); // IE9 only\n       -o-transform: rotateY(@degrees);\n          transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n  -webkit-perspective: @perspective;\n     -moz-perspective: @perspective;\n          perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n  -webkit-perspective-origin: @perspective;\n     -moz-perspective-origin: @perspective;\n          perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n  -webkit-transform-origin: @origin;\n     -moz-transform-origin: @origin;\n      -ms-transform-origin: @origin; // IE9 only\n          transform-origin: @origin;\n}\n\n\n// Transitions\n\n.transition(@transition) {\n  -webkit-transition: @transition;\n       -o-transition: @transition;\n          transition: @transition;\n}\n.transition-property(@transition-property) {\n  -webkit-transition-property: @transition-property;\n          transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n  -webkit-transition-delay: @transition-delay;\n          transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n  -webkit-transition-duration: @transition-duration;\n          transition-duration: @transition-duration;\n}\n.transition-timing-function(@timing-function) {\n  -webkit-transition-timing-function: @timing-function;\n          transition-timing-function: @timing-function;\n}\n.transition-transform(@transition) {\n  -webkit-transition: -webkit-transform @transition;\n     -moz-transition: -moz-transform @transition;\n       -o-transition: -o-transform @transition;\n          transition: transform @transition;\n}\n\n\n// User select\n// For selecting text on the page\n\n.user-select(@select) {\n  -webkit-user-select: @select;\n     -moz-user-select: @select;\n      -ms-user-select: @select; // IE10+\n          user-select: @select;\n}\n","// WebKit-style focus\n\n.tab-focus() {\n  // WebKit-specific. Other browsers will keep their default outline style.\n  // (Initially tried to also force default via `outline: initial`,\n  // but that seems to erroneously remove the outline in Firefox altogether.)\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n","// Image Mixins\n// - Responsive image\n// - Retina image\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n.img-responsive(@display: block) {\n  display: @display;\n  max-width: 100%; // Part 1: Set a maximum relative to the parent\n  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching\n}\n\n\n// Retina image\n//\n// Short retina mixin for setting background-image and -size. Note that the\n// spelling of `min--moz-device-pixel-ratio` is intentional.\n.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {\n  background-image: url(\"@{file-1x}\");\n\n  @media\n  only screen and (-webkit-min-device-pixel-ratio: 2),\n  only screen and (   min--moz-device-pixel-ratio: 2),\n  only screen and (     -o-min-device-pixel-ratio: 2/1),\n  only screen and (        min-device-pixel-ratio: 2),\n  only screen and (                min-resolution: 192dpi),\n  only screen and (                min-resolution: 2dppx) {\n    background-image: url(\"@{file-2x}\");\n    background-size: @width-1x @height-1x;\n  }\n}\n","//\n// Typography\n// --------------------------------------------------\n\n\n// Headings\n// -------------------------\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n  font-family: @headings-font-family;\n  font-weight: @headings-font-weight;\n  line-height: @headings-line-height;\n  color: @headings-color;\n\n  small,\n  .small {\n    font-weight: normal;\n    line-height: 1;\n    color: @headings-small-color;\n  }\n}\n\nh1, .h1,\nh2, .h2,\nh3, .h3 {\n  margin-top: @line-height-computed;\n  margin-bottom: (@line-height-computed / 2);\n\n  small,\n  .small {\n    font-size: 65%;\n  }\n}\nh4, .h4,\nh5, .h5,\nh6, .h6 {\n  margin-top: (@line-height-computed / 2);\n  margin-bottom: (@line-height-computed / 2);\n\n  small,\n  .small {\n    font-size: 75%;\n  }\n}\n\nh1, .h1 { font-size: @font-size-h1; }\nh2, .h2 { font-size: @font-size-h2; }\nh3, .h3 { font-size: @font-size-h3; }\nh4, .h4 { font-size: @font-size-h4; }\nh5, .h5 { font-size: @font-size-h5; }\nh6, .h6 { font-size: @font-size-h6; }\n\n\n// Body text\n// -------------------------\n\np {\n  margin: 0 0 (@line-height-computed / 2);\n}\n\n.lead {\n  margin-bottom: @line-height-computed;\n  font-size: floor((@font-size-base * 1.15));\n  font-weight: 300;\n  line-height: 1.4;\n\n  @media (min-width: @screen-sm-min) {\n    font-size: (@font-size-base * 1.5);\n  }\n}\n\n\n// Emphasis & misc\n// -------------------------\n\n// Ex: (12px small font / 14px base font) * 100% = about 85%\nsmall,\n.small {\n  font-size: floor((100% * @font-size-small / @font-size-base));\n}\n\nmark,\n.mark {\n  background-color: @state-warning-bg;\n  padding: .2em;\n}\n\n// Alignment\n.text-left           { text-align: left; }\n.text-right          { text-align: right; }\n.text-center         { text-align: center; }\n.text-justify        { text-align: justify; }\n.text-nowrap         { white-space: nowrap; }\n\n// Transformation\n.text-lowercase      { text-transform: lowercase; }\n.text-uppercase      { text-transform: uppercase; }\n.text-capitalize     { text-transform: capitalize; }\n\n// Contextual colors\n.text-muted {\n  color: @text-muted;\n}\n.text-primary {\n  .text-emphasis-variant(@brand-primary);\n}\n.text-success {\n  .text-emphasis-variant(@state-success-text);\n}\n.text-info {\n  .text-emphasis-variant(@state-info-text);\n}\n.text-warning {\n  .text-emphasis-variant(@state-warning-text);\n}\n.text-danger {\n  .text-emphasis-variant(@state-danger-text);\n}\n\n// Contextual backgrounds\n// For now we'll leave these alongside the text classes until v4 when we can\n// safely shift things around (per SemVer rules).\n.bg-primary {\n  // Given the contrast here, this is the only class to have its color inverted\n  // automatically.\n  color: #fff;\n  .bg-variant(@brand-primary);\n}\n.bg-success {\n  .bg-variant(@state-success-bg);\n}\n.bg-info {\n  .bg-variant(@state-info-bg);\n}\n.bg-warning {\n  .bg-variant(@state-warning-bg);\n}\n.bg-danger {\n  .bg-variant(@state-danger-bg);\n}\n\n\n// Page header\n// -------------------------\n\n.page-header {\n  padding-bottom: ((@line-height-computed / 2) - 1);\n  margin: (@line-height-computed * 2) 0 @line-height-computed;\n  border-bottom: 1px solid @page-header-border-color;\n}\n\n\n// Lists\n// -------------------------\n\n// Unordered and Ordered lists\nul,\nol {\n  margin-top: 0;\n  margin-bottom: (@line-height-computed / 2);\n  ul,\n  ol {\n    margin-bottom: 0;\n  }\n}\n\n// List options\n\n// Unstyled keeps list items block level, just removes default browser padding and list-style\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n\n// Inline turns list items into inline-block\n.list-inline {\n  .list-unstyled();\n  margin-left: -5px;\n\n  > li {\n    display: inline-block;\n    padding-left: 5px;\n    padding-right: 5px;\n  }\n}\n\n// Description Lists\ndl {\n  margin-top: 0; // Remove browser default\n  margin-bottom: @line-height-computed;\n}\ndt,\ndd {\n  line-height: @line-height-base;\n}\ndt {\n  font-weight: bold;\n}\ndd {\n  margin-left: 0; // Undo browser default\n}\n\n// Horizontal description lists\n//\n// Defaults to being stacked without any of the below styles applied, until the\n// grid breakpoint is reached (default of ~768px).\n\n.dl-horizontal {\n  dd {\n    &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present\n  }\n\n  @media (min-width: @dl-horizontal-breakpoint) {\n    dt {\n      float: left;\n      width: (@dl-horizontal-offset - 20);\n      clear: left;\n      text-align: right;\n      .text-overflow();\n    }\n    dd {\n      margin-left: @dl-horizontal-offset;\n    }\n  }\n}\n\n\n// Misc\n// -------------------------\n\n// Abbreviations and acronyms\nabbr[title],\n// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257\nabbr[data-original-title] {\n  cursor: help;\n  border-bottom: 1px dotted @abbr-border-color;\n}\n.initialism {\n  font-size: 90%;\n  .text-uppercase();\n}\n\n// Blockquotes\nblockquote {\n  padding: (@line-height-computed / 2) @line-height-computed;\n  margin: 0 0 @line-height-computed;\n  font-size: @blockquote-font-size;\n  border-left: 5px solid @blockquote-border-color;\n\n  p,\n  ul,\n  ol {\n    &:last-child {\n      margin-bottom: 0;\n    }\n  }\n\n  // Note: Deprecated small and .small as of v3.1.0\n  // Context: https://github.com/twbs/bootstrap/issues/11660\n  footer,\n  small,\n  .small {\n    display: block;\n    font-size: 80%; // back to default font-size\n    line-height: @line-height-base;\n    color: @blockquote-small-color;\n\n    &:before {\n      content: '\\2014 \\00A0'; // em dash, nbsp\n    }\n  }\n}\n\n// Opposite alignment of blockquote\n//\n// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.\n.blockquote-reverse,\nblockquote.pull-right {\n  padding-right: 15px;\n  padding-left: 0;\n  border-right: 5px solid @blockquote-border-color;\n  border-left: 0;\n  text-align: right;\n\n  // Account for citation\n  footer,\n  small,\n  .small {\n    &:before { content: ''; }\n    &:after {\n      content: '\\00A0 \\2014'; // nbsp, em dash\n    }\n  }\n}\n\n// Addresses\naddress {\n  margin-bottom: @line-height-computed;\n  font-style: normal;\n  line-height: @line-height-base;\n}\n","// Typography\n\n.text-emphasis-variant(@color) {\n  color: @color;\n  a&:hover,\n  a&:focus {\n    color: darken(@color, 10%);\n  }\n}\n","// Contextual backgrounds\n\n.bg-variant(@color) {\n  background-color: @color;\n  a&:hover,\n  a&:focus {\n    background-color: darken(@color, 10%);\n  }\n}\n","// Text overflow\n// Requires inline-block or block for proper styling\n\n.text-overflow() {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n","//\n// Code (inline and block)\n// --------------------------------------------------\n\n\n// Inline and block code styles\ncode,\nkbd,\npre,\nsamp {\n  font-family: @font-family-monospace;\n}\n\n// Inline code\ncode {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: @code-color;\n  background-color: @code-bg;\n  border-radius: @border-radius-base;\n}\n\n// User input typically entered via keyboard\nkbd {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: @kbd-color;\n  background-color: @kbd-bg;\n  border-radius: @border-radius-small;\n  box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);\n\n  kbd {\n    padding: 0;\n    font-size: 100%;\n    font-weight: bold;\n    box-shadow: none;\n  }\n}\n\n// Blocks of code\npre {\n  display: block;\n  padding: ((@line-height-computed - 1) / 2);\n  margin: 0 0 (@line-height-computed / 2);\n  font-size: (@font-size-base - 1); // 14px to 13px\n  line-height: @line-height-base;\n  word-break: break-all;\n  word-wrap: break-word;\n  color: @pre-color;\n  background-color: @pre-bg;\n  border: 1px solid @pre-border-color;\n  border-radius: @border-radius-base;\n\n  // Account for some code outputs that place code tags in pre tags\n  code {\n    padding: 0;\n    font-size: inherit;\n    color: inherit;\n    white-space: pre-wrap;\n    background-color: transparent;\n    border-radius: 0;\n  }\n}\n\n// Enable scrollable blocks of code\n.pre-scrollable {\n  max-height: @pre-scrollable-max-height;\n  overflow-y: scroll;\n}\n","//\n// Grid system\n// --------------------------------------------------\n\n\n// Container widths\n//\n// Set the container width, and override it for fixed navbars in media queries.\n\n.container {\n  .container-fixed();\n\n  @media (min-width: @screen-sm-min) {\n    width: @container-sm;\n  }\n  @media (min-width: @screen-md-min) {\n    width: @container-md;\n  }\n  @media (min-width: @screen-lg-min) {\n    width: @container-lg;\n  }\n}\n\n\n// Fluid container\n//\n// Utilizes the mixin meant for fixed width containers, but without any defined\n// width for fluid, full width layouts.\n\n.container-fluid {\n  .container-fixed();\n}\n\n\n// Row\n//\n// Rows contain and clear the floats of your columns.\n\n.row {\n  .make-row();\n}\n\n\n// Columns\n//\n// Common styles for small and large grid columns\n\n.make-grid-columns();\n\n\n// Extra small grid\n//\n// Columns, offsets, pushes, and pulls for extra small devices like\n// smartphones.\n\n.make-grid(xs);\n\n\n// Small grid\n//\n// Columns, offsets, pushes, and pulls for the small device range, from phones\n// to tablets.\n\n@media (min-width: @screen-sm-min) {\n  .make-grid(sm);\n}\n\n\n// Medium grid\n//\n// Columns, offsets, pushes, and pulls for the desktop device range.\n\n@media (min-width: @screen-md-min) {\n  .make-grid(md);\n}\n\n\n// Large grid\n//\n// Columns, offsets, pushes, and pulls for the large desktop device range.\n\n@media (min-width: @screen-lg-min) {\n  .make-grid(lg);\n}\n","// Grid system\n//\n// Generate semantic grid columns with these mixins.\n\n// Centered container element\n.container-fixed(@gutter: @grid-gutter-width) {\n  margin-right: auto;\n  margin-left: auto;\n  padding-left:  floor((@gutter / 2));\n  padding-right: ceil((@gutter / 2));\n  &:extend(.clearfix all);\n}\n\n// Creates a wrapper for a series of columns\n.make-row(@gutter: @grid-gutter-width) {\n  margin-left:  ceil((@gutter / -2));\n  margin-right: floor((@gutter / -2));\n  &:extend(.clearfix all);\n}\n\n// Generate the extra small columns\n.make-xs-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  float: left;\n  width: percentage((@columns / @grid-columns));\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n}\n.make-xs-column-offset(@columns) {\n  margin-left: percentage((@columns / @grid-columns));\n}\n.make-xs-column-push(@columns) {\n  left: percentage((@columns / @grid-columns));\n}\n.make-xs-column-pull(@columns) {\n  right: percentage((@columns / @grid-columns));\n}\n\n// Generate the small columns\n.make-sm-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-sm-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-offset(@columns) {\n  @media (min-width: @screen-sm-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-push(@columns) {\n  @media (min-width: @screen-sm-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-pull(@columns) {\n  @media (min-width: @screen-sm-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n// Generate the medium columns\n.make-md-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-md-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-offset(@columns) {\n  @media (min-width: @screen-md-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-push(@columns) {\n  @media (min-width: @screen-md-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-pull(@columns) {\n  @media (min-width: @screen-md-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n// Generate the large columns\n.make-lg-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-lg-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-offset(@columns) {\n  @media (min-width: @screen-lg-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-push(@columns) {\n  @media (min-width: @screen-lg-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-pull(@columns) {\n  @media (min-width: @screen-lg-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n","// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `@grid-columns`.\n\n.make-grid-columns() {\n  // Common styles for all sizes of grid columns, widths 1-12\n  .col(@index) { // initial\n    @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n    .col((@index + 1), @item);\n  }\n  .col(@index, @list) when (@index =< @grid-columns) { // general; \"=<\" isn't a typo\n    @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n    .col((@index + 1), ~\"@{list}, @{item}\");\n  }\n  .col(@index, @list) when (@index > @grid-columns) { // terminal\n    @{list} {\n      position: relative;\n      // Prevent columns from collapsing when empty\n      min-height: 1px;\n      // Inner gutter via padding\n      padding-left:  ceil((@grid-gutter-width / 2));\n      padding-right: floor((@grid-gutter-width / 2));\n    }\n  }\n  .col(1); // kickstart it\n}\n\n.float-grid-columns(@class) {\n  .col(@index) { // initial\n    @item: ~\".col-@{class}-@{index}\";\n    .col((@index + 1), @item);\n  }\n  .col(@index, @list) when (@index =< @grid-columns) { // general\n    @item: ~\".col-@{class}-@{index}\";\n    .col((@index + 1), ~\"@{list}, @{item}\");\n  }\n  .col(@index, @list) when (@index > @grid-columns) { // terminal\n    @{list} {\n      float: left;\n    }\n  }\n  .col(1); // kickstart it\n}\n\n.calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {\n  .col-@{class}-@{index} {\n    width: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) {\n  .col-@{class}-push-@{index} {\n    left: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) {\n  .col-@{class}-push-0 {\n    left: auto;\n  }\n}\n.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) {\n  .col-@{class}-pull-@{index} {\n    right: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) {\n  .col-@{class}-pull-0 {\n    right: auto;\n  }\n}\n.calc-grid-column(@index, @class, @type) when (@type = offset) {\n  .col-@{class}-offset-@{index} {\n    margin-left: percentage((@index / @grid-columns));\n  }\n}\n\n// Basic looping in LESS\n.loop-grid-columns(@index, @class, @type) when (@index >= 0) {\n  .calc-grid-column(@index, @class, @type);\n  // next iteration\n  .loop-grid-columns((@index - 1), @class, @type);\n}\n\n// Create grid for specific class\n.make-grid(@class) {\n  .float-grid-columns(@class);\n  .loop-grid-columns(@grid-columns, @class, width);\n  .loop-grid-columns(@grid-columns, @class, pull);\n  .loop-grid-columns(@grid-columns, @class, push);\n  .loop-grid-columns(@grid-columns, @class, offset);\n}\n","//\n// Tables\n// --------------------------------------------------\n\n\ntable {\n  background-color: @table-bg;\n}\ncaption {\n  padding-top: @table-cell-padding;\n  padding-bottom: @table-cell-padding;\n  color: @text-muted;\n  text-align: left;\n}\nth {\n  text-align: left;\n}\n\n\n// Baseline styles\n\n.table {\n  width: 100%;\n  max-width: 100%;\n  margin-bottom: @line-height-computed;\n  // Cells\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        padding: @table-cell-padding;\n        line-height: @line-height-base;\n        vertical-align: top;\n        border-top: 1px solid @table-border-color;\n      }\n    }\n  }\n  // Bottom align for column headings\n  > thead > tr > th {\n    vertical-align: bottom;\n    border-bottom: 2px solid @table-border-color;\n  }\n  // Remove top border from thead by default\n  > caption + thead,\n  > colgroup + thead,\n  > thead:first-child {\n    > tr:first-child {\n      > th,\n      > td {\n        border-top: 0;\n      }\n    }\n  }\n  // Account for multiple tbody instances\n  > tbody + tbody {\n    border-top: 2px solid @table-border-color;\n  }\n\n  // Nesting\n  .table {\n    background-color: @body-bg;\n  }\n}\n\n\n// Condensed table w/ half padding\n\n.table-condensed {\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        padding: @table-condensed-cell-padding;\n      }\n    }\n  }\n}\n\n\n// Bordered version\n//\n// Add borders all around the table and between all the columns.\n\n.table-bordered {\n  border: 1px solid @table-border-color;\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        border: 1px solid @table-border-color;\n      }\n    }\n  }\n  > thead > tr {\n    > th,\n    > td {\n      border-bottom-width: 2px;\n    }\n  }\n}\n\n\n// Zebra-striping\n//\n// Default zebra-stripe styles (alternating gray and transparent backgrounds)\n\n.table-striped {\n  > tbody > tr:nth-of-type(odd) {\n    background-color: @table-bg-accent;\n  }\n}\n\n\n// Hover effect\n//\n// Placed here since it has to come after the potential zebra striping\n\n.table-hover {\n  > tbody > tr:hover {\n    background-color: @table-bg-hover;\n  }\n}\n\n\n// Table cell sizing\n//\n// Reset default table behavior\n\ntable col[class*=\"col-\"] {\n  position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)\n  float: none;\n  display: table-column;\n}\ntable {\n  td,\n  th {\n    &[class*=\"col-\"] {\n      position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)\n      float: none;\n      display: table-cell;\n    }\n  }\n}\n\n\n// Table backgrounds\n//\n// Exact selectors below required to override `.table-striped` and prevent\n// inheritance to nested tables.\n\n// Generate the contextual variants\n.table-row-variant(active; @table-bg-active);\n.table-row-variant(success; @state-success-bg);\n.table-row-variant(info; @state-info-bg);\n.table-row-variant(warning; @state-warning-bg);\n.table-row-variant(danger; @state-danger-bg);\n\n\n// Responsive tables\n//\n// Wrap your tables in `.table-responsive` and we'll make them mobile friendly\n// by enabling horizontal scrolling. Only applies <768px. Everything above that\n// will display normally.\n\n.table-responsive {\n  overflow-x: auto;\n  min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)\n\n  @media screen and (max-width: @screen-xs-max) {\n    width: 100%;\n    margin-bottom: (@line-height-computed * 0.75);\n    overflow-y: hidden;\n    -ms-overflow-style: -ms-autohiding-scrollbar;\n    border: 1px solid @table-border-color;\n\n    // Tighten up spacing\n    > .table {\n      margin-bottom: 0;\n\n      // Ensure the content doesn't wrap\n      > thead,\n      > tbody,\n      > tfoot {\n        > tr {\n          > th,\n          > td {\n            white-space: nowrap;\n          }\n        }\n      }\n    }\n\n    // Special overrides for the bordered tables\n    > .table-bordered {\n      border: 0;\n\n      // Nuke the appropriate borders so that the parent can handle them\n      > thead,\n      > tbody,\n      > tfoot {\n        > tr {\n          > th:first-child,\n          > td:first-child {\n            border-left: 0;\n          }\n          > th:last-child,\n          > td:last-child {\n            border-right: 0;\n          }\n        }\n      }\n\n      // Only nuke the last row's bottom-border in `tbody` and `tfoot` since\n      // chances are there will be only one `tr` in a `thead` and that would\n      // remove the border altogether.\n      > tbody,\n      > tfoot {\n        > tr:last-child {\n          > th,\n          > td {\n            border-bottom: 0;\n          }\n        }\n      }\n\n    }\n  }\n}\n","// Tables\n\n.table-row-variant(@state; @background) {\n  // Exact selectors below required to override `.table-striped` and prevent\n  // inheritance to nested tables.\n  .table > thead > tr,\n  .table > tbody > tr,\n  .table > tfoot > tr {\n    > td.@{state},\n    > th.@{state},\n    &.@{state} > td,\n    &.@{state} > th {\n      background-color: @background;\n    }\n  }\n\n  // Hover states for `.table-hover`\n  // Note: this is not available for cells or rows within `thead` or `tfoot`.\n  .table-hover > tbody > tr {\n    > td.@{state}:hover,\n    > th.@{state}:hover,\n    &.@{state}:hover > td,\n    &:hover > .@{state},\n    &.@{state}:hover > th {\n      background-color: darken(@background, 5%);\n    }\n  }\n}\n","//\n// Forms\n// --------------------------------------------------\n\n\n// Normalize non-controls\n//\n// Restyle and baseline non-control form elements.\n\nfieldset {\n  padding: 0;\n  margin: 0;\n  border: 0;\n  // Chrome and Firefox set a `min-width: min-content;` on fieldsets,\n  // so we reset that to ensure it behaves more like a standard block element.\n  // See https://github.com/twbs/bootstrap/issues/12359.\n  min-width: 0;\n}\n\nlegend {\n  display: block;\n  width: 100%;\n  padding: 0;\n  margin-bottom: @line-height-computed;\n  font-size: (@font-size-base * 1.5);\n  line-height: inherit;\n  color: @legend-color;\n  border: 0;\n  border-bottom: 1px solid @legend-border-color;\n}\n\nlabel {\n  display: inline-block;\n  max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)\n  margin-bottom: 5px;\n  font-weight: bold;\n}\n\n\n// Normalize form controls\n//\n// While most of our form styles require extra classes, some basic normalization\n// is required to ensure optimum display with or without those classes to better\n// address browser inconsistencies.\n\n// Override content-box in Normalize (* isn't specific enough)\ninput[type=\"search\"] {\n  .box-sizing(border-box);\n}\n\n// Position radios and checkboxes better\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  margin: 4px 0 0;\n  margin-top: 1px \\9; // IE8-9\n  line-height: normal;\n}\n\ninput[type=\"file\"] {\n  display: block;\n}\n\n// Make range inputs behave like textual form controls\ninput[type=\"range\"] {\n  display: block;\n  width: 100%;\n}\n\n// Make multiple select elements height not fixed\nselect[multiple],\nselect[size] {\n  height: auto;\n}\n\n// Focus for file, radio, and checkbox\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n  .tab-focus();\n}\n\n// Adjust output element\noutput {\n  display: block;\n  padding-top: (@padding-base-vertical + 1);\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @input-color;\n}\n\n\n// Common form controls\n//\n// Shared size and type resets for form controls. Apply `.form-control` to any\n// of the following form controls:\n//\n// select\n// textarea\n// input[type=\"text\"]\n// input[type=\"password\"]\n// input[type=\"datetime\"]\n// input[type=\"datetime-local\"]\n// input[type=\"date\"]\n// input[type=\"month\"]\n// input[type=\"time\"]\n// input[type=\"week\"]\n// input[type=\"number\"]\n// input[type=\"email\"]\n// input[type=\"url\"]\n// input[type=\"search\"]\n// input[type=\"tel\"]\n// input[type=\"color\"]\n\n.form-control {\n  display: block;\n  width: 100%;\n  height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)\n  padding: @padding-base-vertical @padding-base-horizontal;\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @input-color;\n  background-color: @input-bg;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid @input-border;\n  border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.\n  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));\n  .transition(~\"border-color ease-in-out .15s, box-shadow ease-in-out .15s\");\n\n  // Customize the `:focus` state to imitate native WebKit styles.\n  .form-control-focus();\n\n  // Placeholder\n  .placeholder();\n\n  // Unstyle the caret on `<select>`s in IE10+.\n  &::-ms-expand {\n    border: 0;\n    background-color: transparent;\n  }\n\n  // Disabled and read-only inputs\n  //\n  // HTML5 says that controls under a fieldset > legend:first-child won't be\n  // disabled if the fieldset is disabled. Due to implementation difficulty, we\n  // don't honor that edge case; we style them as disabled anyway.\n  &[disabled],\n  &[readonly],\n  fieldset[disabled] & {\n    background-color: @input-bg-disabled;\n    opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655\n  }\n\n  &[disabled],\n  fieldset[disabled] & {\n    cursor: @cursor-disabled;\n  }\n\n  // Reset height for `textarea`s\n  textarea& {\n    height: auto;\n  }\n}\n\n\n// Search inputs in iOS\n//\n// This overrides the extra rounded corners on search inputs in iOS so that our\n// `.form-control` class can properly style them. Note that this cannot simply\n// be added to `.form-control` as it's not specific enough. For details, see\n// https://github.com/twbs/bootstrap/issues/11586.\n\ninput[type=\"search\"] {\n  -webkit-appearance: none;\n}\n\n\n// Special styles for iOS temporal inputs\n//\n// In Mobile Safari, setting `display: block` on temporal inputs causes the\n// text within the input to become vertically misaligned. As a workaround, we\n// set a pixel line-height that matches the given height of the input, but only\n// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848\n//\n// Note that as of 9.3, iOS doesn't support `week`.\n\n@media screen and (-webkit-min-device-pixel-ratio: 0) {\n  input[type=\"date\"],\n  input[type=\"time\"],\n  input[type=\"datetime-local\"],\n  input[type=\"month\"] {\n    &.form-control {\n      line-height: @input-height-base;\n    }\n\n    &.input-sm,\n    .input-group-sm & {\n      line-height: @input-height-small;\n    }\n\n    &.input-lg,\n    .input-group-lg & {\n      line-height: @input-height-large;\n    }\n  }\n}\n\n\n// Form groups\n//\n// Designed to help with the organization and spacing of vertical forms. For\n// horizontal forms, use the predefined grid classes.\n\n.form-group {\n  margin-bottom: @form-group-margin-bottom;\n}\n\n\n// Checkboxes and radios\n//\n// Indent the labels to position radios/checkboxes as hanging controls.\n\n.radio,\n.checkbox {\n  position: relative;\n  display: block;\n  margin-top: 10px;\n  margin-bottom: 10px;\n\n  label {\n    min-height: @line-height-computed; // Ensure the input doesn't jump when there is no text\n    padding-left: 20px;\n    margin-bottom: 0;\n    font-weight: normal;\n    cursor: pointer;\n  }\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n  position: absolute;\n  margin-left: -20px;\n  margin-top: 4px \\9;\n}\n\n.radio + .radio,\n.checkbox + .checkbox {\n  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing\n}\n\n// Radios and checkboxes on same line\n.radio-inline,\n.checkbox-inline {\n  position: relative;\n  display: inline-block;\n  padding-left: 20px;\n  margin-bottom: 0;\n  vertical-align: middle;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n  margin-top: 0;\n  margin-left: 10px; // space out consecutive inline controls\n}\n\n// Apply same disabled cursor tweak as for inputs\n// Some special care is needed because <label>s don't inherit their parent's `cursor`.\n//\n// Note: Neither radios nor checkboxes can be readonly.\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  &[disabled],\n  &.disabled,\n  fieldset[disabled] & {\n    cursor: @cursor-disabled;\n  }\n}\n// These classes are used directly on <label>s\n.radio-inline,\n.checkbox-inline {\n  &.disabled,\n  fieldset[disabled] & {\n    cursor: @cursor-disabled;\n  }\n}\n// These classes are used on elements with <label> descendants\n.radio,\n.checkbox {\n  &.disabled,\n  fieldset[disabled] & {\n    label {\n      cursor: @cursor-disabled;\n    }\n  }\n}\n\n\n// Static form control text\n//\n// Apply class to a `p` element to make any string of text align with labels in\n// a horizontal form layout.\n\n.form-control-static {\n  // Size it appropriately next to real form controls\n  padding-top: (@padding-base-vertical + 1);\n  padding-bottom: (@padding-base-vertical + 1);\n  // Remove default margin from `p`\n  margin-bottom: 0;\n  min-height: (@line-height-computed + @font-size-base);\n\n  &.input-lg,\n  &.input-sm {\n    padding-left: 0;\n    padding-right: 0;\n  }\n}\n\n\n// Form control sizing\n//\n// Build on `.form-control` with modifier classes to decrease or increase the\n// height and font-size of form controls.\n//\n// The `.form-group-* form-control` variations are sadly duplicated to avoid the\n// issue documented in https://github.com/twbs/bootstrap/issues/15074.\n\n.input-sm {\n  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);\n}\n.form-group-sm {\n  .form-control {\n    height: @input-height-small;\n    padding: @padding-small-vertical @padding-small-horizontal;\n    font-size: @font-size-small;\n    line-height: @line-height-small;\n    border-radius: @input-border-radius-small;\n  }\n  select.form-control {\n    height: @input-height-small;\n    line-height: @input-height-small;\n  }\n  textarea.form-control,\n  select[multiple].form-control {\n    height: auto;\n  }\n  .form-control-static {\n    height: @input-height-small;\n    min-height: (@line-height-computed + @font-size-small);\n    padding: (@padding-small-vertical + 1) @padding-small-horizontal;\n    font-size: @font-size-small;\n    line-height: @line-height-small;\n  }\n}\n\n.input-lg {\n  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);\n}\n.form-group-lg {\n  .form-control {\n    height: @input-height-large;\n    padding: @padding-large-vertical @padding-large-horizontal;\n    font-size: @font-size-large;\n    line-height: @line-height-large;\n    border-radius: @input-border-radius-large;\n  }\n  select.form-control {\n    height: @input-height-large;\n    line-height: @input-height-large;\n  }\n  textarea.form-control,\n  select[multiple].form-control {\n    height: auto;\n  }\n  .form-control-static {\n    height: @input-height-large;\n    min-height: (@line-height-computed + @font-size-large);\n    padding: (@padding-large-vertical + 1) @padding-large-horizontal;\n    font-size: @font-size-large;\n    line-height: @line-height-large;\n  }\n}\n\n\n// Form control feedback states\n//\n// Apply contextual and semantic states to individual form controls.\n\n.has-feedback {\n  // Enable absolute positioning\n  position: relative;\n\n  // Ensure icons don't overlap text\n  .form-control {\n    padding-right: (@input-height-base * 1.25);\n  }\n}\n// Feedback icon (requires .glyphicon classes)\n.form-control-feedback {\n  position: absolute;\n  top: 0;\n  right: 0;\n  z-index: 2; // Ensure icon is above input groups\n  display: block;\n  width: @input-height-base;\n  height: @input-height-base;\n  line-height: @input-height-base;\n  text-align: center;\n  pointer-events: none;\n}\n.input-lg + .form-control-feedback,\n.input-group-lg + .form-control-feedback,\n.form-group-lg .form-control + .form-control-feedback {\n  width: @input-height-large;\n  height: @input-height-large;\n  line-height: @input-height-large;\n}\n.input-sm + .form-control-feedback,\n.input-group-sm + .form-control-feedback,\n.form-group-sm .form-control + .form-control-feedback {\n  width: @input-height-small;\n  height: @input-height-small;\n  line-height: @input-height-small;\n}\n\n// Feedback states\n.has-success {\n  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);\n}\n.has-warning {\n  .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);\n}\n.has-error {\n  .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);\n}\n\n// Reposition feedback icon if input has visible label above\n.has-feedback label {\n\n  & ~ .form-control-feedback {\n    top: (@line-height-computed + 5); // Height of the `label` and its margin\n  }\n  &.sr-only ~ .form-control-feedback {\n    top: 0;\n  }\n}\n\n\n// Help text\n//\n// Apply to any element you wish to create light text for placement immediately\n// below a form control. Use for general help, formatting, or instructional text.\n\n.help-block {\n  display: block; // account for any element using help-block\n  margin-top: 5px;\n  margin-bottom: 10px;\n  color: lighten(@text-color, 25%); // lighten the text some for contrast\n}\n\n\n// Inline forms\n//\n// Make forms appear inline(-block) by adding the `.form-inline` class. Inline\n// forms begin stacked on extra small (mobile) devices and then go inline when\n// viewports reach <768px.\n//\n// Requires wrapping inputs and labels with `.form-group` for proper display of\n// default HTML form controls and our custom form controls (e.g., input groups).\n//\n// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.\n\n.form-inline {\n\n  // Kick in the inline\n  @media (min-width: @screen-sm-min) {\n    // Inline-block all the things for \"inline\"\n    .form-group {\n      display: inline-block;\n      margin-bottom: 0;\n      vertical-align: middle;\n    }\n\n    // In navbar-form, allow folks to *not* use `.form-group`\n    .form-control {\n      display: inline-block;\n      width: auto; // Prevent labels from stacking above inputs in `.form-group`\n      vertical-align: middle;\n    }\n\n    // Make static controls behave like regular ones\n    .form-control-static {\n      display: inline-block;\n    }\n\n    .input-group {\n      display: inline-table;\n      vertical-align: middle;\n\n      .input-group-addon,\n      .input-group-btn,\n      .form-control {\n        width: auto;\n      }\n    }\n\n    // Input groups need that 100% width though\n    .input-group > .form-control {\n      width: 100%;\n    }\n\n    .control-label {\n      margin-bottom: 0;\n      vertical-align: middle;\n    }\n\n    // Remove default margin on radios/checkboxes that were used for stacking, and\n    // then undo the floating of radios and checkboxes to match.\n    .radio,\n    .checkbox {\n      display: inline-block;\n      margin-top: 0;\n      margin-bottom: 0;\n      vertical-align: middle;\n\n      label {\n        padding-left: 0;\n      }\n    }\n    .radio input[type=\"radio\"],\n    .checkbox input[type=\"checkbox\"] {\n      position: relative;\n      margin-left: 0;\n    }\n\n    // Re-override the feedback icon.\n    .has-feedback .form-control-feedback {\n      top: 0;\n    }\n  }\n}\n\n\n// Horizontal forms\n//\n// Horizontal forms are built on grid classes and allow you to create forms with\n// labels on the left and inputs on the right.\n\n.form-horizontal {\n\n  // Consistent vertical alignment of radios and checkboxes\n  //\n  // Labels also get some reset styles, but that is scoped to a media query below.\n  .radio,\n  .checkbox,\n  .radio-inline,\n  .checkbox-inline {\n    margin-top: 0;\n    margin-bottom: 0;\n    padding-top: (@padding-base-vertical + 1); // Default padding plus a border\n  }\n  // Account for padding we're adding to ensure the alignment and of help text\n  // and other content below items\n  .radio,\n  .checkbox {\n    min-height: (@line-height-computed + (@padding-base-vertical + 1));\n  }\n\n  // Make form groups behave like rows\n  .form-group {\n    .make-row();\n  }\n\n  // Reset spacing and right align labels, but scope to media queries so that\n  // labels on narrow viewports stack the same as a default form example.\n  @media (min-width: @screen-sm-min) {\n    .control-label {\n      text-align: right;\n      margin-bottom: 0;\n      padding-top: (@padding-base-vertical + 1); // Default padding plus a border\n    }\n  }\n\n  // Validation states\n  //\n  // Reposition the icon because it's now within a grid column and columns have\n  // `position: relative;` on them. Also accounts for the grid gutter padding.\n  .has-feedback .form-control-feedback {\n    right: floor((@grid-gutter-width / 2));\n  }\n\n  // Form group sizes\n  //\n  // Quick utility class for applying `.input-lg` and `.input-sm` styles to the\n  // inputs and labels within a `.form-group`.\n  .form-group-lg {\n    @media (min-width: @screen-sm-min) {\n      .control-label {\n        padding-top: (@padding-large-vertical + 1);\n        font-size: @font-size-large;\n      }\n    }\n  }\n  .form-group-sm {\n    @media (min-width: @screen-sm-min) {\n      .control-label {\n        padding-top: (@padding-small-vertical + 1);\n        font-size: @font-size-small;\n      }\n    }\n  }\n}\n","// Form validation states\n//\n// Used in forms.less to generate the form validation CSS for warnings, errors,\n// and successes.\n\n.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {\n  // Color the label and help text\n  .help-block,\n  .control-label,\n  .radio,\n  .checkbox,\n  .radio-inline,\n  .checkbox-inline,\n  &.radio label,\n  &.checkbox label,\n  &.radio-inline label,\n  &.checkbox-inline label  {\n    color: @text-color;\n  }\n  // Set the border and box shadow on specific inputs to match\n  .form-control {\n    border-color: @border-color;\n    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work\n    &:focus {\n      border-color: darken(@border-color, 10%);\n      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);\n      .box-shadow(@shadow);\n    }\n  }\n  // Set validation states also for addons\n  .input-group-addon {\n    color: @text-color;\n    border-color: @border-color;\n    background-color: @background-color;\n  }\n  // Optional feedback icon\n  .form-control-feedback {\n    color: @text-color;\n  }\n}\n\n\n// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `@input-border-focus` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n.form-control-focus(@color: @input-border-focus) {\n  @color-rgba: rgba(red(@color), green(@color), blue(@color), .6);\n  &:focus {\n    border-color: @color;\n    outline: 0;\n    .box-shadow(~\"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}\");\n  }\n}\n\n// Form control sizing\n//\n// Relative text size, padding, and border-radii changes for form controls. For\n// horizontal sizing, wrap controls in the predefined grid classes. `<select>`\n// element gets special love because it's special, and that's a fact!\n.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  height: @input-height;\n  padding: @padding-vertical @padding-horizontal;\n  font-size: @font-size;\n  line-height: @line-height;\n  border-radius: @border-radius;\n\n  select& {\n    height: @input-height;\n    line-height: @input-height;\n  }\n\n  textarea&,\n  select[multiple]& {\n    height: auto;\n  }\n}\n","//\n// Buttons\n// --------------------------------------------------\n\n\n// Base styles\n// --------------------------------------------------\n\n.btn {\n  display: inline-block;\n  margin-bottom: 0; // For input.btn\n  font-weight: @btn-font-weight;\n  text-align: center;\n  vertical-align: middle;\n  touch-action: manipulation;\n  cursor: pointer;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid transparent;\n  white-space: nowrap;\n  .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base);\n  .user-select(none);\n\n  &,\n  &:active,\n  &.active {\n    &:focus,\n    &.focus {\n      .tab-focus();\n    }\n  }\n\n  &:hover,\n  &:focus,\n  &.focus {\n    color: @btn-default-color;\n    text-decoration: none;\n  }\n\n  &:active,\n  &.active {\n    outline: 0;\n    background-image: none;\n    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n  }\n\n  &.disabled,\n  &[disabled],\n  fieldset[disabled] & {\n    cursor: @cursor-disabled;\n    .opacity(.65);\n    .box-shadow(none);\n  }\n\n  a& {\n    &.disabled,\n    fieldset[disabled] & {\n      pointer-events: none; // Future-proof disabling of clicks on `<a>` elements\n    }\n  }\n}\n\n\n// Alternate buttons\n// --------------------------------------------------\n\n.btn-default {\n  .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);\n}\n.btn-primary {\n  .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);\n}\n// Success appears as green\n.btn-success {\n  .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);\n}\n// Info appears as blue-green\n.btn-info {\n  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);\n}\n// Warning appears as orange\n.btn-warning {\n  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);\n}\n// Danger and error appear as red\n.btn-danger {\n  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);\n}\n\n\n// Link buttons\n// -------------------------\n\n// Make a button look and behave like a link\n.btn-link {\n  color: @link-color;\n  font-weight: normal;\n  border-radius: 0;\n\n  &,\n  &:active,\n  &.active,\n  &[disabled],\n  fieldset[disabled] & {\n    background-color: transparent;\n    .box-shadow(none);\n  }\n  &,\n  &:hover,\n  &:focus,\n  &:active {\n    border-color: transparent;\n  }\n  &:hover,\n  &:focus {\n    color: @link-hover-color;\n    text-decoration: @link-hover-decoration;\n    background-color: transparent;\n  }\n  &[disabled],\n  fieldset[disabled] & {\n    &:hover,\n    &:focus {\n      color: @btn-link-disabled-color;\n      text-decoration: none;\n    }\n  }\n}\n\n\n// Button Sizes\n// --------------------------------------------------\n\n.btn-lg {\n  // line-height: ensure even-numbered height of button next to large input\n  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large);\n}\n.btn-sm {\n  // line-height: ensure proper height of button next to small input\n  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);\n}\n.btn-xs {\n  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);\n}\n\n\n// Block button\n// --------------------------------------------------\n\n.btn-block {\n  display: block;\n  width: 100%;\n}\n\n// Vertically space out multiple block buttons\n.btn-block + .btn-block {\n  margin-top: 5px;\n}\n\n// Specificity overrides\ninput[type=\"submit\"],\ninput[type=\"reset\"],\ninput[type=\"button\"] {\n  &.btn-block {\n    width: 100%;\n  }\n}\n","// Button variants\n//\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n\n.button-variant(@color; @background; @border) {\n  color: @color;\n  background-color: @background;\n  border-color: @border;\n\n  &:focus,\n  &.focus {\n    color: @color;\n    background-color: darken(@background, 10%);\n        border-color: darken(@border, 25%);\n  }\n  &:hover {\n    color: @color;\n    background-color: darken(@background, 10%);\n        border-color: darken(@border, 12%);\n  }\n  &:active,\n  &.active,\n  .open > .dropdown-toggle& {\n    color: @color;\n    background-color: darken(@background, 10%);\n        border-color: darken(@border, 12%);\n\n    &:hover,\n    &:focus,\n    &.focus {\n      color: @color;\n      background-color: darken(@background, 17%);\n          border-color: darken(@border, 25%);\n    }\n  }\n  &:active,\n  &.active,\n  .open > .dropdown-toggle& {\n    background-image: none;\n  }\n  &.disabled,\n  &[disabled],\n  fieldset[disabled] & {\n    &:hover,\n    &:focus,\n    &.focus {\n      background-color: @background;\n          border-color: @border;\n    }\n  }\n\n  .badge {\n    color: @background;\n    background-color: @color;\n  }\n}\n\n// Button sizes\n.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  padding: @padding-vertical @padding-horizontal;\n  font-size: @font-size;\n  line-height: @line-height;\n  border-radius: @border-radius;\n}\n","// Opacity\n\n.opacity(@opacity) {\n  opacity: @opacity;\n  // IE8 filter\n  @opacity-ie: (@opacity * 100);\n  filter: ~\"alpha(opacity=@{opacity-ie})\";\n}\n","//\n// Component animations\n// --------------------------------------------------\n\n// Heads up!\n//\n// We don't use the `.opacity()` mixin here since it causes a bug with text\n// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.\n\n.fade {\n  opacity: 0;\n  .transition(opacity .15s linear);\n  &.in {\n    opacity: 1;\n  }\n}\n\n.collapse {\n  display: none;\n\n  &.in      { display: block; }\n  tr&.in    { display: table-row; }\n  tbody&.in { display: table-row-group; }\n}\n\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  .transition-property(~\"height, visibility\");\n  .transition-duration(.35s);\n  .transition-timing-function(ease);\n}\n","//\n// Dropdown menus\n// --------------------------------------------------\n\n\n// Dropdown arrow/caret\n.caret {\n  display: inline-block;\n  width: 0;\n  height: 0;\n  margin-left: 2px;\n  vertical-align: middle;\n  border-top:   @caret-width-base dashed;\n  border-top:   @caret-width-base solid ~\"\\9\"; // IE8\n  border-right: @caret-width-base solid transparent;\n  border-left:  @caret-width-base solid transparent;\n}\n\n// The dropdown wrapper (div)\n.dropup,\n.dropdown {\n  position: relative;\n}\n\n// Prevent the focus on the dropdown toggle when closing dropdowns\n.dropdown-toggle:focus {\n  outline: 0;\n}\n\n// The dropdown menu (ul)\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: @zindex-dropdown;\n  display: none; // none by default, but block on \"open\" of the menu\n  float: left;\n  min-width: 160px;\n  padding: 5px 0;\n  margin: 2px 0 0; // override default ul\n  list-style: none;\n  font-size: @font-size-base;\n  text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)\n  background-color: @dropdown-bg;\n  border: 1px solid @dropdown-fallback-border; // IE8 fallback\n  border: 1px solid @dropdown-border;\n  border-radius: @border-radius-base;\n  .box-shadow(0 6px 12px rgba(0,0,0,.175));\n  background-clip: padding-box;\n\n  // Aligns the dropdown menu to right\n  //\n  // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]`\n  &.pull-right {\n    right: 0;\n    left: auto;\n  }\n\n  // Dividers (basically an hr) within the dropdown\n  .divider {\n    .nav-divider(@dropdown-divider-bg);\n  }\n\n  // Links within the dropdown menu\n  > li > a {\n    display: block;\n    padding: 3px 20px;\n    clear: both;\n    font-weight: normal;\n    line-height: @line-height-base;\n    color: @dropdown-link-color;\n    white-space: nowrap; // prevent links from randomly breaking onto new lines\n  }\n}\n\n// Hover/Focus state\n.dropdown-menu > li > a {\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    color: @dropdown-link-hover-color;\n    background-color: @dropdown-link-hover-bg;\n  }\n}\n\n// Active state\n.dropdown-menu > .active > a {\n  &,\n  &:hover,\n  &:focus {\n    color: @dropdown-link-active-color;\n    text-decoration: none;\n    outline: 0;\n    background-color: @dropdown-link-active-bg;\n  }\n}\n\n// Disabled state\n//\n// Gray out text and ensure the hover/focus state remains gray\n\n.dropdown-menu > .disabled > a {\n  &,\n  &:hover,\n  &:focus {\n    color: @dropdown-link-disabled-color;\n  }\n\n  // Nuke hover/focus effects\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    background-color: transparent;\n    background-image: none; // Remove CSS gradient\n    .reset-filter();\n    cursor: @cursor-disabled;\n  }\n}\n\n// Open state for the dropdown\n.open {\n  // Show the menu\n  > .dropdown-menu {\n    display: block;\n  }\n\n  // Remove the outline when :focus is triggered\n  > a {\n    outline: 0;\n  }\n}\n\n// Menu positioning\n//\n// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown\n// menu with the parent.\n.dropdown-menu-right {\n  left: auto; // Reset the default from `.dropdown-menu`\n  right: 0;\n}\n// With v3, we enabled auto-flipping if you have a dropdown within a right\n// aligned nav component. To enable the undoing of that, we provide an override\n// to restore the default dropdown menu alignment.\n//\n// This is only for left-aligning a dropdown menu within a `.navbar-right` or\n// `.pull-right` nav component.\n.dropdown-menu-left {\n  left: 0;\n  right: auto;\n}\n\n// Dropdown section headers\n.dropdown-header {\n  display: block;\n  padding: 3px 20px;\n  font-size: @font-size-small;\n  line-height: @line-height-base;\n  color: @dropdown-header-color;\n  white-space: nowrap; // as with > li > a\n}\n\n// Backdrop to catch body clicks on mobile, etc.\n.dropdown-backdrop {\n  position: fixed;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  top: 0;\n  z-index: (@zindex-dropdown - 10);\n}\n\n// Right aligned dropdowns\n.pull-right > .dropdown-menu {\n  right: 0;\n  left: auto;\n}\n\n// Allow for dropdowns to go bottom up (aka, dropup-menu)\n//\n// Just add .dropup after the standard .dropdown class and you're set, bro.\n// TODO: abstract this so that the navbar fixed styles are not placed here?\n\n.dropup,\n.navbar-fixed-bottom .dropdown {\n  // Reverse the caret\n  .caret {\n    border-top: 0;\n    border-bottom: @caret-width-base dashed;\n    border-bottom: @caret-width-base solid ~\"\\9\"; // IE8\n    content: \"\";\n  }\n  // Different positioning for bottom up menu\n  .dropdown-menu {\n    top: auto;\n    bottom: 100%;\n    margin-bottom: 2px;\n  }\n}\n\n\n// Component alignment\n//\n// Reiterate per navbar.less and the modified component alignment there.\n\n@media (min-width: @grid-float-breakpoint) {\n  .navbar-right {\n    .dropdown-menu {\n      .dropdown-menu-right();\n    }\n    // Necessary for overrides of the default right aligned menu.\n    // Will remove come v4 in all likelihood.\n    .dropdown-menu-left {\n      .dropdown-menu-left();\n    }\n  }\n}\n","// Horizontal dividers\n//\n// Dividers (basically an hr) within dropdowns and nav lists\n\n.nav-divider(@color: #e5e5e5) {\n  height: 1px;\n  margin: ((@line-height-computed / 2) - 1) 0;\n  overflow: hidden;\n  background-color: @color;\n}\n","// Reset filters for IE\n//\n// When you need to remove a gradient background, do not forget to use this to reset\n// the IE filter for IE9 and below.\n\n.reset-filter() {\n  filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(enabled = false)\"));\n}\n","//\n// Button groups\n// --------------------------------------------------\n\n// Make the div behave like a button\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-block;\n  vertical-align: middle; // match .btn alignment given font-size hack above\n  > .btn {\n    position: relative;\n    float: left;\n    // Bring the \"active\" button to the front\n    &:hover,\n    &:focus,\n    &:active,\n    &.active {\n      z-index: 2;\n    }\n  }\n}\n\n// Prevent double borders when buttons are next to each other\n.btn-group {\n  .btn + .btn,\n  .btn + .btn-group,\n  .btn-group + .btn,\n  .btn-group + .btn-group {\n    margin-left: -1px;\n  }\n}\n\n// Optional: Group multiple button groups together for a toolbar\n.btn-toolbar {\n  margin-left: -5px; // Offset the first child's margin\n  &:extend(.clearfix all);\n\n  .btn,\n  .btn-group,\n  .input-group {\n    float: left;\n  }\n  > .btn,\n  > .btn-group,\n  > .input-group {\n    margin-left: 5px;\n  }\n}\n\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n  border-radius: 0;\n}\n\n// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match\n.btn-group > .btn:first-child {\n  margin-left: 0;\n  &:not(:last-child):not(.dropdown-toggle) {\n    .border-right-radius(0);\n  }\n}\n// Need .dropdown-toggle since :last-child doesn't apply, given that a .dropdown-menu is used immediately after it\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n  .border-left-radius(0);\n}\n\n// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)\n.btn-group > .btn-group {\n  float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group > .btn-group:first-child:not(:last-child) {\n  > .btn:last-child,\n  > .dropdown-toggle {\n    .border-right-radius(0);\n  }\n}\n.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  .border-left-radius(0);\n}\n\n// On active and open, don't show outline\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n  outline: 0;\n}\n\n\n// Sizing\n//\n// Remix the default button sizing classes into new ones for easier manipulation.\n\n.btn-group-xs > .btn { &:extend(.btn-xs); }\n.btn-group-sm > .btn { &:extend(.btn-sm); }\n.btn-group-lg > .btn { &:extend(.btn-lg); }\n\n\n// Split button dropdowns\n// ----------------------\n\n// Give the line between buttons some depth\n.btn-group > .btn + .dropdown-toggle {\n  padding-left: 8px;\n  padding-right: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n  padding-left: 12px;\n  padding-right: 12px;\n}\n\n// The clickable button for toggling the menu\n// Remove the gradient and set the same inset shadow as the :active state\n.btn-group.open .dropdown-toggle {\n  .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n\n  // Show no shadow for `.btn-link` since it has no other button styles.\n  &.btn-link {\n    .box-shadow(none);\n  }\n}\n\n\n// Reposition the caret\n.btn .caret {\n  margin-left: 0;\n}\n// Carets in other button sizes\n.btn-lg .caret {\n  border-width: @caret-width-large @caret-width-large 0;\n  border-bottom-width: 0;\n}\n// Upside down carets for .dropup\n.dropup .btn-lg .caret {\n  border-width: 0 @caret-width-large @caret-width-large;\n}\n\n\n// Vertical button groups\n// ----------------------\n\n.btn-group-vertical {\n  > .btn,\n  > .btn-group,\n  > .btn-group > .btn {\n    display: block;\n    float: none;\n    width: 100%;\n    max-width: 100%;\n  }\n\n  // Clear floats so dropdown menus can be properly placed\n  > .btn-group {\n    &:extend(.clearfix all);\n    > .btn {\n      float: none;\n    }\n  }\n\n  > .btn + .btn,\n  > .btn + .btn-group,\n  > .btn-group + .btn,\n  > .btn-group + .btn-group {\n    margin-top: -1px;\n    margin-left: 0;\n  }\n}\n\n.btn-group-vertical > .btn {\n  &:not(:first-child):not(:last-child) {\n    border-radius: 0;\n  }\n  &:first-child:not(:last-child) {\n    .border-top-radius(@btn-border-radius-base);\n    .border-bottom-radius(0);\n  }\n  &:last-child:not(:first-child) {\n    .border-top-radius(0);\n    .border-bottom-radius(@btn-border-radius-base);\n  }\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) {\n  > .btn:last-child,\n  > .dropdown-toggle {\n    .border-bottom-radius(0);\n  }\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  .border-top-radius(0);\n}\n\n\n// Justified button groups\n// ----------------------\n\n.btn-group-justified {\n  display: table;\n  width: 100%;\n  table-layout: fixed;\n  border-collapse: separate;\n  > .btn,\n  > .btn-group {\n    float: none;\n    display: table-cell;\n    width: 1%;\n  }\n  > .btn-group .btn {\n    width: 100%;\n  }\n\n  > .btn-group .dropdown-menu {\n    left: auto;\n  }\n}\n\n\n// Checkbox and radio options\n//\n// In order to support the browser's form validation feedback, powered by the\n// `required` attribute, we have to \"hide\" the inputs via `clip`. We cannot use\n// `display: none;` or `visibility: hidden;` as that also hides the popover.\n// Simply visually hiding the inputs via `opacity` would leave them clickable in\n// certain cases which is prevented by using `clip` and `pointer-events`.\n// This way, we ensure a DOM element is visible to position the popover from.\n//\n// See https://github.com/twbs/bootstrap/pull/12794 and\n// https://github.com/twbs/bootstrap/pull/14559 for more information.\n\n[data-toggle=\"buttons\"] {\n  > .btn,\n  > .btn-group > .btn {\n    input[type=\"radio\"],\n    input[type=\"checkbox\"] {\n      position: absolute;\n      clip: rect(0,0,0,0);\n      pointer-events: none;\n    }\n  }\n}\n","// Single side border-radius\n\n.border-top-radius(@radius) {\n  border-top-right-radius: @radius;\n   border-top-left-radius: @radius;\n}\n.border-right-radius(@radius) {\n  border-bottom-right-radius: @radius;\n     border-top-right-radius: @radius;\n}\n.border-bottom-radius(@radius) {\n  border-bottom-right-radius: @radius;\n   border-bottom-left-radius: @radius;\n}\n.border-left-radius(@radius) {\n  border-bottom-left-radius: @radius;\n     border-top-left-radius: @radius;\n}\n","//\n// Input groups\n// --------------------------------------------------\n\n// Base styles\n// -------------------------\n.input-group {\n  position: relative; // For dropdowns\n  display: table;\n  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table\n\n  // Undo padding and float of grid classes\n  &[class*=\"col-\"] {\n    float: none;\n    padding-left: 0;\n    padding-right: 0;\n  }\n\n  .form-control {\n    // Ensure that the input is always above the *appended* addon button for\n    // proper border colors.\n    position: relative;\n    z-index: 2;\n\n    // IE9 fubars the placeholder attribute in text inputs and the arrows on\n    // select elements in input groups. To fix it, we float the input. Details:\n    // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855\n    float: left;\n\n    width: 100%;\n    margin-bottom: 0;\n\n    &:focus {\n      z-index: 3;\n    }\n  }\n}\n\n// Sizing options\n//\n// Remix the default form control sizing classes into new ones for easier\n// manipulation.\n\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn {\n  .input-lg();\n}\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn {\n  .input-sm();\n}\n\n\n// Display as table-cell\n// -------------------------\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n  display: table-cell;\n\n  &:not(:first-child):not(:last-child) {\n    border-radius: 0;\n  }\n}\n// Addon and addon wrapper for buttons\n.input-group-addon,\n.input-group-btn {\n  width: 1%;\n  white-space: nowrap;\n  vertical-align: middle; // Match the inputs\n}\n\n// Text input groups\n// -------------------------\n.input-group-addon {\n  padding: @padding-base-vertical @padding-base-horizontal;\n  font-size: @font-size-base;\n  font-weight: normal;\n  line-height: 1;\n  color: @input-color;\n  text-align: center;\n  background-color: @input-group-addon-bg;\n  border: 1px solid @input-group-addon-border-color;\n  border-radius: @input-border-radius;\n\n  // Sizing\n  &.input-sm {\n    padding: @padding-small-vertical @padding-small-horizontal;\n    font-size: @font-size-small;\n    border-radius: @input-border-radius-small;\n  }\n  &.input-lg {\n    padding: @padding-large-vertical @padding-large-horizontal;\n    font-size: @font-size-large;\n    border-radius: @input-border-radius-large;\n  }\n\n  // Nuke default margins from checkboxes and radios to vertically center within.\n  input[type=\"radio\"],\n  input[type=\"checkbox\"] {\n    margin-top: 0;\n  }\n}\n\n// Reset rounded corners\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n  .border-right-radius(0);\n}\n.input-group-addon:first-child {\n  border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n  .border-left-radius(0);\n}\n.input-group-addon:last-child {\n  border-left: 0;\n}\n\n// Button input groups\n// -------------------------\n.input-group-btn {\n  position: relative;\n  // Jankily prevent input button groups from wrapping with `white-space` and\n  // `font-size` in combination with `inline-block` on buttons.\n  font-size: 0;\n  white-space: nowrap;\n\n  // Negative margin for spacing, position for bringing hovered/focused/actived\n  // element above the siblings.\n  > .btn {\n    position: relative;\n    + .btn {\n      margin-left: -1px;\n    }\n    // Bring the \"active\" button to the front\n    &:hover,\n    &:focus,\n    &:active {\n      z-index: 2;\n    }\n  }\n\n  // Negative margin to only have a 1px border between the two\n  &:first-child {\n    > .btn,\n    > .btn-group {\n      margin-right: -1px;\n    }\n  }\n  &:last-child {\n    > .btn,\n    > .btn-group {\n      z-index: 2;\n      margin-left: -1px;\n    }\n  }\n}\n","//\n// Navs\n// --------------------------------------------------\n\n\n// Base class\n// --------------------------------------------------\n\n.nav {\n  margin-bottom: 0;\n  padding-left: 0; // Override default ul/ol\n  list-style: none;\n  &:extend(.clearfix all);\n\n  > li {\n    position: relative;\n    display: block;\n\n    > a {\n      position: relative;\n      display: block;\n      padding: @nav-link-padding;\n      &:hover,\n      &:focus {\n        text-decoration: none;\n        background-color: @nav-link-hover-bg;\n      }\n    }\n\n    // Disabled state sets text to gray and nukes hover/tab effects\n    &.disabled > a {\n      color: @nav-disabled-link-color;\n\n      &:hover,\n      &:focus {\n        color: @nav-disabled-link-hover-color;\n        text-decoration: none;\n        background-color: transparent;\n        cursor: @cursor-disabled;\n      }\n    }\n  }\n\n  // Open dropdowns\n  .open > a {\n    &,\n    &:hover,\n    &:focus {\n      background-color: @nav-link-hover-bg;\n      border-color: @link-color;\n    }\n  }\n\n  // Nav dividers (deprecated with v3.0.1)\n  //\n  // This should have been removed in v3 with the dropping of `.nav-list`, but\n  // we missed it. We don't currently support this anywhere, but in the interest\n  // of maintaining backward compatibility in case you use it, it's deprecated.\n  .nav-divider {\n    .nav-divider();\n  }\n\n  // Prevent IE8 from misplacing imgs\n  //\n  // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989\n  > li > a > img {\n    max-width: none;\n  }\n}\n\n\n// Tabs\n// -------------------------\n\n// Give the tabs something to sit on\n.nav-tabs {\n  border-bottom: 1px solid @nav-tabs-border-color;\n  > li {\n    float: left;\n    // Make the list-items overlay the bottom border\n    margin-bottom: -1px;\n\n    // Actual tabs (as links)\n    > a {\n      margin-right: 2px;\n      line-height: @line-height-base;\n      border: 1px solid transparent;\n      border-radius: @border-radius-base @border-radius-base 0 0;\n      &:hover {\n        border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;\n      }\n    }\n\n    // Active state, and its :hover to override normal :hover\n    &.active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @nav-tabs-active-link-hover-color;\n        background-color: @nav-tabs-active-link-hover-bg;\n        border: 1px solid @nav-tabs-active-link-hover-border-color;\n        border-bottom-color: transparent;\n        cursor: default;\n      }\n    }\n  }\n  // pulling this in mainly for less shorthand\n  &.nav-justified {\n    .nav-justified();\n    .nav-tabs-justified();\n  }\n}\n\n\n// Pills\n// -------------------------\n.nav-pills {\n  > li {\n    float: left;\n\n    // Links rendered as pills\n    > a {\n      border-radius: @nav-pills-border-radius;\n    }\n    + li {\n      margin-left: 2px;\n    }\n\n    // Active state\n    &.active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @nav-pills-active-link-hover-color;\n        background-color: @nav-pills-active-link-hover-bg;\n      }\n    }\n  }\n}\n\n\n// Stacked pills\n.nav-stacked {\n  > li {\n    float: none;\n    + li {\n      margin-top: 2px;\n      margin-left: 0; // no need for this gap between nav items\n    }\n  }\n}\n\n\n// Nav variations\n// --------------------------------------------------\n\n// Justified nav links\n// -------------------------\n\n.nav-justified {\n  width: 100%;\n\n  > li {\n    float: none;\n    > a {\n      text-align: center;\n      margin-bottom: 5px;\n    }\n  }\n\n  > .dropdown .dropdown-menu {\n    top: auto;\n    left: auto;\n  }\n\n  @media (min-width: @screen-sm-min) {\n    > li {\n      display: table-cell;\n      width: 1%;\n      > a {\n        margin-bottom: 0;\n      }\n    }\n  }\n}\n\n// Move borders to anchors instead of bottom of list\n//\n// Mixin for adding on top the shared `.nav-justified` styles for our tabs\n.nav-tabs-justified {\n  border-bottom: 0;\n\n  > li > a {\n    // Override margin from .nav-tabs\n    margin-right: 0;\n    border-radius: @border-radius-base;\n  }\n\n  > .active > a,\n  > .active > a:hover,\n  > .active > a:focus {\n    border: 1px solid @nav-tabs-justified-link-border-color;\n  }\n\n  @media (min-width: @screen-sm-min) {\n    > li > a {\n      border-bottom: 1px solid @nav-tabs-justified-link-border-color;\n      border-radius: @border-radius-base @border-radius-base 0 0;\n    }\n    > .active > a,\n    > .active > a:hover,\n    > .active > a:focus {\n      border-bottom-color: @nav-tabs-justified-active-link-border-color;\n    }\n  }\n}\n\n\n// Tabbable tabs\n// -------------------------\n\n// Hide tabbable panes to start, show them when `.active`\n.tab-content {\n  > .tab-pane {\n    display: none;\n  }\n  > .active {\n    display: block;\n  }\n}\n\n\n// Dropdowns\n// -------------------------\n\n// Specific dropdowns\n.nav-tabs .dropdown-menu {\n  // make dropdown border overlap tab border\n  margin-top: -1px;\n  // Remove the top rounded corners here since there is a hard edge above the menu\n  .border-top-radius(0);\n}\n","//\n// Navbars\n// --------------------------------------------------\n\n\n// Wrapper and base class\n//\n// Provide a static navbar from which we expand to create full-width, fixed, and\n// other navbar variations.\n\n.navbar {\n  position: relative;\n  min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)\n  margin-bottom: @navbar-margin-bottom;\n  border: 1px solid transparent;\n\n  // Prevent floats from breaking the navbar\n  &:extend(.clearfix all);\n\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: @navbar-border-radius;\n  }\n}\n\n\n// Navbar heading\n//\n// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy\n// styling of responsive aspects.\n\n.navbar-header {\n  &:extend(.clearfix all);\n\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n  }\n}\n\n\n// Navbar collapse (body)\n//\n// Group your navbar content into this for easy collapsing and expanding across\n// various device sizes. By default, this content is collapsed when <768px, but\n// will expand past that for a horizontal display.\n//\n// To start (on mobile devices) the navbar links, forms, and buttons are stacked\n// vertically and include a `max-height` to overflow in case you have too much\n// content for the user's viewport.\n\n.navbar-collapse {\n  overflow-x: visible;\n  padding-right: @navbar-padding-horizontal;\n  padding-left:  @navbar-padding-horizontal;\n  border-top: 1px solid transparent;\n  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);\n  &:extend(.clearfix all);\n  -webkit-overflow-scrolling: touch;\n\n  &.in {\n    overflow-y: auto;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    width: auto;\n    border-top: 0;\n    box-shadow: none;\n\n    &.collapse {\n      display: block !important;\n      height: auto !important;\n      padding-bottom: 0; // Override default setting\n      overflow: visible !important;\n    }\n\n    &.in {\n      overflow-y: visible;\n    }\n\n    // Undo the collapse side padding for navbars with containers to ensure\n    // alignment of right-aligned contents.\n    .navbar-fixed-top &,\n    .navbar-static-top &,\n    .navbar-fixed-bottom & {\n      padding-left: 0;\n      padding-right: 0;\n    }\n  }\n}\n\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  .navbar-collapse {\n    max-height: @navbar-collapse-max-height;\n\n    @media (max-device-width: @screen-xs-min) and (orientation: landscape) {\n      max-height: 200px;\n    }\n  }\n}\n\n\n// Both navbar header and collapse\n//\n// When a container is present, change the behavior of the header and collapse.\n\n.container,\n.container-fluid {\n  > .navbar-header,\n  > .navbar-collapse {\n    margin-right: -@navbar-padding-horizontal;\n    margin-left:  -@navbar-padding-horizontal;\n\n    @media (min-width: @grid-float-breakpoint) {\n      margin-right: 0;\n      margin-left:  0;\n    }\n  }\n}\n\n\n//\n// Navbar alignment options\n//\n// Display the navbar across the entirety of the page or fixed it to the top or\n// bottom of the page.\n\n// Static top (unfixed, but 100% wide) navbar\n.navbar-static-top {\n  z-index: @zindex-navbar;\n  border-width: 0 0 1px;\n\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: 0;\n  }\n}\n\n// Fix the top/bottom navbars when screen real estate supports it\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  position: fixed;\n  right: 0;\n  left: 0;\n  z-index: @zindex-navbar-fixed;\n\n  // Undo the rounded corners\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top {\n  top: 0;\n  border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n  bottom: 0;\n  margin-bottom: 0; // override .navbar defaults\n  border-width: 1px 0 0;\n}\n\n\n// Brand/project name\n\n.navbar-brand {\n  float: left;\n  padding: @navbar-padding-vertical @navbar-padding-horizontal;\n  font-size: @font-size-large;\n  line-height: @line-height-computed;\n  height: @navbar-height;\n\n  &:hover,\n  &:focus {\n    text-decoration: none;\n  }\n\n  > img {\n    display: block;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    .navbar > .container &,\n    .navbar > .container-fluid & {\n      margin-left: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Navbar toggle\n//\n// Custom button for toggling the `.navbar-collapse`, powered by the collapse\n// JavaScript plugin.\n\n.navbar-toggle {\n  position: relative;\n  float: right;\n  margin-right: @navbar-padding-horizontal;\n  padding: 9px 10px;\n  .navbar-vertical-align(34px);\n  background-color: transparent;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid transparent;\n  border-radius: @border-radius-base;\n\n  // We remove the `outline` here, but later compensate by attaching `:hover`\n  // styles to `:focus`.\n  &:focus {\n    outline: 0;\n  }\n\n  // Bars\n  .icon-bar {\n    display: block;\n    width: 22px;\n    height: 2px;\n    border-radius: 1px;\n  }\n  .icon-bar + .icon-bar {\n    margin-top: 4px;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    display: none;\n  }\n}\n\n\n// Navbar nav links\n//\n// Builds on top of the `.nav` components with its own modifier class to make\n// the nav the full height of the horizontal nav (above 768px).\n\n.navbar-nav {\n  margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;\n\n  > li > a {\n    padding-top:    10px;\n    padding-bottom: 10px;\n    line-height: @line-height-computed;\n  }\n\n  @media (max-width: @grid-float-breakpoint-max) {\n    // Dropdowns get custom display when collapsed\n    .open .dropdown-menu {\n      position: static;\n      float: none;\n      width: auto;\n      margin-top: 0;\n      background-color: transparent;\n      border: 0;\n      box-shadow: none;\n      > li > a,\n      .dropdown-header {\n        padding: 5px 15px 5px 25px;\n      }\n      > li > a {\n        line-height: @line-height-computed;\n        &:hover,\n        &:focus {\n          background-image: none;\n        }\n      }\n    }\n  }\n\n  // Uncollapse the nav\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n    margin: 0;\n\n    > li {\n      float: left;\n      > a {\n        padding-top:    @navbar-padding-vertical;\n        padding-bottom: @navbar-padding-vertical;\n      }\n    }\n  }\n}\n\n\n// Navbar form\n//\n// Extension of the `.form-inline` with some extra flavor for optimum display in\n// our navbars.\n\n.navbar-form {\n  margin-left: -@navbar-padding-horizontal;\n  margin-right: -@navbar-padding-horizontal;\n  padding: 10px @navbar-padding-horizontal;\n  border-top: 1px solid transparent;\n  border-bottom: 1px solid transparent;\n  @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);\n  .box-shadow(@shadow);\n\n  // Mixin behavior for optimum display\n  .form-inline();\n\n  .form-group {\n    @media (max-width: @grid-float-breakpoint-max) {\n      margin-bottom: 5px;\n\n      &:last-child {\n        margin-bottom: 0;\n      }\n    }\n  }\n\n  // Vertically center in expanded, horizontal navbar\n  .navbar-vertical-align(@input-height-base);\n\n  // Undo 100% width for pull classes\n  @media (min-width: @grid-float-breakpoint) {\n    width: auto;\n    border: 0;\n    margin-left: 0;\n    margin-right: 0;\n    padding-top: 0;\n    padding-bottom: 0;\n    .box-shadow(none);\n  }\n}\n\n\n// Dropdown menus\n\n// Menu position and menu carets\n.navbar-nav > li > .dropdown-menu {\n  margin-top: 0;\n  .border-top-radius(0);\n}\n// Menu position and menu caret support for dropups via extra dropup class\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n  margin-bottom: 0;\n  .border-top-radius(@navbar-border-radius);\n  .border-bottom-radius(0);\n}\n\n\n// Buttons in navbars\n//\n// Vertically center a button within a navbar (when *not* in a form).\n\n.navbar-btn {\n  .navbar-vertical-align(@input-height-base);\n\n  &.btn-sm {\n    .navbar-vertical-align(@input-height-small);\n  }\n  &.btn-xs {\n    .navbar-vertical-align(22);\n  }\n}\n\n\n// Text in navbars\n//\n// Add a class to make any element properly align itself vertically within the navbars.\n\n.navbar-text {\n  .navbar-vertical-align(@line-height-computed);\n\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n    margin-left: @navbar-padding-horizontal;\n    margin-right: @navbar-padding-horizontal;\n  }\n}\n\n\n// Component alignment\n//\n// Repurpose the pull utilities as their own navbar utilities to avoid specificity\n// issues with parents and chaining. Only do this when the navbar is uncollapsed\n// though so that navbar contents properly stack and align in mobile.\n//\n// Declared after the navbar components to ensure more specificity on the margins.\n\n@media (min-width: @grid-float-breakpoint) {\n  .navbar-left  { .pull-left(); }\n  .navbar-right {\n    .pull-right();\n    margin-right: -@navbar-padding-horizontal;\n\n    ~ .navbar-right {\n      margin-right: 0;\n    }\n  }\n}\n\n\n// Alternate navbars\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n  background-color: @navbar-default-bg;\n  border-color: @navbar-default-border;\n\n  .navbar-brand {\n    color: @navbar-default-brand-color;\n    &:hover,\n    &:focus {\n      color: @navbar-default-brand-hover-color;\n      background-color: @navbar-default-brand-hover-bg;\n    }\n  }\n\n  .navbar-text {\n    color: @navbar-default-color;\n  }\n\n  .navbar-nav {\n    > li > a {\n      color: @navbar-default-link-color;\n\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-hover-color;\n        background-color: @navbar-default-link-hover-bg;\n      }\n    }\n    > .active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-active-color;\n        background-color: @navbar-default-link-active-bg;\n      }\n    }\n    > .disabled > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-disabled-color;\n        background-color: @navbar-default-link-disabled-bg;\n      }\n    }\n  }\n\n  .navbar-toggle {\n    border-color: @navbar-default-toggle-border-color;\n    &:hover,\n    &:focus {\n      background-color: @navbar-default-toggle-hover-bg;\n    }\n    .icon-bar {\n      background-color: @navbar-default-toggle-icon-bar-bg;\n    }\n  }\n\n  .navbar-collapse,\n  .navbar-form {\n    border-color: @navbar-default-border;\n  }\n\n  // Dropdown menu items\n  .navbar-nav {\n    // Remove background color from open dropdown\n    > .open > a {\n      &,\n      &:hover,\n      &:focus {\n        background-color: @navbar-default-link-active-bg;\n        color: @navbar-default-link-active-color;\n      }\n    }\n\n    @media (max-width: @grid-float-breakpoint-max) {\n      // Dropdowns get custom display when collapsed\n      .open .dropdown-menu {\n        > li > a {\n          color: @navbar-default-link-color;\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-hover-color;\n            background-color: @navbar-default-link-hover-bg;\n          }\n        }\n        > .active > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-active-color;\n            background-color: @navbar-default-link-active-bg;\n          }\n        }\n        > .disabled > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-disabled-color;\n            background-color: @navbar-default-link-disabled-bg;\n          }\n        }\n      }\n    }\n  }\n\n\n  // Links in navbars\n  //\n  // Add a class to ensure links outside the navbar nav are colored correctly.\n\n  .navbar-link {\n    color: @navbar-default-link-color;\n    &:hover {\n      color: @navbar-default-link-hover-color;\n    }\n  }\n\n  .btn-link {\n    color: @navbar-default-link-color;\n    &:hover,\n    &:focus {\n      color: @navbar-default-link-hover-color;\n    }\n    &[disabled],\n    fieldset[disabled] & {\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-disabled-color;\n      }\n    }\n  }\n}\n\n// Inverse navbar\n\n.navbar-inverse {\n  background-color: @navbar-inverse-bg;\n  border-color: @navbar-inverse-border;\n\n  .navbar-brand {\n    color: @navbar-inverse-brand-color;\n    &:hover,\n    &:focus {\n      color: @navbar-inverse-brand-hover-color;\n      background-color: @navbar-inverse-brand-hover-bg;\n    }\n  }\n\n  .navbar-text {\n    color: @navbar-inverse-color;\n  }\n\n  .navbar-nav {\n    > li > a {\n      color: @navbar-inverse-link-color;\n\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-hover-color;\n        background-color: @navbar-inverse-link-hover-bg;\n      }\n    }\n    > .active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-active-color;\n        background-color: @navbar-inverse-link-active-bg;\n      }\n    }\n    > .disabled > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-disabled-color;\n        background-color: @navbar-inverse-link-disabled-bg;\n      }\n    }\n  }\n\n  // Darken the responsive nav toggle\n  .navbar-toggle {\n    border-color: @navbar-inverse-toggle-border-color;\n    &:hover,\n    &:focus {\n      background-color: @navbar-inverse-toggle-hover-bg;\n    }\n    .icon-bar {\n      background-color: @navbar-inverse-toggle-icon-bar-bg;\n    }\n  }\n\n  .navbar-collapse,\n  .navbar-form {\n    border-color: darken(@navbar-inverse-bg, 7%);\n  }\n\n  // Dropdowns\n  .navbar-nav {\n    > .open > a {\n      &,\n      &:hover,\n      &:focus {\n        background-color: @navbar-inverse-link-active-bg;\n        color: @navbar-inverse-link-active-color;\n      }\n    }\n\n    @media (max-width: @grid-float-breakpoint-max) {\n      // Dropdowns get custom display\n      .open .dropdown-menu {\n        > .dropdown-header {\n          border-color: @navbar-inverse-border;\n        }\n        .divider {\n          background-color: @navbar-inverse-border;\n        }\n        > li > a {\n          color: @navbar-inverse-link-color;\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-hover-color;\n            background-color: @navbar-inverse-link-hover-bg;\n          }\n        }\n        > .active > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-active-color;\n            background-color: @navbar-inverse-link-active-bg;\n          }\n        }\n        > .disabled > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-disabled-color;\n            background-color: @navbar-inverse-link-disabled-bg;\n          }\n        }\n      }\n    }\n  }\n\n  .navbar-link {\n    color: @navbar-inverse-link-color;\n    &:hover {\n      color: @navbar-inverse-link-hover-color;\n    }\n  }\n\n  .btn-link {\n    color: @navbar-inverse-link-color;\n    &:hover,\n    &:focus {\n      color: @navbar-inverse-link-hover-color;\n    }\n    &[disabled],\n    fieldset[disabled] & {\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-disabled-color;\n      }\n    }\n  }\n}\n","// Navbar vertical align\n//\n// Vertically center elements in the navbar.\n// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.\n\n.navbar-vertical-align(@element-height) {\n  margin-top: ((@navbar-height - @element-height) / 2);\n  margin-bottom: ((@navbar-height - @element-height) / 2);\n}\n","//\n// Utility classes\n// --------------------------------------------------\n\n\n// Floats\n// -------------------------\n\n.clearfix {\n  .clearfix();\n}\n.center-block {\n  .center-block();\n}\n.pull-right {\n  float: right !important;\n}\n.pull-left {\n  float: left !important;\n}\n\n\n// Toggling content\n// -------------------------\n\n// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1\n.hide {\n  display: none !important;\n}\n.show {\n  display: block !important;\n}\n.invisible {\n  visibility: hidden;\n}\n.text-hide {\n  .text-hide();\n}\n\n\n// Hide from screenreaders and browsers\n//\n// Credit: HTML5 Boilerplate\n\n.hidden {\n  display: none !important;\n}\n\n\n// For Affix plugin\n// -------------------------\n\n.affix {\n  position: fixed;\n}\n","//\n// Breadcrumbs\n// --------------------------------------------------\n\n\n.breadcrumb {\n  padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;\n  margin-bottom: @line-height-computed;\n  list-style: none;\n  background-color: @breadcrumb-bg;\n  border-radius: @border-radius-base;\n\n  > li {\n    display: inline-block;\n\n    + li:before {\n      content: \"@{breadcrumb-separator}\\00a0\"; // Unicode space added since inline-block means non-collapsing white-space\n      padding: 0 5px;\n      color: @breadcrumb-color;\n    }\n  }\n\n  > .active {\n    color: @breadcrumb-active-color;\n  }\n}\n","//\n// Pagination (multiple pages)\n// --------------------------------------------------\n.pagination {\n  display: inline-block;\n  padding-left: 0;\n  margin: @line-height-computed 0;\n  border-radius: @border-radius-base;\n\n  > li {\n    display: inline; // Remove list-style and block-level defaults\n    > a,\n    > span {\n      position: relative;\n      float: left; // Collapse white-space\n      padding: @padding-base-vertical @padding-base-horizontal;\n      line-height: @line-height-base;\n      text-decoration: none;\n      color: @pagination-color;\n      background-color: @pagination-bg;\n      border: 1px solid @pagination-border;\n      margin-left: -1px;\n    }\n    &:first-child {\n      > a,\n      > span {\n        margin-left: 0;\n        .border-left-radius(@border-radius-base);\n      }\n    }\n    &:last-child {\n      > a,\n      > span {\n        .border-right-radius(@border-radius-base);\n      }\n    }\n  }\n\n  > li > a,\n  > li > span {\n    &:hover,\n    &:focus {\n      z-index: 2;\n      color: @pagination-hover-color;\n      background-color: @pagination-hover-bg;\n      border-color: @pagination-hover-border;\n    }\n  }\n\n  > .active > a,\n  > .active > span {\n    &,\n    &:hover,\n    &:focus {\n      z-index: 3;\n      color: @pagination-active-color;\n      background-color: @pagination-active-bg;\n      border-color: @pagination-active-border;\n      cursor: default;\n    }\n  }\n\n  > .disabled {\n    > span,\n    > span:hover,\n    > span:focus,\n    > a,\n    > a:hover,\n    > a:focus {\n      color: @pagination-disabled-color;\n      background-color: @pagination-disabled-bg;\n      border-color: @pagination-disabled-border;\n      cursor: @cursor-disabled;\n    }\n  }\n}\n\n// Sizing\n// --------------------------------------------------\n\n// Large\n.pagination-lg {\n  .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n\n// Small\n.pagination-sm {\n  .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n","// Pagination\n\n.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  > li {\n    > a,\n    > span {\n      padding: @padding-vertical @padding-horizontal;\n      font-size: @font-size;\n      line-height: @line-height;\n    }\n    &:first-child {\n      > a,\n      > span {\n        .border-left-radius(@border-radius);\n      }\n    }\n    &:last-child {\n      > a,\n      > span {\n        .border-right-radius(@border-radius);\n      }\n    }\n  }\n}\n","//\n// Pager pagination\n// --------------------------------------------------\n\n\n.pager {\n  padding-left: 0;\n  margin: @line-height-computed 0;\n  list-style: none;\n  text-align: center;\n  &:extend(.clearfix all);\n  li {\n    display: inline;\n    > a,\n    > span {\n      display: inline-block;\n      padding: 5px 14px;\n      background-color: @pager-bg;\n      border: 1px solid @pager-border;\n      border-radius: @pager-border-radius;\n    }\n\n    > a:hover,\n    > a:focus {\n      text-decoration: none;\n      background-color: @pager-hover-bg;\n    }\n  }\n\n  .next {\n    > a,\n    > span {\n      float: right;\n    }\n  }\n\n  .previous {\n    > a,\n    > span {\n      float: left;\n    }\n  }\n\n  .disabled {\n    > a,\n    > a:hover,\n    > a:focus,\n    > span {\n      color: @pager-disabled-color;\n      background-color: @pager-bg;\n      cursor: @cursor-disabled;\n    }\n  }\n}\n","//\n// Labels\n// --------------------------------------------------\n\n.label {\n  display: inline;\n  padding: .2em .6em .3em;\n  font-size: 75%;\n  font-weight: bold;\n  line-height: 1;\n  color: @label-color;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: .25em;\n\n  // Add hover effects, but only for links\n  a& {\n    &:hover,\n    &:focus {\n      color: @label-link-hover-color;\n      text-decoration: none;\n      cursor: pointer;\n    }\n  }\n\n  // Empty labels collapse automatically (not available in IE8)\n  &:empty {\n    display: none;\n  }\n\n  // Quick fix for labels in buttons\n  .btn & {\n    position: relative;\n    top: -1px;\n  }\n}\n\n// Colors\n// Contextual variations (linked labels get darker on :hover)\n\n.label-default {\n  .label-variant(@label-default-bg);\n}\n\n.label-primary {\n  .label-variant(@label-primary-bg);\n}\n\n.label-success {\n  .label-variant(@label-success-bg);\n}\n\n.label-info {\n  .label-variant(@label-info-bg);\n}\n\n.label-warning {\n  .label-variant(@label-warning-bg);\n}\n\n.label-danger {\n  .label-variant(@label-danger-bg);\n}\n","// Labels\n\n.label-variant(@color) {\n  background-color: @color;\n\n  &[href] {\n    &:hover,\n    &:focus {\n      background-color: darken(@color, 10%);\n    }\n  }\n}\n","//\n// Badges\n// --------------------------------------------------\n\n\n// Base class\n.badge {\n  display: inline-block;\n  min-width: 10px;\n  padding: 3px 7px;\n  font-size: @font-size-small;\n  font-weight: @badge-font-weight;\n  color: @badge-color;\n  line-height: @badge-line-height;\n  vertical-align: middle;\n  white-space: nowrap;\n  text-align: center;\n  background-color: @badge-bg;\n  border-radius: @badge-border-radius;\n\n  // Empty badges collapse automatically (not available in IE8)\n  &:empty {\n    display: none;\n  }\n\n  // Quick fix for badges in buttons\n  .btn & {\n    position: relative;\n    top: -1px;\n  }\n\n  .btn-xs &,\n  .btn-group-xs > .btn & {\n    top: 0;\n    padding: 1px 5px;\n  }\n\n  // Hover state, but only for links\n  a& {\n    &:hover,\n    &:focus {\n      color: @badge-link-hover-color;\n      text-decoration: none;\n      cursor: pointer;\n    }\n  }\n\n  // Account for badges in navs\n  .list-group-item.active > &,\n  .nav-pills > .active > a > & {\n    color: @badge-active-color;\n    background-color: @badge-active-bg;\n  }\n\n  .list-group-item > & {\n    float: right;\n  }\n\n  .list-group-item > & + & {\n    margin-right: 5px;\n  }\n\n  .nav-pills > li > a > & {\n    margin-left: 3px;\n  }\n}\n","//\n// Jumbotron\n// --------------------------------------------------\n\n\n.jumbotron {\n  padding-top:    @jumbotron-padding;\n  padding-bottom: @jumbotron-padding;\n  margin-bottom: @jumbotron-padding;\n  color: @jumbotron-color;\n  background-color: @jumbotron-bg;\n\n  h1,\n  .h1 {\n    color: @jumbotron-heading-color;\n  }\n\n  p {\n    margin-bottom: (@jumbotron-padding / 2);\n    font-size: @jumbotron-font-size;\n    font-weight: 200;\n  }\n\n  > hr {\n    border-top-color: darken(@jumbotron-bg, 10%);\n  }\n\n  .container &,\n  .container-fluid & {\n    border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container\n    padding-left:  (@grid-gutter-width / 2);\n    padding-right: (@grid-gutter-width / 2);\n  }\n\n  .container {\n    max-width: 100%;\n  }\n\n  @media screen and (min-width: @screen-sm-min) {\n    padding-top:    (@jumbotron-padding * 1.6);\n    padding-bottom: (@jumbotron-padding * 1.6);\n\n    .container &,\n    .container-fluid & {\n      padding-left:  (@jumbotron-padding * 2);\n      padding-right: (@jumbotron-padding * 2);\n    }\n\n    h1,\n    .h1 {\n      font-size: @jumbotron-heading-font-size;\n    }\n  }\n}\n","//\n// Thumbnails\n// --------------------------------------------------\n\n\n// Mixin and adjust the regular image class\n.thumbnail {\n  display: block;\n  padding: @thumbnail-padding;\n  margin-bottom: @line-height-computed;\n  line-height: @line-height-base;\n  background-color: @thumbnail-bg;\n  border: 1px solid @thumbnail-border;\n  border-radius: @thumbnail-border-radius;\n  .transition(border .2s ease-in-out);\n\n  > img,\n  a > img {\n    &:extend(.img-responsive);\n    margin-left: auto;\n    margin-right: auto;\n  }\n\n  // Add a hover state for linked versions only\n  a&:hover,\n  a&:focus,\n  a&.active {\n    border-color: @link-color;\n  }\n\n  // Image captions\n  .caption {\n    padding: @thumbnail-caption-padding;\n    color: @thumbnail-caption-color;\n  }\n}\n","//\n// Alerts\n// --------------------------------------------------\n\n\n// Base styles\n// -------------------------\n\n.alert {\n  padding: @alert-padding;\n  margin-bottom: @line-height-computed;\n  border: 1px solid transparent;\n  border-radius: @alert-border-radius;\n\n  // Headings for larger alerts\n  h4 {\n    margin-top: 0;\n    // Specified for the h4 to prevent conflicts of changing @headings-color\n    color: inherit;\n  }\n\n  // Provide class for links that match alerts\n  .alert-link {\n    font-weight: @alert-link-font-weight;\n  }\n\n  // Improve alignment and spacing of inner content\n  > p,\n  > ul {\n    margin-bottom: 0;\n  }\n\n  > p + p {\n    margin-top: 5px;\n  }\n}\n\n// Dismissible alerts\n//\n// Expand the right padding and account for the close button's positioning.\n\n.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0.\n.alert-dismissible {\n  padding-right: (@alert-padding + 20);\n\n  // Adjust close link position\n  .close {\n    position: relative;\n    top: -2px;\n    right: -21px;\n    color: inherit;\n  }\n}\n\n// Alternate styles\n//\n// Generate contextual modifier classes for colorizing the alert.\n\n.alert-success {\n  .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);\n}\n\n.alert-info {\n  .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);\n}\n\n.alert-warning {\n  .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);\n}\n\n.alert-danger {\n  .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);\n}\n","// Alerts\n\n.alert-variant(@background; @border; @text-color) {\n  background-color: @background;\n  border-color: @border;\n  color: @text-color;\n\n  hr {\n    border-top-color: darken(@border, 5%);\n  }\n  .alert-link {\n    color: darken(@text-color, 10%);\n  }\n}\n","//\n// Progress bars\n// --------------------------------------------------\n\n\n// Bar animations\n// -------------------------\n\n// WebKit\n@-webkit-keyframes progress-bar-stripes {\n  from  { background-position: 40px 0; }\n  to    { background-position: 0 0; }\n}\n\n// Spec and IE10+\n@keyframes progress-bar-stripes {\n  from  { background-position: 40px 0; }\n  to    { background-position: 0 0; }\n}\n\n\n// Bar itself\n// -------------------------\n\n// Outer container\n.progress {\n  overflow: hidden;\n  height: @line-height-computed;\n  margin-bottom: @line-height-computed;\n  background-color: @progress-bg;\n  border-radius: @progress-border-radius;\n  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));\n}\n\n// Bar of progress\n.progress-bar {\n  float: left;\n  width: 0%;\n  height: 100%;\n  font-size: @font-size-small;\n  line-height: @line-height-computed;\n  color: @progress-bar-color;\n  text-align: center;\n  background-color: @progress-bar-bg;\n  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));\n  .transition(width .6s ease);\n}\n\n// Striped bars\n//\n// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the\n// `.progress-bar-striped` class, which you just add to an existing\n// `.progress-bar`.\n.progress-striped .progress-bar,\n.progress-bar-striped {\n  #gradient > .striped();\n  background-size: 40px 40px;\n}\n\n// Call animation for the active one\n//\n// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the\n// `.progress-bar.active` approach.\n.progress.active .progress-bar,\n.progress-bar.active {\n  .animation(progress-bar-stripes 2s linear infinite);\n}\n\n\n// Variations\n// -------------------------\n\n.progress-bar-success {\n  .progress-bar-variant(@progress-bar-success-bg);\n}\n\n.progress-bar-info {\n  .progress-bar-variant(@progress-bar-info-bg);\n}\n\n.progress-bar-warning {\n  .progress-bar-variant(@progress-bar-warning-bg);\n}\n\n.progress-bar-danger {\n  .progress-bar-variant(@progress-bar-danger-bg);\n}\n","// Gradients\n\n#gradient {\n\n  // Horizontal gradient, from left to right\n  //\n  // Creates two color stops, start and end, by specifying a color and position for each color stop.\n  // Color stops are not available in IE9 and below.\n  .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n    background-image: -webkit-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+\n    background-image: -o-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Opera 12\n    background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n    background-repeat: repeat-x;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down\n  }\n\n  // Vertical gradient, from top to bottom\n  //\n  // Creates two color stops, start and end, by specifying a color and position for each color stop.\n  // Color stops are not available in IE9 and below.\n  .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Safari 5.1-6, Chrome 10+\n    background-image: -o-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Opera 12\n    background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n    background-repeat: repeat-x;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down\n  }\n\n  .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {\n    background-repeat: repeat-x;\n    background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+\n    background-image: -o-linear-gradient(@deg, @start-color, @end-color); // Opera 12\n    background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n  }\n  .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n    background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n    background-image: -o-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n    background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);\n    background-repeat: no-repeat;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n  }\n  .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n    background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-image: -o-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-repeat: no-repeat;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n  }\n  .radial(@inner-color: #555; @outer-color: #333) {\n    background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);\n    background-image: radial-gradient(circle, @inner-color, @outer-color);\n    background-repeat: no-repeat;\n  }\n  .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {\n    background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n    background-image: -o-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n    background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n  }\n}\n","// Progress bars\n\n.progress-bar-variant(@color) {\n  background-color: @color;\n\n  // Deprecated parent class requirement as of v3.2.0\n  .progress-striped & {\n    #gradient > .striped();\n  }\n}\n",".media {\n  // Proper spacing between instances of .media\n  margin-top: 15px;\n\n  &:first-child {\n    margin-top: 0;\n  }\n}\n\n.media,\n.media-body {\n  zoom: 1;\n  overflow: hidden;\n}\n\n.media-body {\n  width: 10000px;\n}\n\n.media-object {\n  display: block;\n\n  // Fix collapse in webkit from max-width: 100% and display: table-cell.\n  &.img-thumbnail {\n    max-width: none;\n  }\n}\n\n.media-right,\n.media > .pull-right {\n  padding-left: 10px;\n}\n\n.media-left,\n.media > .pull-left {\n  padding-right: 10px;\n}\n\n.media-left,\n.media-right,\n.media-body {\n  display: table-cell;\n  vertical-align: top;\n}\n\n.media-middle {\n  vertical-align: middle;\n}\n\n.media-bottom {\n  vertical-align: bottom;\n}\n\n// Reset margins on headings for tighter default spacing\n.media-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n\n// Media list variation\n//\n// Undo default ul/ol styles\n.media-list {\n  padding-left: 0;\n  list-style: none;\n}\n","//\n// List groups\n// --------------------------------------------------\n\n\n// Base class\n//\n// Easily usable on <ul>, <ol>, or <div>.\n\n.list-group {\n  // No need to set list-style: none; since .list-group-item is block level\n  margin-bottom: 20px;\n  padding-left: 0; // reset padding because ul and ol\n}\n\n\n// Individual list items\n//\n// Use on `li`s or `div`s within the `.list-group` parent.\n\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n  // Place the border on the list items and negative margin up for better styling\n  margin-bottom: -1px;\n  background-color: @list-group-bg;\n  border: 1px solid @list-group-border;\n\n  // Round the first and last items\n  &:first-child {\n    .border-top-radius(@list-group-border-radius);\n  }\n  &:last-child {\n    margin-bottom: 0;\n    .border-bottom-radius(@list-group-border-radius);\n  }\n}\n\n\n// Interactive list items\n//\n// Use anchor or button elements instead of `li`s or `div`s to create interactive items.\n// Includes an extra `.active` modifier class for showing selected items.\n\na.list-group-item,\nbutton.list-group-item {\n  color: @list-group-link-color;\n\n  .list-group-item-heading {\n    color: @list-group-link-heading-color;\n  }\n\n  // Hover state\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    color: @list-group-link-hover-color;\n    background-color: @list-group-hover-bg;\n  }\n}\n\nbutton.list-group-item {\n  width: 100%;\n  text-align: left;\n}\n\n.list-group-item {\n  // Disabled state\n  &.disabled,\n  &.disabled:hover,\n  &.disabled:focus {\n    background-color: @list-group-disabled-bg;\n    color: @list-group-disabled-color;\n    cursor: @cursor-disabled;\n\n    // Force color to inherit for custom content\n    .list-group-item-heading {\n      color: inherit;\n    }\n    .list-group-item-text {\n      color: @list-group-disabled-text-color;\n    }\n  }\n\n  // Active class on item itself, not parent\n  &.active,\n  &.active:hover,\n  &.active:focus {\n    z-index: 2; // Place active items above their siblings for proper border styling\n    color: @list-group-active-color;\n    background-color: @list-group-active-bg;\n    border-color: @list-group-active-border;\n\n    // Force color to inherit for custom content\n    .list-group-item-heading,\n    .list-group-item-heading > small,\n    .list-group-item-heading > .small {\n      color: inherit;\n    }\n    .list-group-item-text {\n      color: @list-group-active-text-color;\n    }\n  }\n}\n\n\n// Contextual variants\n//\n// Add modifier classes to change text and background color on individual items.\n// Organizationally, this must come after the `:hover` states.\n\n.list-group-item-variant(success; @state-success-bg; @state-success-text);\n.list-group-item-variant(info; @state-info-bg; @state-info-text);\n.list-group-item-variant(warning; @state-warning-bg; @state-warning-text);\n.list-group-item-variant(danger; @state-danger-bg; @state-danger-text);\n\n\n// Custom content options\n//\n// Extra classes for creating well-formatted content within `.list-group-item`s.\n\n.list-group-item-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.list-group-item-text {\n  margin-bottom: 0;\n  line-height: 1.3;\n}\n","// List Groups\n\n.list-group-item-variant(@state; @background; @color) {\n  .list-group-item-@{state} {\n    color: @color;\n    background-color: @background;\n\n    a&,\n    button& {\n      color: @color;\n\n      .list-group-item-heading {\n        color: inherit;\n      }\n\n      &:hover,\n      &:focus {\n        color: @color;\n        background-color: darken(@background, 5%);\n      }\n      &.active,\n      &.active:hover,\n      &.active:focus {\n        color: #fff;\n        background-color: @color;\n        border-color: @color;\n      }\n    }\n  }\n}\n","//\n// Panels\n// --------------------------------------------------\n\n\n// Base class\n.panel {\n  margin-bottom: @line-height-computed;\n  background-color: @panel-bg;\n  border: 1px solid transparent;\n  border-radius: @panel-border-radius;\n  .box-shadow(0 1px 1px rgba(0,0,0,.05));\n}\n\n// Panel contents\n.panel-body {\n  padding: @panel-body-padding;\n  &:extend(.clearfix all);\n}\n\n// Optional heading\n.panel-heading {\n  padding: @panel-heading-padding;\n  border-bottom: 1px solid transparent;\n  .border-top-radius((@panel-border-radius - 1));\n\n  > .dropdown .dropdown-toggle {\n    color: inherit;\n  }\n}\n\n// Within heading, strip any `h*` tag of its default margins for spacing.\n.panel-title {\n  margin-top: 0;\n  margin-bottom: 0;\n  font-size: ceil((@font-size-base * 1.125));\n  color: inherit;\n\n  > a,\n  > small,\n  > .small,\n  > small > a,\n  > .small > a {\n    color: inherit;\n  }\n}\n\n// Optional footer (stays gray in every modifier class)\n.panel-footer {\n  padding: @panel-footer-padding;\n  background-color: @panel-footer-bg;\n  border-top: 1px solid @panel-inner-border;\n  .border-bottom-radius((@panel-border-radius - 1));\n}\n\n\n// List groups in panels\n//\n// By default, space out list group content from panel headings to account for\n// any kind of custom content between the two.\n\n.panel {\n  > .list-group,\n  > .panel-collapse > .list-group {\n    margin-bottom: 0;\n\n    .list-group-item {\n      border-width: 1px 0;\n      border-radius: 0;\n    }\n\n    // Add border top radius for first one\n    &:first-child {\n      .list-group-item:first-child {\n        border-top: 0;\n        .border-top-radius((@panel-border-radius - 1));\n      }\n    }\n\n    // Add border bottom radius for last one\n    &:last-child {\n      .list-group-item:last-child {\n        border-bottom: 0;\n        .border-bottom-radius((@panel-border-radius - 1));\n      }\n    }\n  }\n  > .panel-heading + .panel-collapse > .list-group {\n    .list-group-item:first-child {\n      .border-top-radius(0);\n    }\n  }\n}\n// Collapse space between when there's no additional content.\n.panel-heading + .list-group {\n  .list-group-item:first-child {\n    border-top-width: 0;\n  }\n}\n.list-group + .panel-footer {\n  border-top-width: 0;\n}\n\n// Tables in panels\n//\n// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and\n// watch it go full width.\n\n.panel {\n  > .table,\n  > .table-responsive > .table,\n  > .panel-collapse > .table {\n    margin-bottom: 0;\n\n    caption {\n      padding-left: @panel-body-padding;\n      padding-right: @panel-body-padding;\n    }\n  }\n  // Add border top radius for first one\n  > .table:first-child,\n  > .table-responsive:first-child > .table:first-child {\n    .border-top-radius((@panel-border-radius - 1));\n\n    > thead:first-child,\n    > tbody:first-child {\n      > tr:first-child {\n        border-top-left-radius: (@panel-border-radius - 1);\n        border-top-right-radius: (@panel-border-radius - 1);\n\n        td:first-child,\n        th:first-child {\n          border-top-left-radius: (@panel-border-radius - 1);\n        }\n        td:last-child,\n        th:last-child {\n          border-top-right-radius: (@panel-border-radius - 1);\n        }\n      }\n    }\n  }\n  // Add border bottom radius for last one\n  > .table:last-child,\n  > .table-responsive:last-child > .table:last-child {\n    .border-bottom-radius((@panel-border-radius - 1));\n\n    > tbody:last-child,\n    > tfoot:last-child {\n      > tr:last-child {\n        border-bottom-left-radius: (@panel-border-radius - 1);\n        border-bottom-right-radius: (@panel-border-radius - 1);\n\n        td:first-child,\n        th:first-child {\n          border-bottom-left-radius: (@panel-border-radius - 1);\n        }\n        td:last-child,\n        th:last-child {\n          border-bottom-right-radius: (@panel-border-radius - 1);\n        }\n      }\n    }\n  }\n  > .panel-body + .table,\n  > .panel-body + .table-responsive,\n  > .table + .panel-body,\n  > .table-responsive + .panel-body {\n    border-top: 1px solid @table-border-color;\n  }\n  > .table > tbody:first-child > tr:first-child th,\n  > .table > tbody:first-child > tr:first-child td {\n    border-top: 0;\n  }\n  > .table-bordered,\n  > .table-responsive > .table-bordered {\n    border: 0;\n    > thead,\n    > tbody,\n    > tfoot {\n      > tr {\n        > th:first-child,\n        > td:first-child {\n          border-left: 0;\n        }\n        > th:last-child,\n        > td:last-child {\n          border-right: 0;\n        }\n      }\n    }\n    > thead,\n    > tbody {\n      > tr:first-child {\n        > td,\n        > th {\n          border-bottom: 0;\n        }\n      }\n    }\n    > tbody,\n    > tfoot {\n      > tr:last-child {\n        > td,\n        > th {\n          border-bottom: 0;\n        }\n      }\n    }\n  }\n  > .table-responsive {\n    border: 0;\n    margin-bottom: 0;\n  }\n}\n\n\n// Collapsible panels (aka, accordion)\n//\n// Wrap a series of panels in `.panel-group` to turn them into an accordion with\n// the help of our collapse JavaScript plugin.\n\n.panel-group {\n  margin-bottom: @line-height-computed;\n\n  // Tighten up margin so it's only between panels\n  .panel {\n    margin-bottom: 0;\n    border-radius: @panel-border-radius;\n\n    + .panel {\n      margin-top: 5px;\n    }\n  }\n\n  .panel-heading {\n    border-bottom: 0;\n\n    + .panel-collapse > .panel-body,\n    + .panel-collapse > .list-group {\n      border-top: 1px solid @panel-inner-border;\n    }\n  }\n\n  .panel-footer {\n    border-top: 0;\n    + .panel-collapse .panel-body {\n      border-bottom: 1px solid @panel-inner-border;\n    }\n  }\n}\n\n\n// Contextual variations\n.panel-default {\n  .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);\n}\n.panel-primary {\n  .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);\n}\n.panel-success {\n  .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);\n}\n.panel-info {\n  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);\n}\n.panel-warning {\n  .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);\n}\n.panel-danger {\n  .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);\n}\n","// Panels\n\n.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {\n  border-color: @border;\n\n  & > .panel-heading {\n    color: @heading-text-color;\n    background-color: @heading-bg-color;\n    border-color: @heading-border;\n\n    + .panel-collapse > .panel-body {\n      border-top-color: @border;\n    }\n    .badge {\n      color: @heading-bg-color;\n      background-color: @heading-text-color;\n    }\n  }\n  & > .panel-footer {\n    + .panel-collapse > .panel-body {\n      border-bottom-color: @border;\n    }\n  }\n}\n","// Embeds responsive\n//\n// Credit: Nicolas Gallagher and SUIT CSS.\n\n.embed-responsive {\n  position: relative;\n  display: block;\n  height: 0;\n  padding: 0;\n  overflow: hidden;\n\n  .embed-responsive-item,\n  iframe,\n  embed,\n  object,\n  video {\n    position: absolute;\n    top: 0;\n    left: 0;\n    bottom: 0;\n    height: 100%;\n    width: 100%;\n    border: 0;\n  }\n}\n\n// Modifier class for 16:9 aspect ratio\n.embed-responsive-16by9 {\n  padding-bottom: 56.25%;\n}\n\n// Modifier class for 4:3 aspect ratio\n.embed-responsive-4by3 {\n  padding-bottom: 75%;\n}\n","//\n// Wells\n// --------------------------------------------------\n\n\n// Base class\n.well {\n  min-height: 20px;\n  padding: 19px;\n  margin-bottom: 20px;\n  background-color: @well-bg;\n  border: 1px solid @well-border;\n  border-radius: @border-radius-base;\n  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));\n  blockquote {\n    border-color: #ddd;\n    border-color: rgba(0,0,0,.15);\n  }\n}\n\n// Sizes\n.well-lg {\n  padding: 24px;\n  border-radius: @border-radius-large;\n}\n.well-sm {\n  padding: 9px;\n  border-radius: @border-radius-small;\n}\n","//\n// Close icons\n// --------------------------------------------------\n\n\n.close {\n  float: right;\n  font-size: (@font-size-base * 1.5);\n  font-weight: @close-font-weight;\n  line-height: 1;\n  color: @close-color;\n  text-shadow: @close-text-shadow;\n  .opacity(.2);\n\n  &:hover,\n  &:focus {\n    color: @close-color;\n    text-decoration: none;\n    cursor: pointer;\n    .opacity(.5);\n  }\n\n  // Additional properties for button version\n  // iOS requires the button element instead of an anchor tag.\n  // If you want the anchor version, it requires `href=\"#\"`.\n  // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile\n  button& {\n    padding: 0;\n    cursor: pointer;\n    background: transparent;\n    border: 0;\n    -webkit-appearance: none;\n  }\n}\n","//\n// Modals\n// --------------------------------------------------\n\n// .modal-open      - body class for killing the scroll\n// .modal           - container to scroll within\n// .modal-dialog    - positioning shell for the actual modal\n// .modal-content   - actual modal w/ bg and corners and shit\n\n// Kill the scroll on the body\n.modal-open {\n  overflow: hidden;\n}\n\n// Container that the modal scrolls within\n.modal {\n  display: none;\n  overflow: hidden;\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: @zindex-modal;\n  -webkit-overflow-scrolling: touch;\n\n  // Prevent Chrome on Windows from adding a focus outline. For details, see\n  // https://github.com/twbs/bootstrap/pull/10951.\n  outline: 0;\n\n  // When fading in the modal, animate it to slide down\n  &.fade .modal-dialog {\n    .translate(0, -25%);\n    .transition-transform(~\"0.3s ease-out\");\n  }\n  &.in .modal-dialog { .translate(0, 0) }\n}\n.modal-open .modal {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n\n// Shell div to position the modal with bottom padding\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 10px;\n}\n\n// Actual modal\n.modal-content {\n  position: relative;\n  background-color: @modal-content-bg;\n  border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)\n  border: 1px solid @modal-content-border-color;\n  border-radius: @border-radius-large;\n  .box-shadow(0 3px 9px rgba(0,0,0,.5));\n  background-clip: padding-box;\n  // Remove focus outline from opened modal\n  outline: 0;\n}\n\n// Modal background\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: @zindex-modal-background;\n  background-color: @modal-backdrop-bg;\n  // Fade for backdrop\n  &.fade { .opacity(0); }\n  &.in { .opacity(@modal-backdrop-opacity); }\n}\n\n// Modal header\n// Top section of the modal w/ title and dismiss\n.modal-header {\n  padding: @modal-title-padding;\n  border-bottom: 1px solid @modal-header-border-color;\n  &:extend(.clearfix all);\n}\n// Close icon\n.modal-header .close {\n  margin-top: -2px;\n}\n\n// Title text within header\n.modal-title {\n  margin: 0;\n  line-height: @modal-title-line-height;\n}\n\n// Modal body\n// Where all modal content resides (sibling of .modal-header and .modal-footer)\n.modal-body {\n  position: relative;\n  padding: @modal-inner-padding;\n}\n\n// Footer (for actions)\n.modal-footer {\n  padding: @modal-inner-padding;\n  text-align: right; // right align buttons\n  border-top: 1px solid @modal-footer-border-color;\n  &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons\n\n  // Properly space out buttons\n  .btn + .btn {\n    margin-left: 5px;\n    margin-bottom: 0; // account for input[type=\"submit\"] which gets the bottom margin like all other inputs\n  }\n  // but override that for button groups\n  .btn-group .btn + .btn {\n    margin-left: -1px;\n  }\n  // and override it for block buttons as well\n  .btn-block + .btn-block {\n    margin-left: 0;\n  }\n}\n\n// Measure scrollbar width for padding body during modal show/hide\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n\n// Scale up the modal\n@media (min-width: @screen-sm-min) {\n  // Automatically set modal's width for larger viewports\n  .modal-dialog {\n    width: @modal-md;\n    margin: 30px auto;\n  }\n  .modal-content {\n    .box-shadow(0 5px 15px rgba(0,0,0,.5));\n  }\n\n  // Modal sizes\n  .modal-sm { width: @modal-sm; }\n}\n\n@media (min-width: @screen-md-min) {\n  .modal-lg { width: @modal-lg; }\n}\n","//\n// Tooltips\n// --------------------------------------------------\n\n\n// Base class\n.tooltip {\n  position: absolute;\n  z-index: @zindex-tooltip;\n  display: block;\n  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.\n  // So reset our font and text properties to avoid inheriting weird values.\n  .reset-text();\n  font-size: @font-size-small;\n\n  .opacity(0);\n\n  &.in     { .opacity(@tooltip-opacity); }\n  &.top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }\n  &.right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }\n  &.bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }\n  &.left   { margin-left: -3px; padding: 0 @tooltip-arrow-width; }\n}\n\n// Wrapper for the tooltip content\n.tooltip-inner {\n  max-width: @tooltip-max-width;\n  padding: 3px 8px;\n  color: @tooltip-color;\n  text-align: center;\n  background-color: @tooltip-bg;\n  border-radius: @border-radius-base;\n}\n\n// Arrows\n.tooltip-arrow {\n  position: absolute;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1\n.tooltip {\n  &.top .tooltip-arrow {\n    bottom: 0;\n    left: 50%;\n    margin-left: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.top-left .tooltip-arrow {\n    bottom: 0;\n    right: @tooltip-arrow-width;\n    margin-bottom: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.top-right .tooltip-arrow {\n    bottom: 0;\n    left: @tooltip-arrow-width;\n    margin-bottom: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.right .tooltip-arrow {\n    top: 50%;\n    left: 0;\n    margin-top: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-right-color: @tooltip-arrow-color;\n  }\n  &.left .tooltip-arrow {\n    top: 50%;\n    right: 0;\n    margin-top: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-left-color: @tooltip-arrow-color;\n  }\n  &.bottom .tooltip-arrow {\n    top: 0;\n    left: 50%;\n    margin-left: -@tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n  &.bottom-left .tooltip-arrow {\n    top: 0;\n    right: @tooltip-arrow-width;\n    margin-top: -@tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n  &.bottom-right .tooltip-arrow {\n    top: 0;\n    left: @tooltip-arrow-width;\n    margin-top: -@tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n}\n",".reset-text() {\n  font-family: @font-family-base;\n  // We deliberately do NOT reset font-size.\n  font-style: normal;\n  font-weight: normal;\n  letter-spacing: normal;\n  line-break: auto;\n  line-height: @line-height-base;\n  text-align: left; // Fallback for where `start` is not supported\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  white-space: normal;\n  word-break: normal;\n  word-spacing: normal;\n  word-wrap: normal;\n}\n","//\n// Popovers\n// --------------------------------------------------\n\n\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: @zindex-popover;\n  display: none;\n  max-width: @popover-max-width;\n  padding: 1px;\n  // Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.\n  // So reset our font and text properties to avoid inheriting weird values.\n  .reset-text();\n  font-size: @font-size-base;\n\n  background-color: @popover-bg;\n  background-clip: padding-box;\n  border: 1px solid @popover-fallback-border-color;\n  border: 1px solid @popover-border-color;\n  border-radius: @border-radius-large;\n  .box-shadow(0 5px 10px rgba(0,0,0,.2));\n\n  // Offset the popover to account for the popover arrow\n  &.top     { margin-top: -@popover-arrow-width; }\n  &.right   { margin-left: @popover-arrow-width; }\n  &.bottom  { margin-top: @popover-arrow-width; }\n  &.left    { margin-left: -@popover-arrow-width; }\n}\n\n.popover-title {\n  margin: 0; // reset heading margin\n  padding: 8px 14px;\n  font-size: @font-size-base;\n  background-color: @popover-title-bg;\n  border-bottom: 1px solid darken(@popover-title-bg, 5%);\n  border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;\n}\n\n.popover-content {\n  padding: 9px 14px;\n}\n\n// Arrows\n//\n// .arrow is outer, .arrow:after is inner\n\n.popover > .arrow {\n  &,\n  &:after {\n    position: absolute;\n    display: block;\n    width: 0;\n    height: 0;\n    border-color: transparent;\n    border-style: solid;\n  }\n}\n.popover > .arrow {\n  border-width: @popover-arrow-outer-width;\n}\n.popover > .arrow:after {\n  border-width: @popover-arrow-width;\n  content: \"\";\n}\n\n.popover {\n  &.top > .arrow {\n    left: 50%;\n    margin-left: -@popover-arrow-outer-width;\n    border-bottom-width: 0;\n    border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-top-color: @popover-arrow-outer-color;\n    bottom: -@popover-arrow-outer-width;\n    &:after {\n      content: \" \";\n      bottom: 1px;\n      margin-left: -@popover-arrow-width;\n      border-bottom-width: 0;\n      border-top-color: @popover-arrow-color;\n    }\n  }\n  &.right > .arrow {\n    top: 50%;\n    left: -@popover-arrow-outer-width;\n    margin-top: -@popover-arrow-outer-width;\n    border-left-width: 0;\n    border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-right-color: @popover-arrow-outer-color;\n    &:after {\n      content: \" \";\n      left: 1px;\n      bottom: -@popover-arrow-width;\n      border-left-width: 0;\n      border-right-color: @popover-arrow-color;\n    }\n  }\n  &.bottom > .arrow {\n    left: 50%;\n    margin-left: -@popover-arrow-outer-width;\n    border-top-width: 0;\n    border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-bottom-color: @popover-arrow-outer-color;\n    top: -@popover-arrow-outer-width;\n    &:after {\n      content: \" \";\n      top: 1px;\n      margin-left: -@popover-arrow-width;\n      border-top-width: 0;\n      border-bottom-color: @popover-arrow-color;\n    }\n  }\n\n  &.left > .arrow {\n    top: 50%;\n    right: -@popover-arrow-outer-width;\n    margin-top: -@popover-arrow-outer-width;\n    border-right-width: 0;\n    border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-left-color: @popover-arrow-outer-color;\n    &:after {\n      content: \" \";\n      right: 1px;\n      border-right-width: 0;\n      border-left-color: @popover-arrow-color;\n      bottom: -@popover-arrow-width;\n    }\n  }\n}\n","//\n// Carousel\n// --------------------------------------------------\n\n\n// Wrapper for the slide container and indicators\n.carousel {\n  position: relative;\n}\n\n.carousel-inner {\n  position: relative;\n  overflow: hidden;\n  width: 100%;\n\n  > .item {\n    display: none;\n    position: relative;\n    .transition(.6s ease-in-out left);\n\n    // Account for jankitude on images\n    > img,\n    > a > img {\n      &:extend(.img-responsive);\n      line-height: 1;\n    }\n\n    // WebKit CSS3 transforms for supported devices\n    @media all and (transform-3d), (-webkit-transform-3d) {\n      .transition-transform(~'0.6s ease-in-out');\n      .backface-visibility(~'hidden');\n      .perspective(1000px);\n\n      &.next,\n      &.active.right {\n        .translate3d(100%, 0, 0);\n        left: 0;\n      }\n      &.prev,\n      &.active.left {\n        .translate3d(-100%, 0, 0);\n        left: 0;\n      }\n      &.next.left,\n      &.prev.right,\n      &.active {\n        .translate3d(0, 0, 0);\n        left: 0;\n      }\n    }\n  }\n\n  > .active,\n  > .next,\n  > .prev {\n    display: block;\n  }\n\n  > .active {\n    left: 0;\n  }\n\n  > .next,\n  > .prev {\n    position: absolute;\n    top: 0;\n    width: 100%;\n  }\n\n  > .next {\n    left: 100%;\n  }\n  > .prev {\n    left: -100%;\n  }\n  > .next.left,\n  > .prev.right {\n    left: 0;\n  }\n\n  > .active.left {\n    left: -100%;\n  }\n  > .active.right {\n    left: 100%;\n  }\n\n}\n\n// Left/right controls for nav\n// ---------------------------\n\n.carousel-control {\n  position: absolute;\n  top: 0;\n  left: 0;\n  bottom: 0;\n  width: @carousel-control-width;\n  .opacity(@carousel-control-opacity);\n  font-size: @carousel-control-font-size;\n  color: @carousel-control-color;\n  text-align: center;\n  text-shadow: @carousel-text-shadow;\n  background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug\n  // We can't have this transition here because WebKit cancels the carousel\n  // animation if you trip this while in the middle of another animation.\n\n  // Set gradients for backgrounds\n  &.left {\n    #gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));\n  }\n  &.right {\n    left: auto;\n    right: 0;\n    #gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));\n  }\n\n  // Hover/focus state\n  &:hover,\n  &:focus {\n    outline: 0;\n    color: @carousel-control-color;\n    text-decoration: none;\n    .opacity(.9);\n  }\n\n  // Toggles\n  .icon-prev,\n  .icon-next,\n  .glyphicon-chevron-left,\n  .glyphicon-chevron-right {\n    position: absolute;\n    top: 50%;\n    margin-top: -10px;\n    z-index: 5;\n    display: inline-block;\n  }\n  .icon-prev,\n  .glyphicon-chevron-left {\n    left: 50%;\n    margin-left: -10px;\n  }\n  .icon-next,\n  .glyphicon-chevron-right {\n    right: 50%;\n    margin-right: -10px;\n  }\n  .icon-prev,\n  .icon-next {\n    width:  20px;\n    height: 20px;\n    line-height: 1;\n    font-family: serif;\n  }\n\n\n  .icon-prev {\n    &:before {\n      content: '\\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)\n    }\n  }\n  .icon-next {\n    &:before {\n      content: '\\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)\n    }\n  }\n}\n\n// Optional indicator pips\n//\n// Add an unordered list with the following class and add a list item for each\n// slide your carousel holds.\n\n.carousel-indicators {\n  position: absolute;\n  bottom: 10px;\n  left: 50%;\n  z-index: 15;\n  width: 60%;\n  margin-left: -30%;\n  padding-left: 0;\n  list-style: none;\n  text-align: center;\n\n  li {\n    display: inline-block;\n    width:  10px;\n    height: 10px;\n    margin: 1px;\n    text-indent: -999px;\n    border: 1px solid @carousel-indicator-border-color;\n    border-radius: 10px;\n    cursor: pointer;\n\n    // IE8-9 hack for event handling\n    //\n    // Internet Explorer 8-9 does not support clicks on elements without a set\n    // `background-color`. We cannot use `filter` since that's not viewed as a\n    // background color by the browser. Thus, a hack is needed.\n    // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer\n    //\n    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we\n    // set alpha transparency for the best results possible.\n    background-color: #000 \\9; // IE8\n    background-color: rgba(0,0,0,0); // IE9\n  }\n  .active {\n    margin: 0;\n    width:  12px;\n    height: 12px;\n    background-color: @carousel-indicator-active-bg;\n  }\n}\n\n// Optional captions\n// -----------------------------\n// Hidden by default for smaller viewports\n.carousel-caption {\n  position: absolute;\n  left: 15%;\n  right: 15%;\n  bottom: 20px;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: @carousel-caption-color;\n  text-align: center;\n  text-shadow: @carousel-text-shadow;\n  & .btn {\n    text-shadow: none; // No shadow for button elements in carousel-caption\n  }\n}\n\n\n// Scale up controls for tablets and up\n@media screen and (min-width: @screen-sm-min) {\n\n  // Scale up the controls a smidge\n  .carousel-control {\n    .glyphicon-chevron-left,\n    .glyphicon-chevron-right,\n    .icon-prev,\n    .icon-next {\n      width: (@carousel-control-font-size * 1.5);\n      height: (@carousel-control-font-size * 1.5);\n      margin-top: (@carousel-control-font-size / -2);\n      font-size: (@carousel-control-font-size * 1.5);\n    }\n    .glyphicon-chevron-left,\n    .icon-prev {\n      margin-left: (@carousel-control-font-size / -2);\n    }\n    .glyphicon-chevron-right,\n    .icon-next {\n      margin-right: (@carousel-control-font-size / -2);\n    }\n  }\n\n  // Show and left align the captions\n  .carousel-caption {\n    left: 20%;\n    right: 20%;\n    padding-bottom: 30px;\n  }\n\n  // Move up the indicators\n  .carousel-indicators {\n    bottom: 20px;\n  }\n}\n","// Clearfix\n//\n// For modern browsers\n// 1. The space content is one way to avoid an Opera bug when the\n//    contenteditable attribute is included anywhere else in the document.\n//    Otherwise it causes space to appear at the top and bottom of elements\n//    that are clearfixed.\n// 2. The use of `table` rather than `block` is only necessary if using\n//    `:before` to contain the top-margins of child elements.\n//\n// Source: http://nicolasgallagher.com/micro-clearfix-hack/\n\n.clearfix() {\n  &:before,\n  &:after {\n    content: \" \"; // 1\n    display: table; // 2\n  }\n  &:after {\n    clear: both;\n  }\n}\n","// Center-align a block level element\n\n.center-block() {\n  display: block;\n  margin-left: auto;\n  margin-right: auto;\n}\n","// CSS image replacement\n//\n// Heads up! v3 launched with only `.hide-text()`, but per our pattern for\n// mixins being reused as classes with the same name, this doesn't hold up. As\n// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.\n//\n// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757\n\n// Deprecated as of v3.0.1 (has been removed in v4)\n.hide-text() {\n  font: ~\"0/0\" a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n\n// New mixin to use as of v3.0.1\n.text-hide() {\n  .hide-text();\n}\n","//\n// Responsive: Utility classes\n// --------------------------------------------------\n\n\n// IE10 in Windows (Phone) 8\n//\n// Support for responsive views via media queries is kind of borked in IE10, for\n// Surface/desktop in split view and for Windows Phone 8. This particular fix\n// must be accompanied by a snippet of JavaScript to sniff the user agent and\n// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at\n// our Getting Started page for more information on this bug.\n//\n// For more information, see the following:\n//\n// Issue: https://github.com/twbs/bootstrap/issues/10497\n// Docs: http://getbootstrap.com/getting-started/#support-ie10-width\n// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/\n// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/\n\n@-ms-viewport {\n  width: device-width;\n}\n\n\n// Visibility utilities\n// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0\n.visible-xs,\n.visible-sm,\n.visible-md,\n.visible-lg {\n  .responsive-invisibility();\n}\n\n.visible-xs-block,\n.visible-xs-inline,\n.visible-xs-inline-block,\n.visible-sm-block,\n.visible-sm-inline,\n.visible-sm-inline-block,\n.visible-md-block,\n.visible-md-inline,\n.visible-md-inline-block,\n.visible-lg-block,\n.visible-lg-inline,\n.visible-lg-inline-block {\n  display: none !important;\n}\n\n.visible-xs {\n  @media (max-width: @screen-xs-max) {\n    .responsive-visibility();\n  }\n}\n.visible-xs-block {\n  @media (max-width: @screen-xs-max) {\n    display: block !important;\n  }\n}\n.visible-xs-inline {\n  @media (max-width: @screen-xs-max) {\n    display: inline !important;\n  }\n}\n.visible-xs-inline-block {\n  @media (max-width: @screen-xs-max) {\n    display: inline-block !important;\n  }\n}\n\n.visible-sm {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    .responsive-visibility();\n  }\n}\n.visible-sm-block {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    display: block !important;\n  }\n}\n.visible-sm-inline {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    display: inline !important;\n  }\n}\n.visible-sm-inline-block {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    display: inline-block !important;\n  }\n}\n\n.visible-md {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    .responsive-visibility();\n  }\n}\n.visible-md-block {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    display: block !important;\n  }\n}\n.visible-md-inline {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    display: inline !important;\n  }\n}\n.visible-md-inline-block {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    display: inline-block !important;\n  }\n}\n\n.visible-lg {\n  @media (min-width: @screen-lg-min) {\n    .responsive-visibility();\n  }\n}\n.visible-lg-block {\n  @media (min-width: @screen-lg-min) {\n    display: block !important;\n  }\n}\n.visible-lg-inline {\n  @media (min-width: @screen-lg-min) {\n    display: inline !important;\n  }\n}\n.visible-lg-inline-block {\n  @media (min-width: @screen-lg-min) {\n    display: inline-block !important;\n  }\n}\n\n.hidden-xs {\n  @media (max-width: @screen-xs-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-sm {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-md {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-lg {\n  @media (min-width: @screen-lg-min) {\n    .responsive-invisibility();\n  }\n}\n\n\n// Print utilities\n//\n// Media queries are placed on the inside to be mixin-friendly.\n\n// Note: Deprecated .visible-print as of v3.2.0\n.visible-print {\n  .responsive-invisibility();\n\n  @media print {\n    .responsive-visibility();\n  }\n}\n.visible-print-block {\n  display: none !important;\n\n  @media print {\n    display: block !important;\n  }\n}\n.visible-print-inline {\n  display: none !important;\n\n  @media print {\n    display: inline !important;\n  }\n}\n.visible-print-inline-block {\n  display: none !important;\n\n  @media print {\n    display: inline-block !important;\n  }\n}\n\n.hidden-print {\n  @media print {\n    .responsive-invisibility();\n  }\n}\n","// Responsive utilities\n\n//\n// More easily include all the states for responsive-utilities.less.\n.responsive-visibility() {\n  display: block !important;\n  table&  { display: table !important; }\n  tr&     { display: table-row !important; }\n  th&,\n  td&     { display: table-cell !important; }\n}\n\n.responsive-invisibility() {\n  display: none !important;\n}\n"]}
\ No newline at end of file
diff --git a/web/css/font-awesome.min.css b/web/css/font-awesome.min.css
new file mode 100644
index 000000000..540440ce8
--- /dev/null
+++ b/web/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.7.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.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.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{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-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{-ms-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-pp: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-resistance: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: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"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.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}
diff --git a/web/fonts/fontawesome-webfont.eot b/web/fonts/fontawesome-webfont.eot
new file mode 100644
index 000000000..e9f60ca95
Binary files /dev/null and b/web/fonts/fontawesome-webfont.eot differ
diff --git a/web/fonts/fontawesome-webfont.svg b/web/fonts/fontawesome-webfont.svg
new file mode 100644
index 000000000..855c845e5
--- /dev/null
+++ b/web/fonts/fontawesome-webfont.svg
@@ -0,0 +1,2671 @@
+<?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>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
+<defs>
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" 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 glyph-name="music" 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 glyph-name="search" 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 glyph-name="envelope" 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 glyph-name="heart" 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 glyph-name="star" 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 glyph-name="star_empty" 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 glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" 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 glyph-name="th_large" 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 glyph-name="th" 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 glyph-name="th_list" 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 glyph-name="ok" 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 glyph-name="remove" 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 glyph-name="zoom_in" 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 glyph-name="zoom_out" 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 glyph-name="off" 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 glyph-name="signal" 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 glyph-name="cog" 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 glyph-name="trash" 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 glyph-name="home" 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 glyph-name="file_alt" 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 glyph-name="time" 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 glyph-name="road" 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 glyph-name="download_alt" 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 glyph-name="download" 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 glyph-name="upload" 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 glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -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 glyph-name="play_circle" 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 glyph-name="repeat" 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 12q15 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 glyph-name="refresh" 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 glyph-name="list_alt" 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 glyph-name="lock" 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 glyph-name="flag" 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 glyph-name="headphones" 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 glyph-name="volume_off" 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 glyph-name="volume_down" 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 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" 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 36
+t12 56.5t-12 56.5t-29 36t-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 glyph-name="qrcode" 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 glyph-name="barcode" 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 glyph-name="tag" 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 glyph-name="tags" 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 glyph-name="book" 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 glyph-name="bookmark" 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 glyph-name="print" 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 glyph-name="camera" 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 glyph-name="font" 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 -5 -0.5 -13.5t-0.5 -12.5q-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 glyph-name="bold" 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 -0.5t68 -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 glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.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 glyph-name="text_height" 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 glyph-name="text_width" 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 glyph-name="align_left" 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 glyph-name="align_center" 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 glyph-name="align_right" 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 glyph-name="align_justify" 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 glyph-name="list" 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 glyph-name="indent_left" 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 glyph-name="indent_right" 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 glyph-name="facetime_video" 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 glyph-name="picture" 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 glyph-name="pencil" 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 glyph-name="map_marker" 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 glyph-name="adjust" 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 glyph-name="tint" 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 glyph-name="edit" 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 glyph-name="share" 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 glyph-name="check" 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 glyph-name="move" 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 glyph-name="step_backward" 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 10 13 19z" />
+    <glyph glyph-name="fast_backward" 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 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 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-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" 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 glyph-name="pause" 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 glyph-name="stop" 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 glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" 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 glyph-name="chevron_left" 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 glyph-name="chevron_right" 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 glyph-name="plus_sign" 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 glyph-name="minus_sign" 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 glyph-name="remove_sign" 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 glyph-name="ok_sign" 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 glyph-name="question_sign" 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 glyph-name="info_sign" 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 glyph-name="screenshot" 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 glyph-name="remove_circle" 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 glyph-name="ok_circle" 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 glyph-name="ban_circle" 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 glyph-name="arrow_left" 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 glyph-name="arrow_right" 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 glyph-name="arrow_up" 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 glyph-name="arrow_down" 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 glyph-name="share_alt" 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 glyph-name="resize_full" 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 glyph-name="resize_small" 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 glyph-name="plus" 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 glyph-name="minus" 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 glyph-name="asterisk" 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 glyph-name="exclamation_sign" 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 glyph-name="gift" 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 glyph-name="leaf" 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-43 0 -63.5 17.5t-45.5 59.5q-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 glyph-name="fire" 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 glyph-name="eye_open" 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 glyph-name="eye_close" 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-106 -189 -316 -567t-315 -566l-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 glyph-name="warning_sign" 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 glyph-name="plane" 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 glyph-name="calendar" 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 glyph-name="random" 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 glyph-name="comment" 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 glyph-name="magnet" 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 glyph-name="chevron_up" 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 glyph-name="chevron_down" 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 glyph-name="retweet" 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 -10 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 glyph-name="shopping_cart" 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 glyph-name="folder_close" 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 glyph-name="folder_open" 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 glyph-name="resize_vertical" 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 glyph-name="resize_horizontal" 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 glyph-name="bar_chart" 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 glyph-name="twitter_sign" 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 glyph-name="facebook_sign" 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 glyph-name="camera_retro" 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 glyph-name="key" 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 glyph-name="cogs" 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 -11 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 -8 -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 glyph-name="comments" 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 glyph-name="thumbs_up_alt" 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 glyph-name="thumbs_down_alt" 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 31 18 69q0 37 -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 -73 49 -163z" />
+    <glyph glyph-name="star_half" 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 glyph-name="heart_empty" 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 glyph-name="signout" 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 glyph-name="linkedin_sign" 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 glyph-name="pushpin" 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 glyph-name="external_link" 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 glyph-name="signin" 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 glyph-name="trophy" 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 glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.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 glyph-name="upload_alt" 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 glyph-name="lemon" 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 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" 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 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 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 -174q2 -1 19 -11.5t24 -14
+t20.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 glyph-name="check_empty" 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 glyph-name="bookmark_empty" 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 glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 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.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.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 glyph-name="twitter" 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 glyph-name="facebook" 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 glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -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.5
+t-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 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" 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 glyph-name="credit_card" 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 glyph-name="rss" 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 glyph-name="hdd" 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 glyph-name="bullhorn" 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 glyph-name="bell" 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 glyph-name="certificate" 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 glyph-name="hand_right" 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 glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-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-576q-50 0 -89 -38.5
+t-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 -45t45 -19t45 19t19 45z
+M1792 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 128q0 122 81.5 189t206.5 67
+q38 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 glyph-name="hand_up" 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 glyph-name="hand_down" 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 glyph-name="circle_arrow_left" 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 glyph-name="circle_arrow_right" 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 glyph-name="circle_arrow_up" 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 glyph-name="circle_arrow_down" 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 glyph-name="globe" 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 11t-9.5 10q-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-4 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 -10.5t17 -19.5q5 -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 -2q8 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 glyph-name="wrench" 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 glyph-name="tasks" 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 glyph-name="filter" 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 glyph-name="briefcase" 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 glyph-name="fullscreen" 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 glyph-name="group" 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 glyph-name="link" 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 glyph-name="cloud" 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 glyph-name="beaker" 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 glyph-name="cut" 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 glyph-name="copy" 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 glyph-name="paper_clip" 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 glyph-name="save" 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 glyph-name="sign_blank" 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 glyph-name="reorder" 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 glyph-name="ul" 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 glyph-name="ol" 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 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-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 glyph-name="strikethrough" 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 98 -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 -56 -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 glyph-name="underline" 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 glyph-name="table" 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 glyph-name="magic" 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 glyph-name="truck" 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 glyph-name="pinterest" 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 glyph-name="pinterest_sign" 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 glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 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 glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" 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 glyph-name="caret_down" 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 glyph-name="caret_up" 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 glyph-name="caret_left" 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 glyph-name="caret_right" 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 glyph-name="columns" 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 glyph-name="sort" 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 glyph-name="sort_down" 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 glyph-name="sort_up" 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 glyph-name="envelope_alt" 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 glyph-name="linkedin" 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 glyph-name="undo" 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 glyph-name="legal" 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 glyph-name="dashboard" 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 glyph-name="comment_alt" 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 glyph-name="comments_alt" 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 glyph-name="bolt" 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 glyph-name="sitemap" 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 glyph-name="umbrella" 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 glyph-name="paste" 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 glyph-name="light_bulb" 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 glyph-name="exchange" 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 glyph-name="cloud_download" 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 glyph-name="cloud_upload" 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 glyph-name="user_md" 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 glyph-name="stethoscope" 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 glyph-name="suitcase" 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 glyph-name="bell_alt" 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 glyph-name="coffee" 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 glyph-name="food" 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 glyph-name="file_text_alt" 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 glyph-name="building" 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 glyph-name="hospital" 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 glyph-name="ambulance" 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 glyph-name="medkit" 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 glyph-name="fighter_jet" 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 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" 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 glyph-name="h_sign" 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 glyph-name="f0fe" 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 glyph-name="double_angle_left" 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 glyph-name="double_angle_right" 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 glyph-name="double_angle_up" 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 glyph-name="double_angle_down" 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 glyph-name="angle_left" 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 glyph-name="angle_right" 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 glyph-name="angle_up" 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 glyph-name="angle_down" 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 glyph-name="desktop" 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 glyph-name="laptop" 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 glyph-name="tablet" 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 glyph-name="mobile_phone" 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 glyph-name="circle_blank" 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 glyph-name="quote_left" 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 glyph-name="quote_right" 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 glyph-name="spinner" 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 glyph-name="circle" 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 glyph-name="reply" 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 glyph-name="github_alt" 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 glyph-name="folder_close_alt" 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 glyph-name="folder_open_alt" 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 glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" 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 glyph-name="frown" 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 glyph-name="meh" 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 glyph-name="gamepad" 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 glyph-name="keyboard" 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 glyph-name="flag_alt" 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 glyph-name="flag_checkered" 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 glyph-name="terminal" 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 glyph-name="code" 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 glyph-name="reply_all" 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 glyph-name="star_half_empty" 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 glyph-name="location_arrow" 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 glyph-name="crop" 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 glyph-name="code_fork" 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-67 -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 glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-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 glyph-name="question" 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 glyph-name="_279" 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 glyph-name="exclamation" 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 glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-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 -296h109z
+M1534 846v-206h-514l-3 27q-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.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-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 -296h109z
+M1536 -50v-206h-514l-4 27q-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 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" 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 glyph-name="puzzle_piece" 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 glyph-name="microphone" 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 glyph-name="microphone_off" 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 glyph-name="shield" 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 glyph-name="calendar_empty" 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 glyph-name="fire_extinguisher" 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 glyph-name="rocket" 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 glyph-name="maxcdn" 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 glyph-name="chevron_sign_left" 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 glyph-name="chevron_sign_right" 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 glyph-name="chevron_sign_up" 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 glyph-name="chevron_sign_down" 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 glyph-name="html5" 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 glyph-name="css3" 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 glyph-name="anchor" 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-12 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 glyph-name="unlock_alt" 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 glyph-name="bullseye" 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 glyph-name="ellipsis_horizontal" 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 glyph-name="ellipsis_vertical" 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 glyph-name="_303" 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 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 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-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 glyph-name="play_sign" 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 glyph-name="ticket" 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 glyph-name="minus_sign_alt" 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 glyph-name="check_minus" 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 glyph-name="level_up" 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 glyph-name="level_down" 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 glyph-name="check_sign" 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 glyph-name="edit_sign" 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 glyph-name="_312" 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 glyph-name="share_sign" 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 -404q11 -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 glyph-name="compass" 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 glyph-name="collapse" 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 glyph-name="collapse_top" 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 glyph-name="_317" 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 glyph-name="eur" 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 glyph-name="gbp" 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 glyph-name="usd" 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 glyph-name="inr" 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 glyph-name="jpy" 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 glyph-name="rub" 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 glyph-name="krw" 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 glyph-name="btc" 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 glyph-name="file" 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 glyph-name="file_text" 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 glyph-name="sort_by_alphabet" 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 glyph-name="_329" 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 glyph-name="sort_by_attributes" 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 glyph-name="sort_by_attributes_alt" 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 glyph-name="sort_by_order" 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 glyph-name="sort_by_order_alt" 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 glyph-name="_334" 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 glyph-name="_335" 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 glyph-name="youtube_sign" 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 17 -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 -29 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-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-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.5
+h-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 glyph-name="youtube" 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-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 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 glyph-name="xing" 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 glyph-name="xing_sign" 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 glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" 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 glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" 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 glyph-name="adn" 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 glyph-name="f171" 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 glyph-name="bitbucket_sign" 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 glyph-name="tumblr" 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 glyph-name="tumblr_sign" 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 glyph-name="long_arrow_down" 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 glyph-name="long_arrow_up" 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 glyph-name="long_arrow_left" 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 glyph-name="long_arrow_right" 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 glyph-name="apple" 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 374q113 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 glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" 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 glyph-name="linux" 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-10 -11 -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 18q-2 -1 -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-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 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.5
+t-30 -18.5t-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 43
+q-19 4 -51 9.5t-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 -49
+t-14 -48q3 -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 54
+q110 143 124 195q-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.5
+t-40.5 -33.5t-61 -14q-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.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" 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 -5 6.5 -17t7.5 -17q36 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 glyph-name="skype" 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 glyph-name="foursquare" 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 glyph-name="trello" 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 glyph-name="female" 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 glyph-name="male" 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 glyph-name="gittip" 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 glyph-name="sun" 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 glyph-name="_366" 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 glyph-name="archive" 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 glyph-name="bug" 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 glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -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 24q16 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 glyph-name="weibo" 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 glyph-name="renren" 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 glyph-name="_372" 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 -4 1 -50t-1 -72q3 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 glyph-name="stack_exchange" 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 glyph-name="_374" 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 glyph-name="arrow_circle_alt_left" 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 glyph-name="_376" 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 glyph-name="dot_circle_alt" 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 glyph-name="_378" 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 17 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 glyph-name="vimeo_square" 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 glyph-name="_380" 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 glyph-name="plus_square_o" 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 glyph-name="_382" 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 glyph-name="_383" 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 glyph-name="_384" 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-47 32 -142 92.5t-142 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 glyph-name="_385" 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 glyph-name="_386" 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 glyph-name="_387" 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 glyph-name="_388" 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 glyph-name="_389" 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 -15q44 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 glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" 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 glyph-name="_392" 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 glyph-name="_393" 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 glyph-name="f1a4" 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 glyph-name="_395" 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 glyph-name="_396" 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 glyph-name="_397" 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 glyph-name="_398" 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 glyph-name="_399" 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 glyph-name="_400" 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 glyph-name="f1ab" 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 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" 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 glyph-name="_403" 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 glyph-name="_404" 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 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -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 glyph-name="uniF1B1" 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 glyph-name="_406" 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 glyph-name="_407" 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 glyph-name="_408" 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-4 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 glyph-name="_409" 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 glyph-name="_410" 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 glyph-name="_411" 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 glyph-name="_412" 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 glyph-name="_413" 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 glyph-name="_414" 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 glyph-name="_415" 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 glyph-name="_416" 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 glyph-name="_417" 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 glyph-name="_418" 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 glyph-name="_419" 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 169v0v0v0zM881 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 -236
+q0 -11 -8 -19t-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-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" 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 glyph-name="uniF1C1" 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 2q-1 2 -1 3q-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 glyph-name="_422" 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-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" 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 glyph-name="_424" 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 glyph-name="_425" 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 glyph-name="_426" 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 glyph-name="_427" 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 glyph-name="_428" 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 glyph-name="_429" 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 glyph-name="_430" 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 glyph-name="_431" 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 glyph-name="_432" 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 -97l93 -108q66 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.5t-85 -189.5z" />
+    <glyph glyph-name="_433" 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 glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" 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 glyph-name="uniF1D1" 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 glyph-name="uniF1D2" 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 glyph-name="_438" 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 glyph-name="_439" 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 glyph-name="uniF1D5" 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 glyph-name="uniF1D6" 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 glyph-name="uniF1D7" 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 glyph-name="_443" 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 glyph-name="_444" 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 glyph-name="_445" 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 glyph-name="_446" 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 glyph-name="_447" 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 glyph-name="_448" 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 glyph-name="_449" 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 glyph-name="uniF1E0" 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 glyph-name="_451" 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 glyph-name="_452" 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 glyph-name="_453" 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 glyph-name="_454" 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 glyph-name="_455" 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 glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-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 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" 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 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" 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 glyph-name="_459" 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 -77q71 -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 glyph-name="_460" 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 glyph-name="_461" 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 glyph-name="_462" 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 glyph-name="_463" 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 glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" 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 glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" 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 glyph-name="f1f3" 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 glyph-name="_469" 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 glyph-name="_470" 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 glyph-name="_471" 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 glyph-name="_472" 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 glyph-name="_473" 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 glyph-name="_474" 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 glyph-name="_475" 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 glyph-name="_476" 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 glyph-name="f1fc" 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 glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -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.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-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 38
+t-58 27t-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-448
+h256v448h256v-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.5
+q0 29 9.5 51t23.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 glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" 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 glyph-name="_481" 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 glyph-name="_482" 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 glyph-name="_483" 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 glyph-name="_484" 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 glyph-name="_485" 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 glyph-name="_486" 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 glyph-name="_487" 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 glyph-name="_488" 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 glyph-name="_489" 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 -521q17 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 glyph-name="_490" 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 glyph-name="_491" 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 glyph-name="_492" 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 glyph-name="_493" 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 glyph-name="_494" 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 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-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 -13zM552 226h402l64 66
+l-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 -224l213 -225zM1023 946
+l-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 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" 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 glyph-name="_496" 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 glyph-name="f212" 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 glyph-name="_498" 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 glyph-name="_499" 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 glyph-name="_500" 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 glyph-name="_501" 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 126t-103.5 132.5t-108.5 126.5t-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 glyph-name="_502" 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 glyph-name="_503" 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 glyph-name="_504" 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 glyph-name="_505" 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 glyph-name="_506" 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 glyph-name="_507" 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 glyph-name="_508" 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 glyph-name="_509" 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 glyph-name="venus" 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 glyph-name="_511" 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 glyph-name="_512" 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 glyph-name="_513" 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 glyph-name="_514" 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 glyph-name="_515" 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 glyph-name="_516" 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 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" 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 glyph-name="_518" 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 glyph-name="_519" 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 glyph-name="_520" 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 glyph-name="_521" 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 glyph-name="_522" 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 glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" 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 glyph-name="_526" 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 glyph-name="_527" 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 glyph-name="_528" 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 glyph-name="_529" 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 glyph-name="_530" 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 glyph-name="_531" 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 glyph-name="_532" 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 glyph-name="_533" 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 glyph-name="_534" 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 glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" 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 5 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-105 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 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-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 -4
+l-10 -2.5t-12 -2l-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-6 -1 -9 -1q-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 130
+t-73 70q-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 -1 -1 -4t-1 -5q31 -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 glyph-name="_538" 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 glyph-name="_539" 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 glyph-name="_540" 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 glyph-name="_541" 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 glyph-name="_542" 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 glyph-name="_543" 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 glyph-name="_544" 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 glyph-name="_545" 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 glyph-name="_546" 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 glyph-name="_547" 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 glyph-name="_548" 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 glyph-name="_549" 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 glyph-name="_550" 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 glyph-name="_551" 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 glyph-name="_552" 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 glyph-name="_553" 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 glyph-name="_554" 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 glyph-name="_555" 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 glyph-name="_556" 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 glyph-name="_557" 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 glyph-name="_558" 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 glyph-name="_559" 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 glyph-name="_560" 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 glyph-name="_561" 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 glyph-name="_562" 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 glyph-name="_563" 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 glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" 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 glyph-name="_566" 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 glyph-name="_567" 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 glyph-name="_568" 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 glyph-name="_569" 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 -13.5t-23.5 -14.5t-28.5 -13t-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 -13.5t-23.5 -14.5t-28.5 -13t-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 glyph-name="f260" 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 glyph-name="f261" 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 glyph-name="_572" 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 glyph-name="f263" 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 glyph-name="_574" 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 glyph-name="_575" 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 glyph-name="_576" 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 glyph-name="_577" 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 glyph-name="_578" 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 glyph-name="_579" 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 glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" 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 glyph-name="_583" 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 glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" 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 glyph-name="_586" 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 glyph-name="_587" 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 glyph-name="_588" 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 glyph-name="_589" 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 glyph-name="_590" 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 glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -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 glyph-name="_592" 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 glyph-name="_593" 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 glyph-name="_594" 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 glyph-name="_595" 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 glyph-name="_596" 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 glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" 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 glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" 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 glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-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 glyph-name="_612" unicode="&#xf28c;" 
+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 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 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.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+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 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -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.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 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 glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 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
+M1600 640q0 -143 -55.5 -273.5t-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.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -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 glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-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 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 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 glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 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 glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 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 glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 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.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 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 glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 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 glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-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.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 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 glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -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.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -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 glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
diff --git a/web/fonts/fontawesome-webfont.ttf b/web/fonts/fontawesome-webfont.ttf
new file mode 100644
index 000000000..35acda2fa
Binary files /dev/null and b/web/fonts/fontawesome-webfont.ttf differ
diff --git a/web/fonts/fontawesome-webfont.woff b/web/fonts/fontawesome-webfont.woff
new file mode 100644
index 000000000..400014a4b
Binary files /dev/null and b/web/fonts/fontawesome-webfont.woff differ
diff --git a/web/fonts/fontawesome-webfont.woff2 b/web/fonts/fontawesome-webfont.woff2
new file mode 100644
index 000000000..4d13fc604
Binary files /dev/null and b/web/fonts/fontawesome-webfont.woff2 differ
diff --git a/web/includes/Control.php b/web/includes/Control.php
index 72e6c49a9..2121061b1 100644
--- a/web/includes/Control.php
+++ b/web/includes/Control.php
@@ -2,10 +2,13 @@
 namespace ZM;
 
 require_once('database.php');
+require_once('Object.php');
 
-class Control {
+class Control extends ZM_Object {
+  protected static $table = 'Controls';
 
-private $defaults = array(
+  protected $defaults = array(
+    'Id'  =>  null,
     'CanMove' => 0,
     'CanMoveDiag' => 0,
     'CanMoveMap' => 0,
@@ -104,153 +107,139 @@ private $defaults = array(
     'Protocol' => NULL
     );
 
-  public function __construct( $IdOrRow = NULL ) {
-    if ( $IdOrRow ) {
-      $row = NULL;
-      if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
-        $row = dbFetchOne( 'SELECT * FROM Controls WHERE Id=?', NULL, array( $IdOrRow ) );
-        if ( ! $row ) {
-          Error("Unable to load Control record for Id=" . $IdOrRow );
-        }
-      } elseif ( is_array( $IdOrRow ) ) {
-        $row = $IdOrRow;
-      } else {
-        Error("Unknown argument passed to Control Constructor ($IdOrRow)");
-        return;
-      }
-
-      if ( $row ) {
-        foreach ($row as $k => $v) {
-          $this->{$k} = $v;
-        }
-      } else {
-        Error('No row for Control ' . $IdOrRow );
-      }
-    } # end if isset($IdOrRow)
-  } // end function __construct
-
-  public function __call($fn, array $args){
-    if ( count($args) ) {
-      $this->{$fn} = $args[0];
-    }
-    if ( array_key_exists($fn, $this) ) {
-      return $this->{$fn};
-        #array_unshift($args, $this);
-        #call_user_func_array( $this->{$fn}, $args);
-		} else {
-      if ( array_key_exists($fn, $this->control_fields) ) {
-        return $this->control_fields{$fn};
-      } else if ( array_key_exists( $fn, $this->defaults ) ) {
-        return $this->defaults{$fn};
-      } else {
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        Warning( "Unknown function call Control->$fn from $file:$line" );
-      }
-    }
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
   }
 
-  public function set( $data ) {
-    foreach ($data as $k => $v) {
-      if ( is_array( $v ) ) {
-        # perhaps should turn into a comma-separated string
-        $this->{$k} = implode(',',$v);
-      } else if ( is_string( $v ) ) {
-        $this->{$k} = trim( $v );
-      } else if ( is_integer( $v ) ) {
-        $this->{$k} = $v;
-      } else if ( is_bool( $v ) ) {
-        $this->{$k} = $v;
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+
+  public function commands() {
+    $cmds = array();
+
+    $cmds['Wake'] = 'wake';
+    $cmds['Sleep'] = 'sleep';
+    $cmds['Reset'] = 'reset';
+    $cmds['Reboot'] = 'reboot';
+
+    $cmds['PresetSet'] = 'presetSet';
+    $cmds['PresetGoto'] = 'presetGoto';
+    $cmds['PresetHome'] = 'presetHome';
+
+    if ( $this->CanZoom() ) {
+      if ( $this->CanZoomCon() ) {
+        $cmds['ZoomRoot'] = 'zoomCon';
+      } else if ( $this->CanZoomRel() ) {
+        $cmds['ZoomRoot'] = 'zoomRel';
+      } else if ( $this->CanZoomAbs() ) {
+        $cmds['ZoomRoot'] = 'zoomAbs';
       } else {
-        Error( "Unknown type $k => $v of var " . gettype( $v ) );
-        $this->{$k} = $v;
+        $cmds['ZoomRoot'] = '';
+        Error('No zoom type selected. Please select Continuous, Relative, Absolute');
       }
+      $cmds['ZoomTele'] = $cmds['ZoomRoot'].'Tele';
+      $cmds['ZoomWide'] = $cmds['ZoomRoot'].'Wide';
+      $cmds['ZoomStop'] = 'zoomStop';
+      $cmds['ZoomAuto'] = 'zoomAuto';
+      $cmds['ZoomMan'] = 'zoomMan';
     }
-  }
-  public static function find( $parameters = null, $options = null ) {
-    $sql = 'SELECT * FROM Controls ';
-    $values = array();
 
-    if ( $parameters ) {
-      $fields = array();
-      $sql .= 'WHERE ';
-      foreach ( $parameters as $field => $value ) {
-        if ( $value == null ) {
-          $fields[] = $field.' IS NULL';
-        } else if ( is_array( $value ) ) {
-          $func = function(){return '?';};
-          $fields[] = $field.' IN ('.implode(',', array_map( $func, $value ) ). ')';
-          $values += $value;
-
-        } else {
-          $fields[] = $field.'=?';
-          $values[] = $value;
-        }
+    if ( $this->CanFocus() ) {
+      if ( $this->CanFocusCon() ) {
+        $cmds['FocusRoot'] = 'focusCon';
+      } else if ( $this->CanFocusRel() ) {
+        $cmds['FocusRoot'] = 'focusRel';
+      } else if ( $this->CanFocusAbs() ) {
+        $cmds['FocusRoot'] = 'focusAbs';
+      } else {
+        $cmds['FocusRoot'] = '';
+        Error('No focus type selected. Please select Continuous, Relative, Absolute');
       }
-      $sql .= implode(' AND ', $fields );
+      $cmds['FocusFar'] = $cmds['FocusRoot'].'Far';
+      $cmds['FocusNear'] = $cmds['FocusRoot'].'Near';
+      $cmds['FocusStop'] = 'focusStop';
+      $cmds['FocusAuto'] = 'focusAuto';
+      $cmds['FocusMan'] = 'focusMan';
     }
-    if ( $options ) {
-      if ( isset($options['order']) ) {
-        $sql .= ' ORDER BY ' . $options['order'];
+
+    if ( $this->CanIris() ) {
+      if ( $this->CanIrisCon() ) {
+        $cmds['IrisRoot'] = 'irisCon';
+      } else if ( $this->CanIrisRel() ) {
+        $cmds['IrisRoot'] = 'irisRel';
+      } else if ( $this->CanIrisAbs() ) {
+        $cmds['IrisRoot'] = 'irisAbs';
+      } else {
+        $cmds['IrisRoot'] = '';
+        Error('No iris type selected. Please select Continuous, Relative, Absolute');
       }
-      if ( isset($options['limit']) ) {
-        if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
-          $sql .= ' LIMIT ' . $options['limit'];
-        } else {
-          $backTrace = debug_backtrace();
-          $file = $backTrace[1]['file'];
-          $line = $backTrace[1]['line'];
-          Error("Invalid value for limit(".$options['limit'].") passed to Control::find from $file:$line");
-          return;
-        }
+      $cmds['IrisOpen'] = $cmds['IrisRoot'].'Open';
+      $cmds['IrisClose'] = $cmds['IrisRoot'].'Close';
+      $cmds['IrisStop'] = 'irisStop';
+      $cmds['IrisAuto'] = 'irisAuto';
+      $cmds['IrisMan'] = 'irisMan';
+    }
+
+    if ( $this->CanWhite() ) {
+      if ( $this->CanWhiteCon() ) {
+        $cmds['WhiteRoot'] = 'whiteCon';
+      } else if ( $this->CanWhiteRel() ) {
+        $cmds['WhiteRoot'] = 'whiteRel';
+      } else if ( $this->CanWhiteAbs() ) {
+        $cmds['WhiteRoot'] = 'whiteAbs';
+      } else {
+        Error('No White type selected. Please select Continuous, Relative, Absolute');
+        $cmds['WhiteRoot'] = '';
       }
+      $cmds['WhiteIn'] = $cmds['WhiteRoot'].'In';
+      $cmds['WhiteOut'] = $cmds['WhiteRoot'].'Out';
+      $cmds['WhiteAuto'] = 'whiteAuto';
+      $cmds['WhiteMan'] = 'whiteMan';
     }
-    $controls = array();
-    $result = dbQuery($sql, $values);
-    $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Control');
-    foreach ( $results as $row => $obj ) {
-      $controls[] = $obj;
-    }
-    return $controls;
-  }
 
-  public static function find_one( $parameters = array() ) {
-    $results = Control::find( $parameters, array('limit'=>1) );
-    if ( ! sizeof($results) ) {
-      return;
-    }
-    return $results[0];
-  }
-
-  public function save( $new_values = null ) {
-
-    if ( $new_values ) {
-      foreach ( $new_values as $k=>$v ) {
-        $this->{$k} = $v;
+    if ( $this->CanGain() ) {
+      if ( $this->CanGainCon() ) {
+        $cmds['GainRoot'] = 'gainCon';
+      } else if ( $this->CanGainRel() ) {
+        $cmds['GainRoot'] = 'gainRel';
+      } else if ( $this->CanGainAbs() ) {
+        $cmds['GainRoot'] = 'gainAbs';
+      } else {
+        Error('No Gain type selected');
+        $cmds['GainRoot'] = '';
       }
+      $cmds['GainUp'] = $cmds['GainRoot'].'Up';
+      $cmds['GainDown'] = $cmds['GainRoot'].'Down';
+      $cmds['GainAuto'] = 'gainAuto';
+      $cmds['GainMan'] = 'gainMan';
     }
-    // Set default values
-    foreach ( $this->defaults as $k=>$v ) {
-      if ( ( ! array_key_exists( $k, $this ) ) or ( $this->{$k} == '' ) ) {
-        $this->{$k} = $v;
+
+    if ( $this->CanMove() ) {
+      if ( $this->CanMoveCon() ) {
+        $cmds['MoveRoot'] = 'moveCon';
+        $cmds['Center'] = 'moveStop';
+      } elseif ( $this->CanMoveRel() ) {
+        $cmds['MoveRoot'] = 'moveRel';
+        $cmds['Center'] = $cmds['PresetHome'];
+      } elseif ( $this->CanMoveAbs() ) {
+        $cmds['MoveRoot'] = 'moveAbs';
+        $cmds['Center'] = $cmds['PresetHome'];
+      } else {
+        $cmds['MoveRoot'] = '';
+        Error('No move type selected. Please select Continuous, Relative, Absolute');
       }
-    }
-    
-    $fields = array_keys( $this->defaults );
 
-    if ( array_key_exists( 'Id', $this ) ) {
-      $sql = 'UPDATE Controls SET '.implode(', ', array_map( function($field) {return $field.'=?';}, $fields ) ) . ' WHERE Id=?';
-      $values = array_map( function($field){return $this->{$field};}, $fields );
-      $values[] = $this->{'Id'};
-      dbQuery( $sql, $values );
-    } else {
-      $sql = 'INSERT INTO Controls SET '.implode(', ', array_map( function($field) {return $field.'=?';}, $fields ) ) . '';
-      $values = array_map( function($field){return $this->{$field};}, $fields );
-      dbQuery( $sql, $values );
-      $this->{'Id'} = dbInsertId();
+      $cmds['MoveUp'] = $cmds['MoveRoot'].'Up';
+      $cmds['MoveDown'] = $cmds['MoveRoot'].'Down';
+      $cmds['MoveLeft'] = $cmds['MoveRoot'].'Left';
+      $cmds['MoveRight'] = $cmds['MoveRoot'].'Right';
+      $cmds['MoveUpLeft'] = $cmds['MoveRoot'].'UpLeft';
+      $cmds['MoveUpRight'] = $cmds['MoveRoot'].'UpRight';
+      $cmds['MoveDownLeft'] = $cmds['MoveRoot'].'DownLeft';
+      $cmds['MoveDownRight'] = $cmds['MoveRoot'].'DownRight';
     }
-  } // end function save
-
+    return $cmds;
+  } // end public function commands
 } // end class Control
 ?>
diff --git a/web/includes/Event.php b/web/includes/Event.php
index dc7dd3575..23f806354 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -2,86 +2,69 @@
 namespace ZM;
 require_once('Storage.php');
 require_once('functions.php');
+require_once('Object.php');
 
-$event_cache = array();
+class Event extends ZM_Object {
+  protected static $table = 'Events';
 
-class Event {
-
-  private $fields = array(
-'Id',
-'Name',
-'MonitorId',
-'StorageId',
-'SecondaryStorageId',
-'Name',
-'Cause',
-'StartTime',
-'EndTime',
-'Width',
-'Height',
-'Length',
-'Frames',
-'AlarmFrames',
-'DefaultVideo',
-'SaveJPEGs',
-'TotScore',
-'AvgScore',
-'MaxScore',
-'Archived',
-'Videoed',
-'Uploaded',
-'Emailed',
-'Messaged',
-'Executed',
-'Notes',
-'StateId',
-'Orientation',
-'DiskSpace',
-'Scheme',
-'Locked',
+  protected $defaults = array(
+    'Id' => null,
+    'Name' => '',
+    'MonitorId' => null,
+    'StorageId' => null,
+    'SecondaryStorageId' => null,
+    'Cause' => '',
+    'StartTime' => null,
+    'EndTime' => null,
+    'Width' => null,
+    'Height' => null,
+    'Length' => null,
+    'Frames' => null,
+    'AlarmFrames' => null,
+    'DefaultVideo' => '',
+    'SaveJPEGs' => 0,
+    'TotScore' => 0,
+    'AvgScore' => 0,
+    'MaxScore' => 0,
+    'Archived' => 0,
+    'Videoed'  => 0,
+    'Uploaded' => 0,
+    'Emailed' => 0,
+    'Messaged' => 0,
+    'Executed' => 0,
+    'Notes' => '',
+    'StateId' => 0,
+    'Orientation' => 0,
+    'DiskSpace' => null,
+    'Scheme' => 0,
+    'Locked' => 0,
 );
-  public function __construct( $IdOrRow = null ) {
-    $row = NULL;
-    if ( $IdOrRow ) {
-      if ( is_integer($IdOrRow) or is_numeric($IdOrRow) ) {
-        $row = dbFetchOne('SELECT *,unix_timestamp(StartTime) AS Time FROM Events WHERE Id=?', NULL, array($IdOrRow));
-        if ( ! $row ) {
-          Error('Unable to load Event record for Id=' . $IdOrRow);
-        }
-      } elseif ( is_array($IdOrRow) ) {
-        $row = $IdOrRow;
-      } else {
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        Error("Unknown argument passed to Event Constructor from $file:$line) Id was $IdOrRow");
-        return;
-      }
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
 
-      if ( $row ) {
-        foreach ($row as $k => $v) {
-          $this->{$k} = $v;
-        }
-        global $event_cache;
-        $event_cache[$row['Id']] = $this;
-      } else {
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        Error('No row for Event ' . $IdOrRow . " from $file:$line");
-      }
-    } # end if isset($IdOrRow)
-  } // end function __construct
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+
+  public static function clear_cache() {
+    return ZM_Object::_clear_cache(get_class());
+  }
+  public function remove_from_cache() {
+    return ZM_Object::_remove_from_cache(get_class(), $this);
+  }
 
   public function Storage( $new = null ) {
     if ( $new ) {
       $this->{'Storage'} = $new;
     }
-    if ( ! ( array_key_exists('Storage', $this) and $this->{'Storage'} ) ) {
+    if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) {
       if ( isset($this->{'StorageId'}) and $this->{'StorageId'} )
         $this->{'Storage'} = Storage::find_one(array('Id'=>$this->{'StorageId'}));
-      if ( ! ( array_key_exists('Storage', $this) and $this->{'Storage'} ) )
+      if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) {
         $this->{'Storage'} = new Storage(NULL);
+        $this->{'Storage'}->Scheme($this->{'Scheme'});
+      }
     }
     return $this->{'Storage'};
   }
@@ -90,10 +73,10 @@ class Event {
     if ( $new ) {
       $this->{'SecondaryStorage'} = $new;
     }
-    if ( ! ( array_key_exists('SecondaryStorage', $this) and $this->{'SecondaryStorage'} ) ) {
+    if ( ! ( property_exists($this, 'SecondaryStorage') and $this->{'SecondaryStorage'} ) ) {
       if ( isset($this->{'SecondaryStorageId'}) and $this->{'SecondaryStorageId'} )
         $this->{'SecondaryStorage'} = Storage::find_one(array('Id'=>$this->{'SecondaryStorageId'}));
-      if ( ! ( array_key_exists('SecondaryStorage', $this) and $this->{'SecondaryStorage'} ) )
+      if ( ! ( property_exists($this, 'SecondaryStorage') and $this->{'SecondaryStorage'} ) )
         $this->{'SecondaryStorage'} = new Storage(NULL);
     }
     return $this->{'SecondaryStorage'};
@@ -108,24 +91,6 @@ class Event {
     return new Monitor();
   }
 
-  public function __call($fn, array $args){
-  if ( count($args) ) {
-      $this->{$fn} = $args[0];
-    }
-    if ( array_key_exists($fn, $this) ) {
-      return $this->{$fn};
-        
-      $backTrace = debug_backtrace();
-      $file = $backTrace[0]['file'];
-      $line = $backTrace[0]['line'];
-      Warning("Unknown function call Event->$fn from $file:$line");
-      $file = $backTrace[1]['file'];
-      $line = $backTrace[1]['line'];
-      Warning("Unknown function call Event->$fn from $file:$line");
-      Warning(print_r($this, true));
-    }
-  }
-
   public function Time() {
     if ( ! isset($this->{'Time'}) ) {
       $this->{'Time'} = strtotime($this->{'StartTime'});
@@ -170,35 +135,44 @@ class Event {
       Error('Event delete on event with empty Id');
       return;
     }
-    if ( !ZM_OPT_FAST_DELETE ) {
+    if ( $this->{'Archived'} ) {
+      Error('Cannot delete an Archived event.');
+      return;
+    }
+    if ( ZM_OPT_FAST_DELETE ) {
+      dbQuery('DELETE FROM Events WHERE Id = ?', array($this->{'Id'}));
+      return;
+    }
+
+    global $dbConn;
+    $dbConn->beginTransaction();
+    try {
+      $this->lock();
       dbQuery('DELETE FROM Stats WHERE EventId = ?', array($this->{'Id'}));
       dbQuery('DELETE FROM Frames WHERE EventId = ?', array($this->{'Id'}));
       if ( $this->{'Scheme'} == 'Deep' ) {
 
-# Assumption: All events have a start time
+        # Assumption: All events have a start time
         $start_date = date_parse($this->{'StartTime'});
         if ( ! $start_date ) {
-          Error('Unable to parse start time for event ' . $this->{'Id'} . ' not deleting files.');
-          return;
+          throw new Exception('Unable to parse start time for event ' . $this->{'Id'} . ' not deleting files.');
         }
         $start_date['year'] = $start_date['year'] % 100;
 
-# So this is because ZM creates a link under the day pointing to the time that the event happened. 
+        # So this is because ZM creates a link under the day pointing to the time that the event happened. 
         $link_path = $this->Link_Path();
         if ( ! $link_path ) {
-          Error('Unable to determine link path for event '.$this->{'Id'}.' not deleting files.');
-          return;
+          throw new Exception('Unable to determine link path for event '.$this->{'Id'}.' not deleting files.');
         }
-        
+
         $Storage = $this->Storage();
         $eventlink_path = $Storage->Path().'/'.$link_path;
 
         if ( $id_files = glob($eventlink_path) ) {
           if ( ! $eventPath = readlink($id_files[0]) ) {
-            Error("Unable to read link at $id_files[0]");
-            return;
+            throw new Exception("Unable to read link at $id_files[0]");
           }
-# I know we are using arrays here, but really there can only ever be 1 in the array
+          # I know we are using arrays here, but really there can only ever be 1 in the array
           $eventPath = preg_replace('/\.'.$this->{'Id'}.'$/', $eventPath, $id_files[0]);
           deletePath($eventPath);
           deletePath($id_files[0]);
@@ -215,13 +189,29 @@ class Event {
       } else {
         $eventPath = $this->Path();
         if ( ! $eventPath ) {
-          Error('No event Path in Event delete. Not deleting');
-          return;
+          throw new Exception('No event Path in Event delete. Not deleting');
         }
         deletePath($eventPath);
+        if ( $this->SecondaryStorageId() ) {
+          $Storage = $this->SecondaryStorage();
+          if ( $Storage->Id() ) {
+            $eventPath = $Storage->Path().'/'.$this->Relative_Path();
+            if ( ! $eventPath ) {
+              Error('No event Path in Event delete. Not deleting');
+            } else {
+              deletePath($eventPath);
+            }
+          } # end if Storage
+        } # end if has Secondary Storage
       } # USE_DEEP_STORAGE OR NOT
-    } # ! ZM_OPT_FAST_DELETE
-    dbQuery('DELETE FROM Events WHERE Id = ?', array($this->{'Id'}));
+      dbQuery('DELETE FROM Events WHERE Id = ?', array($this->{'Id'}));
+      $dbConn->commit();
+    } catch (PDOException $e) {
+      $dbConn->rollback();
+    } catch (Exception $e) {
+      Error($e->getMessage());
+      $dbConn->rollback();
+    }
   } # end Event->delete
 
   public function getStreamSrc( $args=array(), $querySep='&' ) {
@@ -276,18 +266,23 @@ class Event {
       }
     }
 
-    $streamSrc .= '?'.http_build_query($args,'', $querySep);
+    $streamSrc .= '?'.http_build_query($args, '', $querySep);
 
     return $streamSrc;
   } // end function getStreamSrc
 
+  # The new='' is to so that if we pass null, we reset the value of DiskSpace.
+  # '' is not a valid DiskSpace so that tells us that nothing was passed whereas null (unknown) is.
   function DiskSpace( $new='' ) {
     if ( is_null($new) or ( $new != '' ) ) {
       $this->{'DiskSpace'} = $new;
     }
-    if ( (!array_key_exists('DiskSpace',$this)) or (null === $this->{'DiskSpace'}) ) {
+    if ( (!property_exists($this, 'DiskSpace')) or (null === $this->{'DiskSpace'}) ) {
       $this->{'DiskSpace'} = folder_size($this->Path());
-      dbQuery('UPDATE Events SET DiskSpace=? WHERE Id=?', array($this->{'DiskSpace'}, $this->{'Id'}));
+      if ( $this->{'EndTime'} ) {
+        # Finished events shouldn't grow in size much so we can commit it to the db.
+        dbQuery('UPDATE Events SET DiskSpace=? WHERE Id=?', array($this->{'DiskSpace'}, $this->{'Id'}));
+      }
     }
     return $this->{'DiskSpace'};
   }
@@ -321,7 +316,7 @@ class Event {
   } // end function createListThumbnail
 
   function ThumbnailWidth( ) {
-    if ( ! ( array_key_exists('ThumbnailWidth', $this) ) ) {
+    if ( ! ( property_exists($this, 'ThumbnailWidth') ) ) {
       if ( ZM_WEB_LIST_THUMB_WIDTH ) {
         $this->{'ThumbnailWidth'} = ZM_WEB_LIST_THUMB_WIDTH;
         $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$this->{'Width'};
@@ -338,7 +333,7 @@ class Event {
   } // end function ThumbnailWidth
 
   function ThumbnailHeight( ) {
-    if ( ! ( array_key_exists('ThumbnailHeight', $this) ) ) {
+    if ( ! ( property_exists($this, 'ThumbnailHeight') ) ) {
       if ( ZM_WEB_LIST_THUMB_WIDTH ) {
         $this->{'ThumbnailWidth'} = ZM_WEB_LIST_THUMB_WIDTH;
         $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$this->{'Width'};
@@ -399,75 +394,71 @@ class Event {
     $Event = $this;
     $eventPath = $Event->Path();
 
-    if ( $frame and ! is_array($frame) ) {
+    if ( $frame and !is_array($frame) ) {
       # Must be an Id
       Logger::Debug("Assuming that $frame is an Id");
-      $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
+      $frame = array('FrameId'=>$frame, 'Type'=>'', 'Delta'=>0);
     }
 
-    if ( ( ! $frame ) and file_exists($eventPath.'/snapshot.jpg') ) {
+    if ( ( !$frame ) and file_exists($eventPath.'/snapshot.jpg') ) {
       # No frame specified, so look for a snapshot to use
       $captImage = 'snapshot.jpg';
-      Logger::Debug("Frame not specified, using snapshot");
-      $frame = array('FrameId'=>'snapshot', 'Type'=>'');
+      Logger::Debug('Frame not specified, using snapshot');
+      $frame = array('FrameId'=>'snapshot', 'Type'=>'', 'Delta'=>0);
     } else {
-      $captImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyze.jpg', $frame['FrameId'] );
+      $captImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyze.jpg', $frame['FrameId']);
       if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
-        $captImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-capture.jpg', $frame['FrameId'] );
-        if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
+        $captImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-capture.jpg', $frame['FrameId']);
+        if ( !file_exists($eventPath.'/'.$captImage) ) {
           # Generate the frame JPG
           if ( $Event->DefaultVideo() ) {
             $videoPath = $eventPath.'/'.$Event->DefaultVideo();
 
-            if ( ! file_exists( $videoPath ) ) {
-              Error("Event claims to have a video file, but it does not seem to exist at $videoPath" );
+            if ( !file_exists($videoPath) ) {
+              Error('Event claims to have a video file, but it does not seem to exist at '.$videoPath);
               return '';
             } 
               
             #$command ='ffmpeg -v 0 -i '.$videoPath.' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
             $command ='ffmpeg -ss '. $frame['Delta'] .' -i '.$videoPath.' -frames:v 1 '.$eventPath.'/'.$captImage;
-            Logger::Debug( "Running $command" );
+            Logger::Debug('Running '.$command);
             $output = array();
             $retval = 0;
-            exec( $command, $output, $retval );
+            exec($command, $output, $retval);
             Logger::Debug("Retval: $retval, output: " . implode("\n", $output));
           } else {
-            Error("Can't create frame images from video because there is no video file for event ".$Event->Id().' at ' .$Event->Path() );
+            Error('Can\'t create frame images from video because there is no video file for event '.$Event->Id().' at ' .$Event->Path());
           }
         } // end if capture file exists
       } // end if analyze file exists
-    }
+    } // end if frame or snapshot
 
     $captPath = $eventPath.'/'.$captImage;
-    if ( ! file_exists($captPath) ) {
-      Error("Capture file does not exist at $captPath");
+    if ( !file_exists($captPath) ) {
+      Error('Capture file does not exist at '.$captPath);
     }
     
-    //echo "CI:$captImage, CP:$captPath, TCP:$captPath<br>";
-
     $analImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $frame['FrameId']);
     $analPath = $eventPath.'/'.$analImage;
 
-    //echo "AI:$analImage, AP:$analPath, TAP:$analPath<br>";
-
-    $alarmFrame = $frame['Type']=='Alarm';
+    $alarmFrame = $frame['Type'] == 'Alarm';
 
     $hasAnalImage = $alarmFrame && file_exists($analPath) && filesize($analPath);
     $isAnalImage = $hasAnalImage && !$captureOnly;
 
-    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists('imagecreatefromjpeg') ) {
+    if ( !ZM_WEB_SCALE_THUMBS || ($scale >= SCALE_BASE) || !function_exists('imagecreatefromjpeg') ) {
       $imagePath = $thumbPath = $isAnalImage ? $analPath : $captPath;
       $imageFile = $imagePath;
       $thumbFile = $thumbPath;
     } else {
-      if ( version_compare( phpversion(), '4.3.10', '>=') )
+      if ( version_compare(phpversion(), '4.3.10', '>=') )
         $fraction = sprintf('%.3F', $scale/SCALE_BASE);
       else
         $fraction = sprintf('%.3f', $scale/SCALE_BASE);
       $scale = (int)round($scale);
 
-      $thumbCaptPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $captPath );
-      $thumbAnalPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $analPath );
+      $thumbCaptPath = preg_replace('/\.jpg$/', "-$scale.jpg", $captPath);
+      $thumbAnalPath = preg_replace('/\.jpg$/', "-$scale.jpg", $analPath);
 
       if ( $isAnalImage ) {
         $imagePath = $analPath;
@@ -478,19 +469,19 @@ class Event {
       }
 
       $thumbFile = $thumbPath;
-      if ( $overwrite || ! file_exists( $thumbFile ) || ! filesize( $thumbFile ) ) {
+      if ( $overwrite || ! file_exists($thumbFile) || ! filesize($thumbFile) ) {
         // Get new dimensions
-        list( $imageWidth, $imageHeight ) = getimagesize( $imagePath );
+        list($imageWidth, $imageHeight) = getimagesize($imagePath);
         $thumbWidth = $imageWidth * $fraction;
         $thumbHeight = $imageHeight * $fraction;
 
         // Resample
-        $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
-        $image = imagecreatefromjpeg( $imagePath );
-        imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
+        $thumbImage = imagecreatetruecolor($thumbWidth, $thumbHeight);
+        $image = imagecreatefromjpeg($imagePath);
+        imagecopyresampled($thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight);
 
-        if ( !imagejpeg( $thumbImage, $thumbPath ) )
-          Error( "Can't create thumbnail '$thumbPath'" );
+        if ( !imagejpeg($thumbImage, $thumbPath) )
+          Error("Can't create thumbnail '$thumbPath'");
       }
     } # Create thumbnails
 
@@ -507,83 +498,8 @@ class Event {
         );
 
     return $imageData;
-  }
+  } # getImageSrc
 
-  public static function find_one( $parameters = null, $options = null ) {
-    global $event_cache;
-    if (
-        ( count($parameters) == 1 ) and
-        isset($parameters['Id']) and
-        isset($event_cache[$parameters['Id']]) ) {
-      return $event_cache[$parameters['Id']];
-    }
-    $results = Event::find( $parameters, $options );
-    if ( count($results) > 1 ) {
-      Error("Event Returned more than 1");
-      return $results[0];
-    } else if ( count($results) ) {
-      return $results[0];
-    } else {
-      return null;
-    }
-  }
-
-  public static function find( $parameters = null, $options = null ) {
-    $sql = 'SELECT * FROM Events ';
-    $values = array();
-
-    if ( $parameters ) {
-      $fields = array();
-      $sql .= 'WHERE ';
-      foreach ( $parameters as $field => $value ) {
-        if ( $value == null ) {
-          $fields[] = $field.' IS NULL';
-        } else if ( is_array( $value ) ) {
-          $func = function(){return '?';};
-          $fields[] = $field.' IN ('.implode(',', array_map( $func, $value ) ). ')';
-          $values += $value;
-
-        } else {
-          $fields[] = $field.'=?';
-          $values[] = $value;
-        }
-      }
-      $sql .= implode(' AND ', $fields );
-    }
-    if ( $options ) {
-      if ( isset($options['order']) ) {
-        $sql .= ' ORDER BY ' . $options['order'];
-      }
-      if ( isset($options['limit']) ) {
-        if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
-          $sql .= ' LIMIT ' . $options['limit'];
-        } else {
-          $backTrace = debug_backtrace();
-          $file = $backTrace[1]['file'];
-          $line = $backTrace[1]['line'];
-          Error("Invalid value for limit(".$options['limit'].") passed to Event::find from $file:$line");
-          return array();
-        }
-      }
-    }
-    $filters = array();
-    $result = dbQuery($sql, $values);
-    if ( $result ) {
-      $results = $result->fetchALL();
-      foreach ( $results as $row ) {
-        $filters[] = new Event($row);
-      }
-    }
-    return $filters;
-  }
-
-  public function save( ) {
-    
-    $sql = 'UPDATE Events SET '.implode(', ', array_map( function($field) {return $field.'=?';}, $this->fields ) ) . ' WHERE Id=?';
-    $values = array_map( function($field){return $this->{$field};}, $this->fields );
-    $values[] = $this->{'Id'};
-    dbQuery( $sql, $values );
-  }
   public function link_to($text=null) {
     if ( !$text )
       $text = $this->{'Id'};
@@ -605,11 +521,12 @@ class Event {
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
           $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-        } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");
@@ -648,15 +565,16 @@ class Event {
     $Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server();
     if ( $Server->Id() != ZM_SERVER_ID ) {
 
-      $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json';
+      $url = $Server->UrlToApi().'/events/'.$this->{'Id'}.'.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
         } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");
@@ -686,18 +604,14 @@ class Event {
 
   public function can_delete() {
     if ( $this->Archived() ) {
-      Logger::Debug("Am archived, can't delete");
       return false;
     }
     if ( !$this->EndTime() ) {
-      Logger::Debug("No EndTime can't delete");
       return false;
     }
     if ( !canEdit('Events') ) {
-      Logger::Debug("No permission to edit events, can't delete");
       return false;
     }
-    Logger::Debug("Can delete: archived: " . $this->Archived() . " endtime: " . $this->EndTime() );
 
     return true;
   }
diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index fbe877d7e..3490c276c 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -9,8 +9,11 @@ class Filter extends ZM_Object {
     'Id'              =>  null,
     'Name'            =>  '',
     'AutoExecute'     =>  0,
-    'AutoExecuteCmd'  =>  0,
+    'AutoExecuteCmd'  =>  '',
     'AutoEmail'       =>  0,
+		'EmailTo'					=>	'',
+		'EmailSubject'		=>	'',
+		'EmailBody'				=>	'',
     'AutoDelete'      =>  0,
     'AutoArchive'     =>  0,
     'AutoVideo'       =>  0,
@@ -21,14 +24,110 @@ class Filter extends ZM_Object {
     'AutoCopy'        =>  0,
     'AutoCopyTo'      =>  0,
     'UpdateDiskSpace' =>  0,
+    'UserId'          =>  0,
     'Background'      =>  0,
     'Concurrent'      =>  0,
     'Query_json'      =>  '',
   );
 
+  protected $_querystring;
+  protected $_sql;
+  protected $_hidden_fields;
+  public $_pre_sql_conditions;
+  public $_post_sql_conditions;
+  protected $_Terms;
+
+  public function sql() {
+    if ( ! isset($this->_sql) ) {
+      foreach ( $this->FilterTerms() as $term ) {
+        #if ( ! ($term->is_pre_sql() or $term->is_post_sql()) ) {
+          $this->_sql .= $term->sql();
+        #} else {
+          #$this->_sql .= '1';
+        #}
+      } # end foreach term
+    }
+    return $this->_sql;
+  }
+
+  public function querystring($separator='&amp;') {
+    if ( (! isset($this->_querystring)) or ( $separator != '&amp;' ) ) {
+      foreach ( $this->FilterTerms() as $term ) {
+        $this->_querystring .= $term->querystring($separator);
+      } # end foreach term
+    }
+    return $this->_querystring;
+  }
+
+  public function hidden_fields() {
+    if ( ! isset($this->_hidden_fields) ) {
+      foreach ( $this->FilterTerms() as $term ) {
+        $this->_hidden_fields .= $term->hidden_fields();
+      } # end foreach term
+    }
+    return $this->_hidden_fields;
+  }
+
+  public function pre_sql_conditions() {
+    if ( ! isset($this->_pre_sql_conditions) ) {
+      $this->_pre_sql_conditions = array();
+      foreach ( $this->FilterTerms() as $term ) {
+        if ( $term->is_pre_sql() )
+          $this->_pre_sql_conditions[] = $term;
+      } # end foreach term
+    }
+    return $this->_pre_sql_conditions;
+  }
+
+  public function post_sql_conditions() {
+
+    if ( ! isset($this->_post_sql_conditions) ) {
+      $this->_post_sql_conditions = array();
+      foreach ( $this->FilterTerms() as $term ) {
+        if ( $term->is_post_sql() )
+          $this->_post_sql_conditions[] = $term;
+      } # end foreach term
+    }
+    return $this->_post_sql_conditions;
+  }
+
+  public function FilterTerms() { 
+    if ( ! isset($this->Terms) ) {
+      $this->Terms = array();
+      $_terms = $this->terms();
+      for ( $i = 0; $i < count($_terms); $i++ ) {
+        $term = new FilterTerm($this, $_terms[$i], $i);
+        $this->Terms[] = $term;
+      } # end foreach term
+    }
+    return $this->Terms;
+  }
+
+  public static function parse($new_filter, $querySep='&amp;') {
+    $filter = new Filter();
+    $filter->Query($new_filter['Query']);
+    return $filter;
+  }
+
+  # If no storage areas are specified in the terms, then return all
+  public function get_StorageAreas() {
+    $storage_ids = array();
+    foreach ( $this->Terms as $term ) {
+      if ( $term->attr == 'StorageId' ) {
+        # TODO handle other operators like !=
+        $storage_ids[] = $term->value;
+      }
+    }
+    if ( count($storage_ids) ) {
+      return Storage::find(array('Id'=>$storage_ids));
+    } else {
+      return Storage::find();
+    }
+  } # end function get_StorageAreas
+
   public function Query_json() {
     if ( func_num_args( ) ) {
-      $this->{'Query_json'} = func_get_arg(0);;
+      $this->{'Query_json'} = func_get_arg(0);
       $this->{'Query'} = jsonDecode($this->{'Query_json'});
     }
     return $this->{'Query_json'};
@@ -36,11 +135,11 @@ class Filter extends ZM_Object {
 
   public function Query() {
     if ( func_num_args( ) ) {
-      $this->{'Query'} = func_get_arg(0);;
+      $this->{'Query'} = func_get_arg(0);
       $this->{'Query_json'} = jsonEncode($this->{'Query'});
     }
-    if ( !array_key_exists('Query', $this) ) {
-      if ( array_key_exists('Query_json', $this) and $this->{'Query_json'} ) {
+    if ( !property_exists($this, 'Query') ) {
+      if ( property_exists($this, 'Query_json') and $this->{'Query_json'} ) {
         $this->{'Query'} = jsonDecode($this->{'Query_json'});
       } else {
         $this->{'Query'} = array();
@@ -97,7 +196,7 @@ class Filter extends ZM_Object {
     if ( isset( $this->Query()['sort_asc'] ) ) {
       return $this->{'Query'}['sort_asc'];
     }
-    return ZM_WEB_EVENT_SORT_ORDER;
+    return ZM_WEB_EVENT_SORT_ORDER == 'asc' ? 1 : 0;
     #return $this->defaults{'sort_asc'};
   }
 
@@ -115,13 +214,17 @@ class Filter extends ZM_Object {
 
   public function control($command, $server_id=null) {
     $Servers = $server_id ? Server::find(array('Id'=>$server_id)) : Server::find(array('Status'=>'Running'));
-    if ( !count($Servers) and !$server_id ) {
-      # This will be the non-multi-server case
-      $Servers = array(new Server());
+    if ( !count($Servers) ) {
+      if ( !$server_id ) {
+        # This will be the non-multi-server case
+        $Servers = array(new Server());
+      } else {
+        Warning("Server not found for id $server_id");
+      }
     }
     foreach ( $Servers as $Server ) {
 
-      if ( !defined('ZM_SERVER_ID') or !$Server->Id() or ZM_SERVER_ID==$Server->Id() ) {
+      if ( (!defined('ZM_SERVER_ID')) or (!$Server->Id()) or (ZM_SERVER_ID==$Server->Id()) ) {
         # Local
         Logger::Debug("Controlling filter locally $command for server ".$Server->Id());
         daemonControl($command, 'zmfilter.pl', '--filter_id='.$this->{'Id'}.' --daemon');
@@ -139,7 +242,7 @@ class Filter extends ZM_Object {
             $url = '?user='.$_SESSION['username'];
           }
         }
-        $url .= '&view=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId='.$Server->Id();
+        $url .= '&view=filter&object=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId='.$Server->Id();
         Logger::Debug("sending command to $url");
         $data = array();
         if ( defined('ZM_ENABLE_CSRF_MAGIC') ) {
@@ -168,6 +271,350 @@ class Filter extends ZM_Object {
     } # end foreach erver
   } # end function control
 
+  public function execute() {
+    $command = ZM_PATH_BIN.'/zmfilter.pl --filter_id='.escapeshellarg($this->Id());
+    $result = exec($command, $output, $status);
+    Logger::Debug("$command status:$status output:".implode("\n", $output));
+    return $status;
+  }
+
+  public function test_pre_sql_conditions() {
+    if ( !count($this->pre_sql_conditions()) ) {
+      return true;
+    } # end if pre_sql_conditions
+
+    $failed = false;
+    foreach ( $this->pre_sql_conditions() as $term ) {
+      if ( !$term->test() ) {
+        $failed = true;
+        break;
+      }
+    }
+    return $failed;
+  }
+
+  public function test_post_sql_conditions($event) {
+    if ( !count($this->post_sql_conditions()) ) {
+      return true;
+    } # end if pre_sql_conditions
+
+    $failed = true;
+    foreach ( $this->post_sql_conditions() as $term ) {
+      if ( !$term->test($event) ) {
+        $failed = false;
+        break;
+      }
+    }
+    return $failed;
+  }
+
+  function tree() {
+    $terms = $this->terms();
+
+    if ( count($terms) <= 0 ) {
+      return false;
+    }
+
+    $StorageArea = NULL;
+
+    $postfixExpr = array();
+    $postfixStack = array();
+
+    $priorities = array(
+      '<' => 1,
+      '<=' => 1,
+      '>' => 1,
+      '>=' => 1,
+      '=' => 2,
+      '!=' => 2,
+      '=~' => 2,
+      '!~' => 2,
+      '=[]' => 2,
+      '![]' => 2,
+      'and' => 3,
+      'or' => 4,
+    );
+
+    for ( $i = 0; $i < count($terms); $i++ ) {
+      $term = $terms[$i];
+      if ( !empty($term['cnj']) ) {
+        while( true ) {
+          if ( !count($postfixStack) ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } elseif ( $priorities[$term['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } else {
+            $postfixExpr[] = array_pop($postfixStack);
+          }
+        }
+      } # end if ! empty cnj
+
+      if ( !empty($term['obr']) ) {
+        for ( $j = 0; $j < $term['obr']; $j++ ) {
+          $postfixStack[] = array('type'=>'obr', 'value'=>$term['obr']);
+        }
+      }
+      if ( !empty($term['attr']) ) {
+        $dtAttr = false;
+        switch ( $term['attr']) {
+        case 'MonitorName':
+          $sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $term['attr']);
+          break;
+        case 'ServerId':
+          $sqlValue .= 'M.ServerId';
+          break;
+        case 'StorageServerId':
+          $sqlValue .= 'S.ServerId';
+          break;
+        case 'FilterServerId':
+          $sqlValue .= ZM_SERVER_ID;
+          break;
+        case 'DateTime':
+        case 'StartDateTime':
+          $sqlValue = 'E.StartTime';
+          $dtAttr = true;
+          break;
+        case 'Date':
+        case 'StartDate':
+          $sqlValue = 'to_days(E.StartTime)';
+          $dtAttr = true;
+          break;
+        case 'Time':
+        case 'StartTime':
+          $sqlValue = 'extract(hour_second from E.StartTime)';
+          break;
+        case 'Weekday':
+        case 'StartWeekday':
+          $sqlValue = 'weekday(E.StartTime)';
+          break;
+        case 'EndDateTime':
+          $sqlValue = 'E.EndTime';
+          $dtAttr = true;
+          break;
+        case 'EndDate':
+          $sqlValue = 'to_days(E.EndTime)';
+          $dtAttr = true;
+          break;
+        case 'EndTime':
+          $sqlValue = 'extract(hour_second from E.EndTime)';
+          break;
+        case 'EndWeekday':
+          $sqlValue = 'weekday(E.EndTime)';
+          break;
+        case 'Id':
+        case 'Name':
+        case 'MonitorId':
+        case 'StorageId':
+        case 'SecondaryStorageId':
+        case 'Length':
+        case 'Frames':
+        case 'AlarmFrames':
+        case 'TotScore':
+        case 'AvgScore':
+        case 'MaxScore':
+        case 'Cause':
+        case 'Notes':
+        case 'StateId':
+        case 'Archived':
+          $sqlValue = 'E.'.$term['attr'];
+          break;
+        case 'DiskPercent':
+          // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
+          if ( ! $StorageArea ) {
+            for ( $j = 0; $j < count($terms); $j++ ) {
+              if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                $StorageArea = new Storage($terms[$j]['val']);
+                break;
+              }
+            } // end foreach remaining term
+            if ( ! $StorageArea ) $StorageArea = new Storage();
+          } // end no StorageArea found yet
+          $sqlValue = getDiskPercent($StorageArea);
+          break;
+        case 'DiskBlocks':
+          // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
+          if ( ! $StorageArea ) {
+            for ( $j = 0; $j < count($terms); $j++ ) {
+              if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                $StorageArea = new Storage($terms[$j]['val']);
+                break;
+              }
+            } // end foreach remaining term
+            if ( ! $StorageArea ) $StorageArea = new Storage();
+          } // end no StorageArea found yet
+          $sqlValue = getDiskBlocks($StorageArea);
+          break;
+        default :
+          $sqlValue = $term['attr'];
+          break;
+        }
+        if ( $dtAttr ) {
+          $postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
+        } else {
+          $postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue);
+        }
+      } # end if attr
+
+      if ( isset($term['op']) ) {
+        if ( empty($term['op']) ) {
+          $term['op'] = '=';
+        }
+        switch ( $term['op']) {
+        case '=' :
+        case '!=' :
+        case '>=' :
+        case '>' :
+        case '<' :
+        case '<=' :
+        case 'LIKE' :
+        case 'NOT LIKE':
+          $sqlValue = $term['op'];
+          break;
+        case '=~' :
+          $sqlValue = 'regexp';
+          break;
+        case '!~' :
+          $sqlValue = 'not regexp';
+          break;
+        case '=[]' :
+        case 'IN' :
+          $sqlValue = 'in (';
+          break;
+        case '![]' :
+          $sqlValue = 'not in (';
+          break;
+        case 'IS' :
+        case 'IS NOT' :
+          if ( $term['val'] == 'Odd' )  {
+            $sqlValue .= ' % 2 = 1';
+          } else if ( $term['val'] == 'Even' )  {
+            $sqlValue .= ' % 2 = 0';
+          } else {
+            $sqlValue .= ' '.$term['op'];
+          }
+          break;
+        default :
+          ZM\Error('Unknown operator in filter '.$term['op']);
+        }
+
+        while( true ) {
+          if ( !count($postfixStack) ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
+            break;
+          } elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
+            break;
+          } elseif ( $priorities[$term['op']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue );
+            break;
+          } else {
+            $postfixExpr[] = array_pop($postfixStack);
+          }
+        } // end while
+      } // end if operator
+
+      if ( isset($term['val']) ) {
+        $valueList = array();
+        foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
+          switch ( $term['attr'] ) {
+          case 'MonitorName':
+          case 'Name':
+          case 'Cause':
+          case 'Notes':
+            if ( $term['op'] == 'LIKE' || $term['op'] == 'NOT LIKE' ) {
+              $value = '%'.$value.'%';
+            }
+            $value = dbEscape($value);
+            break;
+          case 'MonitorServerId':
+          case 'FilterServerId':
+          case 'StorageServerId':
+          case 'ServerId':
+            if ( $value == 'ZM_SERVER_ID' ) {
+              $value = ZM_SERVER_ID;
+            } else if ( $value == 'NULL' ) {
+
+            } else {
+              $value = dbEscape($value);
+            }
+            break;
+          case 'StorageId':
+            $StorageArea = new Storage($value);
+            if ( $value != 'NULL' )
+              $value = dbEscape($value);
+            break;
+          case 'DateTime':
+          case 'EndDateTime':
+          case 'StartDateTime':
+            $value = "'".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."'";
+            break;
+          case 'Date':
+          case 'EndDate':
+          case 'StartDate':
+            $value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          case 'Time':
+          case 'EndTime':
+          case 'StartTime':
+            $value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          case 'Weekday':
+          case 'EndWeekday':
+          case 'StartWeekday':
+            $value = 'weekday(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          default :
+            if ( $value != 'NULL' )
+              $value = dbEscape($value);
+          } // end switch attribute
+          $valueList[] = $value;
+        } // end foreach value
+        $postfixExpr[] = array('type'=>'val', 'value'=>$term['val'], 'sqlValue'=>join(',', $valueList));
+      } // end if has val
+
+      if ( !empty($term['cbr']) ) {
+        for ( $j = 0; $j < $term['cbr']; $j++ ) {
+          while ( count($postfixStack) ) {
+            $element = array_pop($postfixStack);
+            if ( $element['type'] == 'obr' ) {
+              $postfixExpr[count($postfixExpr)-1]['bracket'] = true;
+              break;
+            }
+            $postfixExpr[] = $element;
+          }
+        }
+      } #end if cbr
+    } # end foreach term
+
+    while ( count($postfixStack) ) {
+      $postfixExpr[] = array_pop($postfixStack);
+    }
+
+    $exprStack = array();
+    foreach ( $postfixExpr as $element ) {
+      if ( $element['type'] == 'attr' || $element['type'] == 'val' ) {
+        $node = array('data'=>$element, 'count'=>0);
+        $exprStack[] = $node;
+      } elseif ( $element['type'] == 'op' || $element['type'] == 'cnj' ) {
+        $right = array_pop($exprStack);
+        $left = array_pop($exprStack);
+        $node = array('data'=>$element, 'count'=>2+$left['count']+$right['count'], 'right'=>$right, 'left'=>$left);
+        $exprStack[] = $node;
+      } else {
+        ZM\Fatal('Unexpected element type \''.$element['type'].'\', value \''.$element['value'].'\'');
+      }
+    }
+    if ( count($exprStack) != 1 ) {
+      ZM\Fatal('Expression stack has '.count($exprStack).' elements');
+    }
+    return array_pop($exprStack);
+  } # end function tree
+
 } # end class Filter
 
 ?>
diff --git a/web/includes/FilterTerm.php b/web/includes/FilterTerm.php
new file mode 100644
index 000000000..02be63833
--- /dev/null
+++ b/web/includes/FilterTerm.php
@@ -0,0 +1,420 @@
+<?php
+
+namespace ZM;
+$validConjunctionTypes = null;
+
+function getFilterQueryConjunctionTypes() {
+  if ( !isset($validConjunctionTypes ) ) {
+    $validConjunctionTypes = array(
+      'and' => translate('ConjAnd'),
+      'or'  => translate('ConjOr')
+    );
+  }
+  return $validConjunctionTypes;
+}
+
+class FilterTerm {
+  public $filter;
+  public $index;
+  public $attr;
+  public $op;
+  public $val;
+  public $values;
+  public $cnj;
+  public $obr;
+  public $cbr;
+
+
+  public function __construct($filter = null, $term = NULL, $index=0) {
+    $this->filter = $filter;
+    $validConjunctionTypes = getFilterQueryConjunctionTypes();
+
+    $this->index = $index;
+    $this->attr = $term['attr'];
+    $this->op = $term['op'];
+    $this->val = $term['val'];
+    if ( isset($term['cnj']) ) {
+      if ( array_key_exists($term['cnj'], $validConjunctionTypes) ) {
+      $this->cnj = $term['cnj'];
+      } else {
+        Warning('Invalid cnj ' . $term['cnj'].' in '.print_r($term, true));
+      }
+    }
+
+    if ( isset($term['obr']) ) {
+      if ( (string)(int)$term['obr'] == $term['obr'] ) {
+        $this->obr = $term['obr'];
+      } else {
+        Warning('Invalid obr ' . $term['obr'] . ' in ' . print_r($term, true));
+      }
+    }
+    if ( isset($term['cbr']) ) {
+      if ( (string)(int)$term['cbr'] == $term['cbr'] ) {
+        $this->cbr = $term['cbr'];
+      } else {
+        Warning('Invalid cbr ' . $term['cbr'] . ' in ' . print_r($term, true));
+      }
+    }
+  } # end function __construct
+
+  # Returns an array of values.  AS term->value can be a list, we will break it apart, remove quotes etc
+  public function sql_values() {
+    $values = array();
+    if ( !isset($this->val) ) {
+      Logger::Warning('No value in term'.$this->attr);
+      return $values;
+    }
+
+    foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $this->val)) as $value ) {
+
+      switch ( $this->attr ) {
+
+      case 'AlarmedZoneId':
+        $value = '(SELECT * FROM Stats WHERE EventId=E.Id AND ZoneId='.$value.')';
+        break;
+      case 'ExistsInFileSystem':
+        $value = '';
+        break;
+      case 'DiskSpace':
+        $value = '';
+        break;
+      case 'MonitorName':
+      case 'MonitorName':
+      case 'Name':
+      case 'Cause':
+      case 'Notes':
+        if ( $this->op == 'LIKE' || $this->op == 'NOT LIKE' ) {
+          $value = '%'.$value.'%';
+        }
+        $value = dbEscape($value);
+        break;
+      case 'MonitorServerId':
+      case 'FilterServerId':
+      case 'StorageServerId':
+      case 'ServerId':
+        if ( $value == 'ZM_SERVER_ID' ) {
+          $value = ZM_SERVER_ID;
+        } else if ( $value == 'NULL' ) {
+
+        } else {
+          $value = dbEscape($value);
+        }
+        break;
+      case 'StorageId':
+        if ( $value != 'NULL' ) {
+          $value = dbEscape($value);
+        }
+        break;
+      case 'DateTime':
+      case 'StartDateTime':
+      case 'EndDateTime':
+        if ( $value != 'NULL' )
+          $value = '\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\'';
+        break;
+      case 'Date':
+      case 'StartDate':
+      case 'EndDate':
+        if ( $value == 'CURDATE()' or $value == 'NOW()' ) {
+          $value = 'to_days('.$value.')';
+        } else if ( $value != 'NULL' ) {
+          $value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+        }
+        break;
+      case 'Time':
+      case 'StartTime':
+      case 'EndTime':
+        if ( $value != 'NULL' )
+          $value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+        break;
+      default :
+        if ( $value == 'Odd' ) {
+          $value = 1;
+        } else if ( $value == 'Even' ) {
+          $value = 0;
+        } else if ( $value != 'NULL' )
+          $value = dbEscape($value);
+        break;
+      }
+      $values[] = $value;
+    } // end foreach value
+    return $values;
+  } # end function sql_values
+
+  public function sql_operator() {
+    switch ( $this->attr ) {
+    case 'AlarmZoneId':
+      return ' EXISTS ';
+    case 'ExistsInFileSystem':
+    case 'DiskSpace':
+      return '';
+    }
+
+
+    switch ( $this->op ) {
+    case '=' :
+    case '!=' :
+    case '>=' :
+    case '>' :
+    case '<' :
+    case '<=' :
+    case 'LIKE' :
+    case 'NOT LIKE':
+      return ' '.$this->op.' ';
+    case '=~' :
+      return ' regexp ';
+    case '!~' :
+      return ' not regexp ';
+    case '=[]' :
+    case 'IN' :
+      return ' IN ';
+    case '![]' :
+      return ' NOT IN ';
+    case 'EXISTS' :
+     return ' EXISTS ';
+    case 'IS' :
+      # Odd will be replaced with 1
+      # Even will be replaced with 0
+      if ( $this->val == 'Odd' or $this->val == 'Even' )  {
+        return ' % 2 = ';
+      } else {
+        return ' IS ';
+      }
+    case 'IS NOT' :
+      if ( $this->val == 'Odd' or $this->val == 'Even' )  {
+        return ' % 2 = ';
+      }
+      return ' IS NOT ';
+    default:
+      ZM\Warning('Invalid operator in filter: ' . print_r($this->op, true));
+    } // end switch op
+  } # end public function sql_operator
+
+  /* Some terms don't have related SQL */
+  public function sql() {
+
+    $sql = '';
+    if ( isset($this->cnj) ) {
+      $sql .= ' '.$this->cnj.' ';
+    }
+    if ( isset($this->obr) ) {
+      $sql .= ' '.str_repeat('(', $this->obr).' ';
+    }
+
+    switch ( $this->attr ) {
+    case 'ExistsInFileSystem':
+    case 'DiskSpace':
+      $sql .= 'TRUE /*'.$this->attr.'*/';
+      break;
+    case 'MonitorName':
+      $sql .= 'M.Name';
+      break;
+    case 'ServerId':
+    case 'MonitorServerId':
+      $sql .= 'M.ServerId';
+      break;
+    case 'StorageServerId':
+      $sql .= 'S.ServerId';
+      break;
+    case 'FilterServerId':
+      $sql .= ZM_SERVER_ID;
+      break;
+      # Unspecified start or end, so assume start, this is to support legacy filters
+    case 'DateTime':
+      $sql .= 'E.StartTime';
+      break;
+    case 'Date':
+      $sql .= 'to_days(E.StartTime)';
+      break;
+    case 'Time':
+      $sql .= 'extract(hour_second FROM E.StartTime)';
+      break;
+    case 'Weekday':
+      $sql .= 'weekday(E.StartTime)';
+      break;
+      # Starting Time
+    case 'StartDateTime':
+      $sql .= 'E.StartTime';
+      break;
+    case 'FramesEventId':
+      $sql .= 'F.EventId';
+      break;
+    case 'StartDate':
+      $sql .= 'to_days(E.StartTime)';
+      break;
+    case 'StartTime':
+      $sql .= 'extract(hour_second FROM E.StartTime)';
+      break;
+    case 'StartWeekday':
+      $sql .= 'weekday(E.StartTime)';
+      break;
+      # Ending Time
+    case 'EndDateTime':
+      $sql .= 'E.EndTime';
+      break;
+    case 'EndDate':
+      $sql .= 'to_days(E.EndTime)';
+      break;
+    case 'EndTime':
+      $sql .= 'extract(hour_second FROM E.EndTime)';
+      break;
+    case 'EndWeekday':
+      $sql .= 'weekday(E.EndTime)';
+      break;
+    case 'Id':
+    case 'Name':
+    case 'EventDiskSpace':
+    case 'MonitorId':
+    case 'StorageId':
+    case 'SecondaryStorageId':
+    case 'Length':
+    case 'Frames':
+    case 'AlarmFrames':
+    case 'TotScore':
+    case 'AvgScore':
+    case 'MaxScore':
+    case 'Cause':
+    case 'Notes':
+    case 'StateId':
+    case 'Archived':
+      $sql .= 'E.'.$this->attr;
+    }
+    $sql .= $this->sql_operator();
+    $values = $this->sql_values();
+    if ( (count($values) > 1) or ($this->op == 'IN') or ($this->op == 'NOT IN') ) {
+      $sql .= '('.join(',', $values).')';
+    } else {
+      $sql .= $values[0];
+    }
+
+    if ( isset($this->cbr) ) {
+      $sql .= ' '.str_repeat(')', $this->cbr).' ';
+    }
+    return $sql;
+  } # end public function sql
+
+  public function querystring($querySep='&amp;') {
+    # We don't validate the term parameters here
+    $query = '';
+    if ( $this->cnj ) 
+      $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][cnj]').'='.$this->cnj;
+    if ( $this->obr )
+      $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][obr]').'='.$this->obr;
+
+    $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][attr]').'='.urlencode($this->attr);
+    $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][op]').'='.urlencode($this->op);
+    $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][val]').'='.urlencode($this->val);
+    if ( $this->cbr )
+      $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][cbr]').'='.$this->cbr;
+    return $query;
+  } # end public function querystring
+
+  public function hidden_fields() {
+    $html ='';
+    if ( $this->cnj )
+      $html .= '<input type="hidden" name="filter[Query][terms]['.$this->index.'][cnj]" value="'.$this->cnj.'"/>'.PHP_EOL;
+
+    if ( $this->obr )
+      $html .= '<input type="hidden" name="filter[Query][terms]['.$this->index.'][obr]" value="'.$this->obr.'"/>'.PHP_EOL;
+
+    # attr should have been already validation, so shouldn't need htmlspecialchars
+    $html .= '<input type="hidden" name="filter[Query][terms]['.$this->index.'][attr]" value="'.htmlspecialchars($this->attr).'"/>'.PHP_EOL;
+    $html .= '<input type="hidden" name="filter[Query][terms]['.$this->index.'][op]" value="'.htmlspecialchars($this->op).'"/>'.PHP_EOL;
+    $html .= '<input type="hidden" name="filter[Query][terms]['.$this->index.'][val]" value="'.htmlspecialchars($this->val).'"/>'.PHP_EOL;
+    if ( $this->cbr )
+      $html .= '<input type="hidden" name="filter[Query][terms]['.$this->index.'][cbr]" value="'.$this->cbr.'"/>'.PHP_EOL;
+
+    return $html;
+  } # end public function hiddens_fields
+
+  public function test($event=null) {
+    if ( !isset($event) ) {
+      # Is a Pre Condition
+      Logger::Debug("Testing " . $this->attr);
+      if ( $this->attr == 'DiskPercent' ) {
+        # The logic on this is really ugly.  We are going to treat it as an OR
+        foreach ( $this->filter->get_StorageAreas() as $storage ) {
+          $string_to_eval = 'return $storage->disk_usage_percent() '.$this->op.' '.$this->val.';';
+          try {
+            $ret = eval($string_to_eval);
+            Logger::Debug("Evalled $string_to_eval = $ret");
+            if ( $ret )
+              return true;
+          } catch ( Throwable $t ) {
+            Error('Failed evaluating '.$string_to_eval);
+            return false;
+          }
+        } # end foreach Storage Area
+      } else if ( $this->attr == 'SystemLoad' ) {
+        $string_to_eval = 'return getLoad() '.$this->op.' '.$this->val.';';
+        try {
+          $ret = eval($string_to_eval);
+          Logger::Debug("Evaled $string_to_eval = $ret");
+          if ( $ret )
+            return true;
+        } catch ( Throwable $t ) {
+          Error('Failed evaluating '.$string_to_eval);
+          return false;
+        }
+      } else {
+        Error('testing unsupported pre term ' . $this->attr);
+      }
+    } else {
+      # Is a Post Condition 
+      if ( $this->attr == 'ExistsInFileSystem' ) {
+        if ( 
+          ($this->op == 'IS' and $this->val == 'True')
+          or
+          ($this->op == 'IS NOT' and $this->val == 'False')
+        ) {
+          return file_exists($event->Path());
+        } else {
+          return !file_exists($event->Path());
+        }
+      } else if ( $this->attr == 'DiskPercent' ) {
+        $string_to_eval = 'return $event->Storage()->disk_usage_percent() '.$this->op.' '.$this->val.';';
+        try {
+          $ret = eval($string_to_eval);
+          Logger::Debug("Evalled $string_to_eval = $ret");
+          if ( $ret )
+            return true;
+        } catch ( Throwable $t ) {
+          Error('Failed evaluating '.$string_to_eval);
+          return false;
+        }
+      } else if ( $this->attr == 'DiskBlocks' ) {
+        $string_to_eval = 'return $event->Storage()->disk_usage_blocks() '.$this->op.' '.$this->val.';';
+        try {
+          $ret = eval($string_to_eval);
+          Logger::Debug("Evalled $string_to_eval = $ret");
+          if ( $ret )
+            return true;
+        } catch ( Throwable $t ) {
+          Error('Failed evaluating '.$string_to_eval);
+          return false;
+        }
+      } else {
+        Error('testing unsupported post term ' . $this->attr);
+      }
+    }
+    return false;
+  }
+  
+  public function is_pre_sql() {
+    if ( $this->attr == 'DiskPercent' ) {
+        return true;
+    }
+    return false;
+  }
+
+  public function is_post_sql() {
+    if ( $this->attr == 'ExistsInFileSystem' ) {
+        return true;
+    } else if ( $this->attr == 'DiskPercent' ) {
+        return true;
+    }
+    return false;
+  }
+
+} # end class FilterTerm
+
+?>
diff --git a/web/includes/Frame.php b/web/includes/Frame.php
index 470cc8ffc..1117459dc 100644
--- a/web/includes/Frame.php
+++ b/web/includes/Frame.php
@@ -1,33 +1,28 @@
 <?php
 namespace ZM;
-require_once( 'database.php' );
-require_once( 'Event.php' );
+require_once('database.php');
+require_once('Event.php');
+require_once('Object.php');
 
-class Frame {
-  public function __construct( $IdOrRow=null ) {
-    $row = NULL;
-    if ( $IdOrRow ) {
-      if ( is_integer( $IdOrRow ) or ctype_digit($IdOrRow) ) {
-        $row = dbFetchOne( 'SELECT * FROM Frames WHERE Id=?', NULL, array( $IdOrRow ) );
-        if ( ! $row ) {
-          Error("Unable to load Frame record for Id=" . $IdOrRow );
-        }
-      } elseif ( is_array( $IdOrRow ) ) {
-        $row = $IdOrRow;
-      } else {
-        Error("Unknown argument passed to Frame Constructor ($IdOrRow)");
-        return;
-      }
+class Frame extends ZM_Object {
+  protected static $table = 'Frames';
+  protected $defaults = array(
+    'Id' => null,
+    'EventId' => 0,
+    'FrameId' => 0,
+    'Type' => 'Normal',
+    'TimeStamp' => 0,
+    'Delta' => 0.00,
+    'Score' => 0,
+  );
 
-      if ( $row ) {
-        foreach ($row as $k => $v) {
-          $this->{$k} = $v;
-        }
-      } else {
-        Error("No row for Frame " . $IdOrRow );
-      }
-    } # end if isset($IdOrRow)
-  } // end function __construct
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
 
   public function Storage() {
     return $this->Event()->Storage();
@@ -36,66 +31,11 @@ class Frame {
   public function Event() {
     return new Event( $this->{'EventId'} );
   }
-  public function __call( $fn, array $args){
-    if ( count( $args )  ) {
-      $this->{$fn} = $args[0];
-    }
-    if ( array_key_exists( $fn, $this ) ) {
-      return $this->{$fn};
-
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        Warning( "Unknown function call Frame->$fn from $file:$line" );
-    }
-  }
 
   public function getImageSrc( $show='capture' ) {
     return '?view=image&fid='.$this->{'FrameId'}.'&eid='.$this->{'EventId'}.'&show='.$show;
     #return '?view=image&fid='.$this->{'Id'}.'&show='.$show.'&filename='.$this->Event()->MonitorId().'_'.$this->{'EventId'}.'_'.$this->{'FrameId'}.'.jpg';
   } // end function getImageSrc
 
-	public static function find( $parameters = array(), $options = NULL ) {
-		$sql = 'SELECT * FROM Frames';
-		$values = array();
-		if ( sizeof($parameters) ) {
-			$sql .= ' WHERE ' . implode( ' AND ', array_map( 
-				function($v){ return $v.'=?'; }, 
-				array_keys( $parameters ) 
-				) );
-			$values = array_values( $parameters );
-		}
-    if ( $options ) {
-      if ( isset($options['order']) ) {
-        $sql .= ' ORDER BY ' . $options['order'];
-      }
-      if ( isset($options['limit']) ) {
-        if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
-          $sql .= ' LIMIT ' . $options['limit'];
-        } else {
-          $backTrace = debug_backtrace();
-          $file = $backTrace[1]['file'];
-          $line = $backTrace[1]['line'];
-          Error("Invalid value for limit(".$options['limit'].") passed to Frame::find from $file:$line");
-          return array();
-        }
-      }
-    }
-
-		$results = dbFetchAll($sql, NULL, $values);
-		if ( $results ) {
-		  return array_map( function($id){ return new Frame($id); }, $results );
-		}
-    return array();
-	}
-
-	public static function find_one( $parameters = array(), $options = null ) {
-    $options['limit'] = 1;
-	  $results = Frame::find($parameters, $options);
-	  if ( ! sizeof($results) ) {
-		  return;
-	  }
-	  return $results[0];
-	}
-} # end class
+} # end class Frame
 ?>
diff --git a/web/includes/Group.php b/web/includes/Group.php
index a2ad252cd..f5a78f875 100644
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@@ -18,10 +18,10 @@ class Group extends ZM_Object {
   }
 
   public function delete() {
-    if ( array_key_exists('Id', $this) ) {
-      dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($this->{'Id'}));
-      dbQuery('UPDATE Groups SET ParentId=NULL WHERE ParentId=?', array($this->{'Id'}));
-      dbQuery('DELETE FROM Groups WHERE Id=?', array($this->{'Id'}));
+    if ( property_exists($this, 'Id') ) {
+      dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($this->{'Id'}));
+      dbQuery('UPDATE `Groups` SET `ParentId`=NULL WHERE `ParentId`=?', array($this->{'Id'}));
+      dbQuery('DELETE FROM `Groups` WHERE Id=?', array($this->{'Id'}));
       if ( isset($_COOKIE['zmGroup']) ) {
         if ( $this->{'Id'} == $_COOKIE['zmGroup'] ) {
           unset($_COOKIE['zmGroup']);
@@ -35,7 +35,7 @@ class Group extends ZM_Object {
     if ( isset($new) ) {
       $this->{'depth'} = $new;
     }
-    if ( !array_key_exists('depth', $this) or ($this->{'depth'} === null) ) {
+    if ( !property_exists($this, 'depth') or ($this->{'depth'} === null) ) {
       $this->{'depth'} = 0;
       if ( $this->{'ParentId'} != null ) {
         $Parent = Group::find_one(array('Id'=>$this->{'ParentId'}));
@@ -46,26 +46,26 @@ class Group extends ZM_Object {
   } // end public function depth
 
   public function MonitorIds( ) {
-    if ( ! array_key_exists('MonitorIds', $this) ) {
-      $this->{'MonitorIds'} = dbFetchAll('SELECT MonitorId FROM Groups_Monitors WHERE GroupId=?', 'MonitorId', array($this->{'Id'}));
+    if ( ! property_exists($this, 'MonitorIds') ) {
+      $this->{'MonitorIds'} = dbFetchAll('SELECT `MonitorId` FROM `Groups_Monitors` WHERE `GroupId`=?', 'MonitorId', array($this->{'Id'}));
     }
     return $this->{'MonitorIds'};
   }
 
   public static function get_group_dropdown( ) {
 
-    session_start();
     $selected_group_id = 0;
     if ( isset($_REQUEST['groups']) ) {
       $selected_group_id = $group_id = $_SESSION['groups'] = $_REQUEST['groups'];
     } else if ( isset( $_SESSION['groups'] ) ) {
       $selected_group_id = $group_id = $_SESSION['groups'];
     } else if ( isset($_REQUEST['filtering']) ) {
+      zm_session_start();
       unset($_SESSION['groups']);
+      session_write_close();
     }
-    session_write_close();
 
-    return htmlSelect( 'Group[]', Group::get_dropdown_options(), isset($_SESSION['Group'])?$_SESSION['Group']:null, array(
+    return htmlSelect('GroupId[]', Group::get_dropdown_options(), isset($_SESSION['GroupId'])?$_SESSION['GroupId']:null, array(
           'data-on-change' => 'submitThisForm',
           'class'=>'chosen',
           'multiple'=>'multiple',
@@ -76,7 +76,7 @@ class Group extends ZM_Object {
 
   public static function get_dropdown_options() {
     $Groups = array();
-    foreach ( Group::find( ) as $Group ) {
+    foreach ( Group::find(array(), array('order'=>'lower(Name)')) as $Group ) {
       $Groups[$Group->Id()] = $Group;
     }
 
diff --git a/web/includes/Group_Monitor.php b/web/includes/Group_Monitor.php
new file mode 100644
index 000000000..a015c5e60
--- /dev/null
+++ b/web/includes/Group_Monitor.php
@@ -0,0 +1,20 @@
+<?php
+namespace ZM;
+
+class Group_Monitor extends ZM_Object {
+  protected static $table = 'Groups_Monitors';
+  protected $defaults = array(
+      'Id'        =>  null,
+      'GroupId'   =>  null,
+      'MonitorId' =>  null,
+      );
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+} # end class Group_Monitor
+?>
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 6e17802b4..507e1168e 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -2,290 +2,188 @@
 namespace ZM;
 require_once('database.php');
 require_once('Server.php');
+require_once('Object.php');
+require_once('Control.php');
+require_once('Storage.php');
+require_once('Group.php');
 
-$monitor_cache = array();
+$FunctionTypes = null;
 
-class Monitor {
+function getMonitorFunctionTypes() {
+  if ( !isset($FunctionTypes ) ) {
+    $FunctionTypes = array(
+      'None'    => translate('FnNone'),
+      'Monitor' => translate('FnMonitor'),
+      'Modect'  => translate('FnModect'),
+      'Record'  => translate('FnRecord'),
+      'Mocord'  => translate('FnMocord'),
+      'Nodect'  => translate('FnNodect')
+    );
+  }
+  return $FunctionTypes;
+}
 
-private $defaults = array(
-  'Id' => null,
-  'Name' => '',
-  'ServerId' => 0,
-  'StorageId' => 0,
-  'Type'      =>  'Ffmpeg',
-  'Function' => 'None',
-  'Enabled' => 1,
-  'LinkedMonitors' => null,
-  'Triggers'  =>  null,
-  'Device'  =>  '',
-  'Channel' =>  0,
-  'Format'  =>  '0',
-  'V4LMultiBuffer'  =>  null,
-  'V4LCapturesPerFrame' =>  null,
-  'Protocol'  =>  null,
-  'Method'  =>  '',
-  'Host'  =>  null,
-  'Port'  =>  '',
-  'SubPath' =>  '',
-  'Path'  =>  null,
-  'Options' =>  null,
-  'User'  =>  null,
-  'Pass'  =>  null,
-  // These are NOT NULL default 0 in the db, but 0 is not a valid value. FIXME
-  'Width' => null,
-  'Height' => null,
-  'Colours' => 1,
-  'Palette' =>  '0',
-  'Orientation' => null,
-  'Deinterlacing' =>  0,
-  'DecoderHWAccelName'  =>  null,
-  'DecoderHWAccelDevice'  =>  null,
-  'SaveJPEGs' =>  3,
-  'VideoWriter' =>  '0',
-  'OutputCodec' =>  null,
-  'OutputContainer' => null,
-  'EncoderParameters' => null,
-  'RecordAudio' =>  0,
-  'RTSPDescribe'  =>  null,
-  'Brightness'  =>  -1,
-  'Contrast'    =>  -1,
-  'Hue'         =>  -1,
-  'Colour'      =>  -1,
-  'EventPrefix' =>  'Event-',
-  'LabelFormat' =>  null,
-  'LabelX'      =>  0,
-  'LabelY'      =>  0,
-  'LabelSize'   =>  1,
-  'ImageBufferCount'  =>  100,
-  'WarmupCount' =>  0,
-  'PreEventCount' =>  0,
-  'PostEventCount'  =>  0,
-  'StreamReplayBuffer'  => 0,
-  'AlarmFrameCount'     =>  1,
-  'SectionLength'       =>  600,
-  'MinSectionLength'    =>  10,
-  'FrameSkip'           =>  0,
-  'AnalysisFPSLimit'  =>  null,
-  'OutputCodec' => '0',
-  'Encoder'     =>  'auto',
-  'OutputContainer' => 'auto',
-  'Triggers'  =>  null,
-  'AnalysisUpdateDelay'  =>  0,
-  'MaxFPS' => null,
-  'AlarmMaxFPS' => null,
-  'FPSReportInterval'  =>  100,
-  'RefBlendPerc'        =>  6,
-  'AlarmRefBlendPerc'   =>  6,
-  'Controllable'        =>  0,
-  'ControlId' =>  null,
-  'ControlDevice' =>  null,
-  'ControlAddress'  =>  null,
-  'AutoStopTimeout' => null,
-  'TrackMotion'     =>  0,
-  'TrackDelay'      =>  null,
-  'ReturnLocation'  =>  -1,
-  'ReturnDelay'     =>  null,
-  'DefaultRate' =>  100,
-  'DefaultScale'  =>  100,
-  'SignalCheckPoints' =>  0,
-  'SignalCheckColour' =>  '#0000BE',
-  'WebColour'   =>  'red',
-  'Exif'    =>  0,
-  'Sequence'  =>  null,
-  'TotalEvents' =>  null,
-  'TotalEventDiskSpace' =>  null,
-  'HourEvents' =>  null,
-  'HourEventDiskSpace' =>  null,
-  'DayEvents' =>  null,
-  'DayEventDiskSpace' =>  null,
-  'WeekEvents' =>  null,
-  'WeekEventDiskSpace' =>  null,
-  'MonthEvents' =>  null,
-  'MonthEventDiskSpace' =>  null,
-  'ArchivedEvents' =>  null,
-  'ArchivedEventDiskSpace' =>  null,
-  'ZoneCount' =>  0,
-  'Refresh' => null,
-  'DefaultCodec'  => 'auto',
-);
-private $status_fields = array(
-  'Status'  =>  null,
-  'AnalysisFPS' => null,
-  'CaptureFPS' => null,
-  'CaptureBandwidth' => null,
-);
-private $control_fields = array(
-  'Name' => '',
-  'Type' => 'Local',
-  'Protocol' => NULL,
-  'CanWake' => '0',
-  'CanSleep' => '0',
-  'CanReset' => '0',
-  'CanReboot' =>  '0',
-  'CanZoom' => '0',
-  'CanAutoZoom' => '0',
-  'CanZoomAbs' => '0',
-  'CanZoomRel' => '0',
-  'CanZoomCon' => '0',
-  'MinZoomRange' => NULL,
-  'MaxZoomRange' => NULL,
-  'MinZoomStep' => NULL,
-  'MaxZoomStep' => NULL,
-  'HasZoomSpeed' => '0',
-  'MinZoomSpeed' => NULL,
-  'MaxZoomSpeed' => NULL,
-  'CanFocus' => '0',
-  'CanAutoFocus' => '0',
-  'CanFocusAbs' => '0',
-  'CanFocusRel' => '0',
-  'CanFocusCon' => '0',
-  'MinFocusRange' => NULL,
-  'MaxFocusRange' => NULL,
-  'MinFocusStep' => NULL,
-  'MaxFocusStep' => NULL,
-  'HasFocusSpeed' => '0',
-  'MinFocusSpeed' => NULL,
-  'MaxFocusSpeed' => NULL,
-  'CanIris' => '0',
-  'CanAutoIris' => '0',
-  'CanIrisAbs' => '0',
-  'CanIrisRel' => '0',
-  'CanIrisCon' => '0',
-  'MinIrisRange' => NULL,
-  'MaxIrisRange' => NULL,
-  'MinIrisStep' => NULL,
-  'MaxIrisStep' => NULL,
-  'HasIrisSpeed' => '0',
-  'MinIrisSpeed' => NULL,
-  'MaxIrisSpeed' => NULL,
-  'CanGain' => '0',
-  'CanAutoGain' => '0',
-  'CanGainAbs' => '0',
-  'CanGainRel' => '0',
-  'CanGainCon' => '0',
-  'MinGainRange' => NULL,
-  'MaxGainRange' => NULL,
-  'MinGainStep' => NULL,
-  'MaxGainStep' => NULL,
-  'HasGainSpeed' => '0',
-  'MinGainSpeed' => NULL,
-  'MaxGainSpeed' => NULL,
-  'CanWhite' => '0',
-  'CanAutoWhite' => '0',
-  'CanWhiteAbs' => '0',
-  'CanWhiteRel' => '0',
-  'CanWhiteCon' => '0',
-  'MinWhiteRange' => NULL,
-  'MaxWhiteRange' => NULL,
-  'MinWhiteStep' => NULL,
-  'MaxWhiteStep' => NULL,
-  'HasWhiteSpeed' => '0',
-  'MinWhiteSpeed' => NULL,
-  'MaxWhiteSpeed' => NULL,
-  'HasPresets' => '0',
-  'NumPresets' => '0',
-  'HasHomePreset' => '0',
-  'CanSetPresets' => '0',
-  'CanMove' => '0',
-  'CanMoveDiag' => '0',
-  'CanMoveMap' => '0',
-  'CanMoveAbs' => '0',
-  'CanMoveRel' => '0',
-  'CanMoveCon' => '0',
-  'CanPan' => '0',
-  'MinPanRange' => NULL,
-  'MaxPanRange' => NULL,
-  'MinPanStep' => NULL,
-  'MaxPanStep' => NULL,
-  'HasPanSpeed' => '0',
-  'MinPanSpeed' => NULL,
-  'MaxPanSpeed' => NULL,
-  'HasTurboPan' => '0',
-  'TurboPanSpeed' => NULL,
-  'CanTilt' => '0',
-  'MinTiltRange' => NULL,
-  'MaxTiltRange' => NULL,
-  'MinTiltStep'  => NULL,
-  'MaxTiltStep'  => NULL,
-  'HasTiltSpeed' => '0',
-  'MinTiltSpeed' => NULL,
-  'MaxTiltSpeed' => NULL,
-  'HasTurboTilt' => '0',
-  'TurboTiltSpeed' => NULL,
-  'CanAutoScan' => '0',
-  'NumScanPaths' => '0',
-);
+class Monitor extends ZM_Object {
+  protected static $table = 'Monitors';
 
-  public function __construct( $IdOrRow = NULL ) {
-    if ( $IdOrRow ) {
-      $row = NULL;
-      if ( is_integer($IdOrRow) or is_numeric($IdOrRow) ) {
-        $row = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($IdOrRow));
-        if ( ! $row ) {
-          Error("Unable to load Monitor record for Id=" . $IdOrRow);
-        }
-      } elseif ( is_array($IdOrRow) ) {
-        $row = $IdOrRow;
-      } else {
-        Error("Unknown argument passed to Monitor Constructor ($IdOrRow)");
-        return;
-      }
+  protected $defaults = array(
+    'Id' => null,
+    'Name' => array('type'=>'text','filter_regexp'=>'/[^\w\-\.\(\)\:\/ ]/'),
+    'Notes' => '',
+    'ServerId' => 0,
+    'StorageId' => 0,
+    'Type'      => 'Ffmpeg',
+    'Function'  => 'Mocord',
+    'Enabled'   => array('type'=>'boolean','default'=>1),
+    'LinkedMonitors' => array('type'=>'set', 'default'=>null),
+    'Triggers'  =>  array('type'=>'set','default'=>''),
+    'ONVIF_URL' =>  '',
+    'ONVIF_Username'  =>  '',
+    'ONVIF_Password'  =>  '',
+    'ONVIF_Options'   =>  '',
+    'Device'  =>  '',
+    'Channel' =>  0,
+    'Format'  =>  '0',
+    'V4LMultiBuffer'  =>  null,
+    'V4LCapturesPerFrame' =>  1,
+    'Protocol'  =>  null,
+    'Method'  =>  '',
+    'Host'  =>  null,
+    'Port'  =>  '',
+    'SubPath' =>  '',
+    'Path'  =>  null,
+    'Options' =>  null,
+    'User'  =>  null,
+    'Pass'  =>  null,
+    // These are NOT NULL default 0 in the db, but 0 is not a valid value. FIXME
+    'Width' => null,
+    'Height' => null,
+    'Colours' => 4,
+    'Palette' =>  '0',
+    'Orientation' => 'ROTATE_0',
+    'Deinterlacing' =>  0,
+    'DecoderHWAccelName'  =>  null,
+    'DecoderHWAccelDevice'  =>  null,
+    'SaveJPEGs' =>  3,
+    'VideoWriter' =>  '0',
+    'OutputCodec' =>  null,
+    'Encoder'     =>  'auto',
+    'OutputContainer' => null,
+    'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
+    'RecordAudio' =>  array('type'=>'boolean', 'default'=>0),
+    'RTSPDescribe'  =>  array('type'=>'boolean','default'=>0),
+    'Brightness'  =>  -1,
+    'Contrast'    =>  -1,
+    'Hue'         =>  -1,
+    'Colour'      =>  -1,
+    'EventPrefix' =>  'Event-',
+    'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
+    'LabelX'      =>  0,
+    'LabelY'      =>  0,
+    'LabelSize'   =>  1,
+    'ImageBufferCount'  =>  20,
+    'WarmupCount' =>  0,
+    'PreEventCount' =>  5,
+    'PostEventCount'  =>  5,
+    'StreamReplayBuffer'  => 0,
+    'AlarmFrameCount'     =>  1,
+    'SectionLength'       =>  600,
+    'MinSectionLength'    =>  10,
+    'FrameSkip'           =>  0,
+    'MotionFrameSkip'     =>  0,
+    'AnalysisFPSLimit'  =>  null,
+    'AnalysisUpdateDelay'  =>  0,
+    'MaxFPS' => null,
+    'AlarmMaxFPS' => null,
+    'FPSReportInterval'  =>  100,
+    'RefBlendPerc'        =>  6,
+    'AlarmRefBlendPerc'   =>  6,
+    'Controllable'        =>  array('type'=>'boolean','default'=>0),
+    'ControlId' =>  null,
+    'ControlDevice' =>  null,
+    'ControlAddress'  =>  null,
+    'AutoStopTimeout' => null,
+    'TrackMotion'     =>  array('type'=>'boolean','default'=>0),
+    'TrackDelay'      =>  null,
+    'ReturnLocation'  =>  -1,
+    'ReturnDelay'     =>  null,
+    'DefaultRate' =>  100,
+    'DefaultScale'  =>  100,
+    'SignalCheckPoints' =>  0,
+    'SignalCheckColour' =>  '#0000BE',
+    'WebColour'   =>  '#ff0000',
+    'Exif'    =>  array('type'=>'boolean','default'=>0),
+    'Sequence'  =>  null,
+    'TotalEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'TotalEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'HourEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'HourEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'DayEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'DayEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'WeekEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'WeekEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'MonthEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'MonthEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'ArchivedEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'ArchivedEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
+    'ZoneCount' =>  0,
+    'Refresh' => null,
+    'DefaultCodec'  => 'auto',
+    'GroupIds'    => array('default'=>array(), 'do_not_update'=>1),
+  );
+  private $status_fields = array(
+    'Status'  =>  null,
+    'AnalysisFPS' => null,
+    'CaptureFPS' => null,
+    'CaptureBandwidth' => null,
+  );
 
-      if ( $row ) {
-        foreach ($row as $k => $v) {
-          $this->{$k} = $v;
-        }
-        if ( $this->{'Controllable'} ) {
-          $s = dbFetchOne('SELECT * FROM Controls WHERE Id=?', NULL, array($this->{'ControlId'}) );
-          if ( $s ) {
-            foreach ($s as $k => $v) {
-              if ( $k == 'Id' ) {
-                continue;
-  # The reason for these is that the name overlaps Monitor fields.
-              } else if ( $k == 'Protocol' ) {
-                $this->{'ControlProtocol'} = $v;
-              } else if ( $k == 'Name' ) {
-                $this->{'ControlName'} = $v;
-              } else if ( $k == 'Type' ) {
-                $this->{'ControlType'} = $v;
-              } else {
-                $this->{$k} = $v;
-              }
-            }
-          } else {
-            Warning('No Controls found for monitor '.$this->{'Id'} . ' ' . $this->{'Name'}.' althrough it is marked as controllable');
-          }
-        }
-        global $monitor_cache;
-        $monitor_cache[$row['Id']] = $this;
+  public function Control() {
+    if ( !property_exists($this, 'Control') ) {
+      if ( $this->ControlId() )
+        $this->{'Control'} = Control::find_one(array('Id'=>$this->{'ControlId'}));
 
-      } else {
-        Error('No row for Monitor ' . $IdOrRow);
-      }
-    } # end if isset($IdOrRow)
-  } // end function __construct
+      if ( !(property_exists($this, 'Control') and $this->{'Control'}) )
+        $this->{'Control'} = new Control();
+    }
+    return $this->{'Control'};
+  }
 
   public function Server() {
-    return new Server($this->{'ServerId'});
+    if ( !property_exists($this, 'Server') ) {
+      if ( $this->ServerId() )
+        $this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'}));
+      if ( !property_exists($this, 'Server') ) {
+        $this->{'Server'} = new Server();
+      }
+    }
+    return $this->{'Server'};
   }
+
   public function __call($fn, array $args){
     if ( count($args) ) {
-      $this->{$fn} = $args[0];
+      if ( is_array($this->defaults[$fn]) and $this->defaults[$fn]['type'] == 'set' ) {
+        $this->{$fn} = is_array($args[0]) ? implode(',',$args[0]) : $args[0];
+      } else {
+        $this->{$fn} = $args[0];
+      }
     }
-    if ( array_key_exists($fn, $this) ) {
+    if ( property_exists($this, $fn) ) {
       return $this->{$fn};
-        #array_unshift($args, $this);
-        #call_user_func_array( $this->{$fn}, $args);
-    } else if ( array_key_exists($fn, $this->control_fields) ) {
-        return $this->control_fields{$fn};
-    } else if ( array_key_exists( $fn, $this->defaults ) ) {
-        return $this->defaults{$fn};
-    } else if ( array_key_exists( $fn, $this->status_fields) ) {
-      $sql = 'SELECT Status,CaptureFPS,AnalysisFPS,CaptureBandwidth
-        FROM Monitor_Status WHERE MonitorId=?';
+    } else if ( array_key_exists($fn, $this->defaults) ) {
+      if ( is_array($this->defaults[$fn]) ) {
+        return $this->defaults[$fn]['default'];
+      }
+      return $this->defaults[$fn];
+    } else if ( array_key_exists($fn, $this->status_fields) ) {
+      $sql = 'SELECT `Status`,`CaptureFPS`,`AnalysisFPS`,`CaptureBandwidth`
+        FROM `Monitor_Status` WHERE `MonitorId`=?';
       $row = dbFetchOne($sql, NULL, array($this->{'Id'}));
       if ( !$row ) {
-        Error("Unable to load Monitor record for Id=" . $this->{'Id'});
+        Error('Unable to load Monitor record for Id='.$this->{'Id'});
+        foreach ( $this->status_fields as $k => $v ) {
+          $this->{$k} = $v;
+        }
       } else {
         foreach ($row as $k => $v) {
           $this->{$k} = $v;
@@ -296,7 +194,7 @@ private $control_fields = array(
       $backTrace = debug_backtrace();
       $file = $backTrace[1]['file'];
       $line = $backTrace[1]['line'];
-      Warning( "Unknown function call Monitor->$fn from $file:$line" );
+      Warning("Unknown function call Monitor->$fn from $file:$line");
     }
   }
 
@@ -319,36 +217,56 @@ private $control_fields = array(
         $args['user'] = $_SESSION['username'];
       }
     }
-    if ( ( (!isset($args['mode'])) or ( $args['mode'] != 'single' ) ) && !empty($GLOBALS['connkey']) ) {
-      $args['connkey'] = $GLOBALS['connkey'];
+    if ( (!isset($args['mode'])) or ( $args['mode'] != 'single' ) ) {
+      $args['connkey'] = $this->connKey();
     }
     if ( ZM_RAND_STREAM ) {
       $args['rand'] = time();
     }
 
+    # zms doesn't support width & height, so if no scale is set, default it
+    if ( ! isset($args['scale']) ) {
+      if ( isset($args['width']) and intval($args['width']) ) {
+        $args['scale'] = intval((100*intval($args['width']))/$this->ViewWidth());
+      } else if ( isset($args['height']) and intval($args['height']) ) {
+        $args['scale'] = intval((100*intval($args['height']))/$this->ViewHeight());
+      }
+    }
+    if ( isset($args['width']) )
+      unset($args['width']);
+    if ( isset($args['height']) )
+      unset($args['height']);
+
     $streamSrc .= '?'.http_build_query($args, '', $querySep);
 
     return $streamSrc;
   } // end function getStreamSrc
 
-  public function Width($new = null) {
+	public function isPortrait() {
+		return $this->ViewWidth() > $this->ViewHeight();
+	}
+	public function isLandscape() {
+		return $this->ViewWidth() < $this->ViewHeight();
+	}
+
+  public function ViewWidth($new = null) {
     if ( $new )
       $this->{'Width'} = $new;
 
-    $field = ( $this->Orientation() == '90' or $this->Orientation() == '270' ) ? 'Height' : 'Width';
-    if ( array_key_exists($field, $this) )
+    $field = ( $this->Orientation() == 'ROTATE_90' or $this->Orientation() == 'ROTATE_270' ) ? 'Height' : 'Width';
+    if ( property_exists($this, $field) )
       return $this->{$field};
-    return $this->defaults{$field};
+    return $this->defaults[$field];
   } // end function Width
 
-  public function Height($new=null) {
+  public function ViewHeight($new=null) {
     if ( $new )
       $this->{'Height'} = $new;
 
-    $field = ( $this->Orientation() == '90' or $this->Orientation() == '270' ) ?  'Width' : 'Height';
-    if ( array_key_exists($field, $this) )
+    $field = ( $this->Orientation() == 'ROTATE_90' or $this->Orientation() == 'ROTATE_270' ) ?  'Width' : 'Height';
+    if ( property_exists($this, $field) )
       return $this->{$field};
-    return $this->defaults{$field};
+    return $this->defaults[$field];
   } // end function Height
 
   public function SignalCheckColour($new=null) {
@@ -359,116 +277,27 @@ private $control_fields = array(
 
     // Validate that it's a valid colour (we seem to allow color names, not just hex).
     // This also helps prevent XSS.
-    if (array_key_exists($field, $this) && preg_match('/^[#0-9a-zA-Z]+$/', $this->{$field})) {
+    if ( property_exists($this, $field) && preg_match('/^[#0-9a-zA-Z]+$/', $this->{$field})) {
       return $this->{$field};
     }
-    return $this->defaults{$field};
+    return $this->defaults[$field];
   } // end function SignalCheckColour
 
-  public function set($data) {
-    foreach ($data as $k => $v) {
-      if ( method_exists($this, $k) ) {
-        $this->{$k}($v);
-      } else {
-        if ( is_array( $v ) ) {
-# perhaps should turn into a comma-separated string
-          $this->{$k} = implode(',',$v);
-        } else if ( is_string( $v ) ) {
-          $this->{$k} = trim( $v );
-        } else if ( is_integer( $v ) ) {
-          $this->{$k} = $v;
-        } else if ( is_bool( $v ) ) {
-          $this->{$k} = $v;
-        } else if ( is_null( $v ) ) {
-          $this->{$k} = $v;
-        } else {
-          Error( "Unknown type $k => $v of var " . gettype( $v ) );
-          $this->{$k} = $v;
-        }
-      } # end if method_exists
-    } # end foreach $data as $k=>$v
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
   }
-  public static function find( $parameters = null, $options = null ) {
-    $sql = 'SELECT * FROM Monitors ';
-    $values = array();
 
-    if ( $parameters ) {
-      $fields = array();
-      $sql .= 'WHERE ';
-      foreach ( $parameters as $field => $value ) {
-        if ( $value == null ) {
-          $fields[] = $field.' IS NULL';
-        } else if ( is_array($value) ) {
-          $func = function(){return '?';};
-          $fields[] = $field.' IN ('.implode(',', array_map($func, $value)). ')';
-          $values += $value;
-
-        } else {
-          $fields[] = $field.'=?';
-          $values[] = $value;
-        }
-      }
-      $sql .= implode(' AND ', $fields);
-    }
-    if ( $options ) {
-      if ( isset($options['order']) ) {
-        $sql .= ' ORDER BY ' . $options['order'];
-      }
-      if ( isset($options['limit']) ) {
-        if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
-          $sql .= ' LIMIT ' . $options['limit'];
-        } else {
-          $backTrace = debug_backtrace();
-          $file = $backTrace[1]['file'];
-          $line = $backTrace[1]['line'];
-          Error("Invalid value for limit(".$options['limit'].") passed to Control::find from $file:$line");
-          return array();
-        }
-      }
-    }
-    $monitors = array();
-    $result = dbQuery($sql, $values);
-    $results = $result->fetchALL();
-    foreach ( $results as $row ) {
-      $monitors[] = new Monitor($row);
-    }
-    return $monitors;
-  } # end find
-
-  public static function find_one( $parameters = array() ) {
-    global $monitor_cache;
-    if ( 
-        ( count($parameters) == 1 ) and
-        isset($parameters['Id']) and
-        isset($monitor_cache[$parameters['Id']]) ) {
-      return $monitor_cache[$parameters['Id']];
-    }
-    $results = Monitor::find( $parameters, array('limit'=>1) );
-    if ( ! sizeof($results) ) {
-      return;
-    }
-    return $results[0];
-  } # end find_one
-
-  public function save($new_values = null) {
-
-    if ( $new_values ) {
-      foreach ( $new_values as $k=>$v ) {
-        $this->{$k} = $v;
-      }
-    }
-    
-    $fields = array_keys($this->defaults);
-
-    $sql = 'UPDATE Monitors SET '.implode(', ', array_map(function($field) {return $field.'=?';}, $fields )) . ' WHERE Id=?';
-    $values = array_map(function($field){return $this->{$field};}, $fields);
-    $values[] = $this->{'Id'};
-    dbQuery($sql, $values);
-  } // end function save
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
 
   function zmcControl( $mode=false ) {
-    if ( (!defined('ZM_SERVER_ID')) or ( array_key_exists('ServerId', $this) and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
-      if ( $this->{'Type'} == 'Local' ) {
+    if ( ! $this->{'Id'} ) {
+      Warning('Attempt to control a monitor with no Id');
+      return;
+    }
+    if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
+      if ( $this->Type() == 'Local' ) {
         $zmcArgs = '-d '.$this->{'Device'};
       } else {
         $zmcArgs = '-m '.$this->{'Id'};
@@ -490,94 +319,103 @@ private $control_fields = array(
       $url = $Server->UrlToApi().'/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zmc.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-        } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
-      Logger::Debug("sending command to $url");
+      Logger::Debug('sending command to '.$url);
 
       $context  = stream_context_create();
       try {
         $result = file_get_contents($url, false, $context);
-        if ($result === FALSE) { /* Handle error */ 
+        if ( $result === FALSE ) { /* Handle error */
           Error("Error restarting zmc using $url");
         }
       } catch ( Exception $e ) {
         Error("Except $e thrown trying to restart zmc");
       }
     } else {
-      Error("Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.");
+      Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.');
     }
   } // end function zmcControl
 
-  function zmaControl( $mode=false ) {
-    if ( (!defined('ZM_SERVER_ID')) or ( array_key_exists('ServerId', $this) and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
+  function zmaControl($mode=false) {
+    if ( !$this->{'Id'} ) {
+      Warning('Attempt to control a monitor with no Id');
+      return;
+    }
+
+    if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
       if ( $this->{'Function'} == 'None' || $this->{'Function'} == 'Monitor' || $mode == 'stop' ) {
-        if ( ZM_OPT_CONTROL ) {
+        if ( ZM_OPT_CONTROL && $this->Controllable() && $this->TrackMotion() &&
+          ( $this->{'Function'} == 'Modect' || $this->{'Function'} == 'Mocord' ) ) {
           daemonControl('stop', 'zmtrack.pl', '-m '.$this->{'Id'});
         }
         daemonControl('stop', 'zma', '-m '.$this->{'Id'});
       } else {
         if ( $mode == 'restart' ) {
           if ( ZM_OPT_CONTROL ) {
-            daemonControl( 'stop', 'zmtrack.pl', '-m '.$this->{'Id'} );
+            daemonControl('stop', 'zmtrack.pl', '-m '.$this->{'Id'});
           }
-          daemonControl( 'stop', 'zma', '-m '.$this->{'Id'} );
+          daemonControl('stop', 'zma', '-m '.$this->{'Id'});
         }
-        daemonControl( 'start', 'zma', '-m '.$this->{'Id'} );
-        if ( ZM_OPT_CONTROL && $this->{'Controllable'} && $this->{'TrackMotion'} && ( $this->{'Function'} == 'Modect' || $this->{'Function'} == 'Mocord' ) ) {
-          daemonControl( 'start', 'zmtrack.pl', '-m '.$this->{'Id'} );
+        daemonControl('start', 'zma', '-m '.$this->{'Id'});
+        if ( ZM_OPT_CONTROL && $this->Controllable() && $this->TrackMotion() &&
+          ( $this->{'Function'} == 'Modect' || $this->{'Function'} == 'Mocord' ) ) {
+          daemonControl('start', 'zmtrack.pl', '-m '.$this->{'Id'});
         }
         if ( $mode == 'reload' ) {
-          daemonControl( 'reload', 'zma', '-m '.$this->{'Id'} );
+          daemonControl('reload', 'zma', '-m '.$this->{'Id'});
         }
       }
     } else if ( $this->ServerId() ) {
       $Server = $this->Server();
 
-      $url = ZM_BASE_PROTOCOL . '://'.$Server->Hostname().'/zm/api/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zma.json';
+      $url = $Server->UrlToApi().'/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zma.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-        } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");
 
-      $context  = stream_context_create();
+      $context = stream_context_create();
       try {
         $result = file_get_contents($url, false, $context);
-        if ($result === FALSE) { /* Handle error */
+        if ( $result === FALSE ) { /* Handle error */
           Error("Error restarting zma using $url");
         }
       } catch ( Exception $e ) {
         Error("Except $e thrown trying to restart zma");
       }
     } else {
-      Error("Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.");
+      Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.');
     } // end if we are on the recording server
   } // end public function zmaControl
 
-  public function GroupIds( $new='') {
+  public function GroupIds( $new='' ) {
     if ( $new != '' ) {
-      if(!is_array($new)) {
+      if ( !is_array($new) ) {
         $this->{'GroupIds'} = array($new);
       } else {
         $this->{'GroupIds'} = $new;
       }
     }
 
-    if ( !array_key_exists('GroupIds', $this) ) {
-      if ( array_key_exists('Id', $this) and $this->{'Id'} ) {
-        $this->{'GroupIds'} = dbFetchAll('SELECT GroupId FROM Groups_Monitors WHERE MonitorId=?', 'GroupId', array($this->{'Id'}) );
+    if ( !property_exists($this, 'GroupIds') ) {
+      if ( property_exists($this, 'Id') and $this->{'Id'} ) {
+        $this->{'GroupIds'} = dbFetchAll('SELECT `GroupId` FROM `Groups_Monitors` WHERE `MonitorId`=?', 'GroupId', array($this->{'Id'}) );
         if ( ! $this->{'GroupIds'} )
           $this->{'GroupIds'} = array();
       } else {
@@ -586,7 +424,12 @@ private $control_fields = array(
     }
     return $this->{'GroupIds'};
   }
+
   public function delete() {
+    if ( ! $this->{'Id'} ) {
+      Warning("Attempt to delete a monitor without id.");
+      return;
+    }
     $this->zmaControl('stop');
     $this->zmcControl('stop');
 
@@ -595,36 +438,34 @@ private $control_fields = array(
     // well time out before completing, in which case zmaudit will still tidy up
     if ( !ZM_OPT_FAST_DELETE ) {
       $markEids = dbFetchAll('SELECT Id FROM Events WHERE MonitorId=?', 'Id', array($this->{'Id'}));
-      foreach($markEids as $markEid)
+      foreach ($markEids as $markEid)
         deleteEvent($markEid);
 
-      deletePath(ZM_DIR_EVENTS.'/'.basename($this->{'Name'}));
+      if ( $this->{'Name'} )
+        deletePath(ZM_DIR_EVENTS.'/'.basename($this->{'Name'}));
       deletePath(ZM_DIR_EVENTS.'/'.$this->{'Id'});
       $Storage = $this->Storage();
       if ( $Storage->Path() != ZM_DIR_EVENTS ) {
-        deletePath($Storage->Path().'/'.basename($this->{'Name'}));
+        if ( $this->{'Name'} )
+          deletePath($Storage->Path().'/'.basename($this->{'Name'}));
         deletePath($Storage->Path().'/'.$this->{'Id'});
       }
-    } // end if ZM_OPT_FAST_DELETE
+    } // end if !ZM_OPT_FAST_DELETE
 
     // This is the important stuff
     dbQuery('DELETE FROM Zones WHERE MonitorId = ?', array($this->{'Id'}));
     if ( ZM_OPT_X10 )
       dbQuery('DELETE FROM TriggersX10 WHERE MonitorId=?', array($this->{'Id'}));
     dbQuery('DELETE FROM Monitors WHERE Id = ?', array($this->{'Id'}));
-
-    // Deleting a Monitor does not affect the order, just creates a gap in the sequence.  Who cares?
-    // fixSequences();
-
   } // end function delete
 
-  public function Storage( $new = null ) {
+  public function Storage($new = null) {
     if ( $new ) {
       $this->{'Storage'} = $new;
     }
-    if ( ! ( array_key_exists('Storage', $this) and $this->{'Storage'} ) ) {
-      $this->{'Storage'} = isset($this->{'StorageId'}) ? 
-        Storage::find_one(array('Id'=>$this->{'StorageId'})) : 
+    if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) {
+      $this->{'Storage'} = isset($this->{'StorageId'}) ?
+        Storage::find_one(array('Id'=>$this->{'StorageId'})) :
           new Storage(NULL);
       if ( ! $this->{'Storage'} )
         $this->{'Storage'} = new Storage(NULL);
@@ -636,14 +477,17 @@ private $control_fields = array(
     $source = '';
     if ( $this->{'Type'} == 'Local' ) {
       $source = $this->{'Device'}.' ('.$this->{'Channel'}.')';
-    } elseif ( $this->{'Type'} == 'Remote' ) {
+    } else if ( $this->{'Type'} == 'Remote' ) {
       $source = preg_replace( '/^.*@/', '', $this->{'Host'} );
       if ( $this->{'Port'} != '80' and $this->{'Port'} != '554' ) {
         $source .= ':'.$this->{'Port'};
       }
-    } elseif ( $this->{'Type'} == 'File' || $this->{'Type'} == 'cURL' ) {
-      $source = preg_replace( '/^.*\//', '', $this->{'Path'} );
-    } elseif ( $this->{'Type'} == 'Ffmpeg' || $this->{'Type'} == 'Libvlc' || $this->{'Type'} == 'WebSite' ) {
+    } else if ( $this->{'Type'} == 'VNC' ) {
+      $source = preg_replace( '/^.*@/', '', $this->{'Host'} );
+      if ( $this->{'Port'} != '5900' ) {
+        $source .= ':'.$this->{'Port'};
+      }
+    } else if ( $this->{'Type'} == 'Ffmpeg' || $this->{'Type'} == 'Libvlc' || $this->{'Type'} == 'WebSite' ) {
       $url_parts = parse_url( $this->{'Path'} );
       if ( ZM_WEB_FILTER_SOURCE == 'Hostname' ) {
         # Filter out everything but the hostname
@@ -652,7 +496,7 @@ private $control_fields = array(
         } else {
           $source = $this->{'Path'};
         }
-      } elseif ( ZM_WEB_FILTER_SOURCE == "NoCredentials" ) {
+      } else if ( ZM_WEB_FILTER_SOURCE == 'NoCredentials' ) {
         # Filter out sensitive and common items
         unset($url_parts['user']);
         unset($url_parts['pass']);
@@ -662,7 +506,7 @@ private $control_fields = array(
         if ( isset($url_parts['port']) and ( $url_parts['port'] == '80' or $url_parts['port'] == '554' ) )
           unset($url_parts['port']);
         $source = unparse_url($url_parts);
-      } else { # Don't filter anything 
+      } else { # Don't filter anything
         $source = $this->{'Path'};
       }
     }
@@ -672,10 +516,122 @@ private $control_fields = array(
     return $source;
   } // end function Source
 
-  public function UrlToIndex() {
-    return $this->Server()->UrlToIndex();
+  public function UrlToIndex($port=null) {
+    return $this->Server()->UrlToIndex($port);
     //ZM_MIN_STREAMING_PORT ? (ZM_MIN_STREAMING_PORT+$this->Id()) : null);
   }
 
+  public function sendControlCommand($command) {
+    // command is generally a command option list like --command=blah but might be just the word quit
+
+    $options = array();
+    # Convert from a command line params to an option array
+    foreach ( explode(' ', $command) as $option ) {
+      if ( preg_match('/--([^=]+)(?:=(.+))?/', $option, $matches) ) {
+        $options[$matches[1]] = $matches[2]?$matches[2]:1;
+      } else if ( $option != '' and $option != 'quit' and $option != 'start' and $option != 'stop' ) {
+        Warning("Ignored command for zmcontrol $option in $command");
+      }
+    }
+    if ( !count($options) ) {
+      if ( $command == 'quit' or $command == 'start' or $command == 'stop' ) {
+        # These are special as we now run zmcontrol as a daemon through zmdc.
+        $status = daemonStatus('zmcontrol.pl', array('--id', $this->{'Id'}));
+        Logger::Debug("Current status $status");
+        if ( $status or ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) ) {
+          daemonControl($command, 'zmcontrol.pl', '--id '.$this->{'Id'});
+          return;
+        }
+        $options['command'] = $command;
+      } else {
+        Warning("No commands to send to zmcontrol from $command");
+        return false;
+      }
+    }
+
+    if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
+      # Local
+      Logger::Debug('Trying to send options ' . print_r($options, true));
+
+      $optionString = jsonEncode($options);
+      Logger::Debug("Trying to send options $optionString");
+      // Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command.
+      $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
+      if ( $socket < 0 ) {
+        Error('socket_create() failed: '.socket_strerror($socket));
+        return false;
+      }
+      $sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$this->{'Id'}.'.sock';
+      if ( @socket_connect($socket, $sockFile) ) {
+        if ( !socket_write($socket, $optionString) ) {
+          Error('Can\'t write to control socket: '.socket_strerror(socket_last_error($socket)));
+          return false;
+        }
+      } else if ( $command != 'quit' ) {
+        $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id '.$this->{'Id'};
+
+        // Can't connect so use script
+        $ctrlOutput = exec(escapeshellcmd($command));
+      }
+      socket_close($socket);
+    } else if ( $this->ServerId() ) {
+      $Server = $this->Server();
+
+      $url = $Server->UrlToApi().'/monitors/daemonControl/'.$this->{'Id'}.'/'.$command.'/zmcontrol.pl.json';
+      if ( ZM_OPT_USE_AUTH ) {
+        if ( ZM_AUTH_RELAY == 'hashed' ) {
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else if ( ZM_AUTH_RELAY == 'none' ) {
+          $url .= '?user='.$_SESSION['username'];
+        }
+      }
+      Logger::Debug("sending command to $url");
+
+      $context = stream_context_create();
+      try {
+        $result = file_get_contents($url, false, $context);
+        if ( $result === FALSE ) { /* Handle error */
+          Error("Error sending command using $url");
+          return false;
+        }
+      } catch ( Exception $e ) {
+        Error("Exception $e thrown trying to send command to $url");
+        return false;
+      }
+    } else {
+      Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.');
+      return false;
+    } // end if we are on the recording server
+    return true;
+  } // end function sendControlCommand($mid, $command)
+
+  function Groups($new='') {
+    if ( $new != '' )
+      $this->Groups = $new;
+    if ( !property_exists($this, 'Groups') ) {
+      $this->Groups = Group::find(array('Id'=>$this->GroupIds()));
+    }
+    return $this->Groups;
+  }
+  function connKey($new='') {
+    if ( $new )
+      $this->connKey = $new;
+    if ( !isset($this->connKey) ) {
+      if ( !empty($GLOBALS['connkey']) ) {
+        $this->connKey = $GLOBALS['connkey'];
+      } else {
+        $this->connKey = generateConnKey();
+      }
+    }
+    return $this->connKey;
+  }
+
+  function canEdit() {
+    global $user;
+    return ( $user && ($user['Monitors'] == 'Edit') && ( !$this->{'Id'} || visibleMonitor($this->{'Id'}) ));
+  }
 } // end class Monitor
 ?>
diff --git a/web/includes/MontageLayout.php b/web/includes/MontageLayout.php
index ca6b17ef7..f67f3ace5 100644
--- a/web/includes/MontageLayout.php
+++ b/web/includes/MontageLayout.php
@@ -1,133 +1,22 @@
 <?php
 namespace ZM;
+require_once('Object.php');
 
-require_once('database.php');
-
-class MontageLayout {
-
-  private $defaults = array(
+class MontageLayout extends ZM_Object {
+  protected static $table = 'MontageLayouts';
+  protected $defaults = array(
     'Id' => null,
     'Name' => '',
     'Positions' => 0,
   );
 
-  public function __construct( $IdOrRow = NULL ) {
-    if ( $IdOrRow ) {
-      $row = NULL;
-      if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
-        $row = dbFetchOne( 'SELECT * FROM MontageLayouts WHERE Id=?', NULL, array( $IdOrRow ) );
-        if ( ! $row ) {
-          Error("Unable to load MontageLayout record for Id=" . $IdOrRow );
-        }
-      } else if ( is_array( $IdOrRow ) ) {
-        $row = $IdOrRow;
-      } else {
-        Error("Unknown argument passed to MontageLayout Constructor ($IdOrRow)");
-        return;
-      }
-
-      if ( $row ) {
-        foreach ($row as $k => $v) {
-          $this->{$k} = $v;
-        }
-      } else {
-        Error('No row for MontageLayout ' . $IdOrRow );
-      }
-    } # end if isset($IdOrRow)
-  } // end function __construct
-
-  public function __call($fn, array $args){
-    if ( count($args) ) {
-      $this->{$fn} = $args[0];
-    }
-    if ( array_key_exists($fn, $this) ) {
-      return $this->{$fn};
-		} else {
-      if ( array_key_exists( $fn, $this->defaults ) ) {
-        return $this->defaults{$fn};
-      } else {
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        Warning( "Unknown function call MontageLayout->$fn from $file:$line" );
-      }
-    }
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
   }
 
-  public function set( $data ) {
-    foreach ($data as $k => $v) {
-      if ( is_array( $v ) ) {
-        # perhaps should turn into a comma-separated string
-        $this->{$k} = implode(',',$v);
-      } else if ( is_string( $v ) ) {
-        $this->{$k} = trim( $v );
-      } else if ( is_integer( $v ) ) {
-        $this->{$k} = $v;
-      } else if ( is_bool( $v ) ) {
-        $this->{$k} = $v;
-      } else {
-        Error( "Unknown type $k => $v of var " . gettype( $v ) );
-        $this->{$k} = $v;
-      }
-    }
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
   }
-  public static function find( $parameters = null, $options = null ) {
-    $filters = array();
-    $sql = 'SELECT * FROM MontageLayouts ';
-    $values = array();
-
-    if ( $parameters ) {
-      $fields = array();
-      $sql .= 'WHERE ';
-      foreach ( $parameters as $field => $value ) {
-        if ( $value == null ) {
-          $fields[] = $field.' IS NULL';
-        } else if ( is_array( $value ) ) {
-          $func = function(){return '?';};
-          $fields[] = $field.' IN ('.implode(',', array_map( $func, $value ) ). ')';
-          $values += $value;
-
-        } else {
-          $fields[] = $field.'=?';
-          $values[] = $value;
-        }
-      }
-      $sql .= implode(' AND ', $fields );
-    }
-    if ( $options and isset($options['order']) ) {
-    $sql .= ' ORDER BY ' . $options['order'];
-    }
-    $result = dbQuery($sql, $values);
-    if ( $result ) {
-      $results = $result->fetchALL();
-      foreach ( $results as $row ) {
-        $filters[] = new MontageLayout($row);
-      }
-    }
-    return $filters;
-  }
-  public function save( $new_values = null ) {
-    if ( $new_values ) {
-      foreach ( $new_values as $k=>$v ) {
-        $this->{$k} = $v;
-      }
-    }
-
-    $fields = array_values( array_filter( array_keys($this->defaults), function($field){return $field != 'Id';} ) );
-    $values = null; 
-    if ( isset($this->{'Id'}) ) {
-      $sql = 'UPDATE MontageLayouts SET '.implode(', ', array_map( function($field) {return $field.'=?';}, $fields ) ) . ' WHERE Id=?';
-      $values = array_map( function($field){return $this->{$field};}, $fields );
-      $values[] = $this->{'Id'};
-      dbQuery($sql, $values);
-    } else {
-      $sql = 'INSERT INTO MontageLayouts ('.implode( ',', $fields ).') VALUES ('.implode(',',array_map( function(){return '?';}, $fields ) ).')';
-      $values = array_map( function($field){return $this->{$field};}, $fields );
-      dbQuery($sql, $values);
-      global $dbConn;
-      $this->{'Id'} = $dbConn->lastInsertId();
-    }
-  } // end function save
 
 } // end class MontageLayout
 ?>
diff --git a/web/includes/Object.php b/web/includes/Object.php
index 4e73da5d3..e8fff930b 100644
--- a/web/includes/Object.php
+++ b/web/includes/Object.php
@@ -33,21 +33,35 @@ class ZM_Object {
         }
         $cache[$row['Id']] = $this;
       }
-    } else {
-      # Set defaults
-      foreach ( $this->defaults as $k => $v ) $this->{$k} = $v;
     } # end if isset($IdOrRow)
   } # end function __construct
 
   public function __call($fn, array $args){
+    $type = (array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn])) ? $this->defaults[$fn]['type'] : 'scalar';
     if ( count($args) ) {
-      $this->{$fn} = $args[0];
+      if ( $type == 'set' and is_array($args[0]) ) {
+        $this->{$fn} = implode(',', $args[0]);
+      } else if ( array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn]) && isset($this->defaults[$fn]['filter_regexp']) ) {
+        if ( is_array($this->defaults[$fn]['filter_regexp']) ) {
+          foreach ( $this->defaults[$fn]['filter_regexp'] as $regexp ) {
+            $this->{$fn} = preg_replace($regexp, '', $args[0]);
+          }
+        } else {
+          $this->{$fn} = preg_replace($this->defaults[$fn]['filter_regexp'], '', $args[0]);
+        }
+      } else {
+        $this->{$fn} = $args[0];
+      }
     }
-    if ( array_key_exists($fn, $this) ) {
+
+    if ( property_exists($this, $fn) ) {
       return $this->{$fn};
     } else {
       if ( array_key_exists($fn, $this->defaults) ) {
-        return $this->defaults{$fn};
+        if ( is_array($this->defaults[$fn]) ) {
+          return $this->defaults[$fn]['default'];
+        }
+        return $this->defaults[$fn];
       } else {
         $backTrace = debug_backtrace();
         Warning("Unknown function call Object->$fn from ".print_r($backTrace,true));
@@ -58,7 +72,7 @@ class ZM_Object {
   public static function _find($class, $parameters = null, $options = null ) {
     $table = $class::$table;
     $filters = array();
-    $sql = "SELECT * FROM `$table` ";
+    $sql = 'SELECT * FROM `'.$table.'` ';
     $values = array();
 
     if ( $parameters ) {
@@ -87,6 +101,7 @@ class ZM_Object {
         if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
           $sql .= ' LIMIT ' . $options['limit'];
         } else {
+          $backTrace = debug_backtrace();
           Error('Invalid value for limit('.$options['limit'].') passed to '.get_class()."::find from ".print_r($backTrace,true));
           return array();
         }
@@ -104,8 +119,9 @@ class ZM_Object {
 
   public static function _find_one($class, $parameters = array(), $options = array() ) {
     global $object_cache;
-    if ( ! isset($object_cache[$class]) )
+    if ( ! isset($object_cache[$class]) ) {
       $object_cache[$class] = array();
+    }
     $cache = &$object_cache[$class];
     if ( 
         ( count($parameters) == 1 ) and
@@ -121,9 +137,18 @@ class ZM_Object {
     return $results[0];
   }
 
-  public static function Objects_Indexed_By_Id($class) {
+  public static function _clear_cache($class) {
+    global $object_cache;
+    $object_cache[$class] = array();
+  }
+  public function _remove_from_cache($class, $object) {
+    global $object_cache;
+    unset($object_cache[$class][$object->Id()]);
+  }
+
+  public static function Objects_Indexed_By_Id($class, $params=null) {
     $results = array();
-    foreach ( ZM_Object::_find($class, null, array('order'=>'lower(Name)')) as $Object ) {
+    foreach ( ZM_Object::_find($class, $params, array('order'=>'lower(Name)')) as $Object ) {
       $results[$Object->Id()] = $Object;
     }
     return $results;
@@ -132,85 +157,137 @@ class ZM_Object {
   public function to_json() {
     $json = array();
     foreach ($this->defaults as $key => $value) {
-      if ( is_callable(array($this, $key)) ) {
+      if ( is_callable(array($this, $key), false) ) {
         $json[$key] = $this->$key();
-      } else if ( array_key_exists($key, $this) ) {
+      } else if ( property_exists($this, $key) ) {
         $json[$key] = $this->{$key};
       } else {
-        $json[$key] = $this->defaults{$key};
+        $json[$key] = $this->defaults[$key];
       }
     }
     return json_encode($json);
   }
 
   public function set($data) {
-    foreach ( $data as $k => $v ) {
-      if ( method_exists($this, $k) ) {
-        $this->{$k}($v);
+    foreach ( $data as $field => $value ) {
+      if ( method_exists($this, $field) and is_callable(array($this, $field), false) ) {
+        $this->$field($value);
       } else {
-        if ( is_array($v) ) {
+        if ( is_array($value) ) {
 # perhaps should turn into a comma-separated string
-          $this->{$k} = implode(',', $v);
-        } else if ( is_string($v) ) {
-          if ( $v == '' and array_key_exists($k, $this->defaults) ) {
-            $this->{$k} = $this->defaults[$k];
+          $this->{$field} = implode(',', $value);
+        } else if ( is_string($value) ) {
+          if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
+            if ( is_array($this->defaults[$field]['filter_regexp']) ) {
+              foreach ( $this->defaults[$field]['filter_regexp'] as $regexp ) {
+                $this->{$field} = preg_replace($regexp, '', trim($value));
+              }
+            } else {
+              $this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
+            }
           } else {
-            $this->{$k} = trim($v);
+            $this->{$field} = trim($value);
           }
-        } else if ( is_integer($v) ) {
-          $this->{$k} = $v;
-        } else if ( is_bool($v) ) {
-          $this->{$k} = $v;
-        } else if ( is_null($v) ) {
-          $this->{$k} = $v;
+        } else if ( is_integer($value) ) {
+          $this->{$field} = $value;
+        } else if ( is_bool($value) ) {
+          $this->{$field} = $value;
+        } else if ( is_null($value) ) {
+          $this->{$field} = $value;
         } else {
-          Error("Unknown type $k => $v of var " . gettype($v));
-          $this->{$k} = $v;
+          Error("Unknown type $field => $value of var " . gettype($value));
+          $this->{$field} = $value;
         }
       } # end if method_exists
-    } # end foreach $data as $k=>$v
-  }
+    } # end foreach $data as $field=>$value
+  } # end function set($data)
 
-  public function changes( $new_values ) {
+  /* types is an array of fields telling use that the input might be a checkbox so not present in the input, but therefore has a value
+   */
+  public function changes($new_values, $defaults=null) {
     $changes = array();
+
+    if ( $defaults ) {
+      foreach ( $defaults as $field => $type ) {
+        if ( isset($new_values[$field]) ) {
+          # Will have already been handled above
+          continue;
+        }
+
+        if ( isset($this->defaults[$field]) ) {
+          if ( is_array($this->defaults[$field]) ) {
+            $new_values[$field] = $this->defaults[$field]['default'];
+          } else {
+            $new_values[$field] = $this->defaults[$field];
+          }
+        }
+      } # end foreach default
+    } # end if defaults
+
     foreach ( $new_values as $field => $value ) {
 
       if ( method_exists($this, $field) ) {
+
+        if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
+          if ( is_array($this->defaults[$field]['filter_regexp']) ) {
+            foreach ( $this->defaults[$field]['filter_regexp'] as $regexp ) {
+              $value = preg_replace($regexp, '', trim($value));
+            }
+          } else {
+            $value = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
+          }
+        }
+
         $old_value = $this->$field();
-        Logger::Debug("Checking method $field () ".print_r($old_value,true).' => ' . print_r($value,true));
         if ( is_array($old_value) ) {
           $diff = array_recursive_diff($old_value, $value);
-          Logger::Debug("Checking method $field () diff is".print_r($diff,true));
           if ( count($diff) ) {
             $changes[$field] = $value;
           }
         } else if ( $this->$field() != $value ) {
           $changes[$field] = $value;
         }
-      } else if ( array_key_exists($field, $this) ) {
-        Logger::Debug("Checking field $field => ".$this->{$field} . ' ?= ' .$value);
-        if ( $this->{$field} != $value ) {
-          $changes[$field] = $value;
+      } else if ( property_exists($this, $field) ) {
+        $type = (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field])) ? $this->defaults[$field]['type'] : 'scalar';
+        if ( $type == 'set' ) {
+          $old_value = is_array($this->$field) ? $this->$field : explode(',', $this->$field);
+          $new_value = is_array($value) ? $value : explode(',', $value);
+
+          $diff = array_recursive_diff($old_value, $new_value);
+          if ( count($diff) ) {
+            $changes[$field] = $new_value;
+          }
+
+          # Input might be a command separated string, or an array
+
+        } else {
+          if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
+            if ( is_array($this->defaults[$field]['filter_regexp']) ) {
+              foreach ( $this->defaults[$field]['filter_regexp'] as $regexp ) {
+                $value = preg_replace($regexp, '', trim($value));
+              }
+            } else {
+              $value = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
+            }
+          }
+          if ( $this->{$field} != $value ) {
+            $changes[$field] = $value;
+          }
         }
       } else if ( array_key_exists($field, $this->defaults) ) {
+        if ( is_array($this->defaults[$field]) and isset($this->defaults[$field]['default']) ) {
+          $default = $this->defaults[$field]['default'];
+        } else {
+          $default = $this->defaults[$field];
+        }
 
-        Logger::Debug("Checking default $field => ".$this->defaults[$field] . ' ' .$value);
-        if ( $this->defaults[$field] != $value ) {
+        if ( $default != $value ) {
           $changes[$field] = $value;
         }
       }
+    } # end foreach newvalue
+
 
-        #if ( (!array_key_exists($field, $this)) or ( $this->{$field} != $new_values[$field] ) ) {
-      #Logger::Debug("Checking default $field => $default_value changes becaause" . $new_values[$field].' != '.$new_values[$field]);
-          #$changes[$field] = $new_values[$field];
-        ##} else if  {
-      #Logger::Debug("Checking default $field => $default_value changes becaause " . $new_values[$field].' != '.$new_values[$field]);
-          ##array_push( $changes, [$field=>$defaults[$field]] );
-        #}
-      #} else {
-        #Logger::Debug("Checking default $field => $default_value not in new_values");
-      #}
-    } # end foreach default 
     return $changes;
   } # end public function changes
 
@@ -219,23 +296,50 @@ class ZM_Object {
     $table = $class::$table;
 
     if ( $new_values ) {
-      Logger::Debug("New values" . print_r($new_values,true));
       $this->set($new_values);
     }
 
+    # Set defaults.  Note that we only replace "" with null, not other values
+    # because for example if we want to clear TimestampFormat, we clear it, but the default is a string value
+    foreach ( $this->defaults as $field => $default ) {
+      if ( (!property_exists($this, $field)) or ($this->{$field} === '') ) {
+        if ( is_array($default) ) {
+          $this->{$field} = $default['default'];
+        } else if ( $default == null ) {
+          $this->{$field} = $default;
+        }
+      }
+    }
+
+    $fields = array_filter(
+      $this->defaults,
+      function($v) {
+        return !( 
+          is_array($v)
+          and
+          isset($v['do_not_update'])
+          and
+          $v['do_not_update']
+        );
+      }
+    );
+    $fields = array_keys($fields);
+
     if ( $this->Id() ) {
-      $fields = array_keys($this->defaults);
-      $sql = 'UPDATE '.$table.' SET '.implode(', ', array_map(function($field) {return '`'.$field.'`=?';}, $fields )) . ' WHERE Id=?';
-      $values = array_map(function($field){return $this->{$field};}, $fields);
+      $sql = 'UPDATE `'.$table.'` SET '.implode(', ', array_map(function($field) {return '`'.$field.'`=?';}, $fields)).' WHERE Id=?';
+      $values = array_map(function($field){ return $this->{$field};}, $fields);
       $values[] = $this->{'Id'};
       if ( dbQuery($sql, $values) )
         return true;
     } else {
-      $fields = $this->defaults;
       unset($fields['Id']);
 
-      $sql = 'INSERT INTO '.$table.' ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, array_keys($fields))).') VALUES ('.implode(', ', array_map(function($field){return '?';}, array_values($fields))).')';
-      $values = array_map(function($field){return $this->{$field};}, array_keys($fields));
+      $sql = 'INSERT INTO `'.$table.
+        '` ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, $fields)).
+          ') VALUES ('.
+          implode(', ', array_map(function($field){return '?';}, $fields)).')';
+
+      $values = array_map(function($field){return $this->$field();}, $fields);
       if ( dbQuery($sql, $values) ) {
         $this->{'Id'} = dbInsertId();
         return true;
@@ -247,10 +351,18 @@ class ZM_Object {
   public function delete() {
     $class = get_class($this);
     $table = $class::$table;
-    dbQuery("DELETE FROM $table WHERE Id=?", array($this->{'Id'}));
+    dbQuery("DELETE FROM `$table` WHERE Id=?", array($this->{'Id'}));
     if ( isset($object_cache[$class]) and isset($object_cache[$class][$this->{'Id'}]) )
       unset($object_cache[$class][$this->{'Id'}]);
   }
 
-} # end class Sensor Action
+  public function lock() {
+    $class = get_class($this);
+    $table = $class::$table;
+    $row = dbFetchOne("SELECT * FROM `$table` WHERE `Id`=?", NULL, array($this->Id()));
+    if ( !$row ) {
+      Error("Unable to lock $class record for Id=".$this->Id());
+    }
+  }
+} # end class Object
 ?>
diff --git a/web/includes/Server.php b/web/includes/Server.php
index 535ea44ed..bf3dfeb51 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,12 +1,13 @@
 <?php
 namespace ZM;
 require_once('database.php');
-
-$server_cache = array();
+require_once('Object.php');
 
 
-class Server {
-  private $defaults = array(
+class Server extends ZM_Object {
+  protected static $table = 'Servers';
+
+  protected $defaults = array(
     'Id'                   => null,
     'Name'                 => '',
     'Protocol'             => '',
@@ -21,28 +22,12 @@ class Server {
     'zmeventnotification'  => 0,
   );
 
-  public function __construct($IdOrRow = NULL) {
-    global $server_cache;
-    $row = NULL;
-    if ( $IdOrRow ) {
-      if ( is_integer($IdOrRow) or ctype_digit($IdOrRow) ) {
-        $row = dbFetchOne('SELECT * FROM Servers WHERE Id=?', NULL, array($IdOrRow));
-        if ( !$row ) {
-          Error('Unable to load Server record for Id='.$IdOrRow);
-        }
-      } elseif ( is_array($IdOrRow) ) {
-        $row = $IdOrRow;
-      }
-    } # end if isset($IdOrRow)
-    if ( $row ) {
-      foreach ($row as $k => $v) {
-        $this->{$k} = $v;
-      }
-      $server_cache[$row['Id']] = $this;
-    } else {
-      # Set defaults
-      foreach ( $this->defaults as $k => $v ) $this->{$k} = $v;
-    }
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
   }
 
   public function Hostname( $new = null ) {
@@ -54,7 +39,12 @@ class Server {
     } else if ( $this->Id() ) {
       return $this->{'Name'};
     }
-    $result = explode(':',$_SERVER['HTTP_HOST']);
+    # This theoretically will match ipv6 addresses as well
+    if ( preg_match( '/^(\[[[:xdigit:]:]+\]|[^:]+)(:[[:digit:]]+)?$/', $_SERVER['HTTP_HOST'], $matches ) ) {
+      return $matches[1];
+    }
+
+    $result = explode(':', $_SERVER['HTTP_HOST']);
     return $result[0];
   }
 
@@ -90,7 +80,7 @@ class Server {
 
   public function PathToZMS( $new = null ) {
     if ( $new != null )
-      $this{'PathToZMS'} = $new;
+      $this->{'PathToZMS'} = $new;
     if ( $this->Id() and $this->{'PathToZMS'} ) {
       return $this->{'PathToZMS'};
     } else {
@@ -103,12 +93,20 @@ class Server {
   }
 
 	public function Url( $port = null ) {
+    if ( ! ( $this->Id() or $port ) ) {
+      # Don't specify a hostname or port, the browser will figure it out
+      return '';
+    }
+
     $url = $this->Protocol().'://';
 		$url .= $this->Hostname();
-    if ( $port ) {
-      $url .= ':'.$port;
+    if ( !$port ) {
+      $port = $this->Port();
+    }
+    if ( $this->Protocol() == 'https' and $port == 443 ) {
+    } else if ( $this->Protocol() == 'http' and $port == 80 ) {
     } else {
-      $url .= ':'.$this->Port();
+      $url .= ':'.$port;
     }
     return $url;
 	}
@@ -139,98 +137,5 @@ class Server {
     }
     return '/zm/api';
   }
-
-  public function __call($fn, array $args){
-    if ( count($args) ) {
-      $this->{$fn} = $args[0];
-    }
-    if ( array_key_exists($fn, $this) ) {
-      return $this->{$fn};
-    } else {
-      if ( array_key_exists($fn, $this->defaults) ) {
-        return $this->defaults{$fn};
-      } else {
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        Warning("Unknown function call Server->$fn from $file:$line");
-      }
-    }
-  }
-  public static function find( $parameters = null, $options = null ) {
-    $filters = array();
-    $sql = 'SELECT * FROM Servers ';
-    $values = array();
-
-    if ( $parameters ) {
-      $fields = array();
-      $sql .= 'WHERE ';
-      foreach ( $parameters as $field => $value ) {
-        if ( $value == null ) {
-          $fields[] = $field.' IS NULL';
-        } else if ( is_array( $value ) ) {
-          $func = function(){return '?';};
-          $fields[] = $field.' IN ('.implode(',', array_map( $func, $value ) ). ')';
-          $values += $value;
-
-        } else {
-          $fields[] = $field.'=?';
-          $values[] = $value;
-        }
-      }
-      $sql .= implode(' AND ', $fields );
-    }
-    if ( $options ) {
-      if ( isset($options['order']) ) {
-        $sql .= ' ORDER BY ' . $options['order'];
-      }
-      if ( isset($options['limit']) ) {
-        if ( is_integer($options['limit']) or ctype_digit($options['limit']) ) {
-          $sql .= ' LIMIT ' . $options['limit'];
-        } else {
-          $backTrace = debug_backtrace();
-          $file = $backTrace[1]['file'];
-          $line = $backTrace[1]['line'];
-          Error("Invalid value for limit(".$options['limit'].") passed to Server::find from $file:$line");
-          return array();
-        }
-      }
-    }
-    $results = dbFetchAll( $sql, NULL, $values );
-    if ( $results ) {
-      return array_map(function($id){ return new Server($id); }, $results);
-    }
-    return array();
-  }
-
-  public static function find_one( $parameters = array() ) {
-    global $server_cache;
-    if ( 
-        ( count($parameters) == 1 ) and
-        isset($parameters['Id']) and
-        isset($server_cache[$parameters['Id']]) ) {
-      return $server_cache[$parameters['Id']];
-    }
-    $results = Server::find( $parameters, array('limit'=>1) );
-    if ( ! sizeof($results) ) {
-      return;
-    }
-    return $results[0];
-  }
-
-  public function to_json() {
-    $json = array();
-    foreach ($this->defaults as $key => $value) {
-      if ( is_callable(array($this, $key)) ) {
-        $json[$key] = $this->$key();
-      } else if ( array_key_exists($key, $this) ) {
-        $json[$key] = $this->{$key};
-      } else {
-        $json[$key] = $this->defaults{$key};
-      }
-    }
-    return json_encode($json);
-  }
-
 } # end class Server
 ?>
diff --git a/web/includes/Storage.php b/web/includes/Storage.php
index 8607b52fe..2c243d913 100644
--- a/web/includes/Storage.php
+++ b/web/includes/Storage.php
@@ -8,7 +8,7 @@ class Storage extends ZM_Object {
   protected static $table = 'Storage';
   protected $defaults = array(
     'Id'        => null,
-    'Path'      => '',
+    'Path'      => array('type'=>'text','filter_regexp'=>array('/[^\w\-\.\(\)\:\/ ]/','/\/$/')),
     'Name'      => '',
     'Type'      => 'local',
     'Url'       => '',
@@ -16,16 +16,18 @@ class Storage extends ZM_Object {
     'Scheme'    => 'Medium',
     'ServerId'  => 0,
     'DoDelete'  => 1,
+    'Enabled'   => 1,
   );
-  public static function find($parameters = array(), $options = array() ) {
+  public static function find($parameters = array(), $options = array()) {
     return ZM_Object::_find(get_class(), $parameters, $options);
   }
 
-  public static function find_one( $parameters = array(), $options = array() ) {
+  public static function find_one($parameters = array(), $options = array()) {
     return ZM_Object::_find_one(get_class(), $parameters, $options);
   }
 
-  public function Path() {
+  public function Path($new=null) {
+    if ( $new ) $this->{'Path'} = $new;
     if ( isset($this->{'Path'}) and ( $this->{'Path'} != '' ) ) {
       return $this->{'Path'};
     } else if ( ! isset($this->{'Id'}) ) {
@@ -39,7 +41,9 @@ class Storage extends ZM_Object {
     }
     return $this->{'Name'};
   }
-  public function Name() {
+  public function Name($new=null) {
+    if ( $new )
+      $this->{'Name'} = $new;
     if ( isset($this->{'Name'}) and ( $this->{'Name'} != '' ) ) {
       return $this->{'Name'};
     } else if ( ! isset($this->{'Id'}) ) {
@@ -48,6 +52,31 @@ class Storage extends ZM_Object {
     return $this->{'Name'};
   }
 
+  public function Events() {
+    if ( $this->{'Id'} and ! isset($this->{'Events'}) ) {
+      $this->{'Events'} = Event::find(array('StorageId'=>$this->{'Id'}));
+    }
+    if ( ! isset($this->{'Events'}) ) {
+      $this->{'Events'} = array();
+    }
+    return $this->{'Events'};
+  }
+
+	public function EventCount() {
+    if ( (! property_exists($this, 'EventCount')) or (!$this->{'EventCount'}) ) {
+      $this->{'EventCount'} = dbFetchOne('SELECT COUNT(*) AS EventCount FROM Events WHERE StorageId=?', 'EventCount', array($this->Id()));
+		}
+		return $this->{'EventCount'};
+	}
+
+  public function disk_used_blocks() {
+    $df = shell_exec('df '.escapeshellarg($this->Path()));
+    $space = -1;
+    if ( preg_match('/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches) )
+      $space = $matches[1];
+    return $space;
+  }
+
   public function disk_usage_percent() {
     $path = $this->Path();
     if ( ! $path ) {
@@ -70,7 +99,7 @@ class Storage extends ZM_Object {
   }
 
   public function disk_total_space() {
-    if ( !array_key_exists('disk_total_space', $this) ) {
+    if ( !property_exists($this, 'disk_total_space') ) {
       $path = $this->Path();
       if ( file_exists($path) ) {
         $this->{'disk_total_space'} = disk_total_space($path);
@@ -84,8 +113,8 @@ class Storage extends ZM_Object {
 
   public function disk_used_space() {
     # This isn't a function like this in php, so we have to add up the space used in each event.
-    if ( ( !array_key_exists('disk_used_space', $this)) or !$this->{'disk_used_space'} ) {
-      if ( $this->{'Type'} == 's3fs' ) {
+    if ( ( !property_exists($this, 'disk_used_space')) or !$this->{'disk_used_space'} ) {
+      if ( $this->Type() == 's3fs' ) {
         $this->{'disk_used_space'} = $this->event_disk_space();
       } else { 
         $path = $this->Path();
@@ -102,21 +131,37 @@ class Storage extends ZM_Object {
 
   public function event_disk_space() {
     # This isn't a function like this in php, so we have to add up the space used in each event.
-    if ( (! array_key_exists('DiskSpace', $this)) or (!$this->{'DiskSpace'}) ) {
+    if ( (! property_exists($this, 'DiskSpace')) or (!isset($this->{'DiskSpace'})) ) {
       $used = dbFetchOne('SELECT SUM(DiskSpace) AS DiskSpace FROM Events WHERE StorageId=? AND DiskSpace IS NOT NULL', 'DiskSpace', array($this->Id()));
 
-      foreach ( Event::find(array('StorageId'=>$this->Id(), 'DiskSpace'=>null)) as $Event ) {
-        $Event->Storage($this); // Prevent further db hit
-        $used += $Event->DiskSpace();
-      }
+      do {
+        # Do in batches of 1000 so as to not useup all ram, Event will do caching though...
+        $events = Event::find(array('StorageId'=>$this->Id(), 'DiskSpace'=>null), array('limit'=>1000));
+        foreach ( $events as $Event ) {
+          $Event->Storage($this); // Prevent further db hit
+          # DiskSpace will update the event
+          $used += $Event->DiskSpace();
+        } #end foreach
+        Event::clear_cache();
+      } while ( count($events) == 1000 );
       $this->{'DiskSpace'} = $used;
     }
     return $this->{'DiskSpace'};
   } // end function event_disk_space
 
   public function Server() {
-    if ( ! array_key_exists('Server',$this) ) {
-      $this->{'Server'}= new Server($this->{'ServerId'});
+    if ( ! property_exists($this, 'Server') ) {
+      if ( property_exists($this, 'ServerId') ) {
+        $this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'}));
+
+        if ( !$this->{'Server'} ) {
+          if ( $this->{'ServerId'} )
+            Error('No Server record found for server id ' . $this->{'ServerId'});
+          $this->{'Server'} = new Server();
+        }
+      } else {
+        $this->{'Server'} = new Server();
+      }
     }
     return $this->{'Server'};
   }
diff --git a/web/includes/User.php b/web/includes/User.php
new file mode 100644
index 000000000..a80e8ed00
--- /dev/null
+++ b/web/includes/User.php
@@ -0,0 +1,50 @@
+<?php
+namespace ZM;
+require_once('database.php');
+require_once('Object.php');
+
+
+class User extends ZM_Object {
+  protected static $table = 'Users';
+
+	protected $defaults = array(
+			'Id'                   => null,
+      'Username'  => '',
+      'Password' => '',
+      'Language' => '',
+      'Enabled' => 1,
+      'Stream'  => 'None',
+      'Events' => 'None',
+      'Control' => 'None',
+      'Monitors' => 'None',
+      'Groups' => 'None',
+      'Devices' => 'None',
+      'System'=> 'None',
+      'MaxBandwidth'    =>'',
+      'MonitorIds'      =>'',
+      'TokenMinExpiry'  => 0,
+      'APIEnabled'=> 1,
+			);
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+
+  public function Name( ) {
+    return $this->{'Username'};
+  }
+
+  public static function Indexed_By_Id() {
+    $results = array();
+    foreach ( ZM_Object::_find('ZM\User', null, array('order'=>'lower(Username)')) as $Object ) {
+      $results[$Object->Id()] = $Object;
+    }
+    return $results;
+  }
+
+} # end class User
+?>
diff --git a/web/includes/Zone.php b/web/includes/Zone.php
new file mode 100644
index 000000000..9f3850bb1
--- /dev/null
+++ b/web/includes/Zone.php
@@ -0,0 +1,50 @@
+<?php
+namespace ZM;
+require_once('database.php');
+require_once('Object.php');
+
+
+class Zone extends ZM_Object {
+  protected static $table = 'Zones';
+
+	protected $defaults = array(
+			'Id'                  => null,
+      'MonitorId'           => null,
+			'Name'                => '',
+			'Type' => 'Active',
+			'Units' => 'Pixels',
+			'CheckMethod' => 'Blobs',
+			'MinPixelThreshold' => null,
+			'MaxPixelThreshold' => null,
+			'MinAlarmPixels' => null,
+			'MaxAlarmPixels' => null,
+			'FilterX' => null,
+			'FilterY' => null,
+			'MinFilterPixels' => null,
+			'MaxFilterPixels' => null,
+			'MinBlobPixels' => null,
+			'MaxBlobPixels' => null,
+			'MinBlobs' => null,
+			'MaxBlobs' => null,
+			'OverloadFrames' => 0,
+			'ExtendAlarmFrames' => 0,
+			);
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+  public function Monitor() {
+    if ( isset($this->{'MonitorId'}) ) {
+      $Monitor = Monitor::find_one(array('Id'=>$this->{'MonitorId'}));
+      if ( $Monitor )
+        return $Monitor;
+    }
+    return new Monitor();
+  }
+
+} # end class Zone
+?>
diff --git a/web/includes/actions/control.php b/web/includes/actions/control.php
index 5dff5a5d2..5c996e636 100644
--- a/web/includes/actions/control.php
+++ b/web/includes/actions/control.php
@@ -35,7 +35,7 @@ if ( $action == 'control' ) {
   $monitor = new ZM\Monitor($mid);
 
   $ctrlCommand = buildControlCommand($monitor);
-  sendControlCommand($monitor->Id(), $ctrlCommand);
+  $monitor->sendControlCommand($ctrlCommand);
   $view = 'none';
 }
 ?>
diff --git a/web/includes/actions/controlcap.php b/web/includes/actions/controlcap.php
index eec3ffd8b..ad4985f11 100644
--- a/web/includes/actions/controlcap.php
+++ b/web/includes/actions/controlcap.php
@@ -28,6 +28,65 @@ if ( $action == 'controlcap' ) {
   require_once('includes/Control.php');
   $Control = new ZM\Control( !empty($_REQUEST['cid']) ? $_REQUEST['cid'] : null );
 
+  $field_defaults = array(
+    'CanWake' =>  0,
+    'CanSleep'  =>  0,
+    'CanReset'  =>  0,
+    'CanReboot' =>  0,
+    'CanMove' => 0,
+    'CanMoveDiag' => 0,
+    'CanMoveMap' => 0,
+    'CanMoveRel' => 0,
+    'CanMoveAbs' => 0,
+    'CanMoveCon' => 0,
+    'CanPan'    =>  0,
+    'HasPanSpeed' =>  0,
+    'HasTurboPan' =>  0,
+    'CanTilt'     =>  0,
+    'HasTiltSpeed'  =>  0,
+    'HasTurboTilt'  =>  0,
+    'CanZoom' => 0,
+    'CanZoomRel' => 0,
+    'CanZoomAbs' => 0,
+    'CanZoomCon' => 0,
+    'HasZoomSpeed'  =>  0,
+    'CanFocus' => 0,
+    'CanAutoFocus' => 0,
+    'CanFocusRel' => 0,
+    'CanFocusAbs' => 0,
+    'CanFocusCon' => 0,
+    'HasFocusSpeed'  =>  0,
+    'CanGain' => 0,
+    'CanAutoGain' => 0,
+    'CanGainRel' => 0,
+    'CanGainAbs' => 0,
+    'CanGainCon' => 0,
+    'HasGainSpeed'  =>  0,
+    'CanWhite' => 0,
+    'CanAutoWhite' => 0,
+    'CanWhiteRel' => 0,
+    'CanWhiteAbs' => 0,
+    'CanWhiteCon' => 0,
+    'HasWhiteSpeed'  =>  0,
+    'CanIris' => 0,
+    'CanAutoIris' => 0,
+    'CanIrisRel' => 0,
+    'CanIrisAbs' => 0,
+    'CanIrisCon' => 0,
+    'HasIrisSpeed'  =>  0,
+    'HasPresets'    =>  0,
+    'HasHomePreset' =>  0,
+    'CanSetPresets' =>  0,
+  );
+
+  # Checkboxes don't return an element in the POST data, so won't be present in newControl.
+  # So force a value for these fields
+  foreach ( $field_defaults as $field => $value ) {
+    if ( ! (isset($_REQUEST['newControl'][$field]) and $_REQUEST['newControl'][$field]) ) {
+      $_REQUEST['newControl'][$field] = $value;
+    }
+  } # end foreach type
+
   //$changes = getFormChanges( $control, $_REQUEST['newControl'], $types, $columns );
   $Control->save($_REQUEST['newControl']);
   $refreshParent = true;
diff --git a/web/includes/actions/donate.php b/web/includes/actions/donate.php
index cfd60c8f0..c85f4509e 100644
--- a/web/includes/actions/donate.php
+++ b/web/includes/actions/donate.php
@@ -25,24 +25,20 @@ if ( !canEdit('System') ) {
 
 if ( $action == 'donate' && isset($_REQUEST['option']) ) {
   $option = $_REQUEST['option'];
-  switch( $option ) {
+  $nextReminder = time();
+
+  switch ( $option ) {
     case 'go' :
-      // Ignore this, the caller will open the page itself
-      break;
+      // Ignore this, the caller will open the page itself, use a return to shortut the view=none
+      return;
     case 'hour' :
+      $nextReminder += 60*60;
     case 'day' :
+      $nextReminder += 24*60*60;
     case 'week' :
+      $nextReminder += 7*24*60*60;
     case 'month' :
-      $nextReminder = time();
-      if ( $option == 'hour' ) {
-        $nextReminder += 60*60;
-      } elseif ( $option == 'day' ) {
-        $nextReminder += 24*60*60;
-      } elseif ( $option == 'week' ) {
-        $nextReminder += 7*24*60*60;
-      } elseif ( $option == 'month' ) {
-        $nextReminder += 30*24*60*60;
-      }
+      $nextReminder += 30*24*60*60;
       dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
       break;
     case 'never' :
@@ -53,6 +49,6 @@ if ( $action == 'donate' && isset($_REQUEST['option']) ) {
       Warning("Unknown value for option in donate: $option");
       break;
   } // end switch option
-  $view = 'none';
+  $redirect = '?view=console';
 }
 ?>
diff --git a/web/includes/actions/eventdetail.php b/web/includes/actions/eventdetail.php
index 20bd084ee..d0a05829c 100644
--- a/web/includes/actions/eventdetail.php
+++ b/web/includes/actions/eventdetail.php
@@ -41,7 +41,6 @@ if ( $action == 'eventdetail' ) {
     );
   }
   $dbConn->commit();
-  $refreshParent = true;
-  $closePopup = true;
+  $redirect = $_SERVER['HTTP_REFERER'];
 }
 ?>
diff --git a/web/includes/actions/events.php b/web/includes/actions/events.php
index 08782a8a2..41a693ccc 100644
--- a/web/includes/actions/events.php
+++ b/web/includes/actions/events.php
@@ -31,24 +31,28 @@ if ( !canEdit('Events') ) {
 
 if ( $action == 'archive' ) {
   $dbConn->beginTransaction();
-  foreach( getAffectedIds('eids') as $markEid ) {
+  $eids = getAffectedIds('eids');
+  ZM\Logger::Debug("E IDS" . print_r($eids, true));
+  foreach ( $eids as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(1, $markEid));
   }
   $dbConn->commit();
   $refreshParent = true;
 } else if ( $action == 'unarchive' ) {
   $dbConn->beginTransaction();
-  foreach( getAffectedIds('eids') as $markEid ) {
+  $eids = getAffectedIds('eids');
+  ZM\Logger::Debug("E IDS" . print_r($eids, true));
+  foreach ( $eids as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(0, $markEid));
   }
   $dbConn->commit();
   $refreshParent = true;
 } else if ( $action == 'delete' ) {
-  $dbConn->beginTransaction();
   foreach ( getAffectedIds('eids') as $markEid ) {
     deleteEvent($markEid);
   }
-  $dbConn->commit();
   $refreshParent = true;
+} else {
+  ZM\Warning("Unsupported action $action in events");
 }
 ?>
diff --git a/web/includes/actions/filter.php b/web/includes/actions/filter.php
index 2e1f282c7..2725c70fc 100644
--- a/web/includes/actions/filter.php
+++ b/web/includes/actions/filter.php
@@ -50,14 +50,6 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
       $_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']);
       $_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']);
       $_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']);
-      if ( $action == 'execute' ) {
-        $_REQUEST['filter']['Name'] = '_TempFilter'.time();
-        unset($_REQUEST['Id']);
-        #$tempFilterName = '_TempFilter'.time();
-        #$sql .= ' Name = \''.$tempFilterName.'\'';
-      #} else {
-        #$sql .= ' Name = '.dbEscape($_REQUEST['filter']['Name']);
-      }
       
       $_REQUEST['filter']['AutoCopy'] = empty($_REQUEST['filter']['AutoCopy']) ? 0 : 1;
       $_REQUEST['filter']['AutoMove'] = empty($_REQUEST['filter']['AutoMove']) ? 0 : 1;
@@ -72,51 +64,38 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
       $_REQUEST['filter']['Background'] = empty($_REQUEST['filter']['Background']) ? 0 : 1;
       $_REQUEST['filter']['Concurrent'] = empty($_REQUEST['filter']['Concurrent']) ? 0 : 1;
       $changes = $filter->changes($_REQUEST['filter']);
-      ZM\Logger::Debug("Changes: " . print_r($changes,true));
-
-      if ( 0 ) {
-      $sql .= ', Query = '.dbEscape(jsonEncode($_REQUEST['filter']['Query']));
-      $sql .= ', AutoArchive = '.(!empty($_REQUEST['filter']['AutoArchive']) ? 1 : 0);
-      $sql .= ', AutoVideo = '. ( !empty($_REQUEST['filter']['AutoVideo']) ? 1 : 0);
-      $sql .= ', AutoUpload = '. ( !empty($_REQUEST['filter']['AutoUpload']) ? 1 : 0);
-      $sql .= ', AutoEmail = '. ( !empty($_REQUEST['filter']['AutoEmail']) ? 1 : 0);
-      $sql .= ', AutoMessage = '. ( !empty($_REQUEST['filter']['AutoMessage']) ? 1 : 0);
-      $sql .= ', AutoExecute = '. ( !empty($_REQUEST['filter']['AutoExecute']) ? 1 : 0);
-      $sql .= ', AutoExecuteCmd = '.dbEscape($_REQUEST['filter']['AutoExecuteCmd']);
-      $sql .= ', AutoDelete = '. ( !empty($_REQUEST['filter']['AutoDelete']) ? 1 : 0);
-      if ( !empty($_REQUEST['filter']['AutoMove']) ? 1 : 0) {
-        $sql .= ', AutoMove = 1, AutoMoveTo='. validInt($_REQUEST['filter']['AutoMoveTo']);
-      } else {
-        $sql .= ', AutoMove = 0'; 
-      }
-      $sql .= ', UpdateDiskSpace = '. ( !empty($_REQUEST['filter']['UpdateDiskSpace']) ? 1 : 0);
-      $sql .= ', Background = '. ( !empty($_REQUEST['filter']['Background']) ? 1 : 0);
-      $sql .= ', Concurrent = '. ( !empty($_REQUEST['filter']['Concurrent']) ? 1 : 0);
-      }
+      ZM\Logger::Debug('Changes: ' . print_r($changes,true));
 
       if ( $_REQUEST['Id'] and ( $action == 'Save' ) ) {
-        if ( 0 ) {
-        dbQuery('UPDATE Filters SET '.$sql.' WHERE Id=?', array($_REQUEST['Id']));
-        }
-        $filter->save($changes);
         if ( $filter->Background() )
           $filter->control('stop');
-      } else {
-        # COuld be execute
-        if ( 0 ) {
-        dbQuery('INSERT INTO Filters SET'.$sql);
-        $_REQUEST['Id'] = dbInsertId();
-        $filter = new ZM\Filter($_REQUEST['Id']);
-        }
         $filter->save($changes);
+      } else {
+
+        if ( $action == 'execute' ) {
+          if ( count($changes) ) {
+            $filter->Name('_TempFilter'.time());
+            $filter->Id(null);
+          }
+        } else if ( $action == 'SaveAs' ) {
+					$filter->Id(null);
+				}
+        $filter->save($changes);
+
+				// We update the request id so that the newly saved filter is auto-selected
+				$_REQUEST['Id'] = $filter->Id();
       }
-      if ( $filter->Background() )
-        $filter->control('start');
 
       if ( $action == 'execute' ) {
-        executeFilter($_REQUEST['Id']);
+        $filter->execute();
+        if ( count($changes) )
+          $filter->delete();
+
         $view = 'events';
+      } else if ( $filter->Background() ) {
+        $filter->control('start');
       }
+      $redirect = '?view=filter&Id='.$filter->Id();
 
     } else if ( $action == 'control' ) {
       if ( $_REQUEST['command'] == 'start'
diff --git a/web/includes/actions/function.php b/web/includes/actions/function.php
index f60b98fda..9667b8c24 100644
--- a/web/includes/actions/function.php
+++ b/web/includes/actions/function.php
@@ -31,30 +31,29 @@ if ( !canEdit('Monitors', $mid) ) {
 }
 
 if ( $action == 'function' ) {
-  $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
+  $monitor = new ZM\Monitor($mid);
+  if ( !$monitor ) {
+    ZM\Error("Monitor not found with Id=$mid");
+    return;
+  }
 
   $newFunction = validStr($_REQUEST['newFunction']);
   # Because we use a checkbox, it won't get passed in the request. So not being in _REQUEST means 0
   $newEnabled = ( !isset($_REQUEST['newEnabled']) or $_REQUEST['newEnabled'] != '1' ) ? '0' : '1';
-  $oldFunction = $monitor['Function'];
-  $oldEnabled = $monitor['Enabled'];
+  $oldFunction = $monitor->Function();
+  $oldEnabled = $monitor->Enabled();
   if ( $newFunction != $oldFunction || $newEnabled != $oldEnabled ) {
-    dbQuery('UPDATE Monitors SET Function=?, Enabled=? WHERE Id=?',
-      array($newFunction, $newEnabled, $mid));
+    $monitor->save(array('Function'=>$newFunction, 'Enabled'=>$newEnabled));
 
-    $monitor['Function'] = $newFunction;
-    $monitor['Enabled'] = $newEnabled;
-    if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
-      $restart = ($oldFunction == 'None') || ($newFunction == 'None') || ($newEnabled != $oldEnabled);
+    if ( daemonCheck() && ($monitor->Type() != 'WebSite') ) {
       zmaControl($monitor, 'stop');
-      zmcControl($monitor, $restart?'restart':'');
-      zmaControl($monitor, 'start');
+      zmcControl($monitor, ($newFunction != 'None') ? 'restart' : 'stop');
+			if ( $newFunction != 'None' && $newFunction != 'NoDect' )
+        zmaControl($monitor, 'start');
     }
-    $refreshParent = true;
   } else {
     ZM\Logger::Debug('No change to function, not doing anything.');
   }
 } // end if action 
-$view = 'none';
-$closePopup = true;
+$view = 'console';
 ?>
diff --git a/web/includes/actions/group.php b/web/includes/actions/group.php
index ec4f28969..b23659d18 100644
--- a/web/includes/actions/group.php
+++ b/web/includes/actions/group.php
@@ -21,41 +21,31 @@
 // Group edit actions
 # Should probably verify that each monitor id is a valid monitor, that we have access to.
 # However at the moment, you have to have System permissions to do this
-if ( ! canEdit('Groups') ) {
+if ( !canEdit('Groups') ) {
   ZM\Warning('Need group edit permissions to edit groups');
   return;
 }
 
 if ( $action == 'Save' ) {
-  $monitors = empty($_POST['newGroup']['MonitorIds']) ? '' : implode(',', $_POST['newGroup']['MonitorIds']);
   $group_id = null;
-  if ( !empty($_POST['gid']) ) {
+  if ( !empty($_POST['gid']) )
     $group_id = $_POST['gid'];
-    dbQuery(
-      'UPDATE Groups SET Name=?, ParentId=? WHERE Id=?',
+  $group = new ZM\Group($group_id);
+  $group->save(
       array(
-        $_POST['newGroup']['Name'],
-        ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
-        $group_id,
+      'Name'=>  $_POST['newGroup']['Name'],
+      'ParentId'=>( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
       )
     );
-    dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($group_id));
-  } else {
-    dbQuery(
-      'INSERT INTO Groups (Name,ParentId) VALUES (?,?)',
-      array(
-        $_POST['newGroup']['Name'],
-        ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
-      )
-    );
-    $group_id = dbInsertId();
-  }
+  dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($group_id));
+  $group_id = $group->Id();
   if ( $group_id ) {
     foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) {
-      dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
+      dbQuery('INSERT INTO `Groups_Monitors` (`GroupId`,`MonitorId`) VALUES (?,?)', array($group_id, $mid));
     }
   }
   $view = 'none';
   $refreshParent = true;
-} 
+  $closePopup = true;
+}
 ?>
diff --git a/web/includes/actions/login.php b/web/includes/actions/login.php
index 787bb34ca..da1b60ed2 100644
--- a/web/includes/actions/login.php
+++ b/web/includes/actions/login.php
@@ -21,14 +21,95 @@
 
 if ( ('login' == $action) && isset($_REQUEST['username']) && ( ZM_AUTH_TYPE == 'remote' || isset($_REQUEST['password']) ) ) {
 
-  $refreshParent = true;
-  // User login is automatically performed in includes/auth.php So we don't need to perform a login here,
-  // just handle redirects.  This is the action that comes from the login view, so the logical thing to
-  // do on successful auth is redirect to console, otherwise loop back to login.
-  if ( !$user ) {
-    $view = 'login';
-  } else {
-    $view = 'postlogin';
+  // if true, a popup will display after login
+  // lets validate reCaptcha if it exists
+  if (
+    defined('ZM_OPT_USE_GOOG_RECAPTCHA')
+    && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
+    && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY')
+    && ZM_OPT_USE_GOOG_RECAPTCHA
+    && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY
+    && ZM_OPT_GOOG_RECAPTCHA_SITEKEY
+  ) {
+    if ( !isset($_REQUEST['g-recaptcha-response']) ) {
+      ZM\Error('reCaptcha authentication failed. No g-recpatcha-response in REQUEST: ');
+      unset($user); // unset should be ok here because we aren't in a function
+      return;
+    }
+    $url = 'https://www.google.com/recaptcha/api/siteverify';
+    $fields = array (
+      'secret'    => ZM_OPT_GOOG_RECAPTCHA_SECRETKEY,
+      'response'  => $_REQUEST['g-recaptcha-response'],
+      'remoteip'  => $_SERVER['REMOTE_ADDR']
+    );
+    $res = do_post_request($url, http_build_query($fields));
+    $responseData = json_decode($res, true);
+    // credit: https://github.com/google/recaptcha/blob/master/src/ReCaptcha/Response.php
+    // if recaptcha resulted in error, we might have to deny login
+    if ( isset($responseData['success']) && ($responseData['success'] == false) ) {
+      // PP - before we deny auth, let's make sure the error was not 'invalid secret'
+      // because that means the user did not configure the secret key correctly
+      // in this case, we prefer to let him login in and display a message to correct
+      // the key. Unfortunately, there is no way to check for invalid site key in code
+      // as it produces the same error as when you don't answer a recaptcha
+      if ( isset($responseData['error-codes']) && is_array($responseData['error-codes']) ) {
+        if ( !in_array('invalid-input-secret', $responseData['error-codes']) ) {
+          ZM\Error('reCaptcha authentication failed. response was: ' . print_r($responseData['error-codes'],true));
+          unset($user); // unset should be ok here because we aren't in a function
+          return;
+        } else {
+          ZM\Error('Invalid recaptcha secret detected');
+        }
+      }
+    } // end if success==false
+    if ( ! (empty($_REQUEST['username']) or empty($_REQUEST['password'])) ) {
+      $ret = validateUser($_REQUEST['username'], $_REQUEST['password']);
+      if ( !$ret[0] ) {
+        ZM\Error($ret[1]);
+        unset($user); // unset should be ok here because we aren't in a function
+      } else {
+        $user = $ret[0];
+      }
+    } # end if have username and password
+  } // end if using reCaptcha
+
+  // if captcha existed, it was passed
+
+  if ( ! isset($user) ) {
+    $_SESSION['loginFailed'] = true;
+    return;
   }
-}
+
+  $close_session = 0;
+  if ( !is_session_started() ) {
+    zm_session_start();
+    $close_session = 1;
+  }
+
+  $username = $_REQUEST['username'];
+  $password = $_REQUEST['password'];
+
+  ZM\Info("Login successful for user \"$username\"");
+  $password_type = password_type($password);
+
+  if ( $password_type == 'mysql' or $password_type == 'mysql+bcrypt' ) {
+    ZM\Info('Migrating password, if possible for future logins');
+    migrateHash($username, $password);
+  }
+  unset($_SESSION['loginFailed']);
+  if ( ZM_AUTH_TYPE == 'builtin' ) {
+    $_SESSION['passwordHash'] = $user['Password'];
+  }
+  $_SESSION['username'] = $user['Username'];
+  if ( ZM_AUTH_RELAY == 'plain' ) {
+    // Need to save this in session, can't use the value in User because it is hashed
+    $_SESSION['password'] = $_REQUEST['password'];
+  }
+  zm_session_regenerate_id();
+  generateAuthHash(ZM_AUTH_HASH_IPS, true);
+  if ( $close_session )
+    session_write_close();
+
+  $view = 'postlogin';
+} # end if doing a login action
 ?>
diff --git a/web/includes/actions/logout.php b/web/includes/actions/logout.php
index 3b9a7b8d2..999d7d772 100644
--- a/web/includes/actions/logout.php
+++ b/web/includes/actions/logout.php
@@ -21,8 +21,10 @@
 
 if ( $action == 'logout' ) {
   userLogout();
-  $refreshParent = true;
-  $view = 'none';
-  $closePopup = true;
+  $view = 'login';
+  ZM\Logger::Debug("User: " . print_r($user,true));
+} elseif ( $action == 'config' ) {
+  $redirect = '?view=user&uid='.$user['Id'];
 }
+
 ?>
diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 9803bad59..b1a7d4726 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -24,38 +24,54 @@ if ( ! canEdit('Monitors') ) {
   return;
 }
 
-if ( $action == 'monitor' ) {
+if ( $action == 'save' ) {
   $mid = 0;
   if ( !empty($_REQUEST['mid']) ) {
     $mid = validInt($_REQUEST['mid']);
-    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
-
     if ( ZM_OPT_X10 ) {
       $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
       if ( !$x10Monitor )
         $x10Monitor = array();
     }
+    if ( !canEdit('Monitors', $mid) ) {
+      ZM\Warning('You do not have permission to edit this monitor');
+      return;
+    }
   } else {
-    $monitor = array();
     if ( ZM_OPT_X10 ) {
       $x10Monitor = array();
     }
+    if ( $user['MonitorIds'] ) {
+      ZM\Warning('You are restricted to certain monitors so cannot add a new one.');
+      return;
+    }
   }
-  $Monitor = new ZM\Monitor($monitor);
+
+  $monitor = new ZM\Monitor($mid);
 
   // Define a field type for anything that's not simple text equivalent
   $types = array(
-      'Triggers' => 'set',
-      'Controllable' => 'toggle',
-      'TrackMotion' => 'toggle',
-      'Enabled' => 'toggle',
-      'DoNativeMotDet' => 'toggle',
-      'Exif' => 'toggle',
-      'RTSPDescribe' => 'toggle',
-      'RecordAudio' => 'toggle',
+      'Triggers' => array(),
+      'Controllable' => 0,
+      'TrackMotion' => 0,
+      'Enabled' => 0,
+      'Exif' => 0,
+      'RTSPDescribe' => 0,
+      'V4LMultiBuffer'  => '',
+      'RecordAudio' => 0,
       'Method' => 'raw',
+      'GroupIds'  =>  array(),
+      'LinkedMonitors'  => array() 
       );
 
+  # Checkboxes don't return an element in the POST data, so won't be present in newMonitor.
+  # So force a value for these fields
+  foreach ( $types as $field => $value ) {
+    if ( ! isset($_REQUEST['newMonitor'][$field] ) ) {
+      $_REQUEST['newMonitor'][$field] = $value;
+    }
+  } # end foreach type
+
   if ( $_REQUEST['newMonitor']['ServerId'] == 'auto' ) {
     $_REQUEST['newMonitor']['ServerId'] = dbFetchOne(
       'SELECT Id FROM Servers WHERE Status=\'Running\' ORDER BY FreeMem DESC, CpuLoad ASC LIMIT 1', 'Id');
@@ -66,121 +82,166 @@ if ( $action == 'monitor' ) {
     }
   }
 
-  $columns = getTableColumns('Monitors');
-  $changes = getFormChanges($monitor, $_REQUEST['newMonitor'], $types, $columns);
-#ZM\Logger::Debug("Columns:". print_r($columns,true));
-#ZM\Logger::Debug("Changes:". print_r($changes,true));
-#ZM\Logger::Debug("newMonitor:". print_r($_REQUEST['newMonitor'],true));
+  $changes = $monitor->changes($_REQUEST['newMonitor'], $types);
+  $restart = false;
 
   if ( count($changes) ) {
-    if ( $mid ) {
+    if ( $monitor->Id() ) {
 
       # If we change anything that changes the shared mem size, zma can complain.  So let's stop first.
-      if ( $monitor['Type'] != 'WebSite' ) {
-        $Monitor->zmaControl('stop');
-        $Monitor->zmcControl('stop');
-      }
-      dbQuery('UPDATE Monitors SET '.implode(', ', $changes).' WHERE Id=?', array($mid));
-      // Groups will be added below
-      if ( isset($changes['Name']) or isset($changes['StorageId']) ) {
-        $OldStorage = new ZM\Storage($monitor['StorageId']);
-        $saferOldName = basename($monitor['Name']);
-        if ( file_exists($OldStorage->Path().'/'.$saferOldName) )
-          unlink($OldStorage->Path().'/'.$saferOldName);
-
-        $NewStorage = new ZM\Storage($_REQUEST['newMonitor']['StorageId']);
-        if ( !file_exists($NewStorage->Path().'/'.$mid) ) {
-          if ( !mkdir($NewStorage->Path().'/'.$mid, 0755) ) {
-            ZM\Error('Unable to mkdir ' . $NewStorage->Path().'/'.$mid);
-          }
-        }
-        $saferNewName = basename($_REQUEST['newMonitor']['Name']);
-        if ( !symlink($NewStorage->Path().'/'.$mid, $NewStorage->Path().'/'.$saferNewName) ) {
-          ZM\Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
+      if ( $monitor->Type() != 'WebSite' ) {
+        $monitor->zmaControl('stop');
+        $monitor->zmcControl('stop');
+        if ( $monitor->Controllable() ) {
+          $monitor->sendControlCommand('stop');
         }
       }
-      if ( isset($changes['Width']) || isset($changes['Height']) ) {
-        $newW = $_REQUEST['newMonitor']['Width'];
-        $newH = $_REQUEST['newMonitor']['Height'];
-        $newA = $newW * $newH;
-        $oldW = $monitor['Width'];
-        $oldH = $monitor['Height'];
-        $oldA = $oldW * $oldH;
 
-        $zones = dbFetchAll('SELECT * FROM Zones WHERE MonitorId=?', NULL, array($mid));
-        foreach ( $zones as $zone ) {
-          $newZone = $zone;
-          $points = coordsToPoints($zone['Coords']);
-          for ( $i = 0; $i < count($points); $i++ ) {
-            $points[$i]['x'] = intval(($points[$i]['x']*($newW-1))/($oldW-1));
-            $points[$i]['y'] = intval(($points[$i]['y']*($newH-1))/($oldH-1));
+      # These are used in updating zones
+      $oldW = $monitor->Width();
+      $oldH = $monitor->Height();
+
+      if ( $monitor->save($changes) ) {
+
+        // Groups will be added below
+        if ( isset($changes['Name']) or isset($changes['StorageId']) ) {
+          // creating symlinks when symlink already exists reports errors, but is perfectly ok
+          error_reporting(0);
+
+          $OldStorage = $monitor->Storage();
+          $saferOldName = basename($monitor->Name());
+          if ( file_exists($OldStorage->Path().'/'.$saferOldName) )
+            unlink($OldStorage->Path().'/'.$saferOldName);
+
+          $NewStorage = new ZM\Storage($_REQUEST['newMonitor']['StorageId']);
+          if ( !file_exists($NewStorage->Path().'/'.$mid) ) {
+            if ( !mkdir($NewStorage->Path().'/'.$mid, 0755) ) {
+              ZM\Error('Unable to mkdir ' . $NewStorage->Path().'/'.$mid);
+            }
           }
-          $newZone['Coords'] = pointsToCoords($points);
-          $newZone['Area'] = intval(round(($zone['Area']*$newA)/$oldA));
-          $newZone['MinAlarmPixels'] = intval(round(($newZone['MinAlarmPixels']*$newA)/$oldA));
-          $newZone['MaxAlarmPixels'] = intval(round(($newZone['MaxAlarmPixels']*$newA)/$oldA));
-          $newZone['MinFilterPixels'] = intval(round(($newZone['MinFilterPixels']*$newA)/$oldA));
-          $newZone['MaxFilterPixels'] = intval(round(($newZone['MaxFilterPixels']*$newA)/$oldA));
-          $newZone['MinBlobPixels'] = intval(round(($newZone['MinBlobPixels']*$newA)/$oldA));
-          $newZone['MaxBlobPixels'] = intval(round(($newZone['MaxBlobPixels']*$newA)/$oldA));
-
-          $changes = getFormChanges($zone, $newZone, $types);
-
-          if ( count($changes) ) {
-            dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?',
-              array($mid, $zone['Id']));
+          $saferNewName = basename($_REQUEST['newMonitor']['Name']);
+          $link_path = $NewStorage->Path().'/'.$saferNewName;
+          if ( !symlink($NewStorage->Path().'/'.$mid, $link_path) ) {
+            if ( ! ( file_exists($link_path) and is_link($link_path) ) ) {
+              ZM\Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
+            }
           }
-        } // end foreach zone
-      } // end if width and height
+        } // end if Name or Storage Area Change
+
+        if ( isset($changes['Width']) || isset($changes['Height']) ) {
+          $newW = $_REQUEST['newMonitor']['Width'];
+          $newH = $_REQUEST['newMonitor']['Height'];
+
+          $zones = dbFetchAll('SELECT * FROM Zones WHERE MonitorId=?', NULL, array($mid));
+
+          if ( ($newW == $oldH) and ($newH == $oldW) ) {
+            foreach ( $zones as $zone ) {
+              $newZone = $zone;
+              # Rotation, no change to area etc just swap the coords
+              $newZone = $zone;
+              $points = coordsToPoints($zone['Coords']);
+              for ( $i = 0; $i < count($points); $i++ ) {
+                $x = $points[$i]['x'];
+                $points[$i]['x'] = $points[$i]['y'];
+                $points[$i]['y'] = $x;
+
+                if ( $points[$i]['x'] > ($newW-1) ) {
+                  ZM\Warning("Correcting x {$points[$i]['x']} > $newW of zone {$newZone['Name']} as it extends outside the new dimensions");
+                  $points[$i]['x'] = ($newW-1);
+                }
+                if ( $points[$i]['y'] > ($newH-1) ) {
+                  ZM\Warning("Correcting y {$points[$i]['y']} $newH of zone {$newZone['Name']} as it extends outside the new dimensions");
+                  $points[$i]['y'] = ($newH-1);
+                }
+              }
+
+              $newZone['Coords'] = pointsToCoords($points);
+              $changes = getFormChanges($zone, $newZone, $types);
+
+              if ( count($changes) ) {
+                dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?',
+                  array($mid, $zone['Id']));
+              }
+            } # end foreach zone
+          } else {
+            $newA = $newW * $newH;
+            $oldA = $oldW * $oldH;
+
+            foreach ( $zones as $zone ) {
+              $newZone = $zone;
+              $points = coordsToPoints($zone['Coords']);
+              for ( $i = 0; $i < count($points); $i++ ) {
+                $points[$i]['x'] = intval(($points[$i]['x']*($newW-1))/($oldW-1));
+                $points[$i]['y'] = intval(($points[$i]['y']*($newH-1))/($oldH-1));
+                if ( $points[$i]['x'] > ($newW-1) ) {
+                  ZM\Warning("Correcting x of zone {$newZone['Name']} as it extends outside the new dimensions");
+                  $points[$i]['x'] = ($newW-1);
+                }
+                if ( $points[$i]['y'] > ($newH-1) ) {
+                  ZM\Warning("Correcting y of zone {$newZone['Name']} as it extends outside the new dimensions");
+                  $points[$i]['y'] = ($newH-1);
+                }
+              }
+              $newZone['Coords'] = pointsToCoords($points);
+              $newZone['Area'] = intval(round(($zone['Area']*$newA)/$oldA));
+              $newZone['MinAlarmPixels'] = intval(round(($newZone['MinAlarmPixels']*$newA)/$oldA));
+              $newZone['MaxAlarmPixels'] = intval(round(($newZone['MaxAlarmPixels']*$newA)/$oldA));
+              $newZone['MinFilterPixels'] = intval(round(($newZone['MinFilterPixels']*$newA)/$oldA));
+              $newZone['MaxFilterPixels'] = intval(round(($newZone['MaxFilterPixels']*$newA)/$oldA));
+              $newZone['MinBlobPixels'] = intval(round(($newZone['MinBlobPixels']*$newA)/$oldA));
+              $newZone['MaxBlobPixels'] = intval(round(($newZone['MaxBlobPixels']*$newA)/$oldA));
+
+              $changes = getFormChanges($zone, $newZone, $types);
+
+              if ( count($changes) ) {
+                dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?',
+                  array($mid, $zone['Id']));
+              }
+            } // end foreach zone
+          } // end if rotation or just size change
+        } // end if changes in width or height
+      } // end if successful save
       $restart = true;
-    } else if ( ! $user['MonitorIds'] ) {
+    } else { // new monitor
       // Can only create new monitors if we are not restricted to specific monitors
 # FIXME This is actually a race condition. Should lock the table.
       $maxSeq = dbFetchOne('SELECT MAX(Sequence) AS MaxSequence FROM Monitors', 'MaxSequence');
-      $changes[] = 'Sequence = '.($maxSeq+1);
+      $changes['Sequence'] = $maxSeq+1;
 
-      $sql = 'INSERT INTO Monitors SET '.implode(', ', $changes);
-      if ( dbQuery($sql) ) {
-        $mid = dbInsertId();
+      if ( $monitor->save($changes) ) {
+        $mid = $monitor->Id();
         $zoneArea = $_REQUEST['newMonitor']['Width'] * $_REQUEST['newMonitor']['Height'];
         dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid, sprintf( "%d,%d %d,%d %d,%d %d,%d", 0, 0, $_REQUEST['newMonitor']['Width']-1, 0, $_REQUEST['newMonitor']['Width']-1, $_REQUEST['newMonitor']['Height']-1, 0, $_REQUEST['newMonitor']['Height']-1 ), $zoneArea, intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*2)/100)  ) );
         //$view = 'none';
-        $Storage = new ZM\Storage($_REQUEST['newMonitor']['StorageId']);
+        $Storage = $monitor->Storage();
+
+				error_reporting(0);
         mkdir($Storage->Path().'/'.$mid, 0755);
         $saferName = basename($_REQUEST['newMonitor']['Name']);
         symlink($mid, $Storage->Path().'/'.$saferName);
 
       } else {
         ZM\Error('Error saving new Monitor.');
-        $error_message = dbError($sql);
         return;
       }
-    } else {
-      ZM\Error('Users with Monitors restrictions cannot create new monitors.');
-      return;
     }
 
+    if ( isset($changes['GroupIds']) ) {
+      dbQuery('DELETE FROM Groups_Monitors WHERE MonitorId=?', array($mid));
+      foreach ( $changes['GroupIds'] as $group_id ) {
+        dbQuery('INSERT INTO Groups_Monitors (GroupId, MonitorId) VALUES (?,?)', array($group_id, $mid));
+      }
+    } // end if there has been a change of groups
+
     $restart = true;
   } else {
     ZM\Logger::Debug('No action due to no changes to Monitor');
   } # end if count(changes)
 
-  if (
-    ( !isset($_POST['newMonitor']['GroupIds']) )
-    or
-    ( count($_POST['newMonitor']['GroupIds']) != count($Monitor->GroupIds()) )
-    or 
-    array_diff($_POST['newMonitor']['GroupIds'], $Monitor->GroupIds())
-  ) {
-    if ( $Monitor->Id() )
-      dbQuery('DELETE FROM Groups_Monitors WHERE MonitorId=?', array($mid));
-
-    if ( isset($_POST['newMonitor']['GroupIds']) ) {
-      foreach ( $_POST['newMonitor']['GroupIds'] as $group_id ) {
-        dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
-      }
-    }
-  } // end if there has been a change of groups
+  if ( !$mid ) {
+    ZM\Error("We should have a mid by now.  Something went wrong.");
+    return;
+  }
 
   if ( ZM_OPT_X10 ) {
     $x10Changes = getFormChanges($x10Monitor, $_REQUEST['newX10Monitor']);
@@ -200,24 +261,19 @@ if ( $action == 'monitor' ) {
   } # end if ZM_OPT_X10
 
   if ( $restart ) {
-    
-    $new_monitor = new ZM\Monitor($mid);
+    if ( $monitor->Function() != 'None' and $monitor->Type() != 'WebSite' ) {
+      $monitor->zmcControl('start');
+      if ( ($monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord') and $monitor->Enabled() )
+        $monitor->zmaControl('start');
 
-    if ( $new_monitor->Function() != 'None' and $new_monitor->Type() != 'WebSite' ) {
-      $new_monitor->zmcControl('start');
-      if ( ($new_monitor->Function() == 'Modect' or $new_monitor->Function == 'Mocord') and $new_monitor->Enabled() )
-        $new_monitor->zmaControl('start');
-
-      if ( $new_monitor->Controllable() ) {
-        require_once('includes/control_functions.php');
-        sendControlCommand($mid, 'quit');
+      if ( $monitor->Controllable() ) {
+        $monitor->sendControlCommand('start');
       }
     }
     // really should thump zmwatch and maybe zmtrigger too.
     //daemonControl( 'restart', 'zmwatch.pl' );
-    $refreshParent = true;
   } // end if restart
-  $view = 'none';
+  $redirect = '?view=console';
 } else {
   ZM\Warning("Unknown action $action in Monitor");
 } // end if action == Delete
diff --git a/web/includes/actions/montage.php b/web/includes/actions/montage.php
index 207c9a0f0..cd9a41aaf 100644
--- a/web/includes/actions/montage.php
+++ b/web/includes/actions/montage.php
@@ -36,7 +36,7 @@ if ( isset($_REQUEST['object']) ) {
       }
       $Layout->Positions($_REQUEST['Positions']);
       $Layout->save();
-      session_start();
+      zm_session_start();
       $_SESSION['zmMontageLayout'] = $Layout->Id();
       setcookie('zmMontageLayout', $Layout->Id(), 1);
       session_write_close();
diff --git a/web/includes/actions/server.php b/web/includes/actions/server.php
index 1ffe4933d..dc0ae4b45 100644
--- a/web/includes/actions/server.php
+++ b/web/includes/actions/server.php
@@ -24,7 +24,7 @@ if ( ! canEdit('System') ) {
   return;
 }
 
-if ( $action == 'Save' ) {
+if ( $action == 'save' ) {
   if ( !empty($_REQUEST['id']) ) {
     $dbServer = dbFetchOne(
       'SELECT * FROM Servers WHERE Id=?',
@@ -46,7 +46,7 @@ if ( $action == 'Save' ) {
     }
     $refreshParent = true;
   }
-  $view = 'none';
+  $redirect = '?view=options&tab=servers';
 } else {
   ZM\Error("Unknown action $action in saving Server");
 }
diff --git a/web/includes/actions/settings.php b/web/includes/actions/settings.php
index 25c4f76d4..c33f3a54c 100644
--- a/web/includes/actions/settings.php
+++ b/web/includes/actions/settings.php
@@ -29,7 +29,6 @@ if ( ! canView('Control', $_REQUEST['mid']) ) {
   return;
 }
 
-require_once('control_functions.php');
 require_once('Monitor.php');
 $mid = validInt($_REQUEST['mid']);
 if ( $action == 'settings' ) {
diff --git a/web/includes/actions/state.php b/web/includes/actions/state.php
index 9799cdec3..0f7a9e9a5 100644
--- a/web/includes/actions/state.php
+++ b/web/includes/actions/state.php
@@ -31,19 +31,19 @@ if ( $action == 'state' ) {
   }
 } else if ( $action == 'save' ) {
   if ( !empty($_REQUEST['runState']) || !empty($_REQUEST['newState']) ) {
-    $sql = 'SELECT Id,Function,Enabled FROM Monitors ORDER BY Id';
+    $sql = 'SELECT `Id`,`Function`,`Enabled` FROM Monitors ORDER BY Id';
     $definitions = array();
-    foreach( dbFetchAll($sql) as $monitor ) {
+    foreach ( dbFetchAll($sql) as $monitor ) {
       $definitions[] = $monitor['Id'].':'.$monitor['Function'].':'.$monitor['Enabled'];
     }
     $definition = join(',', $definitions);
     if ( $_REQUEST['newState'] )
       $_REQUEST['runState'] = $_REQUEST['newState'];
-    dbQuery('REPLACE INTO States SET Name=?, Definition=?', array($_REQUEST['runState'],$definition));
+    dbQuery('REPLACE INTO `States` SET `Name`=?, `Definition`=?', array($_REQUEST['runState'],$definition));
   }
 } else if ( $action == 'delete' ) {
   if ( isset($_REQUEST['runState']) )
-    dbQuery('DELETE FROM States WHERE Name=?', array($_REQUEST['runState']));
+    dbQuery('DELETE FROM `States` WHERE `Name`=?', array($_REQUEST['runState']));
 }
 $view = 'console';
 ?>
diff --git a/web/includes/actions/storage.php b/web/includes/actions/storage.php
index f60c8227d..69ebfae0b 100644
--- a/web/includes/actions/storage.php
+++ b/web/includes/actions/storage.php
@@ -19,31 +19,22 @@
 //
 
 // System edit actions
-if ( ! canEdit('System') ) {
+if ( !canEdit('System') ) {
   ZM\Warning('Need System permission to edit Storage');
   return;
 }
 
-if ( $action == 'Save' ) {
-  if ( !empty($_REQUEST['id']) )
-    $dbStorage = dbFetchOne('SELECT * FROM Storage WHERE Id=?', NULL, array($_REQUEST['id']));
-  else
-    $dbStorage = array();
+if ( $action == 'save' ) {
+  $storage = new ZM\Storage($_REQUEST['id']);
 
-  $types = array();
-  $changes = getFormChanges($dbStorage, $_REQUEST['newStorage'], $types);
+  $changes = $storage->changes($_REQUEST['newStorage']);
 
   if ( count($changes) ) {
-    if ( !empty($_REQUEST['id']) ) {
-      dbQuery('UPDATE Storage SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['id']));
-    } else {
-      dbQuery('INSERT INTO Storage set '.implode(', ', $changes));
-    }
+    $storage->save($changes);
     $refreshParent = true;
   }
-  $view = 'none';
+  $redirect = '?view=options&tab=storage';
 } else {
   ZM\Error("Unknown action $action in saving Storage");
 }
-
 ?>
diff --git a/web/includes/actions/user.php b/web/includes/actions/user.php
index a786f78d7..acbcdab7e 100644
--- a/web/includes/actions/user.php
+++ b/web/includes/actions/user.php
@@ -18,36 +18,52 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( $action == 'user' ) {
+if ( $action == 'Save' ) {
   if ( canEdit('System') ) {
-    if ( !empty($_REQUEST['uid']) )
+    if ( !empty($_REQUEST['uid']) ) {
       $dbUser = dbFetchOne('SELECT * FROM Users WHERE Id=?', NULL, array($_REQUEST['uid']));
-    else
+    } else {
       $dbUser = array();
+    }
 
     $types = array();
+    if ( isset($_REQUEST['newUser']['MonitorIds']) and is_array($_REQUEST['newUser']['MonitorIds']) )
+      $_REQUEST['newUser']['MonitorIds'] = implode(',', $_REQUEST['newUser']['MonitorIds']);
+    if ( !$_REQUEST['newUser']['Password'] )
+      unset($_REQUEST['newUser']['Password']);
+
     $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
 
-    if ( function_exists('password_hash') ) {
-      $pass_hash = '"'.password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT).'"';
-    } else {
-      $pass_hash = ' PASSWORD('.dbEscape($_REQUEST['newUser']['Password']).') ';
-      ZM\Info('Cannot use bcrypt as you are using PHP < 5.3');
-    }
-   
-    if ( $_REQUEST['newUser']['Password'] ) {
-      $changes['Password'] = 'Password = '.$pass_hash;
-      ZM\Info('PASS CMD='.$changes['Password']);
-    } else {
-      unset($changes['Password']);
+    
+    if ( isset($_REQUEST['newUser']['Password']) ) {
+      if ( function_exists('password_hash') ) {
+        $pass_hash = '"'.password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT).'"';
+      } else {
+        $pass_hash = ' PASSWORD('.dbEscape($_REQUEST['newUser']['Password']).') ';
+        ZM\Info('Cannot use bcrypt as you are using PHP < 5.3');
+      }
+
+      if ( $_REQUEST['newUser']['Password'] ) {
+        $changes['Password'] = 'Password = '.$pass_hash;
+      } else {
+        unset($changes['Password']);
+      }
     }
 
     if ( count($changes) ) {
       if ( !empty($_REQUEST['uid']) ) {
         dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['uid']));
         # If we are updating the logged in user, then update our session user data.
-        if ( $user and ( $dbUser['Username'] == $user['Username'] ) )
-          userLogin($dbUser['Username'], $dbUser['Password']);
+        if ( $user and ( $dbUser['Username'] == $user['Username'] ) ) {
+          # We are the logged in user, need to update the $user object and generate a new auth_hash
+          $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Id=?';
+          $user = dbFetchOne($sql, NULL, array($_REQUEST['uid']));
+
+          # Have to update auth hash in session
+          zm_session_start();
+          generateAuthHash(ZM_AUTH_HASH_IPS, true);
+          session_write_close();
+        }
       } else {
         dbQuery('INSERT INTO Users SET '.implode(', ', $changes));
       }
@@ -62,8 +78,8 @@ if ( $action == 'user' ) {
     $types = array();
     $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
 
-    if (function_exists ('password_hash')) {
-      $pass_hash = '"'.password_hash($pass, PASSWORD_BCRYPT).'"';
+    if ( function_exists('password_hash') ) {
+      $pass_hash = '"'.password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT).'"';
     } else {
       $pass_hash = ' PASSWORD('.dbEscape($_REQUEST['newUser']['Password']).') ';
       ZM\Info ('Cannot use bcrypt as you are using PHP < 5.3');
@@ -71,12 +87,19 @@ if ( $action == 'user' ) {
 
     if ( !empty($_REQUEST['newUser']['Password']) ) {
       $changes['Password'] = 'Password = '.$pass_hash;
-    }
-      
-    else
+    } else {
       unset($changes['Password']);
+    }
     if ( count($changes) ) {
       dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id=?', array($uid));
+
+      # We are the logged in user, need to update the $user object and generate a new auth_hash
+      $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Id=?';
+      $user = dbFetchOne($sql, NULL, array($uid));
+      
+      zm_session_start();
+      generateAuthHash(ZM_AUTH_HASH_IPS, true);
+      session_write_close();
       $refreshParent = true;
     }
     $view = 'none';
diff --git a/web/includes/actions/version.php b/web/includes/actions/version.php
index fde85427f..a203e1dd3 100644
--- a/web/includes/actions/version.php
+++ b/web/includes/actions/version.php
@@ -42,6 +42,8 @@ if ( $action == 'version' && isset($_REQUEST['option']) ) {
       $nextReminder += 24*60*60;
     } elseif ( $option == 'week' ) {
       $nextReminder += 7*24*60*60;
+    } elseif ( $option == 'month' ) {
+      $nextReminder += 30*24*60*60;
     }
     dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_NEXT_REMINDER'");
     break;
diff --git a/web/includes/actions/zone.php b/web/includes/actions/zone.php
index cc7db0226..c0e4eabbb 100644
--- a/web/includes/actions/zone.php
+++ b/web/includes/actions/zone.php
@@ -21,9 +21,9 @@
 // Monitor edit actions, require a monitor id and edit permissions for that monitor
 if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
   $mid = validInt($_REQUEST['mid']);
-  if ( $action == 'zone' && isset($_REQUEST['zid']) ) {
+  if ( ($action == 'zone') && isset($_REQUEST['zid']) ) {
     $zid = validInt($_REQUEST['zid']);
-    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
+    $monitor = new ZM\Monitor($mid);
 
     if ( !empty($zid) ) {
       $zone = dbFetchOne('SELECT * FROM Zones WHERE MonitorId=? AND Id=?', NULL, array($mid, $zid));
@@ -32,17 +32,15 @@ if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
     }
 
     if ( $_REQUEST['newZone']['Units'] == 'Percent' ) {
-      $_REQUEST['newZone']['MinAlarmPixels'] = intval(($_REQUEST['newZone']['MinAlarmPixels']*$_REQUEST['newZone']['Area'])/100);
-      $_REQUEST['newZone']['MaxAlarmPixels'] = intval(($_REQUEST['newZone']['MaxAlarmPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MinFilterPixels']) )
-        $_REQUEST['newZone']['MinFilterPixels'] = intval(($_REQUEST['newZone']['MinFilterPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MaxFilterPixels']) )
-        $_REQUEST['newZone']['MaxFilterPixels'] = intval(($_REQUEST['newZone']['MaxFilterPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MinBlobPixels']) )
-        $_REQUEST['newZone']['MinBlobPixels'] = intval(($_REQUEST['newZone']['MinBlobPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MaxBlobPixels']) )
-        $_REQUEST['newZone']['MaxBlobPixels'] = intval(($_REQUEST['newZone']['MaxBlobPixels']*$_REQUEST['newZone']['Area'])/100);
-    }
+			foreach (array(
+						'MinAlarmPixels','MaxAlarmPixels',
+						'MinFilterPixels','MaxFilterPixels',
+						'MinBlobPixels','MaxBlobPixels'
+						) as $field ) {
+				if ( isset($_REQUEST['newZone'][$field]) and $_REQUEST['newZone'][$field] )
+					$_REQUEST['newZone'][$field] = intval(($_REQUEST['newZone'][$field]*$_REQUEST['newZone']['Area'])/100);
+			}
+		}
 
     unset($_REQUEST['newZone']['Points']);
 
@@ -60,21 +58,20 @@ if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
       } else {
         dbQuery('INSERT INTO Zones SET MonitorId=?, '.implode(', ', $changes), array($mid));
       }
-      if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
+      if ( daemonCheck() && ($monitor->Type() != 'WebSite') ) {
         if ( $_REQUEST['newZone']['Type'] == 'Privacy' ) {
-          zmaControl($monitor, 'stop');
-          zmcControl($monitor, 'restart');
-          zmaControl($monitor, 'start');
+          $monitor->zmaControl('stop');
+          $monitor->zmcControl('restart');
+          $monitor->zmaControl('start');
         } else {
-          zmaControl($monitor, 'restart');
+          $monitor->zmaControl('restart');
         }
       }
-      if ( ($_REQUEST['newZone']['Type'] == 'Privacy') && $monitor['Controllable'] ) {
-        require_once('control_functions.php');
-        sendControlCommand($mid, 'quit');
+      if ( ($_REQUEST['newZone']['Type'] == 'Privacy') && $monitor->Controllable() ) {
+        $monitor->sendControlCommand('quit');
       }
       $refreshParent = true;
-    }
+    } // end if changes
     $view = 'none';
   } // end if action 
 } // end if $mid and canEdit($mid)
diff --git a/web/includes/actions/zones.php b/web/includes/actions/zones.php
index babb4fa7b..48f5a6091 100644
--- a/web/includes/actions/zones.php
+++ b/web/includes/actions/zones.php
@@ -17,33 +17,39 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
+require_once('includes/Zone.php');
+global $error_message;
 
-if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
-  $mid = validInt($_REQUEST['mid']);
-  $monitor = new ZM\Monitor($mid);
-  
-  if ( $action == 'delete' ) {
-    if ( isset($_REQUEST['markZids']) ) {
-      $restart_zmc = 0;
-      foreach ( $_REQUEST['markZids'] as $markZid ) {
+$monitors_to_restart = array();
 
-        if ( ! $restart_zmc ) {
-          $zone = dbFetchOne('SELECT * FROM Zones WHERE Id=?', NULL, array($markZid));
-          if ( $zone['Type'] == 'Privacy' ) {
-            $restart_zmc = 1;
-          }
-        }
-        dbQuery('DELETE FROM Zones WHERE MonitorId=? AND Id=?', array($mid, $markZid));
+if ( $action == 'delete' ) {
+  if ( isset($_REQUEST['markZids']) ) {
+    foreach ( $_REQUEST['markZids'] as $markZid ) {
+      $zone = new ZM\Zone($markZid);
+      if ( ! $zone->Id() ) {
+        $error_message .= 'Zone not found for id ' . $markZid.'<br/>';
+        continue;
       }
-      if ( daemonCheck() && $monitor->Type() != 'WebSite' ) {
+      $monitor = $zone->Monitor();
+      if ( !$monitor->CanEdit() ) {
+        $error_message .= 'You do not have permission to edit zones for monitor ' . $monitor->Name().'.<br/>';
+        continue;
+      }
+      # Could use true but store the object instead for easy access later
+      $monitors_to_restart[$monitor->Id()] = $monitor;
+      $error_message .= $zone->delete();
+    } # end foreach Zone
+
+    foreach ( $monitors_to_restart as $mid => $monitor ) {
+      if ( daemonCheck() and ($monitor->Type() != 'WebSite') ) {
         zmaControl($mid, 'stop');
-        if ( $restart_zmc )
+        if ( $monitor->Type() == 'Privacy' )
           zmcControl($mid, 'restart');
         zmaControl($mid, 'start');
       } // end if daemonCheck()
-      $refreshParent = true;
-    } // end if isset($_REQUEST['markZids'])
-  } // end if action 
-} // end if $mid and canEdit($mid)
+    }
+    $refreshParent = true;
+  } // end if isset($_REQUEST['markZids'])
+} // end if action 
 
 ?>
diff --git a/web/includes/auth.php b/web/includes/auth.php
index 652ef3c98..e49f5876b 100644
--- a/web/includes/auth.php
+++ b/web/includes/auth.php
@@ -20,9 +20,23 @@
 //
 require_once('session.php');
 require_once(__DIR__.'/../vendor/autoload.php');
-
 use \Firebase\JWT\JWT;
 
+function password_type($password) {
+   if ( $password[0] == '*' ) {
+    return 'mysql';
+  } else if ( preg_match('/^\$2[ayb]\$.+$/', $password) ) {
+    return 'bcrypt';
+  } else if ( substr($password, 0,4) == '-ZM-' ) {
+  // zmupdate.pl adds a '-ZM-' prefix to overlay encrypted passwords
+  // this is done so that we don't spend cycles doing two bcrypt password_verify calls
+  // for every wrong password entered. This will only be invoked for passwords zmupdate.pl has
+  // overlay hashed
+    return 'mysql+bcrypt';
+  }
+  return 'plain';
+}
+
 // this function migrates mysql hashing to bcrypt, if you are using PHP >= 5.5
 // will be called after successful login, only if mysql hashing is detected
 function migrateHash($user, $pass) {
@@ -33,7 +47,6 @@ function migrateHash($user, $pass) {
     $bcrypt_hash = password_hash($pass, PASSWORD_BCRYPT);
     //ZM\Info ("hased bcrypt $pass is $bcrypt_hash");
     $update_password_sql = 'UPDATE Users SET Password=\''.$bcrypt_hash.'\' WHERE Username=\''.$user.'\'';
-    ZM\Info($update_password_sql);
     dbQuery($update_password_sql);
     # Since password field has changed, existing auth_hash is no longer valid
     generateAuthHash(ZM_AUTH_HASH_IPS, true);
@@ -43,226 +56,105 @@ function migrateHash($user, $pass) {
   }
 }
 
-// core function used to login a user to PHP. Is also used for cake sessions for the API
-function userLogin($username='', $password='', $passwordHashed=false, $from_api_layer = false) {
-  
-  global $user;
+// core function used to load a User record by username and password
+function validateUser($username='', $password='') {
 
-  if ( !$username and isset($_REQUEST['username']) )
-    $username = $_REQUEST['username'];
-  if ( !$password and isset($_REQUEST['password']) )
-    $password = $_REQUEST['password'];
+  $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
+  // local user, shouldn't affect the global user
+  $user = dbFetchOne($sql, NULL, array($username));
 
-  // if true, a popup will display after login
-  // lets validate reCaptcha if it exists
-  // this only applies if it userLogin was not called from API layer
-  if ( !$from_api_layer
-      && defined('ZM_OPT_USE_GOOG_RECAPTCHA')
-      && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
-      && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY')
-      && ZM_OPT_USE_GOOG_RECAPTCHA
-      && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY
-      && ZM_OPT_GOOG_RECAPTCHA_SITEKEY )
-  {
-    $url = 'https://www.google.com/recaptcha/api/siteverify';
-    $fields = array (
-        'secret'    => ZM_OPT_GOOG_RECAPTCHA_SECRETKEY,
-        'response'  => $_REQUEST['g-recaptcha-response'],
-        'remoteip'  => $_SERVER['REMOTE_ADDR']
-        );
-    $res = do_post_request($url, http_build_query($fields));
-    $responseData = json_decode($res, true);
-    // credit: https://github.com/google/recaptcha/blob/master/src/ReCaptcha/Response.php
-    // if recaptcha resulted in error, we might have to deny login
-    if ( isset($responseData['success']) && ($responseData['success'] == false) ) {
-      // PP - before we deny auth, let's make sure the error was not 'invalid secret'
-      // because that means the user did not configure the secret key correctly
-      // in this case, we prefer to let him login in and display a message to correct
-      // the key. Unfortunately, there is no way to check for invalid site key in code
-      // as it produces the same error as when you don't answer a recaptcha
-      if ( isset($responseData['error-codes']) && is_array($responseData['error-codes']) ) {
-        if ( !in_array('invalid-input-secret', $responseData['error-codes']) ) {
-          Error('reCaptcha authentication failed');
-          return null;
-        } else {
-          Error('Invalid recaptcha secret detected');
-        }
-      }
-    } // end if success==false
-  } // end if using reCaptcha
+  if ( ! $user ) {
+    return array(false, "Could not retrieve user $username details");
+  }
 
-  // coming here means we need to authenticate the user
-  // if captcha existed, it was passed
-
-  $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username = ?';
-  $sql_values = array($username);
-
-  // First retrieve the stored password
-  // and move password hashing to application space
-    
-  $saved_user_details = dbFetchOne($sql, NULL, $sql_values);
-  $password_correct = false;
-  $password_type = NULL;
-    
-  if ( $saved_user_details ) {
-
-    // if the API layer asked us to login, make sure the user 
-    // has API enabled (admin may have banned API for this user)
-
-    if ( $from_api_layer ) {
-      if ( $saved_user_details['APIEnabled'] != 1 ) {
-        ZM\Error("API disabled for: $username");
-        $_SESSION['loginFailed'] = true;
-        unset($user);
-        return false;
-      }
-    }
-
-    $saved_password = $saved_user_details['Password'];
-    if ( $saved_password[0] == '*' ) {
-      // We assume we don't need to support mysql < 4.1
-      // Starting MY SQL 4.1, mysql concats a '*' in front of its password hash
-      // https://blog.pythian.com/hashing-algorithm-in-mysql-password-2/
-      ZM\Logger::Debug('Saved password is using MYSQL password function');
-      $input_password_hash = '*'.strtoupper(sha1(sha1($password, true)));
-      $password_correct = ($saved_password == $input_password_hash);
-      $password_type = 'mysql';
-      
-    } else if ( preg_match('/^\$2[ayb]\$.+$/', $saved_password) ) {
-      ZM\Logger::Debug('bcrypt signature found, assumed bcrypt password');
-      $password_type = 'bcrypt';
-      $password_correct = $passwordHashed ? ($password == $saved_password) : password_verify($password, $saved_password);
-    }
+  switch ( password_type($user['Password']) ) {
+  case 'mysql' : 
+    // We assume we don't need to support mysql < 4.1
+    // Starting MY SQL 4.1, mysql concats a '*' in front of its password hash
+    // https://blog.pythian.com/hashing-algorithm-in-mysql-password-2/
+    ZM\Logger::Debug('Saved password is using MYSQL password function');
+    $input_password_hash = '*'.strtoupper(sha1(sha1($password, true)));
+    $password_correct = ($user['Password'] == $input_password_hash);
+    break;
+  case 'bcrypt' :
+    ZM\Logger::Debug('bcrypt signature found, assumed bcrypt password');
+    $password_correct = password_verify($password, $user['Password']);
+    break;
+  case 'mysql+bcrypt' : 
     // zmupdate.pl adds a '-ZM-' prefix to overlay encrypted passwords
     // this is done so that we don't spend cycles doing two bcrypt password_verify calls
     // for every wrong password entered. This will only be invoked for passwords zmupdate.pl has
     // overlay hashed
-    else if ( substr($saved_password, 0,4) == '-ZM-' ) {
-      ZM\Logger::Debug("Detected bcrypt overlay hashing for $username");
-      $bcrypt_hash = substr($saved_password, 4);
-      $mysql_encoded_password = '*'.strtoupper(sha1(sha1($password, true)));
-      ZM\Logger::Debug("Comparing password $mysql_encoded_password to bcrypt hash: $bcrypt_hash");
-      $password_correct = password_verify($mysql_encoded_password, $bcrypt_hash);
-      $password_type = 'mysql'; // so we can migrate later down
-    } else {
-      // we really should nag the user not to use plain
-      ZM\Warning ('assuming plain text password as signature is not known. Please do not use plain, it is very insecure');
-      $password_type = 'plain';
-      $password_correct = ($saved_password == $password);
-    }
-  } else {
-    ZM\Error("Could not retrieve user $username details");
-    $_SESSION['loginFailed'] = true;
-    unset($user);
-    return false;
-  }
-
-  $close_session = 0;
-  if ( !is_session_started() ) {
-    session_start();
-    $close_session = 1;
-  }
-  $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
+    ZM\Logger::Debug("Detected bcrypt overlay hashing for $username");
+    $bcrypt_hash = substr($user['Password'], 4);
+    $mysql_encoded_password = '*'.strtoupper(sha1(sha1($password, true)));
+    ZM\Logger::Debug("Comparing password $mysql_encoded_password to bcrypt hash: $bcrypt_hash");
+    $password_correct = password_verify($mysql_encoded_password, $bcrypt_hash);
+    break;
+  default:
+    // we really should nag the user not to use plain
+    ZM\Warning('assuming plain text password as signature is not known. Please do not use plain, it is very insecure');
+    $password_correct = ($user['Password'] == $password);
+  } // switch password_type
 
   if ( $password_correct ) {
-    ZM\Info("Login successful for user \"$username\"");
-    $user = $saved_user_details;
-    if ( $password_type == 'mysql' ) {
-      ZM\Info('Migrating password, if possible for future logins');
-      migrateHash($username, $password);
-    }
-    unset($_SESSION['loginFailed']);
-    if ( ZM_AUTH_TYPE == 'builtin' ) {
-      $_SESSION['passwordHash'] = $user['Password'];
-    }
-    $_SESSION['username'] = $user['Username'];
-    if ( ZM_AUTH_RELAY == 'plain' ) {
-      // Need to save this in session, can't use the value in User because it is hashed
-      $_SESSION['password'] = $_REQUEST['password'];
-    }
-    zm_session_regenerate_id();
-  } else {
-    ZM\Warning("Login denied for user \"$username\"");
-    $_SESSION['loginFailed'] = true;
-    unset($user);
+    return array($user, 'OK');
   }
-  if ( $close_session )
-    session_write_close();
-  return isset($user) ? $user: null;
-} # end function userLogin
+  return array(false, "Login denied for user \"$username\"");
+} # end function validateUser
 
 function userLogout() {
   global $user;
   ZM\Info('User "'.$user['Username'].'" logged out');
-  unset($user);
+  $user = null;// unset only clears the local variable
   zm_session_clear();
 }
 
-
-function validateToken ($token, $allowed_token_type='access', $from_api_layer=false) {
-
+function validateToken($token, $allowed_token_type='access') {
   global $user;
   $key = ZM_AUTH_HASH_SECRET;
   //if (ZM_AUTH_HASH_IPS) $key .= $_SERVER['REMOTE_ADDR'];
   try {
-    $decoded_token =  JWT::decode($token, $key, array('HS256'));
+    $decoded_token = JWT::decode($token, $key, array('HS256'));
   } catch (Exception $e) {
     ZM\Error("Unable to authenticate user. error decoding JWT token:".$e->getMessage());
-
     return array(false, $e->getMessage());
   }
 
   // convert from stdclass to array
   $jwt_payload = json_decode(json_encode($decoded_token), true);
-
-  $type = $jwt_payload['type'];
-  if ( $type != $allowed_token_type ) {
-    if ( $allowed_token_type == 'access' ) {
-      // give a hint that the user is not doing it right
-      ZM\Error('Please do not use refresh tokens for this operation');
+  if ($allowed_token_type != 'any') {
+    $type = $jwt_payload['type'];
+    if ( $type != $allowed_token_type ) {
+      ZM\Error("Token type mismatch. Expected $allowed_token_type but got $type");
+      return array(false, 'Incorrect token type');
     }
-    return array (false, 'Incorrect token type');
+  } else {
+    ZM\Logger::Debug('Not comparing token types as [any] was passed');
   }
-
+  
   $username = $jwt_payload['user'];
-  $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username = ?';
-  $sql_values = array($username);
-
-  $saved_user_details = dbFetchOne($sql, NULL, $sql_values);
+  $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
+  $saved_user_details = dbFetchOne($sql, NULL, array($username));
 
   if ( $saved_user_details ) {
-
-    if ($from_api_layer && $saved_user_details['APIEnabled'] == 0) {
-    // if from_api_layer is true, an additional check will be done
-    // to make sure APIs are enabled for this user. This is a good place
-    // to do it, since we are doing a DB dip here.
-      ZM\Error ("API is disabled for \"$username\"");
-      unset($user);
-      return array(false, 'API is disabled for user');
-
-    }
-
     $issuedAt =  $jwt_payload['iat'];
     $minIssuedAt = $saved_user_details['TokenMinExpiry'];
 
     if ( $issuedAt < $minIssuedAt ) {
       ZM\Error("Token revoked for $username. Please generate a new token");
-      $_SESSION['loginFailed'] = true;
-      unset($user);
+      $user = null;// unset only clears the local variable
       return array(false, 'Token revoked. Please re-generate');
     }
-
     $user = $saved_user_details;
     return array($user, 'OK');
-  } else {
-    ZM\Error("Could not retrieve user $username details");
-    $_SESSION['loginFailed'] = true;
-    unset($user);
-    return array(false, 'No such user/credentials');
   }
+  ZM\Error("Could not retrieve user $username details");
+  $user = null;// unset only clears the local variable
+  return array(false, 'No such user/credentials');
 } // end function validateToken($token, $allowed_token_type='access')
 
-function getAuthUser($auth, $from_api_layer = false) {
+function getAuthUser($auth) {
   if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') && !empty($auth) ) {
     $remoteAddr = '';
     if ( ZM_AUTH_HASH_IPS ) {
@@ -291,19 +183,8 @@ function getAuthUser($auth, $from_api_layer = false) {
         $authHash = md5($authKey);
 
         if ( $auth == $authHash ) {
-          if ($from_api_layer && $user['APIEnabled'] == 0) {
-            // if from_api_layer is true, an additional check will be done
-            // to make sure APIs are enabled for this user. This is a good place
-            // to do it, since we are doing a DB dip here.
-              ZM\Error ("API is disabled for \"".$user['Username']."\"");
-              unset($user);
-              return array(false, 'API is disabled for user');
-        
-            }
-            else {
-              return $user;
-            }
-        }
+          return $user;
+        } // end if $auth == $authHash
       } // end foreach hour
     } // end foreach user
   } // end if using auth hash
@@ -312,35 +193,28 @@ function getAuthUser($auth, $from_api_layer = false) {
 } // end getAuthUser($auth)
 
 function generateAuthHash($useRemoteAddr, $force=false) {
-  if ( ZM_OPT_USE_AUTH and (ZM_AUTH_RELAY == 'hashed') and isset($_SESSION['username']) and $_SESSION['passwordHash'] ) {
+  global $user;
+  if ( ZM_OPT_USE_AUTH and (ZM_AUTH_RELAY == 'hashed') and isset($user['Username']) and isset($user['Password']) ) {
     $time = time();
 
     # We use 1800 so that we regenerate the hash at half the TTL
     $mintime = $time - ( ZM_AUTH_HASH_TTL * 1800 );
 
+    # Appending the remoteAddr prevents us from using an auth hash generated for a different ip
     if ( $force or ( !isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]) ) or ( $_SESSION['AuthHashGeneratedAt'] < $mintime ) ) {
       # Don't both regenerating Auth Hash if an hour hasn't gone by yet
       $local_time = localtime();
       $authKey = '';
       if ( $useRemoteAddr ) {
-        $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
+        $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$_SESSION['remoteAddr'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
       } else {
-        $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
+        $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
       }
       #ZM\Logger::Debug("Generated using hour:".$local_time[2] . ' mday:' . $local_time[3] . ' month:'.$local_time[4] . ' year: ' . $local_time[5] );
       $auth = md5($authKey);
-      $close_session = 0;
-      if ( !is_session_started() ) {
-        session_start();
-        $close_session = 1;
-      }
       $_SESSION['AuthHash'.$_SESSION['remoteAddr']] = $auth;
       $_SESSION['AuthHashGeneratedAt'] = $time;
-      if ( $close_session )
-        session_write_close();
-      #ZM\Logger::Debug("Generated new auth $auth at " . $_SESSION['AuthHashGeneratedAt']. " using $authKey" );
-      #} else {
-      #ZM\Logger::Debug("Using cached auth " . $_SESSION['AuthHash'] ." beacuse generatedat:" . $_SESSION['AuthHashGeneratedAt'] . ' < now:'. $time . ' - ' .  ZM_AUTH_HASH_TTL . ' * 1800 = '. $mintime);
+      # Because we don't write out the session, it shouldn't actually get written out to disk.  However if it does, the GeneratedAt should protect us.
     } # end if AuthHash is not cached
     return $_SESSION['AuthHash'.$_SESSION['remoteAddr']];
   } # end if using AUTH and AUTH_RELAY
@@ -350,70 +224,97 @@ function generateAuthHash($useRemoteAddr, $force=false) {
 function visibleMonitor($mid) {
   global $user;
 
-  return ( empty($user['MonitorIds']) || in_array($mid, explode(',', $user['MonitorIds'])) );
+  return ( $user && empty($user['MonitorIds']) || in_array($mid, explode(',', $user['MonitorIds'])) );
 }
 
 function canView($area, $mid=false) {
   global $user;
 
-  return ( ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor($mid) ) );
+  return ( $user && ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor($mid) ) );
 }
 
 function canEdit($area, $mid=false) {
   global $user;
 
-  return ( $user[$area] == 'Edit' && ( !$mid || visibleMonitor($mid) ));
+  return ( $user && ($user[$area] == 'Edit') && ( !$mid || visibleMonitor($mid) ));
 }
 
-global $user;
-if ( ZM_OPT_USE_AUTH ) {
-  $close_session = 0;
-  if ( !is_session_started() ) {
-    zm_session_start();
-    $close_session = 1;
-  }
-
+function userFromSession() {
+  $user = null; // Not global
   if ( isset($_SESSION['username']) ) {
     if ( ZM_AUTH_HASH_LOGINS and (ZM_AUTH_RELAY == 'hashed') ) {
       # Extra validation, if logged in, then the auth hash will be set in the session, so we can validate it.
       # This prevent session modification to switch users
       if ( isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]) )
         $user = getAuthUser($_SESSION['AuthHash'.$_SESSION['remoteAddr']]);
+      else
+        ZM\Logger::Debug("No auth hash in session, there should have been");
     } else {
       # Need to refresh permissions and validate that the user still exists
       $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
       $user = dbFetchOne($sql, NULL, array($_SESSION['username']));
     }
+  } else {
+    ZM\Logger::Debug('No username in session');
   }
+  return $user;
+}
 
-  if ( ZM_AUTH_RELAY == 'plain' ) {
-    // Need to save this in session
-    $_SESSION['password'] = $user['Password'];
-  }
-  $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
-
-  if ( ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth']) ) {
-    if ( $authUser = getAuthUser($_REQUEST['auth']) ) {
-      userLogin($authUser['Username'], $authUser['Password'], true);
+function get_auth_relay() {
+  if ( ZM_OPT_USE_AUTH ) {
+    if ( ZM_AUTH_RELAY == 'hashed' ) {
+      return 'auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
+    } else if ( ZM_AUTH_RELAY == 'plain' ) {
+      // password probably needs to be escaped
+      return 'username='.$_SESSION['username'].'&password='.urlencode($_SESSION['password']);
+    } else if ( ZM_AUTH_RELAY == 'none' ) {
+      return 'username='.$_SESSION['username'];
+    } else {
+      ZM\Error('Unknown value for ZM_AUTH_RELAY ' . ZM_AUTH_RELAY);
     }
-  } else if ( isset($_REQUEST['username']) and isset($_REQUEST['password']) ) {
-    userLogin($_REQUEST['username'], $_REQUEST['password'], false);
-    # Because it might have migrated the password we need to update the hash
-    generateAuthHash(ZM_AUTH_HASH_IPS, true);
   }
+  return '';
+} // end function get_auth_relay
 
-  if ( empty($user) && !empty($_REQUEST['token']) ) {
-    $ret = validateToken($_REQUEST['token'], 'access');
+if ( ZM_OPT_USE_AUTH ) {
+  if ( !empty($_REQUEST['token']) ) {
+    // we only need to get the username here
+    // don't know the token type. That will
+    // be checked later 
+    $ret = validateToken($_REQUEST['token'], 'any');
     $user = $ret[0];
-  }
+  } else {
+    // Non token based auth
 
-  if ( !empty($user) ) {
-    // generate it once here, while session is open.  Value will be cached in session and return when called later on
-    generateAuthHash(ZM_AUTH_HASH_IPS);
-  }
-  if ( $close_session )
-    session_write_close();
+    if ( ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth']) ) {
+      $user = getAuthUser($_REQUEST['auth']);
+    } else if (
+      ! (
+        empty($_REQUEST['username']) or
+        empty($_REQUEST['password']) or
+      (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA)
+    ) ) {
+      $ret = validateUser($_REQUEST['username'], $_REQUEST['password']);
+      if ( !$ret[0] ) {
+        ZM\Error($ret[1]);
+        unset($user); // unset should be ok here because we aren't in a function
+        return;
+      }
+      $user = $ret[0];
+    } else if ( (ZM_AUTH_TYPE == 'remote') and !empty($_SERVER['REMOTE_USER']) ) {
+      $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
+      // local user, shouldn't affect the global user
+      $user = dbFetchOne($sql, NULL, array($_SERVER['REMOTE_USER']));
+    } else {
+      $user = userFromSession();
+    }
+
+    if ( !empty($user) ) {
+      // generate it once here, while session is open.  Value will be cached in session and return when called later on
+      generateAuthHash(ZM_AUTH_HASH_IPS);
+    }
+  } # end if token based auth
 } else {
   $user = $defaultUser;
-}
+} # end if ZM_OPT_USE_AUTH
 ?>
diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 01382ad37..65dbcdbd9 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -31,11 +31,11 @@ global $configvals;
 
 $configFile = ZM_CONFIG;
 $localConfigFile = basename($configFile);
-if ( file_exists( $localConfigFile ) && filesize( $localConfigFile ) > 0 ) {
+if ( file_exists($localConfigFile) && filesize($localConfigFile) > 0 ) {
   if ( php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']) )
-    print( "Warning, overriding installed $localConfigFile file with local copy\n" );
+    print("Warning, overriding installed $localConfigFile file with local copy\n");
   else
-    error_log( "Warning, overriding installed $localConfigFile file with local copy" );
+    error_log("Warning, overriding installed $localConfigFile file with local copy");
   $configFile = $localConfigFile;
 }
 
@@ -47,96 +47,96 @@ $configvals = process_configfile($configFile);
 $configSubFolder = ZM_CONFIG_SUBDIR;
 if ( is_dir($configSubFolder) ) {
   if ( is_readable($configSubFolder) ) {
-    foreach ( glob("$configSubFolder/*.conf") as $filename ) {
+    foreach ( glob($configSubFolder.'/*.conf') as $filename ) {
       //error_log("processing $filename");
-      $configvals = array_replace($configvals, process_configfile($filename) );
+      $configvals = array_replace($configvals, process_configfile($filename));
     }
   } else {
-    error_log( "WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on $configSubFolder." );
+    error_log('WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on '.$configSubFolder);
   }
 } else {
-  error_log( "WARNING: ZoneMinder configuration subfolder found but is not a directory. Check $configSubFolder." );
+  error_log('WARNING: ZoneMinder configuration subfolder found but is not a directory. Check '.$configSubFolder);
 }
 
 # Now that our array our finalized, define each key => value
 # pair in the array as a constant
-foreach( $configvals as $key => $value) {
-  define( $key, $value );
+foreach ( $configvals as $key => $value ) {
+  define($key, $value);
 }
 
 //
 // This section is options normally derived from other options or configuration
 //
-define( 'ZMU_PATH', ZM_PATH_BIN.'/zmu' );               // Local path to the ZoneMinder Utility
+define('ZMU_PATH', ZM_PATH_BIN.'/zmu');               // Local path to the ZoneMinder Utility
 
 //
 // If setup supports Video 4 Linux v2 and/or v1
 //
-define( 'ZM_HAS_V4L2', '@ZM_HAS_V4L2@' );               // V4L2 support enabled
-define( 'ZM_HAS_V4L1', '@ZM_HAS_V4L1@' );               // V4L1 support enabled
-define( 'ZM_HAS_V4L', '@ZM_HAS_V4L@' );                 // V4L support enabled
+define('ZM_HAS_V4L2', '@ZM_HAS_V4L2@');               // V4L2 support enabled
+define('ZM_HAS_V4L1', '@ZM_HAS_V4L1@');               // V4L1 support enabled
+define('ZM_HAS_V4L', '@ZM_HAS_V4L@');                 // V4L support enabled
 
 //
 // If ONVIF support has been built in
 //
-define( 'ZM_HAS_ONVIF', '@ZM_HAS_ONVIF@' );             // ONVIF support enabled
+define('ZM_HAS_ONVIF', '@ZM_HAS_ONVIF@');             // ONVIF support enabled
 
 //
 // If PCRE dev libraries are installed
 //
-define( 'ZM_PCRE', '@ZM_PCRE@' );                       // PCRE support enabled
+define('ZM_PCRE', '@ZM_PCRE@');                       // PCRE support enabled
 
 //
 // Alarm states
 //
-define( 'STATE_IDLE', 0 );
-define( 'STATE_PREALARM', 1 );
-define( 'STATE_ALARM', 2 );
-define( 'STATE_ALERT', 3 );
-define( 'STATE_TAPE', 4 );
+define('STATE_IDLE', 0);
+define('STATE_PREALARM', 1);
+define('STATE_ALARM', 2);
+define('STATE_ALERT', 3);
+define('STATE_TAPE', 4);
 
 //
 // DVR Control Commands
 //
 
-define( 'MSG_CMD', 1 );
-define( 'MSG_DATA_WATCH', 2 );
-define( 'MSG_DATA_EVENT', 3 );
+define('MSG_CMD', 1);
+define('MSG_DATA_WATCH', 2);
+define('MSG_DATA_EVENT', 3);
 
-define( 'CMD_NONE', 0 );
-define( 'CMD_PAUSE', 1 );
-define( 'CMD_PLAY', 2 );
-define( 'CMD_STOP', 3 );
-define( 'CMD_FASTFWD', 4 );
-define( 'CMD_SLOWFWD', 5 );
-define( 'CMD_SLOWREV', 6 );
-define( 'CMD_FASTREV', 7 );
-define( 'CMD_ZOOMIN', 8 );
-define( 'CMD_ZOOMOUT', 9 );
-define( 'CMD_PAN', 10 );
-define( 'CMD_SCALE', 11 );
-define( 'CMD_PREV', 12 );
-define( 'CMD_NEXT', 13 );
-define( 'CMD_SEEK', 14 );
-define( 'CMD_VARPLAY', 15 );
-define( 'CMD_QUIT', 17 );
-define( 'CMD_QUERY', 99 );
+define('CMD_NONE', 0);
+define('CMD_PAUSE', 1);
+define('CMD_PLAY', 2);
+define('CMD_STOP', 3);
+define('CMD_FASTFWD', 4);
+define('CMD_SLOWFWD', 5);
+define('CMD_SLOWREV', 6);
+define('CMD_FASTREV', 7);
+define('CMD_ZOOMIN', 8);
+define('CMD_ZOOMOUT', 9);
+define('CMD_PAN', 10);
+define('CMD_SCALE', 11);
+define('CMD_PREV', 12);
+define('CMD_NEXT', 13);
+define('CMD_SEEK', 14 );
+define('CMD_VARPLAY', 15);
+define('CMD_QUIT', 17);
+define('CMD_QUERY', 99);
 
 //
 // These are miscellaneous options you won't normally need to change
 //
-define( 'MAX_EVENTS', 10 );                             // The maximum number of events to show in the monitor event listing
-define( 'RATE_BASE', 100 );                             // The additional scaling factor used to help get fractional rates in integer format
-define( 'SCALE_BASE', 100 );                            // The additional scaling factor used to help get fractional scales in integer format
+define('MAX_EVENTS', 10);            // The maximum number of events to show in the monitor event listing
+define('RATE_BASE', 100);            // The additional scaling factor used to help get fractional rates in integer format
+define('SCALE_BASE', 100);           // The additional scaling factor used to help get fractional scales in integer format
 
 //
 // Date and time formats, not to be modified by language files
 //
-define( 'STRF_FMT_DATETIME_DB', '%Y-%m-%d %H:%M:%S' );      // Strftime format for database queries, don't change
-define( 'MYSQL_FMT_DATETIME_SHORT', '%y/%m/%d %H:%i:%S' );  // MySQL date_format shorter format for dates with time
+define('STRF_FMT_DATETIME_DB', '%Y-%m-%d %H:%M:%S');      // Strftime format for database queries, don't change
+define('MYSQL_FMT_DATETIME_SHORT', '%y/%m/%d %H:%i:%S');  // MySQL date_format shorter format for dates with time
 
-require_once( 'database.php' );
-require_once( 'logger.php' );
+require_once('database.php');
+require_once('logger.php');
 loadConfig();
 ZM\Logger::fetch()->initialise();
 
@@ -165,51 +165,65 @@ function loadConfig( $defineConsts=true ) {
   $result = $dbConn->query('SELECT Name,Value FROM Config');
   if ( !$result )
     echo mysql_error();
-  while( $row = dbFetchNext( $result ) ) {
-    if ( $defineConsts )
-      define( $row['Name'], $row['Value'] );
+  while( $row = dbFetchNext($result) ) {
     $config[$row['Name']] = $row;
+
+    if ( $defineConsts ) {
+      # Values in conf.d files override db so check if already defined and update value
+      if ( ! defined($row['Name']) ) {
+        define($row['Name'], $row['Value']);
+      } else {
+        $config[$row['Name']]['Value'] = constant($row['Name']);
+      }
+    }
   }
+  return $config;
 } # end function loadConfig
 
 // For Human-readability, use ZM_SERVER_HOST or ZM_SERVER_NAME in zm.conf, and convert it here to a ZM_SERVER_ID
 if ( ! defined('ZM_SERVER_ID') ) {
+	require_once('Server.php');
   if ( defined('ZM_SERVER_NAME') and ZM_SERVER_NAME ) {
-    $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
-    if ( ! $server_id ) {
-      Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.');
+		# Use Server lookup so that it caches
+		$Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_NAME));
+    if ( !$Server ) {
+      ZM\Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.');
     } else {
-      define( 'ZM_SERVER_ID', $server_id );
+      define('ZM_SERVER_ID', $Server->Id());
     }
   } else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) {
-    $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST));
-    if ( ! $server_id ) {
-      Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.');
+		$Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_HOST));
+    if ( ! $Server ) {
+      ZM\Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.');
     } else {
-      define( 'ZM_SERVER_ID', $server_id );
+      define('ZM_SERVER_ID', $Server->Id());
     }
   }
 }
 
+if ( defined('ZM_TIMEZONE') and ZM_TIMEZONE )
+  ini_set('date.timezone', ZM_TIMEZONE);
+
 function process_configfile($configFile) {
-  if ( is_readable( $configFile ) ) {
+  if ( is_readable($configFile) ) {
     $configvals = array();
 
-    $cfg = fopen( $configFile, 'r') or Error("Could not open config file: $configFile.");
+    $cfg = fopen($configFile, 'r') or ZM\Error('Could not open config file: '.$configFile);
     while ( !feof($cfg) ) {
-      $str = fgets( $cfg, 256 );
-      if ( preg_match( '/^\s*$/', $str ))
+      $str = fgets($cfg, 256);
+      if ( preg_match('/^\s*(#.*)?$/', $str) ) {
         continue;
-      elseif ( preg_match( '/^\s*#/', $str ))
-        continue;
-      elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches ))
+      } else if ( preg_match('/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches) ) {
         $configvals[$matches[1]] = $matches[2];
+			} else {
+				ZM\Error("Malformed line in config $configFile\n$str");
+			}
     }
-    fclose( $cfg );
-    return( $configvals );
+    fclose($cfg);
+    return $configvals;
   } else {
-    error_log( "WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on $configFile." );
-    return( false );
+    error_log('WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on '.$configFile);
+    return false;
   }
 }
 
diff --git a/web/includes/control_functions.php b/web/includes/control_functions.php
index 5573db5a5..3fe131fab 100644
--- a/web/includes/control_functions.php
+++ b/web/includes/control_functions.php
@@ -1,13 +1,14 @@
 <?php
 
-function buildControlCommand( $monitor ) {
-  $ctrlCommand = ZM_PATH_BIN.'/zmcontrol.pl';
+function buildControlCommand($monitor) {
+  $ctrlCommand = '';
+  $control = $monitor->Control();
 
   if ( isset($_REQUEST['xge']) || isset($_REQUEST['yge']) ) {
     $slow = 0.9; // Threshold for slow speed/timeouts
     $turbo = 0.9; // Threshold for turbo speed
 
-    if ( preg_match( '/^([a-z]+)([A-Z][a-z]+)([A-Za-z]+)+$/', $_REQUEST['control'], $matches ) ) {
+    if ( preg_match('/^([a-z]+)([A-Z][a-z]+)([A-Za-z]+)+$/', $_REQUEST['control'], $matches) ) {
       $command = $matches[1];
       $mode = $matches[2];
       $dirn = $matches[3];
@@ -16,22 +17,22 @@ function buildControlCommand( $monitor ) {
       case 'focus' :
       {
         $factor = $_REQUEST['yge']/100;
-        if ( $monitor->HasFocusSpeed() ) {
-          $speed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$factor)));
+        if ( $control->HasFocusSpeed() ) {
+          $speed = intval(round($control->MinFocusSpeed()+(($control->MaxFocusSpeed()-$control->MinFocusSpeed())*$factor)));
           $ctrlCommand .= ' --speed='.$speed;
         }
         switch( $mode ) {
         case 'Abs' :
         case 'Rel' :
         {
-          $step = intval(round($monitor->MinFocusStep()+(($monitor->MaxFocusStep()-$monitor->MinFocusStep())*$factor)));
+          $step = intval(round($control->MinFocusStep()+(($control->MaxFocusStep()-$control->MinFocusStep())*$factor)));
           $ctrlCommand .= ' --step='.$step;
           break;
         }
         case 'Con' :
         {
           if ( $monitor->AutoStopTimeout() ) {
-            $slowSpeed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$slow)));
+            $slowSpeed = intval(round($control->MinFocusSpeed()+(($control->MaxFocusSpeed()-$control->MinFocusSpeed())*$slow)));
             if ( $speed < $slowSpeed ) {
               $ctrlCommand .= ' --autostop';
             }
@@ -43,19 +44,19 @@ function buildControlCommand( $monitor ) {
       }
       case 'zoom' :
         $factor = $_REQUEST['yge']/100;
-        if ( $monitor->HasZoomSpeed() ) {
-          $speed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$factor)));
+        if ( $control->HasZoomSpeed() ) {
+          $speed = intval(round($control->MinZoomSpeed()+(($control->MaxZoomSpeed()-$control->MinZoomSpeed())*$factor)));
           $ctrlCommand .= ' --speed='.$speed;
         }
         switch( $mode ) {
         case 'Abs' :
         case 'Rel' :
-          $step = intval(round($monitor->MinZoomStep()+(($monitor->MaxZoomStep()-$monitor->MinZoomStep())*$factor)));
+          $step = intval(round($control->MinZoomStep()+(($control->MaxZoomStep()-$control->MinZoomStep())*$factor)));
           $ctrlCommand .= ' --step='.$step;
           break;
         case 'Con' :
           if ( $monitor->AutoStopTimeout() ) {
-            $slowSpeed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$slow)));
+            $slowSpeed = intval(round($control->MinZoomSpeed()+(($control->MaxZoomSpeed()-$control->MinZoomSpeed())*$slow)));
             if ( $speed < $slowSpeed ) {
               $ctrlCommand .= ' --autostop';
             }
@@ -65,42 +66,42 @@ function buildControlCommand( $monitor ) {
         break;
       case 'iris' :
         $factor = $_REQUEST['yge']/100;
-        if ( $monitor->HasIrisSpeed() ) {
-          $speed = intval(round($monitor->MinIrisSpeed()+(($monitor->MaxIrisSpeed()-$monitor->MinIrisSpeed())*$factor)));
+        if ( $control->HasIrisSpeed() ) {
+          $speed = intval(round($control->MinIrisSpeed()+(($control->MaxIrisSpeed()-$control->MinIrisSpeed())*$factor)));
           $ctrlCommand .= ' --speed='.$speed;
         }
         switch( $mode ) {
         case 'Abs' :
         case 'Rel' :
-          $step = intval(round($monitor->MinIrisStep()+(($monitor->MaxIrisStep()-$monitor->MinIrisStep())*$factor)));
+          $step = intval(round($control->MinIrisStep()+(($control->MaxIrisStep()-$control->MinIrisStep())*$factor)));
           $ctrlCommand .= ' --step='.$step;
           break;
         }
         break;
       case 'white' :
         $factor = $_REQUEST['yge']/100;
-        if ( $monitor->HasWhiteSpeed() ) {
-          $speed = intval(round($monitor->MinWhiteSpeed()+(($monitor->MaxWhiteSpeed()-$monitor->MinWhiteSpeed())*$factor)));
+        if ( $control->HasWhiteSpeed() ) {
+          $speed = intval(round($control->MinWhiteSpeed()+(($control->MaxWhiteSpeed()-$control->MinWhiteSpeed())*$factor)));
           $ctrlCommand .= ' --speed='.$speed;
         }
         switch( $mode ) {
         case 'Abs' :
         case 'Rel' :
-          $step = intval(round($monitor->MinWhiteStep()+(($monitor->MaxWhiteStep()-$monitor->MinWhiteStep())*$factor)));
+          $step = intval(round($control->MinWhiteStep()+(($control->MaxWhiteStep()-$control->MinWhiteStep())*$factor)));
           $ctrlCommand .= ' --step='.$step;
           break;
         }
         break;
       case 'gain' :
         $factor = $_REQUEST['yge']/100;
-        if ( $monitor->HasGainSpeed() ) {
-          $speed = intval(round($monitor->MinGainSpeed()+(($monitor->MaxGainSpeed()-$monitor->MinGainSpeed())*$factor)));
+        if ( $control->HasGainSpeed() ) {
+          $speed = intval(round($control->MinGainSpeed()+(($control->MaxGainSpeed()-$control->MinGainSpeed())*$factor)));
           $ctrlCommand .= ' --speed='.$speed;
         }
         switch( $mode ) {
         case 'Abs' :
         case 'Rel' :
-          $step = intval(round($monitor->MinGainStep()+(($monitor->MaxGainStep()-$monitor->MinGainStep())*$factor)));
+          $step = intval(round($control->MinGainStep()+(($control->MaxGainStep()-$control->MinGainStep())*$factor)));
           $ctrlCommand .= ' --step='.$step;
           break;
         }
@@ -109,9 +110,9 @@ function buildControlCommand( $monitor ) {
         $xFactor = empty($_REQUEST['xge'])?0:$_REQUEST['xge']/100;
         $yFactor = empty($_REQUEST['yge'])?0:$_REQUEST['yge']/100;
 
-        if ( $monitor->Orientation() != '0' ) {
+        if ( $monitor->Orientation() != 'ROTATE_0' ) {
           $conversions = array(
-            '90' => array(
+            'ROTATE_90' => array(
               'Up' => 'Left',
               'Down' => 'Right',
               'Left' => 'Down',
@@ -121,7 +122,7 @@ function buildControlCommand( $monitor ) {
               'DownLeft' => 'DownRight',
               'DownRight' => 'UpRight',
             ),
-            '180' => array(
+            'ROTATE_180' => array(
               'Up' => 'Down',
               'Down' => 'Up',
               'Left' => 'Right',
@@ -131,7 +132,7 @@ function buildControlCommand( $monitor ) {
               'DownLeft' => 'UpRight',
               'DownRight' => 'UpLeft',
             ),
-            '270' => array(
+            'ROTATE_270' => array(
               'Up' => 'Right',
               'Down' => 'Left',
               'Left' => 'Up',
@@ -141,7 +142,7 @@ function buildControlCommand( $monitor ) {
               'DownLeft' => 'UpLeft',
               'DownRight' => 'DownLeft',
             ),
-            'hori' => array(
+            'FLIP_HORI' => array(
               'Up' => 'Up',
               'Down' => 'Down',
               'Left' => 'Right',
@@ -151,7 +152,7 @@ function buildControlCommand( $monitor ) {
               'DownLeft' => 'DownRight',
               'DownRight' => 'DownLeft',
             ),
-            'vert' => array(
+            'FLIP_VERT' => array(
               'Up' => 'Down',
               'Down' => 'Up',
               'Left' => 'Left',
@@ -167,29 +168,29 @@ function buildControlCommand( $monitor ) {
           $dirn = $new_dirn;
         }
 
-        if ( $monitor->HasPanSpeed() && $xFactor ) {
-          if ( $monitor->HasTurboPan() ) {
+        if ( $control->HasPanSpeed() && $xFactor ) {
+          if ( $control->HasTurboPan() ) {
             if ( $xFactor >= $turbo ) {
-              $panSpeed = $monitor->TurboPanSpeed();
+              $panSpeed = $control->TurboPanSpeed();
             } else {
               $xFactor = $xFactor/$turbo;
-              $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+              $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
             }
           } else {
-            $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+            $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
           }
           $ctrlCommand .= ' --panspeed='.$panSpeed;
         }
-        if ( $monitor->HasTiltSpeed() && $yFactor ) {
-          if ( $monitor->HasTurboTilt() ) {
+        if ( $control->HasTiltSpeed() && $yFactor ) {
+          if ( $control->HasTurboTilt() ) {
             if ( $yFactor >= $turbo ) {
-              $tiltSpeed = $monitor->TurboTiltSpeed();
+              $tiltSpeed = $control->TurboTiltSpeed();
             } else {
               $yFactor = $yFactor/$turbo;
-              $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+              $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
             }
           } else {
-            $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+            $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
           }
           $ctrlCommand .= ' --tiltspeed='.$tiltSpeed;
         }
@@ -197,18 +198,18 @@ function buildControlCommand( $monitor ) {
         case 'Rel' :
         case 'Abs' :
           if ( preg_match( '/(Left|Right)$/', $dirn ) ) {
-            $panStep = intval(round($monitor->MinPanStep()+(($monitor->MaxPanStep()-$monitor->MinPanStep())*$xFactor)));
+            $panStep = intval(round($control->MinPanStep()+(($control->MaxPanStep()-$control->MinPanStep())*$xFactor)));
             $ctrlCommand .= ' --panstep='.$panStep;
           }
           if ( preg_match( '/^(Up|Down)/', $dirn ) ) {
-            $tiltStep = intval(round($monitor->MinTiltStep()+(($monitor->MaxTiltStep()-$monitor->MinTiltStep())*$yFactor)));
+            $tiltStep = intval(round($control->MinTiltStep()+(($control->MaxTiltStep()-$control->MinTiltStep())*$yFactor)));
             $ctrlCommand .= ' --tiltstep='.$tiltStep;
           }
           break;
         case 'Con' :
           if ( $monitor->AutoStopTimeout() ) {
-            $slowPanSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$slow)));
-            $slowTiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$slow)));
+            $slowPanSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$slow)));
+            $slowTiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$slow)));
             if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) ) {
               $ctrlCommand .= ' --autostop';
             }
@@ -224,38 +225,38 @@ function buildControlCommand( $monitor ) {
       $x = deScale( $_REQUEST['x'], $_REQUEST['scale'] );
       $y = deScale( $_REQUEST['y'], $_REQUEST['scale'] );
       switch ( $monitor->Orientation() ) {
-      case '0' :
-      case '180' :
-      case 'hori' :
-      case 'vert' :
+      case 'ROTATE_0' :
+      case 'ROTATE_180' :
+      case 'FLIP_HORI' :
+      case 'FLIP_VERT' :
         $width = $monitor->Width();
         $height = $monitor->Height();
         break;
-      case '90' :
-      case '270' :
+      case 'ROTATE_90' :
+      case 'ROTATE_270' :
         $width = $monitor->Height();
         $height = $monitor->Width();
         break;
       }
       switch ( $monitor->Orientation() ) {
-      case '90' :
+      case 'ROTATE_90' :
         $tempY = $y;
         $y = $height - $x;
         $x = $tempY;
         break;
-      case '180' :
+      case 'ROTATE_180' :
         $x = $width - $x;
         $y = $height - $y;
         break;
-      case '270' :
+      case 'ROTATE_270' :
         $tempX = $x;
         $x = $width - $y;
         $y = $tempX;
         break;
-      case 'hori' :
+      case 'FLIP_HORI' :
         $x = $width - $x;
         break;
-      case 'vert' :
+      case 'FLIP_VERT' :
         $y = $height - $y;
         break;
       }
@@ -271,24 +272,24 @@ function buildControlCommand( $monitor ) {
       $yFactor = ($y - $halfHeight)/$halfHeight;
 
       switch ( $monitor->Orientation() ) {
-      case '90' :
+      case 'ROTATE_90' :
         $tempYFactor = $y;
         $yFactor = -$xFactor;
         $xFactor = $tempYFactor;
         break;
-      case '180' :
+      case 'ROTATE_180' :
         $xFactor = -$xFactor;
         $yFactor = -$yFactor;
         break;
-      case '270' :
+      case 'ROTATE_270' :
         $tempXFactor = $x;
         $xFactor = -$yFactor;
         $yFactor = $tempXFactor;
         break;
-      case 'hori' :
+      case 'FLIP_HORI' :
         $xFactor = -$xFactor;
         break;
-      case 'vert' :
+      case 'FLIP_VERT' :
         $yFactor = -$yFactor;
         break;
       }
@@ -319,36 +320,36 @@ function buildControlCommand( $monitor ) {
         $xFactor = abs($xFactor);
         $yFactor = abs($yFactor);
 
-        if ( $monitor->HasPanSpeed() && $xFactor ) {
-          if ( $monitor->HasTurboPan() ) {
+        if ( $control->HasPanSpeed() && $xFactor ) {
+          if ( $control->HasTurboPan() ) {
             if ( $xFactor >= $turbo ) {
-              $panSpeed = $monitor->TurboPanSpeed();
+              $panSpeed = $control->TurboPanSpeed();
             } else {
               $xFactor = $xFactor/$turbo;
-              $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+              $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
             }
           } else {
-            $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+            $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
           }
         }
-        if ( $monitor->HasTiltSpeed() && $yFactor ) {
-          if ( $monitor->HasTurboTilt() ) {
+        if ( $control->HasTiltSpeed() && $yFactor ) {
+          if ( $control->HasTurboTilt() ) {
             if ( $yFactor >= $turbo ) {
-              $tiltSpeed = $monitor->TurboTiltSpeed();
+              $tiltSpeed = $control->TurboTiltSpeed();
             } else {
               $yFactor = $yFactor/$turbo;
-              $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+              $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
             }
           } else {
-            $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+            $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
           }
         }
         if ( preg_match( '/(Left|Right)$/', $dirn ) ) {
-          $panStep = intval(round($monitor->MinPanStep()+(($monitor->MaxPanStep()-$monitor->MinPanStep())*$xFactor)));
+          $panStep = intval(round($control->MinPanStep()+(($control->MaxPanStep()-$control->MinPanStep())*$xFactor)));
           $ctrlCommand .= ' --panstep='.$panStep.' --panspeed='.$panSpeed;
         }
         if ( preg_match( '/^(Up|Down)/', $dirn ) ) {
-          $tiltStep = intval(round($monitor->MinTiltStep()+(($monitor->MaxTiltStep()-$monitor->MinTiltStep())*$yFactor)));
+          $tiltStep = intval(round($control->MinTiltStep()+(($control->MaxTiltStep()-$control->MinTiltStep())*$yFactor)));
           $ctrlCommand .= ' --tiltstep='.$tiltStep.' --tiltspeed='.$tiltSpeed;
         }
       }
@@ -362,24 +363,24 @@ function buildControlCommand( $monitor ) {
       $yFactor = ($y - $halfHeight)/$halfHeight;
 
       switch ( $monitor->Orientation() ) {
-      case '90' :
+      case 'ROTATE_90' :
         $tempYFactor = $y;
         $yFactor = -$xFactor;
         $xFactor = $tempYFactor;
         break;
-      case '180' :
+      case 'ROTATE_180' :
         $xFactor = -$xFactor;
         $yFactor = -$yFactor;
         break;
-      case '270' :
+      case 'ROTATE_270' :
         $tempXFactor = $x;
         $xFactor = -$yFactor;
         $yFactor = $tempXFactor;
         break;
-      case 'hori' :
+      case 'FLIP_HORI' :
         $xFactor = -$xFactor;
         break;
-      case 'vert' :
+      case 'FLIP_VERT' :
         $yFactor = -$yFactor;
         break;
       }
@@ -410,28 +411,28 @@ function buildControlCommand( $monitor ) {
         $xFactor = abs($xFactor);
         $yFactor = abs($yFactor);
 
-        if ( $monitor->HasPanSpeed() && $xFactor ) {
-          if ( $monitor->HasTurboPan() ) {
+        if ( $control->HasPanSpeed() && $xFactor ) {
+          if ( $control->HasTurboPan() ) {
             if ( $xFactor >= $turbo ) {
-              $panSpeed = $monitor->TurboPanSpeed();
+              $panSpeed = $control->TurboPanSpeed();
             } else {
               $xFactor = $xFactor/$turbo;
-              $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+              $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
             }
           } else {
-            $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+            $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
           }
         }
-        if ( $monitor->HasTiltSpeed() && $yFactor ) {
-          if ( $monitor->HasTurboTilt() ) {
+        if ( $control->HasTiltSpeed() && $yFactor ) {
+          if ( $control->HasTurboTilt() ) {
             if ( $yFactor >= $turbo ) {
-              $tiltSpeed = $monitor->TurboTiltSpeed();
+              $tiltSpeed = $control->TurboTiltSpeed();
             } else {
               $yFactor = $yFactor/$turbo;
-              $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+              $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
             }
           } else {
-            $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+            $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
           }
         }
         if ( preg_match( '/(Left|Right)$/', $dirn ) ) {
@@ -441,8 +442,8 @@ function buildControlCommand( $monitor ) {
           $ctrlCommand .= ' --tiltspeed='.$tiltSpeed;
         }
         if ( $monitor->AutoStopTimeout() ) {
-          $slowPanSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$slow)));
-          $slowTiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$slow)));
+          $slowPanSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$slow)));
+          $slowTiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$slow)));
           if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) ) {
             $ctrlCommand .= ' --autostop';
           }
@@ -470,19 +471,19 @@ function buildControlCommand( $monitor ) {
             $factor = ($y+1)/$long_y;
             break;
           }
-          if ( $monitor->HasFocusSpeed() ) {
-            $speed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$factor)));
+          if ( $control->HasFocusSpeed() ) {
+            $speed = intval(round($control->MinFocusSpeed()+(($control->MaxFocusSpeed()-$control->MinFocusSpeed())*$factor)));
             $ctrlCommand .= ' --speed='.$speed;
           }
           switch( $mode ) {
           case 'Abs' :
           case 'Rel' :
-            $step = intval(round($monitor->MinFocusStep()+(($monitor->MaxFocusStep()-$monitor->MinFocusStep())*$factor)));
+            $step = intval(round($control->MinFocusStep()+(($control->MaxFocusStep()-$control->MinFocusStep())*$factor)));
             $ctrlCommand .= ' --step='.$step;
             break;
           case 'Con' :
             if ( $monitor->AutoStopTimeout() ) {
-              $slowSpeed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$slow)));
+              $slowSpeed = intval(round($control->MinFocusSpeed()+(($control->MaxFocusSpeed()-$control->MinFocusSpeed())*$slow)));
               if ( $speed < $slowSpeed ) {
                 $ctrlCommand .= ' --autostop';
               }
@@ -499,19 +500,19 @@ function buildControlCommand( $monitor ) {
             $factor = ($y+1)/$long_y;
             break;
           }
-          if ( $monitor->HasZoomSpeed() ) {
-            $speed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$factor)));
+          if ( $control->HasZoomSpeed() ) {
+            $speed = intval(round($control->MinZoomSpeed()+(($control->MaxZoomSpeed()-$control->MinZoomSpeed())*$factor)));
             $ctrlCommand .= ' --speed='.$speed;
           }
           switch( $mode ) {
           case 'Abs' :
           case 'Rel' :
-            $step = intval(round($monitor->MinZoomStep()+(($monitor->MaxZoomStep()-$monitor->MinZoomStep())*$factor)));
+            $step = intval(round($control->MinZoomStep()+(($control->MaxZoomStep()-$control->MinZoomStep())*$factor)));
             $ctrlCommand .= ' --step='.$step;
             break;
           case 'Con' :
             if ( $monitor->AutoStopTimeout() ) {
-              $slowSpeed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$slow)));
+              $slowSpeed = intval(round($control->MinZoomSpeed()+(($control->MaxZoomSpeed()-$control->MinZoomSpeed())*$slow)));
               if ( $speed < $slowSpeed ) {
                 $ctrlCommand .= ' --autostop';
               }
@@ -528,14 +529,14 @@ function buildControlCommand( $monitor ) {
             $factor = ($y+1)/$long_y;
             break;
           }
-          if ( $monitor->HasIrisSpeed() ) {
-            $speed = intval(round($monitor->MinIrisSpeed()+(($monitor->MaxIrisSpeed()-$monitor->MinIrisSpeed())*$factor)));
+          if ( $control->HasIrisSpeed() ) {
+            $speed = intval(round($control->MinIrisSpeed()+(($control->MaxIrisSpeed()-$control->MinIrisSpeed())*$factor)));
             $ctrlCommand .= ' --speed='.$speed;
           }
           switch( $mode ) {
           case 'Abs' :
           case 'Rel' :
-            $step = intval(round($monitor->MinIrisStep()+(($monitor->MaxIrisStep()-$monitor->MinIrisStep())*$factor)));
+            $step = intval(round($control->MinIrisStep()+(($control->MaxIrisStep()-$control->MinIrisStep())*$factor)));
             $ctrlCommand .= ' --step='.$step;
             break;
           }
@@ -549,14 +550,14 @@ function buildControlCommand( $monitor ) {
             $factor = ($y+1)/$long_y;
             break;
           }
-          if ( $monitor->HasWhiteSpeed() ) {
-            $speed = intval(round($monitor->MinWhiteSpeed()+(($monitor->MaxWhiteSpeed()-$monitor->MinWhiteSpeed())*$factor)));
+          if ( $control->HasWhiteSpeed() ) {
+            $speed = intval(round($control->MinWhiteSpeed()+(($control->MaxWhiteSpeed()-$control->MinWhiteSpeed())*$factor)));
             $ctrlCommand .= ' --speed='.$speed;
           }
           switch( $mode ) {
           case 'Abs' :
           case 'Rel' :
-            $step = intval(round($monitor->MinWhiteStep()+(($monitor->MaxWhiteStep()-$monitor->MinWhiteStep())*$factor)));
+            $step = intval(round($control->MinWhiteStep()+(($control->MaxWhiteStep()-$control->MinWhiteStep())*$factor)));
             $ctrlCommand .= ' --step='.$step;
             break;
           }
@@ -570,14 +571,14 @@ function buildControlCommand( $monitor ) {
             $factor = ($y+1)/$long_y;
             break;
           }
-          if ( $monitor->HasGainSpeed() ) {
-            $speed = intval(round($monitor->MinGainSpeed()+(($monitor->MaxGainSpeed()-$monitor->MinGainSpeed())*$factor)));
+          if ( $control->HasGainSpeed() ) {
+            $speed = intval(round($control->MinGainSpeed()+(($control->MaxGainSpeed()-$control->MinGainSpeed())*$factor)));
             $ctrlCommand .= ' --speed='.$speed;
           }
           switch( $mode ) {
           case 'Abs' :
           case 'Rel' :
-            $step = intval(round($monitor->MinGainStep()+(($monitor->MaxGainStep()-$monitor->MinGainStep())*$factor)));
+            $step = intval(round($control->MinGainStep()+(($control->MaxGainStep()-$control->MinGainStep())*$factor)));
             $ctrlCommand .= ' --step='.$step;
             break;
           }
@@ -597,9 +598,9 @@ function buildControlCommand( $monitor ) {
             $xFactor = ($x+1)/$short_x;
           }
 
-          if ( $monitor->Orientation() != '0' ) {
+          if ( $monitor->Orientation() != 'ROTATE_0' ) {
             $conversions = array(
-              '90' => array(
+              'ROTATE_90' => array(
                 'Up' => 'Left',
                 'Down' => 'Right',
                 'Left' => 'Down',
@@ -609,7 +610,7 @@ function buildControlCommand( $monitor ) {
                 'DownLeft' => 'DownRight',
                 'DownRight' => 'UpRight',
               ),
-              '180' => array(
+              'ROTATE_180' => array(
                 'Up' => 'Down',
                 'Down' => 'Up',
                 'Left' => 'Right',
@@ -619,7 +620,7 @@ function buildControlCommand( $monitor ) {
                 'DownLeft' => 'UpRight',
                 'DownRight' => 'UpLeft',
               ),
-              '270' => array(
+              'ROTATE_270' => array(
                 'Up' => 'Right',
                 'Down' => 'Left',
                 'Left' => 'Up',
@@ -629,7 +630,7 @@ function buildControlCommand( $monitor ) {
                 'DownLeft' => 'UpLeft',
                 'DownRight' => 'DownLeft',
               ),
-              'hori' => array(
+              'FLIP_HORI' => array(
                 'Up' => 'Up',
                 'Down' => 'Down',
                 'Left' => 'Right',
@@ -639,7 +640,7 @@ function buildControlCommand( $monitor ) {
                 'DownLeft' => 'DownRight',
                 'DownRight' => 'DownLeft',
               ),
-              'vert' => array(
+              'FLIP_VERT' => array(
                 'Up' => 'Down',
                 'Down' => 'Up',
                 'Left' => 'Left',
@@ -655,29 +656,29 @@ function buildControlCommand( $monitor ) {
             $dirn = $new_dirn;
           }
 
-          if ( $monitor->HasPanSpeed() && $xFactor ) {
-            if ( $monitor->HasTurboPan() ) {
+          if ( $control->HasPanSpeed() && $xFactor ) {
+            if ( $control->HasTurboPan() ) {
               if ( $xFactor >= $turbo ) {
-                $panSpeed = $monitor->TurboPanSpeed();
+                $panSpeed = $control->TurboPanSpeed();
               } else {
                 $xFactor = $xFactor/$turbo;
-                $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+                $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
               }
             } else {
-              $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
+              $panSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$xFactor)));
             }
             $ctrlCommand .= ' --panspeed='.$panSpeed;
           }
-          if ( $monitor->HasTiltSpeed() && $yFactor ) {
-            if ( $monitor->HasTurboTilt() ) {
+          if ( $control->HasTiltSpeed() && $yFactor ) {
+            if ( $control->HasTurboTilt() ) {
               if ( $yFactor >= $turbo ) {
-                $tiltSpeed = $monitor->TurboTiltSpeed();
+                $tiltSpeed = $control->TurboTiltSpeed();
               } else {
                 $yFactor = $yFactor/$turbo;
-                $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+                $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
               }
             } else {
-              $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
+              $tiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$yFactor)));
             }
             $ctrlCommand .= ' --tiltspeed='.$tiltSpeed;
           }
@@ -685,18 +686,18 @@ function buildControlCommand( $monitor ) {
           case 'Rel' :
           case 'Abs' :
             if ( preg_match( '/(Left|Right)$/', $dirn ) ) {
-              $panStep = intval(round($monitor->MinPanStep()+(($monitor->MaxPanStep()-$monitor->MinPanStep())*$xFactor)));
+              $panStep = intval(round($control->MinPanStep()+(($control->MaxPanStep()-$control->MinPanStep())*$xFactor)));
               $ctrlCommand .= ' --panstep='.$panStep;
             }
             if ( preg_match( '/^(Up|Down)/', $dirn ) ) {
-              $tiltStep = intval(round($monitor->MinTiltStep()+(($monitor->MaxTiltStep()-$monitor->MinTiltStep())*$yFactor)));
+              $tiltStep = intval(round($control->MinTiltStep()+(($control->MaxTiltStep()-$control->MinTiltStep())*$yFactor)));
               $ctrlCommand .= ' --tiltstep='.$tiltStep;
             }
             break;
           case 'Con' :
             if ( $monitor->AutoStopTimeout() ) {
-              $slowPanSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$slow)));
-              $slowTiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$slow)));
+              $slowPanSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$slow)));
+              $slowTiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$slow)));
               if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) ) {
                 $ctrlCommand .= ' --autostop';
               }
@@ -716,12 +717,16 @@ function buildControlCommand( $monitor ) {
       if ( canEdit( 'Control' ) ) {
         $preset = validInt($_REQUEST['preset']);
         $newLabel = validJsStr($_REQUEST['newLabel']);
-        $row = dbFetchOne( 'SELECT * FROM ControlPresets WHERE MonitorId = ? AND Preset = ?', NULL, array( $monitor->Id(), $preset ) );
+        $row = dbFetchOne(
+          'SELECT * FROM `ControlPresets` WHERE `MonitorId` = ? AND `Preset`=?',
+          NULL, array($monitor->Id(), $preset));
         if ( $newLabel != $row['Label'] ) {
           if ( $newLabel ) {
-            dbQuery( 'REPLACE INTO ControlPresets ( MonitorId, Preset, Label ) VALUES ( ?, ?, ? )', array( $monitor->Id(), $preset, $newLabel ) );
+            dbQuery('REPLACE INTO `ControlPresets` (`MonitorId`, `Preset`, `Label`) VALUES ( ?, ?, ? )',
+              array($monitor->Id(), $preset, $newLabel));
           } else {
-            dbQuery( 'DELETE FROM ControlPresets WHERE MonitorId = ? AND Preset = ?', array( $monitor->Id(), $preset ) );
+            dbQuery('DELETE FROM `ControlPresets` WHERE `MonitorId`=? AND `Preset`=?',
+              array($monitor->Id(), $preset));
           }
         }
         $ctrlCommand .= ' --preset='.$preset;
@@ -735,29 +740,3 @@ function buildControlCommand( $monitor ) {
   return $ctrlCommand;
 }
 
-function sendControlCommand($mid, $command) {
-  // Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command.
-  $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
-  if ( $socket < 0 ) {
-    Fatal('socket_create() failed: '.socket_strerror($socket));
-  }
-  $sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$mid.'.sock';
-  if ( @socket_connect($socket, $sockFile) ) {
-    $options = array();
-    foreach ( explode(' ', $command) as $option ) {
-      if ( preg_match('/--([^=]+)(?:=(.+))?/', $option, $matches) ) {
-        $options[$matches[1]] = $matches[2]?$matches[2]:1;
-      }
-    }
-    $optionString = jsonEncode($options);
-    if ( !socket_write($socket, $optionString) ) {
-      Fatal("Can't write to control socket: ".socket_strerror(socket_last_error($socket)));
-    }
-    socket_close($socket);
-  } else if ( $command != 'quit' ) {
-    $command .= ' --id='.$mid;
-
-    // Can't connect so use script
-    $ctrlOutput = exec(escapeshellcmd($command));
-  }
-} // end function sendControlCommand($mid, $command)
diff --git a/web/includes/csrf/csrf-magic.php b/web/includes/csrf/csrf-magic.php
index d96165eb9..edb04002a 100644
--- a/web/includes/csrf/csrf-magic.php
+++ b/web/includes/csrf/csrf-magic.php
@@ -389,7 +389,7 @@ function csrf_conf($key, $val) {
  */
 function csrf_start() {
     if ($GLOBALS['csrf']['auto-session'] && !session_id()) {
-        session_start();
+        zm_session_start();
     }
 }
 
diff --git a/web/includes/database.php b/web/includes/database.php
index d941a01e0..8e621e2f9 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -25,21 +25,28 @@ define('DB_LOG_DEBUG', 2);
 $GLOBALS['dbLogLevel'] = DB_LOG_OFF;
 
 $GLOBALS['dbConn'] = false;
+require_once('logger.php');
 
 function dbConnect() {
   global $dbConn;
 
-  if ( strpos(ZM_DB_HOST, ':') ) {
-    // Host variable may carry a port or socket.
-    list($host, $portOrSocket) = explode(':', ZM_DB_HOST, 2);
-    if ( ctype_digit($portOrSocket) ) {
-      $socket = ':host='.$host . ';port='.$portOrSocket;
+  $dsn = ZM_DB_TYPE;
+  if ( ZM_DB_HOST ) {
+    if ( strpos(ZM_DB_HOST, ':') ) {
+      // Host variable may carry a port or socket.
+      list($host, $portOrSocket) = explode(':', ZM_DB_HOST, 2);
+      if ( ctype_digit($portOrSocket) ) {
+        $dsn .= ':host='.$host.';port='.$portOrSocket.';';
+      } else {
+        $dsn .= ':unix_socket='.$portOrSocket.';';
+      }
     } else {
-      $socket = ':unix_socket='.$portOrSocket;
+      $dsn .= ':host='.ZM_DB_HOST.';';
     }
   } else {
-    $socket = ':host='.ZM_DB_HOST;
+    $dsn .= ':host=localhost;';
   }
+  $dsn .= 'dbname='.ZM_DB_NAME;
 
   try {
     $dbOptions = null;
@@ -49,21 +56,26 @@ function dbConnect() {
         PDO::MYSQL_ATTR_SSL_KEY  => ZM_DB_SSL_CLIENT_KEY,
         PDO::MYSQL_ATTR_SSL_CERT => ZM_DB_SSL_CLIENT_CERT,
       );
-      $dbConn = new PDO(ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS, $dbOptions);
+      $dbConn = new PDO($dsn, ZM_DB_USER, ZM_DB_PASS, $dbOptions);
     } else {
-      $dbConn = new PDO(ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS);
+      $dbConn = new PDO($dsn, ZM_DB_USER, ZM_DB_PASS);
     }
 
     $dbConn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
     $dbConn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-  } catch(PDOException $ex ) {
-    echo 'Unable to connect to ZM db.' . $ex->getMessage();
+  } catch(PDOException $ex) {
+    global $error_message;
+    $error_message = "Unable to connect to ZM db using dsn $dsn<br/><br/>".$ex->getMessage();
     error_log('Unable to connect to ZM DB ' . $ex->getMessage());
     $dbConn = null;
   }
-}
+  return $dbConn;
+}  // end function dbConnect
 
-dbConnect();
+if ( !dbConnect() ) {
+  include('views/no_database_connection.php');
+  exit();
+}
 
 function dbDisconnect() {
   global $dbConn;
@@ -110,16 +122,10 @@ function dbError($sql) {
 
 function dbEscape( $string ) {
   global $dbConn;
-  if ( version_compare(phpversion(), '4.3.0', '<'))
-    if ( get_magic_quotes_gpc() )
-      return $dbConn->quote(stripslashes($string));
-    else
-      return $dbConn->quote($string);
+  if ( version_compare(phpversion(), '5.4', '<=') and get_magic_quotes_gpc() ) 
+    return $dbConn->quote(stripslashes($string));
   else
-    if ( get_magic_quotes_gpc() )
-      return $dbConn->quote(stripslashes($string));
-    else
-      return $dbConn->quote($string);
+    return $dbConn->quote($string);
 }
 
 function dbQuery($sql, $params=NULL) {
@@ -135,7 +141,7 @@ function dbQuery($sql, $params=NULL) {
       }
 
       if ( ! $result->execute($params) ) {
-        ZM\Error("SQL: Error executing $sql: " . implode(',', $result->errorInfo()));
+        ZM\Error("SQL: Error executing $sql: " . print_r($result->errorInfo(), true));
         return NULL;
       }
     } else {
@@ -149,10 +155,7 @@ function dbQuery($sql, $params=NULL) {
       }
     }
     if ( defined('ZM_DB_DEBUG') ) {
-      if ( $params )
-        ZM\Logger::Debug("SQL: $sql" . implode(',',$params) . ' rows: '.$result->rowCount());
-      else
-        ZM\Logger::Debug("SQL: $sql: rows:" . $result->rowCount());
+      ZM\Logger::Debug('SQL: '.$sql.' '.($params?implode(',',$params):'').' rows: '.$result->rowCount());
     }
   } catch(PDOException $e) {
     ZM\Error("SQL-ERR '".$e->getMessage()."', statement was '".$sql."' params:" . ($params?implode(',',$params):''));
@@ -212,6 +215,10 @@ function dbFetch($sql, $col=false) {
 }
 
 function dbFetchNext($result, $col=false) {
+	if ( !$result ) {
+		ZM\Error("dbFetchNext called on null result.");
+		return false;
+	}
   if ( $dbRow = $result->fetch(PDO::FETCH_ASSOC) )
     return $col ? $dbRow[$col] : $dbRow;
   return false;
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 978f5f68b..b10e74eac 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2,28 +2,31 @@
 //
 // ZoneMinder web function library, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // 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.
-// 
+//
+//
+require_once('Filter.php');
+require_once('FilterTerm.php');
 
 // Compatibility functions
-if ( version_compare( phpversion(), '4.3.0', '<') ) {
+if ( version_compare(phpversion(), '4.3.0', '<') ) {
   function ob_get_clean() {
     $buffer = ob_get_contents();
     ob_end_clean();
-    return( $buffer );
+    return $buffer;
   }
 }
 
@@ -36,14 +39,18 @@ function noCacheHeaders() {
 }
 
 function CSPHeaders($view, $nonce) {
-  $additionalScriptSrc = "";
+  global $Servers;
+  if ( ! $Servers )
+    $Servers = ZM\Server::find();
+
+  $additionalScriptSrc = implode(' ', array_map(function($S){return $S->Hostname();}, $Servers));
   switch ($view) {
     case 'login': {
       if (defined('ZM_OPT_USE_GOOG_RECAPTCHA')
           && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY')
           && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
           && ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY) {
-        $additionalScriptSrc = "https://www.google.com";
+        $additionalScriptSrc .= ' https://www.google.com';
       }
       // fall through
     }
@@ -72,14 +79,14 @@ function CSPHeaders($view, $nonce) {
     case 'storage':
     case 'version': {
       // Enforce script-src on pages where inline scripts and event handlers have been fixed.
-      // 'unsafe-inline' is only for backwards compatibility with browsers which
-      // only support CSP 1 (with no nonce-* support).
-      header("Content-Security-Policy: script-src 'unsafe-inline' 'self' 'nonce-$nonce' $additionalScriptSrc");
+      header("Content-Security-Policy: script-src 'self' 'nonce-$nonce' $additionalScriptSrc");
       break;
     }
     default: {
       // Use Report-Only mode on all other pages.
-      header("Content-Security-Policy-Report-Only: script-src 'unsafe-inline' 'self' 'nonce-$nonce' $additionalScriptSrc");
+      header("Content-Security-Policy-Report-Only: script-src 'self' 'nonce-$nonce' $additionalScriptSrc;".
+        (ZM_CSP_REPORT_URI ? ' report-uri '.ZM_CSP_REPORT_URI : '' )
+      );
       break;
     }
   }
@@ -90,7 +97,9 @@ function CORSHeaders() {
 
 # The following is left for future reference/use.
     $valid = false;
-    $Servers = ZM\Server::find();
+    global $Servers;
+    if ( ! $Servers )
+      $Servers = ZM\Server::find();
     if ( sizeof($Servers) < 1 ) {
 # Only need CORSHeaders in the event that there are multiple servers in use.
       # ICON: Might not be true. multi-port?
@@ -101,14 +110,14 @@ function CORSHeaders() {
       }
       return;
     }
-    foreach( $Servers as $Server ) {
+    foreach ( $Servers as $Server ) {
       if (
         preg_match('/^(https?:\/\/)?'.preg_quote($Server->Hostname(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
         or
         preg_match('/^(https?:\/\/)?'.preg_quote($Server->Name(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
       ) {
         $valid = true;
-        ZM\Logger::Debug("Setting Access-Control-Allow-Origin from " . $_SERVER['HTTP_ORIGIN']);
+        ZM\Logger::Debug('Setting Access-Control-Allow-Origin from '.$_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Headers: x-requested-with,x-request');
         break;
@@ -120,57 +129,30 @@ function CORSHeaders() {
   }
 }
 
-function getStreamSrc( $args, $querySep='&amp;' ) {
-  $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
-
-  if ( ZM_OPT_USE_AUTH ) {
-    if ( ZM_AUTH_RELAY == 'hashed' ) {
-      $args[] = 'auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-    } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-      $args[] = 'user='.$_SESSION['username'];
-      $args[] = 'pass='.$_SESSION['password'];
-    } elseif ( ZM_AUTH_RELAY == 'none' ) {
-      $args[] = 'user='.$_SESSION['username'];
-    }
-  }
-  if ( !in_array( 'mode=single', $args ) && !empty($GLOBALS['connkey']) ) {   
-    $args[] = 'connkey='.$GLOBALS['connkey'];
-  }       
-  if ( ZM_RAND_STREAM ) {
-    $args[] = 'rand='.time();
-  }
-
-  if ( count($args) ) {
-    $streamSrc .= '?'.join( $querySep, $args );
-  }
-
-  return( $streamSrc );
-}
-
 function getMimeType( $file ) {
   if ( function_exists('mime_content_type') ) {
-    return( mime_content_type( $file ) );
+    return mime_content_type($file);
   } elseif ( function_exists('finfo_file') ) {
-    $finfo = finfo_open( FILEINFO_MIME );
-    $mimeType = finfo_file( $finfo, $file );
+    $finfo = finfo_open(FILEINFO_MIME);
+    $mimeType = finfo_file($finfo, $file);
     finfo_close($finfo);
-    return( $mimeType );
+    return $mimeType;
   }
-  return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
+  return trim(exec('file -bi '.escapeshellarg($file).' 2>/dev/null'));
 }
 
-function outputVideoStream( $id, $src, $width, $height, $format, $title='' ) {
-  echo getVideoStreamHTML( $id, $src, $width, $height, $format, $title );
+function outputVideoStream($id, $src, $width, $height, $format, $title='') {
+  echo getVideoStreamHTML($id, $src, $width, $height, $format, $title);
 }
 
-function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
+function getVideoStreamHTML($id, $src, $width, $height, $format, $title='') {
   $html = '';
   $width = validInt($width);
   $height = validInt($height);
   $title = validHtmlStr($title);
 
-  if ( file_exists( $src ) ) {
-    $mimeType = getMimeType( $src );
+  if ( file_exists($src) ) {
+    $mimeType = getMimeType($src);
   } else {
     switch( $format ) {
       case 'asf' :
@@ -194,7 +176,7 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
         $mimeType = 'video/3gpp';
         break;
       default :
-        $mimeType = "video/$format";
+        $mimeType = 'video/'.$format;
         break;
     }
   }
@@ -205,7 +187,6 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
       case 'video/x-ms-asf' :
       case 'video/x-msvideo' :
       case 'video/mp4' :
-        {
           if ( isWindows() ) {
             return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'
               classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
@@ -226,9 +207,7 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
               </embed>
               </object>';
           }
-        }
       case 'video/quicktime' :
-        {
             return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'"
             classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
             codebase="'.ZM_BASE_PROTOCOL.'://www.apple.com/qtactivex/qtplugin.cab"
@@ -244,9 +223,7 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
             controller="true">
             </embed>
             </object>';
-        }
       case 'application/x-shockwave-flash' :
-        {
             return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'"
             classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
             codebase="'.ZM_BASE_PROTOCOL.'://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
@@ -264,7 +241,6 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
             bgcolor="#ffffff">
             </embed>
             </object>';
-        }
     } # end switch
   } # end if use object tags
   return '<embed'. ( isset($mimeType)?(' type="'.$mimeType.'"'):'' ). '
@@ -292,39 +268,39 @@ function getImageStreamHTML( $id, $src, $width, $height, $title='' ) {
   }
 }
 
-function outputControlStream( $src, $width, $height, $monitor, $scale, $target ) {
+function outputControlStream($src, $width, $height, $monitor, $scale, $target) {
 ?>
   <form name="ctrlForm" method="post" action="?" target="<?php echo $target ?>">
-    <input type="hidden" name="view" value="blank">
-    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
-    <input type="hidden" name="action" value="control">
+    <input type="hidden" name="view" value="blank"/>
+    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
+    <input type="hidden" name="action" value="control"/>
     <?php
     if ( $monitor['CanMoveMap'] ) {
     ?>
-      <input type="hidden" name="control" value="moveMap">
+      <input type="hidden" name="control" value="moveMap"/>
     <?php
-    } elseif ( $monitor['CanMoveRel'] ) {
+    } else if ( $monitor['CanMoveRel'] ) {
     ?>
-      <input type="hidden" name="control" value="movePseudoMap">
+      <input type="hidden" name="control" value="movePseudoMap"/>
     <?php
-    } elseif ( $monitor['CanMoveCon'] ) {
+    } else if ( $monitor['CanMoveCon'] ) {
     ?>
-      <input type="hidden" name="control" value="moveConMap">
+      <input type="hidden" name="control" value="moveConMap"/>
     <?php
     }
     ?>
-    <input type="hidden" name="scale" value="<?php echo $scale ?>">
+    <input type="hidden" name="scale" value="<?php echo $scale ?>"/>
     <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
   </form>
 <?php
 }
 
-function outputHelperStream( $id, $src, $width, $height, $title='' ) {
-  echo getHelperStream( $id, $src, $width, $height, $title );
+function outputHelperStream($id, $src, $width, $height, $title='') {
+  echo getHelperStream($id, $src, $width, $height, $title);
 }
-function getHelperStream( $id, $src, $width, $height, $title='' ) {
+function getHelperStream($id, $src, $width, $height, $title='') {
     return '<object type="application/x-java-applet" id="'.$id.'" code="com.charliemouse.cambozola.Viewer"
-    archive="'. ZM_PATH_CAMBOZOLA .'" 
+    archive="'. ZM_PATH_CAMBOZOLA .'"
     align="middle"
     width="'. $width .'"
     height="'. $height .'"
@@ -334,63 +310,65 @@ function getHelperStream( $id, $src, $width, $height, $title='' ) {
     </object>';
 }
 
-function outputImageStill( $id, $src, $width, $height, $title='' ) {
-  echo getImageStill( $id, $src, $width, $height, $title='' );
+function outputImageStill($id, $src, $width, $height, $title='') {
+  echo getImageStill($id, $src, $width, $height, $title='');
 }
-function getImageStill( $id, $src, $width, $height, $title='' ) {
-  return '<img id="'.$id.'" src="'.$src.'" alt="'.$title.'"'.(validInt($width)?' width="'.$width.'"':'').(validInt($height)?' height="'.$height.'"':'').'/>';
+function getImageStill($id, $src, $width, $height, $title='') {
+  return '<img id="'.$id.'" src="'.$src.'" alt="'.$title.'"'.
+    (validInt($width)?' width="'.$width.'"':'').
+    (validInt($height)?' height="'.$height.'"':'').'/>';
 }
 
-function getWebSiteUrl( $id, $src, $width, $height, $title='' ) {
-    # Prevent unsightly warnings when php cannot verify the ssl certificate
-    stream_context_set_default( [
-        'ssl' => [
-            'verify_peer' => false,
-            'verify_peer_name' => false,
-        ],
-    ]);
-    # The End User can turn off the following warning under Options -> Web
-    if ( ZM_WEB_XFRAME_WARN ) {
-        $header = get_headers($src, 1);
-        # If the target website has set X-Frame-Options, check it for "sameorigin" and warn the end user
-        if (array_key_exists('X-Frame-Options', $header)) {
-            $header = $header['X-Frame-Options'];
-            if ( stripos($header, 'sameorigin') === 0 )
-                ZM\Warning("Web site $src has X-Frame-Options set to sameorigin. An X-Frame-Options browser plugin is required to display this site.");
-        }
+function getWebSiteUrl($id, $src, $width, $height, $title='') {
+  # Prevent unsightly warnings when php cannot verify the ssl certificate
+  stream_context_set_default( [
+    'ssl' => [
+      'verify_peer' => false,
+      'verify_peer_name' => false,
+    ],
+  ]);
+  # The End User can turn off the following warning under Options -> Web
+  if ( ZM_WEB_XFRAME_WARN ) {
+    $header = get_headers($src, 1);
+    # If the target website has set X-Frame-Options, check it for "sameorigin" and warn the end user
+    if ( array_key_exists('X-Frame-Options', $header) ) {
+      $header = $header['X-Frame-Options'];
+      if ( stripos($header, 'sameorigin') === 0 )
+        ZM\Warning('Web site '.$src.' has X-Frame-Options set to sameorigin. An X-Frame-Options browser plugin is required to display this site.');
     }
-    return '<object id="'.$id.'" data="'.$src.'" alt="'.$title.'" width="'.$width.'" height="'.$height.'"></object>';
+  }
+  return '<object id="'.$id.'" data="'.$src.'" alt="'.$title.'" width="'.$width.'" height="'.$height.'"></object>';
 }
 
-function outputControlStill( $src, $width, $height, $monitor, $scale, $target ) {
+function outputControlStill($src, $width, $height, $monitor, $scale, $target) {
   ?>
   <form name="ctrlForm" method="post" action="?" target="<?php echo $target ?>">
-    <input type="hidden" name="view" value="blank">
-    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
-    <input type="hidden" name="action" value="control">
+    <input type="hidden" name="view" value="blank"/>
+    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
+    <input type="hidden" name="action" value="control"/>
     <?php
     if ( $monitor['CanMoveMap'] ) {
     ?>
-    <input type="hidden" name="control" value="moveMap">
+    <input type="hidden" name="control" value="moveMap"/>
     <?php
-    } elseif ( $monitor['CanMoveRel'] ) {
+    } else if ( $monitor['CanMoveRel'] ) {
     ?>
-    <input type="hidden" name="control" value="movePseudoMap">
+    <input type="hidden" name="control" value="movePseudoMap"/>
     <?php
-    } elseif ( $monitor['CanMoveCon'] ) {
+    } else if ( $monitor['CanMoveCon'] ) {
     ?>
-    <input type="hidden" name="control" value="moveConMap">
+    <input type="hidden" name="control" value="moveConMap"/>
     <?php
     }
     ?>
-    <input type="hidden" name="scale" value="<?php echo $scale ?>">
-    <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
+    <input type="hidden" name="scale" value="<?php echo $scale ?>"/>
+    <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
   </form>
   <?php
 }
 
 // Incoming args are shell-escaped. This function must escape any further arguments it cannot guarantee.
-function getZmuCommand( $args ) {
+function getZmuCommand($args) {
   $zmuCommand = ZMU_PATH;
 
   if ( ZM_OPT_USE_AUTH ) {
@@ -405,23 +383,24 @@ function getZmuCommand( $args ) {
 
   $zmuCommand .= $args;
 
-  return( $zmuCommand );
+  return $zmuCommand;
 }
 
-function getEventDefaultVideoPath( $event ) {
-  $Event = new ZM\Event( $event );
-  return $Event->getStreamSrc( array( 'mode'=>'mpeg', 'format'=>'h264' ) );
+function getEventDefaultVideoPath($event) {
+  $Event = new ZM\Event($event);
+  return $Event->getStreamSrc(array('mode'=>'mpeg', 'format'=>'h264'));
 }
 
 function deletePath( $path ) {
-  if ( is_dir( $path ) ) {
-    system( escapeshellcmd( 'rm -rf '.$path ) );
+  ZM\Logger::Debug('Deleting '.$path);
+  if ( is_dir($path) ) {
+    system(escapeshellcmd('rm -rf '.$path));
   } else if ( file_exists($path) ) {
-    unlink( $path );
+    unlink($path);
   }
 }
 
-function deleteEvent( $event ) {
+function deleteEvent($event) {
 
   if ( empty($event) ) {
     ZM\Error('Empty event passed to deleteEvent.');
@@ -430,11 +409,14 @@ function deleteEvent( $event ) {
 
   if ( gettype($event) != 'array' ) {
 # $event could be an eid, so turn it into an event hash
-    $event = new ZM\Event( $event );
-  } else {
-ZM\Logger::Debug("Event type: " . gettype($event));
+    $event = new ZM\Event($event);
   }
 
+  if ( $event->Archived() ) {
+    ZM\Info('Cannot delete Archived event.');
+    return;
+  } # end if Archived
+
   global $user;
 
   if ( $user['Events'] == 'Edit' ) {
@@ -442,7 +424,7 @@ ZM\Logger::Debug("Event type: " . gettype($event));
   } # CAN EDIT
 }
 
-function makeLink( $url, $label, $condition=1, $options='' ) {
+function makeLink($url, $label, $condition=1, $options='') {
   $string = '';
   if ( $condition ) {
     $string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>';
@@ -451,17 +433,25 @@ function makeLink( $url, $label, $condition=1, $options='' ) {
   if ( $condition ) {
     $string .= '</a>';
   }
-  return( $string );
+  return $string;
+}
+
+//Make it slightly easier to create a link to help text modal
+function makeHelpLink($ohndx) {
+  $string = '&nbsp;(<a id="' .$ohndx. '" class="optionhelp" href="#">?</a>)';
+
+  return $string;
 }
 
 /**
  * $label must be already escaped. It can't be done here since it sometimes contains HTML tags.
  */
-function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options='' ) {
+function makePopupLink($url, $winName, $winSize, $label, $condition=1, $options='') {
   // Avoid double-encoding since some consumers incorrectly pass a pre-escaped URL.
-  $string = '<a class="popup-link" href="' . htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, ini_get("default_charset"), false) . '"';
-  $string .= ' data-window-name="' . htmlspecialchars($winName) . '"';
+  $string = '<a';
   if ( $condition ) {
+    $string .= ' class="popup-link" href="' . htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false) . '"';
+    $string .= ' data-window-name="' . htmlspecialchars($winName) . '"';
     if ( is_array( $winSize ) ) {
       $string .= ' data-window-tag="' . htmlspecialchars($winSize[0]) . '"';
       $string .= ' data-window-width="' . htmlspecialchars($winSize[1]) . '"';
@@ -472,32 +462,42 @@ function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options
 
     $string .= ($options ? (' ' . $options ) : '') . '>';
   } else {
-    $string .= '<a>';
+    $string .= '>';
   }
   $string .= $label;
   $string .= '</a>';
-  return( $string );
+  return $string;
 }
 
-function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1, $options='' ) {
+function makePopupButton($url, $winName, $winSize, $buttonValue, $condition=1, $options='') {
   $string = '<input type="button" class="popup-link" value="' . htmlspecialchars($buttonValue) . '"';
   $string .= ' data-url="' . htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, ini_get("default_charset"), false) . '"';
   $string .= ' data-window-name="' . htmlspecialchars($winName) . '"';
-    if ( is_array( $winSize ) ) {
-      $string .= ' data-window-tag="' . htmlspecialchars($winSize[0]) . '"';
-      $string .= ' data-window-width="' . htmlspecialchars($winSize[1]) . '"';
-      $string .= ' data-window-height="' . htmlspecialchars($winSize[2]) . '"';
-    } else {
-      $string .= ' data-window-tag="' . htmlspecialchars($winSize) . '"';
-    }
-    if (!$condition) {
-     $string .= ' disabled="disabled"';
-    }
-    $string  .=  ($options ? (' ' . $options) : '') . '/>';
-  return( $string );
+  if ( is_array($winSize) ) {
+    $string .= ' data-window-tag="' . htmlspecialchars($winSize[0]) . '"';
+    $string .= ' data-window-width="' . htmlspecialchars($winSize[1]) . '"';
+    $string .= ' data-window-height="' . htmlspecialchars($winSize[2]) . '"';
+  } else {
+    $string .= ' data-window-tag="' . htmlspecialchars($winSize) . '"';
+  }
+  if (!$condition) {
+    $string .= ' disabled="disabled"';
+  }
+  $string .= ($options ? (' ' . $options) : '') . '/>';
+  return $string;
 }
 
-function htmlSelect( $name, $contents, $values, $behaviours=false ) {
+function makeButton($url, $buttonValue, $condition=1, $options='') {
+  $string = '<button type="button" data-on-click-this="'.$buttonValue.'"';
+  $string .= ' data-url="' .$url. '"';
+  if (!$condition) {
+    $string .= ' disabled="disabled"';
+  }
+  $string .= ($options ? (' ' . $options) : '') . '/>'.translate($buttonValue).'</button>'.PHP_EOL;
+  return $string;
+}
+
+function htmlSelect($name, $contents, $values, $behaviours=false) {
   $behaviourText = '';
   if ( !empty($behaviours) ) {
     if ( is_array($behaviours) ) {
@@ -509,13 +509,13 @@ function htmlSelect( $name, $contents, $values, $behaviours=false ) {
     }
   }
 
-  return "<select name=\"$name\" id=\"$name\"$behaviourText>".htmlOptions($contents, $values).'</select>';
+  return '<select name="'.$name.'" '.$behaviourText.'>'.htmlOptions($contents, $values).'</select>';
 }
 
-function htmlOptions($contents, $values) {
+function htmlOptions($options, $values) {
   $options_html = '';
-
-  foreach ( $contents as $value=>$option ) {
+  $has_selected = false;
+  foreach ( $options as $value=>$option ) {
     $disabled = 0;
     $text = '';
     if ( is_array($option) ) {
@@ -527,36 +527,42 @@ function htmlOptions($contents, $values) {
 
       if ( isset($option['disabled']) ) {
         $disabled = $option['disabled'];
-        ZM\Error("Setting to disabled");
       }
     } else if ( is_object($option) ) {
       $text = $option->Name();
     } else {
       $text = $option;
     }
-    $selected = is_array($values) ? in_array($value, $values) : !strcmp($value, $values);
-    $options_html .= "<option value=\"".htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false)."\"".
+    $selected = is_array($values) ? in_array($value, $values) : (!strcmp($value, $values));
+    if ( !$has_selected ) 
+      $has_selected = $selected;
+
+    $options_html .= '<option value="'.htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false).'"'.
       ($selected?' selected="selected"':'').
       ($disabled?' disabled="disabled"':'').
-      ">".htmlspecialchars($text, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false)."</option>";
+      '>'.htmlspecialchars($text, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false).'</option>
+';
+  } # end foreach options
+  if ( $values and ! $has_selected ) {
+    ZM\Warning('Specified value '.$values.' not in contents: '.print_r($options, true));
   }
   return $options_html;
+} # end function htmlOptions
+
+function truncText($text, $length, $deslash=1) {
+  return preg_replace('/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', ($deslash?stripslashes($text):$text));
 }
 
-function truncText( $text, $length, $deslash=1 ) {       
-  return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', ($deslash?stripslashes($text):$text) ) );       
-}               
-
-function buildSelect( $name, $contents, $behaviours=false ) {
+function buildSelect($name, $contents, $behaviours=false) {
   $value = '';
-  if ( preg_match( '/^\s*(\w+)\s*(\[.*\])?\s*$/', $name, $matches ) && count($matches) > 2 ) {
+  if ( preg_match('/^\s*(\w+)\s*(\[.*\])?\s*$/', $name, $matches) && (count($matches) > 2) ) {
     $arr = $matches[1];
     if ( isset($GLOBALS[$arr]) )
       $value = $GLOBALS[$arr];
     elseif ( isset($_REQUEST[$arr]) )
       $value = $_REQUEST[$arr];
-    if ( !preg_match_all( '/\[\s*[\'"]?(\w+)["\']?\s*\]/', $matches[2], $matches ) ) {
-      ZM\Fatal( "Can't parse selector '$name'" );
+    if ( !preg_match_all('/\[\s*[\'"]?(\w+)["\']?\s*\]/', $matches[2], $matches) ) {
+      ZM\Fatal("Can't parse selector '$name'");
     }
     for ( $i = 0; $i < count($matches[1]); $i++ ) {
       $idx = $matches[1][$i];
@@ -593,24 +599,23 @@ function buildSelect( $name, $contents, $behaviours=false ) {
   $html = ob_get_contents();
   ob_end_clean();
 
-  return( $html );
+  return $html;
 }
 
-function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
+function getFormChanges($values, $newValues, $types=false, $columns=false) {
   $changes = array();
   if ( !$types )
     $types = array();
 
-  foreach( $newValues as $key=>$value ) {
+  foreach ( $newValues as $key=>$value ) {
     if ( $columns && !isset($columns[$key]) )
       continue;
 
     if ( !isset($types[$key]) )
       $types[$key] = false;
 
-    switch( $types[$key] ) {
+    switch ( $types[$key] ) {
       case 'set' :
-        {
           if ( is_array($newValues[$key]) ) {
             if ( (!isset($values[$key])) or ( join(',',$newValues[$key]) != $values[$key] ) ) {
               $changes[$key] = "`$key` = ".dbEscape(join(',',$newValues[$key]));
@@ -619,14 +624,12 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
             $changes[$key] = "`$key` = ''";
           }
           break;
-        }
       case 'image' :
-        {
           if ( is_array( $newValues[$key] ) ) {
             $imageData = getimagesize( $newValues[$key]['tmp_name'] );
             $changes[$key.'Width'] = $key.'Width = '.$imageData[0];
             $changes[$key.'Height'] = $key.'Height = '.$imageData[1];
-            $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
+            $changes[$key.'Type'] = $key.'Type = \''.$newValues[$key]['type'].'\'';
             $changes[$key.'Size'] = $key.'Size = '.$newValues[$key]['size'];
             ob_start();
             readfile( $newValues[$key]['tmp_name'] );
@@ -636,12 +639,10 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
             $changes[$key] = "$key = ".dbEscape($value);
           }
           break;
-        }
       case 'document' :
-        {
           if ( is_array( $newValues[$key] ) ) {
             $imageData = getimagesize( $newValues[$key]['tmp_name'] );
-            $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
+            $changes[$key.'Type'] = $key.'Type = \''.$newValues[$key]['type'].'\'';
             $changes[$key.'Size'] = $key.'Size = '.$newValues[$key]['size'];
             ob_start();
             readfile( $newValues[$key]['tmp_name'] );
@@ -651,30 +652,25 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
             $changes[$key] = $key . ' = '.dbEscape($value);
           }
           break;
-        }
       case 'file' :
-        {
           $changes[$key.'Type'] = $key.'Type = '.dbEscape($newValues[$key]['type']);
           $changes[$key.'Size'] = $key.'Size = '.dbEscape($newValues[$key]['size']);
           ob_start();
           readfile( $newValues[$key]['tmp_name'] );
-          $changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'";
+          $changes[$key] = $key.' = \''.dbEscape( ob_get_contents() ).'\'';
           ob_end_clean();
           break;
-        }
       case 'raw' :
-        {
           if ( (!isset($values[$key])) or ($values[$key] != $value) ) {
             $changes[$key] = $key . ' = '.dbEscape($value);
           }
           break;
-        }
       case 'toggle' :
         if ( (!isset($values[$key])) or $values[$key] != $value ) {
           if ( empty($value) ) {
-            $changes[$key] = "$key = 0";
+            $changes[$key] = $key.' = 0';
           } else {
-            $changes[$key] = "$key = 1";
+            $changes[$key] = $key.' = 1';
             //$changes[$key] = $key . ' = '.dbEscape(trim($value));
           }
         }
@@ -685,7 +681,6 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
         }
         break;
       default :
-        {
           if ( !isset($values[$key]) || ($values[$key] != $value) ) {
             if ( ! isset($value) || $value == '' ) {
               $changes[$key] = "`$key` = NULL";
@@ -694,34 +689,38 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
             }
           }
           break;
-        }
     } // end switch
   } // end foreach newvalues
-  foreach( $values as $key=>$value ) {
+
+  foreach ( $values as $key=>$value ) {
     if ( !empty($columns[$key]) ) {
       if ( !empty($types[$key]) ) {
         if ( $types[$key] == 'toggle' ) {
           if ( !isset($newValues[$key]) && !empty($value) ) {
-            $changes[$key] = "$key = 0";
+            $changes[$key] = "`$key` = 0";
           }
         } else if ( $types[$key] == 'set' ) {
-          $changes[$key] = "$key = ''";
+          $changes[$key] = "`$key` = ''";
         }
       }
     }
   }
-  return( $changes );
+  return $changes;
 }
 
-function getBrowser( &$browser, &$version ) {
+function getBrowser(&$browser, &$version) {
   if ( isset($_SESSION['browser']) ) {
     $browser = $_SESSION['browser'];
     $version = $_SESSION['version'];
   } else {
-    if (( preg_match( '/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $logVersion)) || (preg_match( '/.*Trident.*rv:(.*?)(;|\))/', $_SERVER['HTTP_USER_AGENT'], $logVersion))) {
+    if (
+      ( preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $logVersion))
+      ||
+      ( preg_match('/.*Trident.*rv:(.*?)(;|\))/', $_SERVER['HTTP_USER_AGENT'], $logVersion))
+    ) {
       $version = $logVersion[1];
       $browser = 'ie';
-    } elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+    } else if ( preg_match('/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
       $version = $logVersion[1];
       // Check for old version of Chrome with bug 5876
       if ( $version < 7 ) {
@@ -729,16 +728,16 @@ function getBrowser( &$browser, &$version ) {
       } else {
         $browser = 'chrome';
       }
-    } elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+    } else if ( preg_match('/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
       $version = $logVersion[1];
       $browser = 'safari';
-    } elseif ( preg_match( '/Opera[ \/]([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+    } else if ( preg_match('/Opera[ \/]([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
       $version = $logVersion[1];
       $browser = 'opera';
-    } elseif ( preg_match( '/Konqueror\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+    } else if ( preg_match('/Konqueror\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
       $version = $logVersion[1];
       $browser = 'konqueror';
-    } elseif ( preg_match( '/Mozilla\/([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+    } else if ( preg_match('/Mozilla\/([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
       $version = $logVersion[1];
       $browser = 'mozilla';
     } else {
@@ -751,58 +750,58 @@ function getBrowser( &$browser, &$version ) {
 }
 
 function isMozilla() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'mozilla' );
+  return $browser == 'mozilla';
 }
 
 function isKonqueror() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'konqueror' );
+  return $browser == 'konqueror';
 }
 
 function isInternetExplorer() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'ie' );
+  return $browser == 'ie';
 }
 
 function isOldChrome() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'oldchrome' );
+  return $browser == 'oldchrome';
 }
 
 function isChrome() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'chrome' );
+  return $browser == 'chrome';
 }
 
 function isOpera() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'opera' );
+  return $browser == 'opera';
 }
 
 function isSafari() {
-  getBrowser( $browser, $version );
+  getBrowser($browser, $version);
 
-  return( $browser == 'safari' );
+  return $browser == 'safari';
 }
 
 function isWindows() {
-  return ( preg_match( '/Win/', $_SERVER['HTTP_USER_AGENT'] ) );
+  return preg_match('/Win/', $_SERVER['HTTP_USER_AGENT']);
 }
 
 function canStreamIframe() {
-  return( isKonqueror() );
+  return isKonqueror();
 }
 
 function canStreamNative() {
   // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
-  return( ZM_WEB_CAN_STREAM == 'yes' || ( ZM_WEB_CAN_STREAM == 'auto' && (!isInternetExplorer() && !isOldChrome()) ) );
+  return ( ZM_WEB_CAN_STREAM == 'yes' || ( ZM_WEB_CAN_STREAM == 'auto' && (!isInternetExplorer() && !isOldChrome()) ) );
 }
 
 function canStreamApplet() {
@@ -810,20 +809,20 @@ function canStreamApplet() {
     ZM\Warning('ZM_OPT_CAMBOZOLA is enabled, but the system cannot find '.ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA);
   }
 
-  return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
+  return (ZM_OPT_CAMBOZOLA && file_exists(ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA));
 }
 
 function canStream() {
-  return( canStreamNative() | canStreamApplet() );
+  return canStreamNative() | canStreamApplet();
 }
 
-function packageControl( $command ) {
-  $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );
+function packageControl($command) {
+  $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg($command);
   $string .= ' 2>/dev/null >&- <&- >/dev/null';
-  exec( $string );
+  exec($string);
 }
 
-function daemonControl( $command, $daemon=false, $args=false ) {
+function daemonControl($command, $daemon=false, $args=false) {
   $string = escapeshellcmd(ZM_PATH_BIN).'/zmdc.pl '.$command;
   if ( $daemon ) {
     $string .= ' ' . $daemon;
@@ -831,9 +830,9 @@ function daemonControl( $command, $daemon=false, $args=false ) {
       $string .= ' ' . $args;
     }
   }
-  $string = escapeshellcmd( $string );
+  $string = escapeshellcmd($string);
   #$string .= ' 2>/dev/null >&- <&- >/dev/null';
-ZM\Logger::Debug("daemonControl $string");
+  ZM\Logger::Debug('daemonControl '.$string);
   exec($string);
 }
 
@@ -860,92 +859,97 @@ function initDaemonStatus() {
   }
 }
 
-function daemonStatus( $daemon, $args=false ) {
+function daemonStatus($daemon, $args=false) {
   global $daemon_status;
 
   initDaemonStatus();
 
   $string = $daemon;
-  if ( $args )
-    $string .= ' ' . $args;
-  return( strpos( $daemon_status, "'$string' running" ) !== false );
+  if ( $args ) {
+		if ( is_array($args) ) {
+			$string .= join(' ', $args);
+		} else {
+			$string .= ' ' . $args;
+		}
+	}
+  return ( strpos($daemon_status, "'$string' running") !== false );
 }
 
-function zmcStatus( $monitor ) {
+function zmcStatus($monitor) {
   if ( $monitor['Type'] == 'Local' ) {
     $zmcArgs = '-d '.$monitor['Device'];
   } else {
     $zmcArgs = '-m '.$monitor['Id'];
   }
-  return( daemonStatus( 'zmc', $zmcArgs ) );
+  return daemonStatus('zmc', $zmcArgs);
 }
 
-function zmaStatus( $monitor ) {
-  if ( is_array( $monitor ) ) {
+function zmaStatus($monitor) {
+  if ( is_array($monitor) ) {
     $monitor = $monitor['Id'];
   }
-  return( daemonStatus( 'zma', "-m $monitor" ) );
+  return daemonStatus('zma', '-m '.$monitor);
 }
 
-function daemonCheck( $daemon=false, $args=false ) {
+function daemonCheck($daemon=false, $args=false) {
   $string = ZM_PATH_BIN.'/zmdc.pl check';
   if ( $daemon ) {
     $string .= ' ' . $daemon;
     if ( $args )
       $string .= ' '. $args;
   }
-  $string = escapeshellcmd( $string );
-  $result = exec( $string );
-  return( preg_match( '/running/', $result ) );
+  $string = escapeshellcmd($string);
+  $result = exec($string);
+  return preg_match('/running/', $result);
 }
 
-function zmcCheck( $monitor ) {
+function zmcCheck($monitor) {
   if ( $monitor['Type'] == 'Local' ) {
     $zmcArgs = '-d '.$monitor['Device'];
   } else {
     $zmcArgs = '-m '.$monitor['Id'];
   }
-  return( daemonCheck( 'zmc', $zmcArgs ) );
+  return daemonCheck('zmc', $zmcArgs);
 }
 
-function zmaCheck( $monitor ) {
-  if ( is_array( $monitor ) ) {
+function zmaCheck($monitor) {
+  if ( is_array($monitor) ) {
     $monitor = $monitor['Id'];
   }
-  return( daemonCheck( 'zma', "-m $monitor" ) );
+  return daemonCheck('zma', '-m '.$monitor);
 }
 
-function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
-  $Event = new ZM\Event( $event );
-  return $Event->getImageSrc( $frame, $scale, $captureOnly, $overwrite );
+function getImageSrc($event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false) {
+  $Event = new ZM\Event($event);
+  return $Event->getImageSrc($frame, $scale, $captureOnly, $overwrite);
 }
 
-function viewImagePath( $path, $querySep='&amp;' ) {
-  return( '?view=image'.$querySep.'path='.$path );
+function viewImagePath($path, $querySep='&amp;') {
+  return '?view=image'.$querySep.'path='.$path;
 }
 
-function createListThumbnail( $event, $overwrite=false ) {
+function createListThumbnail($event, $overwrite=false) {
   # Load the frame with the highest score to use as a thumbnail
-  if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $event['Id'], $event['MaxScore'] ) )) )
-    return( false );
+  if ( !($frame = dbFetchOne('SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1', NULL, array($event['Id'], $event['MaxScore']) )) )
+    return false;
 
   $frameId = $frame['FrameId'];
 
   if ( ZM_WEB_LIST_THUMB_WIDTH ) {
     $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
     $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$event['Width'];
-    $thumbHeight = reScale( $event['Height'], $scale );
+    $thumbHeight = reScale($event['Height'], $scale);
   } elseif ( ZM_WEB_LIST_THUMB_HEIGHT ) {
     $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
     $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$event['Height'];
-    $thumbWidth = reScale( $event['Width'], $scale );
+    $thumbWidth = reScale($event['Width'], $scale);
   } else {
-    ZM\Fatal( "No thumbnail width or height specified, please check in Options->Web" );
+    ZM\Fatal('No thumbnail width or height specified, please check in Options->Web');
   }
 
-  $imageData = getImageSrc( $event, $frame, $scale, false, $overwrite );
-  if ( ! $imageData ) {
-    return ( false );
+  $imageData = getImageSrc($event, $frame, $scale, false, $overwrite);
+  if ( !$imageData ) {
+    return false;
   }
 
   $thumbData = $frame;
@@ -953,74 +957,67 @@ function createListThumbnail( $event, $overwrite=false ) {
   $thumbData['Width'] = (int)$thumbWidth;
   $thumbData['Height'] = (int)$thumbHeight;
 
-  return( $thumbData );
+  return $thumbData;
 }
 
-function createVideo( $event, $format, $rate, $scale, $overwrite=false ) {
-  $command = ZM_PATH_BIN."/zmvideo.pl -e ".$event['Id']." -f ".$format." -r ".sprintf( "%.2F", ($rate/RATE_BASE) );
-  if ( preg_match( '/\d+x\d+/', $scale ) )
-    $command .= " -S ".$scale;
+function createVideo($event, $format, $rate, $scale, $overwrite=false) {
+  $command = ZM_PATH_BIN.'/zmvideo.pl -e '.$event['Id'].' -f '.$format.' -r '.sprintf('%.2F', ($rate/RATE_BASE));
+  if ( preg_match('/\d+x\d+/', $scale) )
+    $command .= ' -S '.$scale;
   else
-    if ( version_compare( phpversion(), "4.3.10", ">=") )
-      $command .= " -s ".sprintf( "%.2F", ($scale/SCALE_BASE) );
+    if ( version_compare(phpversion(), '4.3.10', '>=') )
+      $command .= ' -s '.sprintf('%.2F', ($scale/SCALE_BASE));
     else
-      $command .= " -s ".sprintf( "%.2f", ($scale/SCALE_BASE) );
+      $command .= ' -s '.sprintf('%.2f', ($scale/SCALE_BASE));
   if ( $overwrite )
-    $command .= " -o";
-  $command = escapeshellcmd( $command );
-  $result = exec( $command, $output, $status );
-Logger::Debug("generating Video $command: result($result outptu:(".implode("\n", $output )." status($status");
-  return( $status?"":rtrim($result) );
-}
-
-function executeFilter( $filter_id ) {
-  $command = ZM_PATH_BIN.'/zmfilter.pl --filter_id '.escapeshellarg($filter_id);
+    $command .= ' -o';
+  $command = escapeshellcmd($command);
   $result = exec($command, $output, $status);
-  dbQuery('DELETE FROM Filters WHERE Id=?', array($filter_id));
-  return $status;
+  ZM\Logger::Debug("generating Video $command: result($result outptu:(".implode("\n", $output )." status($status");
+  return $status ? '' : rtrim($result);
 }
 
 # This takes more than one scale amount, so it runs through each and alters dimension.
 # I can't imagine why you would want to do that.
-function reScale( $dimension, $dummy ) {
+function reScale($dimension, $dummy) {
   $new_dimension = $dimension;
   for ( $i = 1; $i < func_num_args(); $i++ ) {
-    $scale = func_get_arg( $i );
-    if ( !empty($scale) && ($scale != 'auto') && ($scale != SCALE_BASE) )
+    $scale = func_get_arg($i);
+    if ( !empty($scale) && ($scale != '0') && ($scale != 'auto') && ($scale != SCALE_BASE) )
       $new_dimension = (int)(($new_dimension*$scale)/SCALE_BASE);
   }
-  return( $new_dimension );
+  return $new_dimension;
 }
 
-function deScale( $dimension, $dummy ) {
+function deScale($dimension, $dummy) {
   $new_dimension = $dimension;
   for ( $i = 1; $i < func_num_args(); $i++ ) {
-    $scale = func_get_arg( $i );
+    $scale = func_get_arg($i);
     if ( !empty($scale) && $scale != SCALE_BASE )
       $new_dimension = (int)(($new_dimension*SCALE_BASE)/$scale);
   }
-  return( $new_dimension );
+  return $new_dimension;
 }
 
 function monitorLimitSql() {
   global $user;
   if ( !empty($user['MonitorIds']) )
-    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
+    $midSql = ' AND MonitorId IN ('.join(',', preg_split('/["\'\s]*,["\'\s]*/', $user['MonitorIds'])).')';
   else
     $midSql = '';
-  return( $midSql );
+  return $midSql;
 }
 
 
-function parseSort( $saveToSession=false, $querySep='&amp;' ) {
+function parseSort($saveToSession=false, $querySep='&amp;') {
   global $sortQuery, $sortColumn, $sortOrder, $limitQuery; // Outputs
-  if (isset($_REQUEST['filter']['Query']['sort_field'])) { //Handle both new and legacy filter passing
+  if ( isset($_REQUEST['filter']['Query']['sort_field']) ) { //Handle both new and legacy filter passing
     $_REQUEST['sort_field'] = $_REQUEST['filter']['Query']['sort_field'];
   }
-  if (isset($_REQUEST['filter']['Query']['sort_asc'])) {
+  if ( isset($_REQUEST['filter']['Query']['sort_asc']) ) {
     $_REQUEST['sort_asc'] = $_REQUEST['filter']['Query']['sort_asc'];
   }
-  if (isset($_REQUEST['filter']['Query']['limit'])) {
+  if ( isset($_REQUEST['filter']['Query']['limit']) ) {
     $_REQUEST['limit'] = $_REQUEST['filter']['Query']['limit'];
   }
   if ( empty($_REQUEST['sort_field']) ) {
@@ -1096,9 +1093,9 @@ function parseSort( $saveToSession=false, $querySep='&amp;' ) {
       $sortColumn = 'E.StartTime';
       break;
   }
-  if ( !$_REQUEST['sort_asc'] )
+  if ( !isset($_REQUEST['sort_asc']) )
     $_REQUEST['sort_asc'] = 0;
-  $sortOrder = $_REQUEST['sort_asc']?'asc':'desc';
+  $sortOrder = $_REQUEST['sort_asc'] ? 'asc' : 'desc';
   $sortQuery = $querySep.'sort_field='.validHtmlStr($_REQUEST['sort_field']).$querySep.'sort_asc='.validHtmlStr($_REQUEST['sort_asc']);
   if ( !isset($_REQUEST['limit']) )
     $_REQUEST['limit'] = '';
@@ -1107,262 +1104,28 @@ function parseSort( $saveToSession=false, $querySep='&amp;' ) {
     $_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']);
   }
   if ($_REQUEST['limit'] != '') {
-    $limitQuery = "&limit=".validInt($_REQUEST['limit']);
+    $limitQuery = '&limit='.validInt($_REQUEST['limit']);
   }
 }
 
-function getFilterQueryConjunctionTypes() {
-  return array(
-               'and' => translate('ConjAnd'),
-               'or'  => translate('ConjOr')
-               );
-}
-
+# Historically this function has just modified the passed in filter array.
+# This would normally be $_REQUEST['filter'];  We don't like modifying 
+# request parameters. For now we will keep this behaviour, but note that we 
+# now return the resulting array and other code should by modified to use that.
+#
+# Please note that I will be removing the savetosession code as well.
 function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
-  $filter['query'] = '';
-  $filter['sql'] = '';
-  $filter['fields'] = '';
 
-  $validQueryConjunctionTypes = getFilterQueryConjunctionTypes();
-  $StorageArea = NULL;
+  $Filter = ZM\Filter::parse($filter, $querySep);
 
-  $terms = isset($filter['Query']) ? $filter['Query']['terms'] : NULL;
-  if ( ! isset($terms) ) {
-        $backTrace = debug_backtrace();
-        $file = $backTrace[1]['file'];
-        $line = $backTrace[1]['line'];
-        ZM\Warning("No terms in filter from $file:$line");
-        ZM\Warning(print_r($filter,true));
-  }
-  if ( isset($terms) && count($terms) ) {
-    for ( $i = 0; $i < count($terms); $i++ ) {
+  $filter['sql'] = $Filter->sql();
+  $filter['querystring'] = $Filter->querystring($querySep);
+  $filter['hidden_fields'] = $Filter->hidden_fields();
+  $filter['pre_sql_conditions'] = $Filter->pre_sql_conditions();
+  $filter['post_sql_conditions'] = $Filter->post_sql_conditions();
 
-      $term = $terms[$i];
-
-      if ( isset($term['cnj']) && array_key_exists($term['cnj'], $validQueryConjunctionTypes) ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cnj]").'='.urlencode($term['cnj']);
-        $filter['sql'] .= ' '.$term['cnj'].' ';
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][cnj]\" value=\"".htmlspecialchars($term['cnj'])."\"/>\n";
-      }
-      if ( isset($term['obr']) && (string)(int)$term['obr'] == $term['obr'] ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][obr]").'='.urlencode($term['obr']);
-        $filter['sql'] .= ' '.str_repeat('(', $term['obr']).' ';
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][obr]\" value=\"".htmlspecialchars($term['obr'])."\"/>\n";
-      }
-      if ( isset($term['attr']) ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][attr]").'='.urlencode($term['attr']);
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][attr]\" value=\"".htmlspecialchars($term['attr'])."\"/>\n";
-        switch ( $term['attr'] ) {
-          case 'MonitorName':
-            $filter['sql'] .= 'M.Name';
-            break;
-          case 'ServerId':
-          case 'MonitorServerId':
-            $filter['sql'] .= 'M.ServerId';
-            break;
-          case 'StorageServerId':
-            $filter['sql'] .= 'S.ServerId';
-            break;
-          case 'FilterServerId':
-            $filter['sql'] .= ZM_SERVER_ID;
-            break;
-# Unspecified start or end, so assume start, this is to support legacy filters
-          case 'DateTime':
-            $filter['sql'] .= 'E.StartTime';
-            break;
-          case 'Date':
-            $filter['sql'] .= 'to_days( E.StartTime )';
-            break;
-          case 'Time':
-            $filter['sql'] .= 'extract( hour_second from E.StartTime )';
-            break;
-          case 'Weekday':
-            $filter['sql'] .= 'weekday( E.StartTime )';
-            break;
-# Starting Time
-          case 'StartDateTime':
-            $filter['sql'] .= 'E.StartTime';
-            break;
-          case 'FramesEventId':
-            $filter['sql'] .= 'F.EventId';
-            break;
-          case 'StartDate':
-            $filter['sql'] .= 'to_days( E.StartTime )';
-            break;
-          case 'StartTime':
-            $filter['sql'] .= 'extract( hour_second from E.StartTime )';
-            break;
-          case 'StartWeekday':
-            $filter['sql'] .= 'weekday( E.StartTime )';
-            break;
-# Ending Time
-          case 'EndDateTime':
-            $filter['sql'] .= 'E.EndTime';
-            break;
-          case 'EndDate':
-            $filter['sql'] .= 'to_days( E.EndTime )';
-            break;
-          case 'EndTime':
-            $filter['sql'] .= 'extract( hour_second from E.EndTime )';
-            break;
-          case 'EndWeekday':
-            $filter['sql'] .= 'weekday( E.EndTime )';
-            break;
-          case 'Id':
-          case 'Name':
-          case 'DiskSpace':
-          case 'MonitorId':
-          case 'StorageId':
-          case 'Length':
-          case 'Frames':
-          case 'AlarmFrames':
-          case 'TotScore':
-          case 'AvgScore':
-          case 'MaxScore':
-          case 'Cause':
-          case 'Notes':
-          case 'StateId':
-          case 'Archived':
-            $filter['sql'] .= 'E.'.$term['attr'];
-            break;
-          case 'DiskPercent':
-            // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-            if ( ! $StorageArea ) {
-              for ( $j = 0; $j < count($terms); $j++ ) {
-                if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-                  $StorageArea = ZM\Storage::find_one(array('Id'=>$terms[$j]['val']));
-                  break;
-                }
-              } // end foreach remaining term
-              if ( ! $StorageArea ) $StorageArea = new ZM\Storage();
-            } // end no StorageArea found yet
-
-            $filter['sql'] .= getDiskPercent( $StorageArea->Path() );
-            break;
-          case 'DiskBlocks':
-            // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-            if ( ! $StorageArea ) {
-              for ( $j = $i; $j < count($terms); $j++ ) {
-                if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-                  $StorageArea = ZM\Storage::find_one(array('Id'=>$terms[$j]['val']));
-                }
-              } // end foreach remaining term
-            } // end no StorageArea found yet
-            $filter['sql'] .= getDiskBlocks( $StorageArea );
-            break;
-          case 'SystemLoad':
-            $filter['sql'] .= getLoad();
-            break;
-        }
-        $valueList = array();
-        foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $term['val'] ) ) as $value ) {
-          switch ( $term['attr'] ) {
-            case 'MonitorName':
-            case 'Name':
-            case 'Cause':
-            case 'Notes':
-              $value = dbEscape($value);
-              break;
-            case 'MonitorServerId':
-            case 'FilterServerId':
-            case 'StorageServerId':
-            case 'ServerId':
-              if ( $value == 'ZM_SERVER_ID' ) {
-                $value = ZM_SERVER_ID;
-              } else if ( $value == 'NULL' ) {
-
-              } else {
-                $value = dbEscape($value);
-              }
-              break;
-            case 'StorageId':
-              $StorageArea = ZM\Storage::find_one(array('Id'=>$value));
-              if ( $value != 'NULL' )
-                $value = dbEscape($value);
-              break;
-            case 'DateTime':
-            case 'StartDateTime':
-            case 'EndDateTime':
-              if ( $value != 'NULL' )
-                $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
-              break;
-            case 'Date':
-            case 'StartDate':
-            case 'EndDate':
-              if ( $value != 'NULL' )
-                $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
-              break;
-            case 'Time':
-            case 'StartTime':
-            case 'EndTime':
-              if ( $value != 'NULL' )
-              $value = "extract( hour_second from '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
-              break;
-            default :
-              if ( $value != 'NULL' )
-                $value = dbEscape($value);
-              break;
-          }
-          $valueList[] = $value;
-        } // end foreach value
-
-        switch ( $term['op'] ) {
-          case '=' :
-          case '!=' :
-          case '>=' :
-          case '>' :
-          case '<' :
-          case '<=' :
-            $filter['sql'] .= ' '.$term['op'].' '. $value;
-            break;
-          case '=~' :
-            $filter['sql'] .= ' regexp '.$value;
-            break;
-          case '!~' :
-            $filter['sql'] .= ' not regexp '.$value;
-            break;
-          case '=[]' :
-          case 'IN' :
-            $filter['sql'] .= ' in ('.join( ',', $valueList ).')';
-            break;
-          case '![]' :
-            $filter['sql'] .= ' not in ('.join( ',', $valueList ).')';
-            break;
-          case 'IS' :
-            if ( $value == 'Odd' )  {
-              $filter['sql'] .= ' % 2 = 1';
-            } else if ( $value == 'Even' )  {
-              $filter['sql'] .= ' % 2 = 0';
-            } else {
-              $filter['sql'] .= " IS $value";
-            }
-            break;
-          case 'IS NOT' :
-            $filter['sql'] .= " IS NOT $value";
-            break;
-          default:
-            ZM\Warning('Invalid operator in filter: ' . print_r($term['op'], true));
-        } // end switch op
-
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][op]").'='.urlencode($term['op']);
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][op]\" value=\"".htmlspecialchars($term['op'])."\"/>\n";
-        if ( isset($term['val']) ) {
-          $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][val]").'='.urlencode($term['val']);
-          $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][val]\" value=\"".htmlspecialchars($term['val'])."\"/>\n";
-        }
-      } // end if ( isset($term['attr']) )
-      if ( isset($term['cbr']) && (string)(int)$term['cbr'] == $term['cbr'] ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cbr]").'='.urlencode($term['cbr']);
-        $filter['sql'] .= ' '.str_repeat( ')', $term['cbr'] ).' ';
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][cbr]\" value=\"".htmlspecialchars($term['cbr'])."\"/>\n";
-      }
-    } // end foreach term
-    if ( $filter['sql'] )
-      $filter['sql'] = ' and ( '.$filter['sql'].' )';
-    if ( $saveToSession ) {
-      $_SESSION['filter'] = $filter;
-    }
-  } // end if terms
+  if ( $filter['sql'] )
+    $filter['sql'] = ' AND ( '.$filter['sql'].' )';
 
   #if ( 0 ) {
     #// ICON I feel like these should be here, but not yet
@@ -1370,40 +1133,39 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
     #$filter['sql'] .= ' ORDER BY ' . $filter['Query']['sort_field'] . (
       #( $filter['Query']['sort_asc'] ? ' ASC' : ' DESC' ) );
   #}
-  #if ( $filter['Query']['limit'] ) {
-    #$filter['sql'] .= ' LIMIT ' . validInt($filter['Query']['limit']);
   #}
-  #}
-}
+  return $filter;
+} // end function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;')
 
 // Please note that the filter is passed in by copy, so you need to use the return value from this function.
 //
-function addFilterTerm( $filter, $position, $term=false ) {
+function addFilterTerm($filter, $position, $term=false) {
   if ( $position < 0 )
     $position = 0;
-  
-  if ( ! isset( $filter['Query']['terms'] ) )
+
+  if ( !isset($filter['Query']['terms']) )
     $filter['Query']['terms'] = array();
-  elseif( $position > count($filter['Query']['terms']) )
+  else if ( $position > count($filter['Query']['terms']) )
     $position = count($filter['Query']['terms']);
+
   if ( $term && $position == 0 )
-    unset( $term['cnj'] );
-  array_splice( $filter['Query']['terms'], $position, 0, array( $term?$term:array() ) );
+    unset($term['cnj']);
+  array_splice($filter['Query']['terms'], $position, 0, array($term ? $term : array()));
 
   return $filter;
 }
 
-function delFilterTerm( $filter, $position ) {
+function delFilterTerm($filter, $position) {
   if ( $position < 0 )
     $position = 0;
-  elseif( $position >= count($filter['Query']['terms']) )
+  else if ( $position >= count($filter['Query']['terms']) )
     $position = count($filter['Query']['terms']);
-  array_splice( $filter['Query']['terms'], $position, 1 );
+  array_splice($filter['Query']['terms'], $position, 1);
 
   return $filter;
 }
 
-function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;' ) {
+function getPagination($pages, $page, $maxShortcuts, $query, $querySep='&amp;') {
   global $view;
 
   $pageText = '';
@@ -1430,7 +1192,7 @@ function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;'
           if ( $newPage <= 1 )
             break;
           $pagesUsed[$newPage] = true;
-          array_unshift( $newPages, $newPage );
+          array_unshift($newPages, $newPage);
         }
         if ( !isset($pagesUsed[1]) )
           array_unshift( $newPages, 1 );
@@ -1438,8 +1200,8 @@ function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;'
         foreach ( $newPages as $newPage ) {
           $pageText .= '<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>&nbsp;';
         }
+      } # end if page > 1
 
-      }
       $pageText .= '-&nbsp;'.$page.'&nbsp;-';
       if ( $page < $pages ) {
         $newPages = array();
@@ -1452,10 +1214,10 @@ function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;'
           if ( $newPage > $pages )
             break;
           $pagesUsed[$newPage] = true;
-          array_push( $newPages, $newPage );
+          array_push($newPages, $newPage);
         }
         if ( !isset($pagesUsed[$pages]) )
-          array_push( $newPages, $pages );
+          array_push($newPages, $pages);
 
         foreach ( $newPages as $newPage ) {
           $pageText .= '&nbsp;<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>';
@@ -1464,160 +1226,161 @@ function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;'
         if ( false && $page < ($pages-1) ) {
           $pageText .= '<a href="?view='.$view.$querySep.'page='.$pages.$query.'">&gt;&gt;</a>';
         }
-      }
+      } # end if $page < $pages
     }
   }
-  return( $pageText );
+  return $pageText;
 }
 
-function sortHeader( $field, $querySep='&amp;' ) {
+function sortHeader($field, $querySep='&amp;') {
   global $view;
   return implode($querySep, array(
     '?view='.$view,
-    'page=1'.$_REQUEST['filter']['query'],
+    'page=1'.(isset($_REQUEST['filter'])?$_REQUEST['filter']['query']:''),
     'sort_field='.$field,
     'sort_asc='.($_REQUEST['sort_field'] == $field ? !$_REQUEST['sort_asc'] : 0),
     'limit='.validInt($_REQUEST['limit']),
-    ($_REQUEST['eid'] ? 'eid='.$_REQUEST['eid'] : '' ),
+    (isset($_REQUEST['eid']) ? 'eid='.$_REQUEST['eid'] : '' ),
   ));
 }
 
-function sortTag( $field ) {
-  if ( $_REQUEST['sort_field'] == $field )
-    if ( $_REQUEST['sort_asc'] )
-      return( '(^)' );
-    else
-      return( '(v)' );
-  return( false );
+function sortTag($field) {
+  if ( isset($_REQUEST['sort_field']) ) {
+    if ( $_REQUEST['sort_field'] == $field )
+      if ( $_REQUEST['sort_asc'] )
+        return '(^)';
+      else
+        return '(v)';
+  }
+  return false;
 }
 
 function getLoad() {
   $load = sys_getloadavg();
-  return( $load[0] );
+  return $load[0];
 }
 
 function getDiskPercent($path = ZM_DIR_EVENTS) {
   $total = disk_total_space($path);
   if ( $total === false ) {
-    Error('disk_total_space returned false. Verify the web account user has access to ' . $path );
+    ZM\Error('disk_total_space returned false. Verify the web account user has access to ' . $path);
     return 0;
   } elseif ( $total == 0 ) {
-    Error('disk_total_space indicates the following path has a filesystem size of zero bytes ' . $path );
+    ZM\Error('disk_total_space indicates the following path has a filesystem size of zero bytes ' . $path);
     return 100;
   }
   $free = disk_free_space($path);
   if ( $free === false ) {
-    Error('disk_free_space returned false. Verify the web account user has access to ' . $path );
+    ZM\Error('disk_free_space returned false. Verify the web account user has access to ' . $path);
   }
   $space = round((($total - $free) / $total) * 100);
-  return( $space );
+  return $space;
 }
 
-function getDiskBlocks() {
-  if ( ! $StorageArea ) $StorageArea = new ZM\Storage();
-  $df = shell_exec( 'df '.escapeshellarg($StorageArea->Path() ));
+function getDiskBlocks($path = ZM_DIR_EVENTS) {
+  $df = shell_exec('df '.escapeshellarg($path));
   $space = -1;
-  if ( preg_match( '/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches ) )
+  if ( preg_match('/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches) )
     $space = $matches[1];
-  return( $space );
+  return $space;
 }
 
 function systemStats() {
 
-    $load = getLoad();
-    $diskPercent = getDiskPercent();
-    $pathMapPercent = getDiskPercent(ZM_PATH_MAP);
-    $cpus = getcpus();
+  $load = getLoad();
+  $diskPercent = getDiskPercent();
+  $pathMapPercent = getDiskPercent(ZM_PATH_MAP);
+  $cpus = getcpus();
 
-    $normalized_load = $load / $cpus;
+  $normalized_load = $load / $cpus;
 
-    # Colorize the system load stat
-    if ( $normalized_load <= 0.75 ) {
-        $htmlLoad=$load;
-    } elseif ( $normalized_load <= 0.9 ) {
-        $htmlLoad="<span class=\"warning\">$load</span>";
-    } elseif ( $normalized_load <= 1.1 ) {
-        $htmlLoad="<span class=\"error\">$load</span>";
+  # Colorize the system load stat
+  if ( $normalized_load <= 0.75 ) {
+    $htmlLoad = $load;
+  } else if ( $normalized_load <= 0.9 ) {
+    $htmlLoad = '<span class="warning">'.$load.'</span>';
+  } else if ( $normalized_load <= 1.1 ) {
+    $htmlLoad = '<span class="error">'.$load.'</span>';
+  } else {
+    $htmlLoad = '<span class="critical">'.$load.'</span>';
+  }
+
+  # Colorize the disk space stat
+  if ( $diskPercent < 98 ) {
+    $htmlDiskPercent = $diskPercent.'%';
+  } else if ( $diskPercent <= 99 ) {
+    $htmlDiskPercent = '<span class="warning">'.$diskPercent.'%</span>';
+  } else {
+    $htmlDiskPercent = '<span class="error">'.$diskPercent.'%</span>';
+  }
+
+  # Colorize the PATH_MAP (usually /dev/shm) stat
+  if ( $pathMapPercent < 90 ) {
+    if ( disk_free_space(ZM_PATH_MAP) > 209715200 ) { # have to always have at least 200MiB free
+      $htmlPathMapPercent = $pathMapPercent.'%';
     } else {
-        $htmlLoad="<span class=\"critical\">$load</span>";
+      $htmlPathMapPercent = '<span class="warning">'.$pathMapPercent.'%</span>';
     }
+  } else if ( $pathMapPercent < 100 ) {
+    $htmlPathMapPercent = '<span class="warning">'.$pathMapPercent.'%</span>';
+  } else {
+    $htmlPathMapPercent = '<span class="critical">'.$pathMapPercent.'%</span>';
+  }
 
-    # Colorize the disk space stat
-    if ( $diskPercent < 98 ) {
-        $htmlDiskPercent="$diskPercent%";
-    } elseif ( $diskPercent <= 99 ) {
-        $htmlDiskPercent="<span class=\"warning\">$diskPercent%</span>";
-    } else {
-        $htmlDiskPercent="<span class=\"error\">$diskPercent%</span>";
-    }
+  $htmlString = translate('Load').': '.$htmlLoad.' - '.translate('Disk').': '.$htmlDiskPercent.' - '.ZM_PATH_MAP.': '.$htmlPathMapPercent;
 
-    # Colorize the PATH_MAP (usually /dev/shm) stat
-    if ( $pathMapPercent < 90 ) {
-        if ( disk_free_space(ZM_PATH_MAP) > 209715200 ) { # have to always have at least 200MiB free
-            $htmlPathMapPercent="$pathMapPercent%";
-        } else {
-            $htmlPathMapPercent="<span class=\"warning\">$pathMapPercent%</span>";
-        }
-    } elseif ( $pathMapPercent < 100 ) {
-        $htmlPathMapPercent="<span class=\"warning\">$pathMapPercent%</span>";
-    } else {
-        $htmlPathMapPercent="<span class=\"critical\">$pathMapPercent%</span>";
-    }
-
-    $htmlString = translate('Load').": $htmlLoad - ".translate('Disk').": $htmlDiskPercent - ".ZM_PATH_MAP.": $htmlPathMapPercent";
-
-    return( $htmlString );
+  return $htmlString;
 }
 
 function getcpus() {
 
-    if (is_readable("/proc/cpuinfo") ) { # Works on Linux
-        preg_match_all('/^processor/m', file_get_contents('/proc/cpuinfo'), $matches); 
-        $num_cpus = count($matches[0]);
-    } else { # Works on BSD
-        $matches = explode(":", shell_exec("sysctl hw.ncpu"));
-        $num_cpus = trim($matches[1]);
-    }
+  if ( is_readable('/proc/cpuinfo') ) { # Works on Linux
+    preg_match_all('/^processor/m', file_get_contents('/proc/cpuinfo'), $matches);
+    $num_cpus = count($matches[0]);
+  } else { # Works on BSD
+    $matches = explode(':', shell_exec('sysctl hw.ncpu'));
+    $num_cpus = trim($matches[1]);
+  }
 
-    return( $num_cpus );
+  return $num_cpus;
 }
 
-// Function to fix a problem whereby the built in PHP session handling 
-// features want to put the sid as a hidden field after the form or 
+// Function to fix a problem whereby the built in PHP session handling
+// features want to put the sid as a hidden field after the form or
 // fieldset tag, neither of which will work with strict XHTML Basic.
 function sidField() {
   if ( SID ) {
-    list( $sessname, $sessid ) = explode( "=", SID );
+    list($sessname, $sessid) = explode('=', SID);
 ?>
     <input type="hidden" name="<?php echo $sessname ?>" value="<?php echo $sessid ?>"/>
 <?php
   }
 }
 
-function verNum( $version ) {
+function verNum($version) {
   $vNum = '';
   $maxFields = 3;
-  $vFields = explode( '.', $version );
-  array_splice( $vFields, $maxFields );
+  $vFields = explode('.', $version);
+  array_splice($vFields, $maxFields);
   while ( count($vFields) < $maxFields ) {
     $vFields[] = 0;
   }
   foreach ( $vFields as $vField ) {
-    $vField = sprintf( '%02d', $vField );
+    $vField = sprintf('%02d', $vField);
     while ( strlen($vField) < 2 ) {
       $vField = '0'.$vField;
     }
     $vNum .= $vField;
   }
-  return( $vNum );
+  return $vNum;
 }
 
 function fixSequences() {
   $sequence = 1;
-  $sql = 'select * from Monitors order by Sequence asc, Id asc';
-  foreach( dbFetchAll( $sql ) as $monitor ) {
+  $sql = 'SELECT * FROM Monitors ORDER BY Sequence ASC, Id ASC';
+  foreach( dbFetchAll($sql) as $monitor ) {
     if ( $monitor['Sequence'] != $sequence ) {
-      dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) );
+      dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($sequence, $monitor['Id']));
     }
     $sequence++;
   }
@@ -1625,27 +1388,27 @@ function fixSequences() {
 
 function firstSet() {
   foreach ( func_get_args() as $arg ) {
-    if ( !empty( $arg ) )
-      return( $arg );
+    if ( !empty($arg) )
+      return $arg;
   }
 }
 
-function linesIntersect( $line1, $line2 ) {
+function linesIntersect($line1, $line2) {
   global $debug;
 
-  $min_x1 = min( $line1[0]['x'], $line1[1]['x'] );
-  $max_x1 = max( $line1[0]['x'], $line1[1]['x'] );
-  $min_x2 = min( $line2[0]['x'], $line2[1]['x'] );
-  $max_x2 = max( $line2[0]['x'], $line2[1]['x'] );
-  $min_y1 = min( $line1[0]['y'], $line1[1]['y'] );
-  $max_y1 = max( $line1[0]['y'], $line1[1]['y'] );
-  $min_y2 = min( $line2[0]['y'], $line2[1]['y'] );
-  $max_y2 = max( $line2[0]['y'], $line2[1]['y'] );
+  $min_x1 = min($line1[0]['x'], $line1[1]['x']);
+  $max_x1 = max($line1[0]['x'], $line1[1]['x']);
+  $min_x2 = min($line2[0]['x'], $line2[1]['x']);
+  $max_x2 = max($line2[0]['x'], $line2[1]['x']);
+  $min_y1 = min($line1[0]['y'], $line1[1]['y']);
+  $max_y1 = max($line1[0]['y'], $line1[1]['y']);
+  $min_y2 = min($line2[0]['y'], $line2[1]['y']);
+  $max_y2 = max($line2[0]['y'], $line2[1]['y']);
 
   // Checking if bounding boxes intersect
   if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 ) {
     if ( $debug ) echo 'Not intersecting, out of bounds<br>';
-    return( false );
+    return false;
   }
 
   $dx1 = $line1[1]['x'] - $line1[0]['x'];
@@ -1672,54 +1435,54 @@ function linesIntersect( $line1, $line2 ) {
 
       if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 ) {
         if ( $debug ) echo "Intersecting, at x $x<br>";
-        return( true );
+        return true;
       } else {
         if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
-        return( false );
+        return false;
       }
     } elseif ( $b1 == $b2 ) {
-      // Colinear, must overlap due to box check, intersect? 
+      // Colinear, must overlap due to box check, intersect?
       if ( $debug ) echo 'Intersecting, colinear<br>';
-      return( true );
+      return true;
     } else {
       // Parallel
       if ( $debug ) echo 'Not intersecting, parallel<br>';
-      return( false );
+      return false;
     }
-  } elseif ( !$dx1 ) { // Line 1 is vertical 
+  } elseif ( !$dx1 ) { // Line 1 is vertical
     $y = ( $m2 * $line1[0]['x'] ) * $b2;
     if ( $y >= $min_y1 && $y <= $max_y1 ) {
       if ( $debug ) echo "Intersecting, at y $y<br>";
-      return( true );
+      return true;
     } else {
       if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
-      return( false );
+      return false;
     }
-  } elseif ( !$dx2 ) { // Line 2 is vertical 
+  } elseif ( !$dx2 ) { // Line 2 is vertical
     $y = ( $m1 * $line2[0]['x'] ) * $b1;
     if ( $y >= $min_y2 && $y <= $max_y2 ) {
       if ( $debug ) echo "Intersecting, at y $y<br>";
-      return( true );
+      return true;
     } else {
       if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
-      return( false );
+      return false;
     }
   } else { // Both lines are vertical
     if ( $line1[0]['x'] == $line2[0]['x'] ) {
-      // Colinear, must overlap due to box check, intersect? 
+      // Colinear, must overlap due to box check, intersect?
       if ( $debug ) echo 'Intersecting, vertical, colinear<br>';
-      return( true );
+      return true;
     } else {
       // Parallel
       if ( $debug ) echo 'Not intersecting, vertical, parallel<br>';
-      return( false );
+      return false;
     }
   }
   if ( $debug ) echo 'Whoops, unexpected scenario<br>';
-  return( false );
+  return false;
 }
 
-function isSelfIntersecting( $points ) {
+function isSelfIntersecting($points) {
   global $debug;
 
   $n_coords = count($points);
@@ -1731,43 +1494,42 @@ function isSelfIntersecting( $points ) {
   for ( $i = 0; $i <= ($n_coords-2); $i++ ) {
     for ( $j = $i+2; $j < $n_coords+min(0,$i-1); $j++ ) {
       if ( $debug ) echo "Checking $i and $j<br>";
-      if ( linesIntersect( $edges[$i], $edges[$j] ) ) {
+      if ( linesIntersect($edges[$i], $edges[$j]) ) {
         if ( $debug ) echo "Lines $i and $j intersect<br>";
-        return( true );
+        return true;
       }
     }
   }
-  return( false );
+  return false;
 }
 
-function getPolyCentre( $points, $area=0 ) {
+function getPolyCentre($points, $area=0) {
   $cx = 0.0;
   $cy = 0.0;
   if ( !$area )
-    $area = getPolyArea( $points );
+    $area = getPolyArea($points);
   for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ ) {
     $ct = ($points[$i]['x'] * $points[$j]['y']) - ($points[$j]['x'] * $points[$i]['y']);
-    $cx += ($points[$i]['x'] + $points[$j]['x']) * ct;
-    $cy += ($points[$i]['y'] + $points[$j]['y']) * ct;
+    $cx += ($points[$i]['x'] + $points[$j]['x']) * $ct;
+    $cy += ($points[$i]['y'] + $points[$j]['y']) * $ct;
   }
   $cx = intval(round(abs($cx/(6.0*$area))));
   $cy = intval(round(abs($cy/(6.0*$area))));
-  printf( "X:%cx, Y:$cy<br>" );
-  return( array( 'x'=>$cx, 'y'=>$cy ) );
+  return array('x'=>$cx, 'y'=>$cy);
 }
 
-function _CompareXY( $a, $b ) {
+function _CompareXY($a, $b) {
   if ( $a['min_y'] == $b['min_y'] )
-    return( intval($a['min_x'] - $b['min_x']) );
+    return intval($a['min_x'] - $b['min_x']);
   else
-    return( intval($a['min_y'] - $b['min_y']) );
+    return intval($a['min_y'] - $b['min_y']);
 }
 
-function _CompareX( $a, $b ) {
-  return( intval($a['min_x'] - $b['min_x']) );
+function _CompareX($a, $b) {
+  return intval($a['min_x'] - $b['min_x']);
 }
 
-function getPolyArea( $points ) {
+function getPolyArea($points) {
   global $debug;
 
   $n_coords = count($points);
@@ -1793,11 +1555,16 @@ function getPolyArea( $points ) {
         );
   }
 
-  usort( $global_edges, '_CompareXY' );
+  usort($global_edges, '_CompareXY');
 
   if ( $debug ) {
     for ( $i = 0; $i < count($global_edges); $i++ ) {
-      printf( '%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>', $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] );
+      printf('%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>',
+        $i,
+        $global_edges[$i]['min_y'],
+        $global_edges[$i]['max_y'],
+        $global_edges[$i]['min_x'],
+        $global_edges[$i]['_1_m']);
     }
   }
 
@@ -1807,18 +1574,23 @@ function getPolyArea( $points ) {
   do {
     for ( $i = 0; $i < count($global_edges); $i++ ) {
       if ( $global_edges[$i]['min_y'] == $y ) {
-        if ( $debug ) printf( 'Moving global edge<br>' );
+        if ( $debug ) printf('Moving global edge<br>');
         $active_edges[] = $global_edges[$i];
-        array_splice( $global_edges, $i, 1 );
+        array_splice($global_edges, $i, 1);
         $i--;
       } else {
         break;
       }
     }
-    usort( $active_edges, '_CompareX' );
+    usort($active_edges, '_CompareX');
     if ( $debug ) {
       for ( $i = 0; $i < count($active_edges); $i++ ) {
-        printf( '%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>', $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] );
+        printf('%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>',
+          $y, $i,
+          $active_edges[$i]['min_y'],
+          $active_edges[$i]['max_y'],
+          $active_edges[$i]['min_x'],
+          $active_edges[$i]['_1_m']);
       }
     }
     $last_x = 0;
@@ -1834,23 +1606,23 @@ function getPolyArea( $points ) {
         $parity = !$parity;
       $last_x = $x;
     }
-    if ( $debug ) printf( '%d: Area:%d<br>', $y, $row_area );
+    if ( $debug ) printf('%d: Area:%d<br>', $y, $row_area);
     $y++;
     for ( $i = 0; $i < count($active_edges); $i++ ) {
       if ( $y >= $active_edges[$i]['max_y'] ) { // Or >= as per sheets
-        if ( $debug ) printf( 'Deleting active_edge<br>' );
-        array_splice( $active_edges, $i, 1 );
+        if ( $debug ) printf('Deleting active_edge<br>');
+        array_splice($active_edges, $i, 1);
         $i--;
       } else {
         $active_edges[$i]['min_x'] += $active_edges[$i]['_1_m'];
       }
     }
   } while ( count($global_edges) || count($active_edges) );
-  if ( $debug ) printf( 'Area:%d<br>', $area );
-  return( $area );
+  if ( $debug ) printf('Area:%d<br>', $area);
+  return $area;
 }
 
-function getPolyAreaOld( $points ) {
+function getPolyAreaOld($points) {
   $area = 0.0;
   $edge = 0.0;
   for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ ) {
@@ -1861,174 +1633,179 @@ function getPolyAreaOld( $points ) {
     $edge += $trap_edge;
     $trap_area = ($x_diff * $y_sum );
     $area += $trap_area;
-    printf( "%d->%d, %d-%d=%.2f, %d+%d=%.2f(%.2f), %.2f, %.2f<br>", i, j, $points[$i]['x'], $points[$j]['x'], $x_diff, $points[$i]['y'], $points[$j]['y'], $y_sum, $y_diff, $trap_area, $trap_edge );
+    printf('%d->%d, %d-%d=%.2f, %d+%d=%.2f(%.2f), %.2f, %.2f<br>',
+      $i, $j,
+      $points[$i]['x'], $points[$j]['x'],
+      $x_diff,
+      $points[$i]['y'], $points[$j]['y'],
+      $y_sum, $y_diff, $trap_area, $trap_edge);
   }
   $edge = intval(round(abs($edge)));
   $area = intval(round((abs($area)+$edge)/2));
   echo "E:$edge<br>";
   echo "A:$area<br>";
-  return( $area );
+  return $area;
 }
 
-function mapCoords( $a ) {
-  return( $a['x'].",".$a['y'] );
+function mapCoords($a) {
+  return $a['x'].','.$a['y'];
 }
 
-function pointsToCoords( $points ) {
-  return( join( ' ', array_map( 'mapCoords', $points ) ) );
+function pointsToCoords($points) {
+  return join(' ', array_map('mapCoords', $points));
 }
 
-function coordsToPoints( $coords ) {
+function coordsToPoints($coords) {
   $points = array();
-  if ( preg_match_all( '/(\d+,\d+)+/', $coords, $matches ) ) {
+  if ( preg_match_all('/(\d+,\d+)+/', $coords, $matches) ) {
     for ( $i = 0; $i < count($matches[1]); $i++ ) {
-      if ( preg_match( '/(\d+),(\d+)/', $matches[1][$i], $cmatches ) ) {
-        $points[] = array( 'x'=>$cmatches[1], 'y'=>$cmatches[2] );
+      if ( preg_match('/(\d+),(\d+)/', $matches[1][$i], $cmatches) ) {
+        $points[] = array('x'=>$cmatches[1], 'y'=>$cmatches[2]);
       } else {
-        echo( "Bogus coordinates '".$matches[$i]."'" );
-        return( false );
+        echo('Bogus coordinates ('.$matches[$i].')');
+        return false;
       }
     }
   } else {
-    echo( "Bogus coordinate string '$coords'" );
-    return( false );
+    echo('Bogus coordinate string '.$coords);
+    return false;
   }
-  return( $points );
+  return $points;
 }
 
-function limitPoints( &$points, $min_x, $min_y, $max_x, $max_y ) {
+function limitPoints(&$points, $min_x, $min_y, $max_x, $max_y) {
   foreach ( $points as &$point ) {
     if ( $point['x'] < $min_x ) {
-      ZM\Logger::Debug('Limiting point x'.$point['x'].' to min_x ' . $min_x );
+      ZM\Logger::Debug('Limiting point x'.$point['x'].' to min_x '.$min_x);
       $point['x'] = $min_x;
     } else if ( $point['x'] > $max_x ) {
-      ZM\Logger::Debug('Limiting point x'.$point['x'].' to max_x ' . $max_x );
+      ZM\Logger::Debug('Limiting point x'.$point['x'].' to max_x '.$max_x);
       $point['x'] = $max_x;
     }
     if ( $point['y'] < $min_y ) {
-      ZM\Logger::Debug('Limiting point y'.$point['y'].' to min_y ' . $min_y );
+      ZM\Logger::Debug('Limiting point y'.$point['y'].' to min_y '.$min_y);
       $point['y'] = $min_y;
     } else if ( $point['y'] > $max_y ) {
-      ZM\Logger::Debug('Limiting point y'.$point['y'].' to max_y ' . $max_y );
+      ZM\Logger::Debug('Limiting point y'.$point['y'].' to max_y '.$max_y);
       $point['y'] = $max_y;
     }
   } // end foreach point
 } // end function limitPoints( $points, $min_x, $min_y, $max_x, $max_y )
 
-function scalePoints( &$points, $scale ) {
+function scalePoints(&$points, $scale) {
   foreach ( $points as &$point ) {
-    $point['x'] = reScale( $point['x'], $scale );
-    $point['y'] = reScale( $point['y'], $scale );
+    $point['x'] = reScale($point['x'], $scale);
+    $point['y'] = reScale($point['y'], $scale);
   }
 }
 
 function getLanguages() {
   $langs = array();
   foreach ( glob('lang/*_*.php') as $file ) {
-    preg_match( '/([^\/]+_.+)\.php/', $file, $matches );
+    preg_match('/([^\/]+_.+)\.php/', $file, $matches);
     $langs[$matches[1]] = $matches[1];
   }
-  return( $langs );
+  return $langs;
 }
 
-function trimString( $string, $length ) {
-  return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', $string ) );
+function trimString($string, $length) {
+  return preg_replace('/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', $string);
 }
 
-function monitorIdsToNames( $ids ) {
+function monitorIdsToNames($ids) {
   global $mITN_monitors;
   if ( !$mITN_monitors ) {
-    $sql = 'select Id, Name from Monitors';
-    foreach( dbFetchAll( $sql ) as $monitor ) {
+    $sql = 'SELECT Id, Name FROM Monitors';
+    foreach ( dbFetchAll($sql) as $monitor ) {
       $mITN_monitors[$monitor['Id']] = $monitor;
     }
   }
   $names = array();
   if ( ! is_array($ids) ) {
-    $ids = preg_split( '/\s*,\s*/', $ids );
+    $ids = preg_split('/\s*,\s*/', $ids);
   }
   foreach ( $ids as $id ) {
-    if ( visibleMonitor( $id ) ) {
+    if ( visibleMonitor($id) ) {
       if ( isset($mITN_monitors[$id]) ) {
         $names[] = $mITN_monitors[$id]['Name'];
       }
     }
   }
-  $name_string = join( ', ', $names );
-  return( $name_string );
+  $name_string = join(', ', $names);
+  return $name_string;
 }
 
 function initX10Status() {
   global $x10_status;
 
   if ( !isset($x10_status) ) {
-    $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
+    $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
     if ( $socket < 0 ) {
-      ZM\Fatal( 'socket_create() failed: '.socket_strerror($socket) );
+      ZM\Fatal('socket_create() failed: '.socket_strerror($socket));
     }
     $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
-    if ( @socket_connect( $socket, $sock_file ) ) {
+    if ( @socket_connect($socket, $sock_file) ) {
       $command = 'status';
-      if ( !socket_write( $socket, $command ) ) {
-        ZM\Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
+      if ( !socket_write($socket, $command) ) {
+        ZM\Fatal('Can\'t write to control socket: '.socket_strerror(socket_last_error($socket)));
       }
-      socket_shutdown( $socket, 1 );
+      socket_shutdown($socket, 1);
       $x10Output = '';
-      while ( $x10Response = socket_read( $socket, 256 ) ) {
+      while ( $x10Response = socket_read($socket, 256) ) {
         $x10Output .= $x10Response;
       }
-      socket_close( $socket );
+      socket_close($socket);
     } else {
       // Can't connect so use script
-      $command = ZM_PATH_BIN."/zmx10.pl --command status";
+      $command = ZM_PATH_BIN.'/zmx10.pl --command status';
       //$command .= " 2>/dev/null >&- <&- >/dev/null";
 
-      $x10Output = exec( escapeshellcmd( $command ) );
+      $x10Output = exec(escapeshellcmd($command));
     }
-    foreach ( explode( "\n", $x10Output ) as $x10Response ) {
-      if ( preg_match( "/^(\d+)\s+(.+)$/", $x10Response, $matches ) ) {
+    foreach ( explode("\n", $x10Output) as $x10Response ) {
+      if ( preg_match('/^(\d+)\s+(.+)$/', $x10Response, $matches) ) {
         $x10_status[$matches[1]] = $matches[2];
       }
     }
   }
 }
 
-function getDeviceStatusX10( $key ) {
+function getDeviceStatusX10($key) {
   global $x10_status;
 
   initX10Status();
 
   if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) )
     $status = 'unknown';
-  return( $status );
+  return $status;
 }
 
-function setDeviceStatusX10( $key, $status ) {
-  $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
+function setDeviceStatusX10($key, $status) {
+  $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
   if ( $socket < 0 ) {
-    ZM\Fatal( 'socket_create() failed: '.socket_strerror($socket) );
+    ZM\Fatal('socket_create() failed: '.socket_strerror($socket));
   }
   $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
-  if ( @socket_connect( $socket, $sock_file ) ) {
+  if ( @socket_connect($socket, $sock_file) ) {
     $command = "$status;$key";
-    if ( !socket_write( $socket, $command ) ) {
-      ZM\Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
+    if ( !socket_write($socket, $command) ) {
+      ZM\Fatal('Can\'t write to control socket: '.socket_strerror(socket_last_error($socket)));
     }
-    socket_shutdown( $socket, 1 );
-    $x10Response = socket_read( $socket, 256 );
-    socket_close( $socket );
+    socket_shutdown($socket, 1);
+    $x10Response = socket_read($socket, 256);
+    socket_close($socket);
   } else {
     // Can't connect so use script
-    $command = ZM_PATH_BIN.'/zmx10.pl --command '.escapeshellarg( $status );
+    $command = ZM_PATH_BIN.'/zmx10.pl --command '.escapeshellarg($status);
     $command .= ' --unit-code '.escapeshellarg( $key );
     //$command .= " 2>/dev/null >&- <&- >/dev/null";
-    $x10Response = exec( $command );
+    $x10Response = exec($command);
   }
-  if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) )
+  if ( preg_match('/^'.$key.'\s+(.*)/', $x10Response, $matches) )
     $status = $matches[1];
   else
     $status = 'unknown';
-  return( $status );
+  return $status;
 }
 
 function logState() {
@@ -2048,7 +1825,7 @@ function logState() {
       if ( $count['Level'] <= ZM\Logger::PANIC )
         $count['Level'] = ZM\Logger::FATAL;
       if ( !($levelCount = $levelCounts[$count['Level']]) ) {
-        Error('Unexpected Log level '.$count['Level']);
+        ZM\Error('Unexpected Log level '.$count['Level']);
         next;
       }
       if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] ) {
@@ -2062,78 +1839,83 @@ function logState() {
   return $state;
 }
 
-function isVector ( &$array ) {
+function isVector(&$array) {
   $next_key = 0;
   foreach ( array_keys($array) as $key ) {
-    if ( !is_int( $key ) )
-      return( false );
+    if ( !is_int($key) )
+      return false;
     if ( $key != $next_key++ )
-      return( false );
+      return false;
   }
-  return( true );
+  return true;
 }
 
 function checkJsonError($value) {
   if ( function_exists('json_last_error') ) {
-    $value = var_export($value,true);
-    switch( json_last_error() ) {
+    $value = var_export($value, true);
+    switch ( json_last_error() ) {
       case JSON_ERROR_DEPTH :
-        ZM\Fatal( "Unable to decode JSON string '$value', maximum stack depth exceeded" );
+        ZM\Error("Unable to decode JSON string '$value', maximum stack depth exceeded");
+        break;
       case JSON_ERROR_CTRL_CHAR :
-        ZM\Fatal( "Unable to decode JSON string '$value', unexpected control character found" );
+        ZM\Error("Unable to decode JSON string '$value', unexpected control character found");
+        break;
       case JSON_ERROR_STATE_MISMATCH :
-        ZM\Fatal( "Unable to decode JSON string '$value', invalid or malformed JSON" );
+        ZM\Error("Unable to decode JSON string '$value', invalid or malformed JSON");
+        break;
       case JSON_ERROR_SYNTAX :
-        ZM\Fatal( "Unable to decode JSON string '$value', syntax error" );
+        ZM\Error("Unable to decode JSON string '$value', syntax error");
+        break;
       default :
-        ZM\Fatal( "Unable to decode JSON string '$value', unexpected error ".json_last_error() );
+        ZM\Error("Unable to decode JSON string '$value', unexpected error ".json_last_error());
+        break;
       case JSON_ERROR_NONE:
         break;
     }
   }
 }
 
-function jsonEncode( &$value ) {
+function jsonEncode(&$value) {
   if ( function_exists('json_encode') ) {
     $string = json_encode( $value );
     checkJsonError($value);
-    return( $string );
+    return $string;
   }
 
   switch ( gettype($value) ) {
     case 'double':
     case 'integer':
-      return( $value );
+      return $value;
     case 'boolean':
-      return( $value?'true':'false' );
+      return $value ? 'true' : 'false';
     case 'string':
-      return( '"'.preg_replace( "/\r?\n/", '\\n', addcslashes($value,'"\\/') ).'"' );
+      return '"'.preg_replace("/\r?\n/", '\\n', addcslashes($value,'"\\/')).'"';
     case 'NULL':
-      return( 'null' );
+      return 'null';
     case 'object':
-      return( '"Object '.addcslashes(get_class($value),'"\\/').'"' );
+      return '"Object '.addcslashes(get_class($value),'"\\/').'"';
     case 'array':
       if ( isVector( $value ) )
-        return( '['.join( ',', array_map( 'jsonEncode', $value) ).']' );
+        return '['.join(',', array_map('jsonEncode', $value)).']';
       else {
         $result = '{';
         foreach ($value as $subkey => $subvalue ) {
           if ( $result != '{' )
             $result .= ',';
-          $result .= '"'.$subkey.'":'.jsonEncode( $subvalue );
+          $result .= '"'.$subkey.'":'.jsonEncode($subvalue);
         }
-        return( $result.'}' );
+        return $result.'}';
       }
     default:
-      return( '"'.addcslashes(gettype($value),'"\\/').'"' );
+      return '"'.addcslashes(gettype($value),'"\\/').'"';
   }
 }
 
-function jsonDecode( $value ) {
+function jsonDecode($value) {
   if ( function_exists('json_decode') ) {
-    $object = json_decode( $value, true );
+    $object = json_decode($value, true);
     checkJsonError($value);
-    return( $object );
+    return $object;
   }
 
   $comment = false;
@@ -2148,7 +1930,7 @@ function jsonDecode( $value ) {
       } else if ( $value[$i] == ':' ) {
         $out .= '=>';
       } else {
-        $out .= $value[$i];         
+        $out .= $value[$i];
       }
     } else if ( !$unescape ) {
       if ( $value[$i] == '\\' )
@@ -2165,83 +1947,83 @@ function jsonDecode( $value ) {
       $comment = !$comment;
     }
   }
-  eval( $out.';' );
-  return( $result );
+  eval($out.';');
+  return $result;
 }
 
-define( 'HTTP_STATUS_OK', 200 );
-define( 'HTTP_STATUS_BAD_REQUEST', 400 );
-define( 'HTTP_STATUS_FORBIDDEN', 403 );
+define('HTTP_STATUS_OK', 200);
+define('HTTP_STATUS_BAD_REQUEST', 400);
+define('HTTP_STATUS_FORBIDDEN', 403);
 
-function ajaxError( $message, $code=HTTP_STATUS_OK ) {
-  ZM\Error( $message );
-  if ( function_exists( 'ajaxCleanup' ) )
+function ajaxError($message, $code=HTTP_STATUS_OK) {
+  ZM\Error($message);
+  if ( function_exists('ajaxCleanup') )
     ajaxCleanup();
   if ( $code == HTTP_STATUS_OK ) {
-    $response = array( 'result'=>'Error', 'message'=>$message );
-    header( 'Content-type: text/plain' );
-    exit( jsonEncode( $response ) );
+    $response = array('result'=>'Error', 'message'=>$message);
+    header('Content-type: application/json');
+    exit(jsonEncode($response));
   }
-  header( "HTTP/1.0 $code $message" );
+  header("HTTP/1.0 $code $message");
   exit();
 }
 
-function ajaxResponse( $result=false ) {
-  if ( function_exists( 'ajaxCleanup' ) )
+function ajaxResponse($result=false) {
+  if ( function_exists('ajaxCleanup') )
     ajaxCleanup();
-  $response = array( 'result'=>'Ok' );
-  if ( is_array( $result ) ) {
-    $response = array_merge( $response, $result );
-  } elseif ( !empty($result) ) {
+  $response = array('result'=>'Ok');
+  if ( is_array($result) ) {
+    $response = array_merge($response, $result);
+  } else if ( !empty($result) ) {
     $response['message'] = $result;
   }
-  header( 'Content-type: text/plain' );
-  exit( jsonEncode( $response ) );
+  header('Content-type: application/json');
+  exit(jsonEncode($response));
 }
 
 function generateConnKey() {
-  return( rand( 1, 999999 ) );
+  return rand(1, 999999);
 }
 
-function detaintPath( $path ) {
+function detaintPath($path) {
   // Remove any absolute paths, or relative ones that want to go up
-  $path = preg_replace( '/\.(?:\.+[\\/][\\/]*)+/', '', $path );
-  $path = preg_replace( '/^[\\/]+/', '', $path );
-  return( $path );
+  $path = str_replace('../', '', $path);
+  $path = ltrim($path, '/');
+  return $path;
 }
 
-function cache_bust( $file ) {
+function cache_bust($file) {
   # Use the last modified timestamp to create a link that gets a different filename
   # To defeat caching.  Should probably use md5 hash
   $parts = pathinfo($file);
   global $css;
-  $dirname = preg_replace( '/\//', '_', $parts['dirname'] );
+  $dirname = str_replace('/', '_', $parts['dirname']);
   $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
   if ( file_exists(ZM_DIR_CACHE.'/'.$cacheFile) or symlink(ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile) ) {
     return 'cache/'.$cacheFile;
   } else {
-    ZM\Warning("Failed linking $file to $cacheFile");
+    ZM\Warning('Failed linking '.$file.' to '.$cacheFile);
   }
   return $file;
 }
 
-function getSkinFile( $file ) {
+function getSkinFile($file) {
   global $skinBase;
   $skinFile = false;
   foreach ( $skinBase as $skin ) {
-    $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
-    if ( file_exists( $tempSkinFile ) )
+    $tempSkinFile = detaintPath('skins/'.$skin.'/'.$file);
+    if ( file_exists($tempSkinFile) )
       $skinFile = $tempSkinFile;
   }
-  return  $skinFile;
+  return $skinFile;
 }
 
-function getSkinIncludes( $file, $includeBase=false, $asOverride=false ) {
+function getSkinIncludes($file, $includeBase=false, $asOverride=false) {
   global $skinBase;
   $skinFile = false;
   foreach ( $skinBase as $skin ) {
-    $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
-    if ( file_exists( $tempSkinFile ) )
+    $tempSkinFile = detaintPath('skins/'.$skin.'/'.$file);
+    if ( file_exists($tempSkinFile) )
       $skinFile = $tempSkinFile;
   }
   $includeFiles = array();
@@ -2256,52 +2038,81 @@ function getSkinIncludes( $file, $includeBase=false, $asOverride=false ) {
     if ( $skinFile )
       $includeFiles[] = $skinFile;
   }
-  return( $includeFiles );
+  return $includeFiles;
 }
 
-function requestVar( $name, $default='' ) {
-  return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default );
+function requestVar($name, $default='') {
+  return isset($_REQUEST[$name]) ? validHtmlStr($_REQUEST[$name]) : $default;
 }
 
 // For numbers etc in javascript or tags etc
-function validInt( $input ) {
-  return( preg_replace( '/\D/', '', $input ) );
+function validInt($input) {
+  return preg_replace('/\D/', '', $input);
 }
 
 function validNum( $input ) {
-  return( preg_replace( '/[^\d.-]/', '', $input ) );
+  return preg_replace('/[^\d.-]/', '', $input);
 }
 
 // For general strings
-function validStr( $input ) {
-  return( strip_tags( $input ) );
+function validStr($input) {
+  return strip_tags($input);
 }
 
 // For strings in javascript or tags etc, expected to be in quotes so further quotes escaped rather than converted
-function validJsStr( $input ) {
-  return( strip_tags( addslashes( $input ) ) );
+function validJsStr($input) {
+  return strip_tags(addslashes($input));
 }
 
 // For general text in pages outside of tags or quotes so quotes converted to entities
-function validHtmlStr( $input ) {
-  return( htmlspecialchars( $input, ENT_QUOTES ) );
+function validHtmlStr($input) {
+  return htmlspecialchars($input, ENT_QUOTES);
 }
 
+/* options['width'] is the desired view width not necessarily the image width requested.
+ * It can be % in which case we us it to set the scale
+ * It can be px in which case we can use it to calculate the scale
+ * Same width height.  If both are set we should calculate the smaller resulting scale
+ */
 function getStreamHTML($monitor, $options = array()) {
 
-  if ( isset($options['scale']) and $options['scale'] and ($options['scale'] != 100) ) {
-    $options['width'] = reScale($monitor->Width(), $options['scale']).'px';
-    $options['height'] = reScale($monitor->Height(), $options['scale']).'px';
+  if ( isset($options['scale']) and $options['scale'] != '' ) {
+    if ( $options['scale'] != 'auto' && $options['scale'] != '0' ) {
+      #ZM\Warning('Setting dimensions from scale:'.$options['scale']);
+      $options['width'] = reScale($monitor->ViewWidth(), $options['scale']).'px';
+      $options['height'] = reScale($monitor->ViewHeight(), $options['scale']).'px';
+    } else if ( ! ( isset($options['width']) or isset($options['height']) ) ) {
+      $options['width'] = '100%';
+      $options['height'] = 'auto';
+    }
   } else {
+    $options['scale'] = 100;
     # scale is empty or 100
     # There may be a fixed width applied though, in which case we need to leave the height empty
     if ( ! ( isset($options['width']) and $options['width'] ) ) {
-      $options['width'] = $monitor->Width().'px';
-      if ( ! ( isset($options['height']) and $options['height'] ) ) {
-        $options['height'] = $monitor->Height().'px';
+      # Havn't specified width.  If we specified height, then we should
+      # use a width that keeps the aspect ratio, otherwise no scaling, 
+      # no dimensions, so assume the dimensions of the Monitor
+
+      if ( ! (isset($options['height']) and $options['height']) ) {
+        # If we havn't specified any scale or dimensions, then we must be using CSS to scale it in a dynamic way. Can't make any assumptions.
+        #$options['width'] = $monitor->ViewWidth().'px';
+        #$options['height'] = $monitor->ViewHeight().'px';
+      }
+    } else {
+      #ZM\Warning("Have width ".$options['width']);
+      if ( preg_match('/^(\d+)px$/', $options['width'], $matches) ) {
+        $scale = intval(100*$matches[1]/$monitor->ViewWidth());
+        #ZM\Warning("Scale is $scale");
+        if ( $scale < $options['scale'] )
+          $options['scale'] = $scale;
+      } else if ( preg_match('/^(\d+)%$/', $options['width'], $matches) ) {
+        $scale = intval($matches[1]);
+        if ( $scale < $options['scale'] )
+          $options['scale'] = $scale;
+      } else {
+        Warning('Invalid value for width: '.$options['width']);
       }
-    } else if ( ! isset($options['height']) ) {
-      $options['height'] = '';
     }
   }
   if ( ! isset($options['mode'] ) ) {
@@ -2337,54 +2148,57 @@ function getStreamHTML($monitor, $options = array()) {
       return getImageStreamHTML( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], $monitor->Name());
     elseif ( canStreamApplet() )
       // Helper, empty widths and heights really don't work.
-      return getHelperStream( 'liveStream'.$monitor->Id(), $streamSrc, 
-          $options['width'] ? $options['width'] : $monitor->Width(), 
-          $options['height'] ? $options['height'] : $monitor->Height(),
+      return getHelperStream( 'liveStream'.$monitor->Id(), $streamSrc,
+          $options['width'] ? $options['width'] : $monitor->ViewWidth(),
+          $options['height'] ? $options['height'] : $monitor->ViewHeight(),
           $monitor->Name());
   } else {
     if ( $options['mode'] == 'stream' ) {
-      ZM\Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
+      ZM\Info('The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.');
     }
     $options['mode'] = 'single';
     $streamSrc = $monitor->getStreamSrc($options);
-    return getImageStill( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], $monitor->Name());
+    return getImageStill('liveStream'.$monitor->Id(), $streamSrc,
+      (isset($options['width']) ? $options['width'] : null),
+      (isset($options['height']) ? $options['height'] : null),
+      $monitor->Name());
   }
 } // end function getStreamHTML
 
 function getStreamMode( ) {
   $streamMode = '';
-  if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
+  if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
     $streamMode = 'mpeg';
   } elseif ( canStream() ) {
     $streamMode = 'jpeg';
   } else {
     $streamMode = 'single';
-    ZM\Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
+    ZM\Info('The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.');
   }
   return $streamMode;
 } // end function getStreamMode
 
 function folder_size($dir) {
-    $size = 0;
-    foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $each) {
-        $size += is_file($each) ? filesize($each) : folder_size($each);
-    }
-    return $size;
+  $size = 0;
+  foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $each) {
+    $size += is_file($each) ? filesize($each) : folder_size($each);
+  }
+  return $size;
 } // end function folder_size
 
 function human_filesize($size, $precision = 2) {
-    $units = array('B','kB','MB','GB','TB','PB','EB','ZB','YB');
-    $step = 1024;
-    $i = 0;
-    while (($size / $step) > 0.9) {
-        $size = $size / $step;
-        $i++;
-    }
-    return round($size, $precision).$units[$i];
+  $units = array('B','kB','MB','GB','TB','PB','EB','ZB','YB');
+  $step = 1024;
+  $i = 0;
+  while (($size / $step) > 0.9) {
+    $size = $size / $step;
+    $i++;
+  }
+  return round($size, $precision).$units[$i];
 }
 
 function csrf_startup() {
-    csrf_conf('rewrite-js', 'includes/csrf/csrf-magic.js');
+  csrf_conf('rewrite-js', 'includes/csrf/csrf-magic.js');
 }
 
 function check_timezone() {
@@ -2392,25 +2206,28 @@ function check_timezone() {
 
   $sys_tzoffset = trim(shell_exec('date "+%z"'));
   $php_tzoffset = trim($now->format('O'));
-  $mysql_tzoffset = trim(dbFetchOne("SELECT TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),'%H%i');",'TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),\'%H%i\')'));
+  $mysql_tzoffset = trim(dbFetchOne(
+    'SELECT TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),\'%H%i\');',
+    'TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),\'%H%i\')'
+  ));
 
-  #Logger::Debug("System timezone offset determine to be: $sys_tzoffset,\x20 
-                 #PHP timezone offset determine to be: $php_tzoffset,\x20 
+  #Logger::Debug("System timezone offset determine to be: $sys_tzoffset,\x20
+                 #PHP timezone offset determine to be: $php_tzoffset,\x20
                  #Mysql timezone offset determine to be: $mysql_tzoffset
                #");
 
   if ( $sys_tzoffset != $php_tzoffset )
-    ZM\Error("ZoneMinder is not installed properly: php's date.timezone does not match the system timezone!");
+    ZM\Error("ZoneMinder is not configured properly: php's date.timezone $php_tzoffset does not match the system timezone $sys_tzoffset! Please check Options->System->Timezone.");
 
   if ( $sys_tzoffset != $mysql_tzoffset )
-    ZM\Error("ZoneMinder is not installed properly: mysql's timezone does not match the system timezone! Event lists will display incorrect times.");
+    ZM\Error('ZoneMinder is not configured properly: mysql\'s timezone does not match the system timezone! Event lists will display incorrect times.');
 
   if (!ini_get('date.timezone') || !date_default_timezone_set(ini_get('date.timezone')))
-    ZM\Error("ZoneMinder is not installed properly: php's date.timezone is not set to a valid timezone");
+    ZM\Error('ZoneMinder is not configured properly: php\'s date.timezone is not set to a valid timezone. Please check Options->System->Timezone');
 
 }
 
-function unparse_url($parsed_url, $substitutions = array() ) { 
+function unparse_url($parsed_url, $substitutions = array() ) {
   $fields = array('scheme','host','port','user','pass','path','query','fragment');
 
   foreach ( $fields as $field ) {
@@ -2418,16 +2235,16 @@ function unparse_url($parsed_url, $substitutions = array() ) {
       $parsed_url[$field] = $substitutions[$field];
     }
   }
-  $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; 
-  $host     = isset($parsed_url['host']) ? $parsed_url['host'] : ''; 
-  $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; 
-  $user     = isset($parsed_url['user']) ? $parsed_url['user'] : ''; 
-  $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : ''; 
-  $pass     = ($user || $pass) ? "$pass@" : ''; 
-  $path     = isset($parsed_url['path']) ? $parsed_url['path'] : ''; 
-  $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; 
-  $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; 
-  return "$scheme$user$pass$host$port$path$query$fragment"; 
+  $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+  $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+  $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+  $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+  $pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass']  : '';
+  $pass     = ($user || $pass) ? $pass.'@' : '';
+  $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+  $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+  $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+  return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 }
 
 // PP - POST request handler for PHP which does not need extensions
@@ -2466,12 +2283,12 @@ function do_post_request($url, $data, $optional_headers = null) {
   $ctx = stream_context_create($params);
   $fp = @fopen($url, 'rb', false, $ctx);
   if ( !$fp ) {
-    throw new Exception("Problem with $url, "
+    throw new Exception('Problem with '.$url.', '
       .print_r(error_get_last(),true));
   }
   $response = @stream_get_contents($fp);
   if ( $response === false ) {
-    throw new Exception("Problem reading data from $url, data: ".print_r($params,true)
+    throw new Exception('Problem reading data from '.$url.', data: '.print_r($params,true)
       .print_r(error_get_last(),true));
   }
   return $response;
@@ -2491,7 +2308,7 @@ if ( !function_exists('sem_get') ) {
 }
 
 if ( !function_exists('ftok') ) {
-  function ftok($filename = "", $proj = "") {
+  function ftok($filename = '', $proj = '') {
     if ( empty($filename) || !file_exists($filename) ) {
       return -1;
     } else {
@@ -2527,13 +2344,22 @@ function format_duration($time, $separator=':') {
 
 function array_recursive_diff($aArray1, $aArray2) {
   $aReturn = array();
+  if ( ! (is_array($aArray1) and is_array($aArray2) ) ) {
+    $backTrace = debug_backtrace();
+    ZM\Warning('Bad arrays passed 1:' . print_r($aArray1,true) . PHP_EOL.'2: '.print_r($aArray2,true).PHP_EOL.' from: '.print_r($backTrace,true));
+    return;
+  }
 
-  foreach ($aArray1 as $mKey => $mValue) {
+  foreach ( $aArray1 as $mKey => $mValue ) {
     if ( array_key_exists($mKey, $aArray2) ) {
       if ( is_array($mValue) ) {
-        $aRecursiveDiff = array_recursive_diff($mValue, $aArray2[$mKey]);
-        if ( count($aRecursiveDiff) ) {
-          $aReturn[$mKey] = $aRecursiveDiff;
+        if ( is_array($aArray2[$mKey]) ) {
+          $aRecursiveDiff = array_recursive_diff($mValue, $aArray2[$mKey]);
+          if ( count($aRecursiveDiff) ) {
+            $aReturn[$mKey] = $aRecursiveDiff;
+          }
+        } else {
+          $aReturn[$mKey] = $mValue;
         }
       } else {
         if ( $mValue != $aArray2[$mKey] ) {
@@ -2566,4 +2392,62 @@ function array_recursive_diff($aArray1, $aArray2) {
   return $aReturn;
 }
 
+function html_radio($name, $values, $selected=null, $options=array(), $attrs=array()) {
+
+  $html = '';
+  if ( isset($options['default']) and ( $selected == null ) ) {
+    $selected = $options['default'];
+  } # end if
+
+  foreach ( $values as $value => $label ) {
+    if ( isset($options['container']) ) {
+      $html .= $options['container'][0];
+    }
+    $attributes = array_map(
+          function($attr, $value){return $attr.'="'.$value.'"';},
+          array_keys($attrs),
+          array_values($attrs)
+        );
+    $attributes_string = implode(' ', $attributes);
+
+    $html .= sprintf('
+      <div class="form-check%7$s">
+        <label class="form-check-label radio%7$s" for="%1$s%6$s%2$s">
+        <input class="form-check-input" type="radio" name="%1$s" value="%2$s" id="%1$s%6$s%2$s" %4$s%5$s />
+        %3$s</label></div>
+        ', $name, $value, $label, ($value==$selected?' checked="checked"':''),
+        $attributes_string,
+        (isset($options['id']) ? $options['id'] : ''),
+        ( ( (!isset($options['inline'])) or $options['inline'] ) ? '-inline' : '')
+      );
+    if ( isset($options['container']) ) {
+      $html .= $options['container'][1];
+    }
+  } # end foreach value
+  return $html;
+} # end sub html_radio
+
+
+function random_colour() {
+  return '#'.
+    str_pad( dechex( mt_rand(0, 255) ), 2, '0', STR_PAD_LEFT).
+    str_pad( dechex( mt_rand(0, 255) ), 2, '0', STR_PAD_LEFT).
+    str_pad( dechex( mt_rand(0, 255) ), 2, '0', STR_PAD_LEFT);
+}
+
+function zm_random_bytes($length = 32) {
+  if ( !isset($length) || intval($length) <= 8 ) {
+    $length = 32;
+  }
+  if ( function_exists('random_bytes') ) {
+    return random_bytes($length);
+  }
+  if ( function_exists('mcrypt_create_iv') ) {
+    return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+  }
+  if ( function_exists('openssl_random_pseudo_bytes') ) {
+    return openssl_random_pseudo_bytes($length);
+  }
+  ZM\Error('No random_bytes function found.');
+}
 ?>
diff --git a/web/includes/lang.php b/web/includes/lang.php
index 38f1179d8..78a64a0e1 100644
--- a/web/includes/lang.php
+++ b/web/includes/lang.php
@@ -18,40 +18,52 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-function translate( $name ) {
+function translate($name) {
   global $SLANG;
-  if ( array_key_exists($name, $SLANG) )
+  // The isset is more performant
+  if ( isset($SLANG[$name]) || array_key_exists($name, $SLANG) )
     return $SLANG[$name];
   else
     return $name;
 }
 
-function loadLanguage( $prefix='' ) {
+function loadLanguage($prefix='') {
   global $user;
 
   if ( $prefix )
     $prefix = $prefix.'/';
 
-  $fallbackLangFile = $prefix.'lang/en_gb.php';
-  $systemLangFile = $prefix.'lang/'.ZM_LANG_DEFAULT.'.php';
-  if ( isset($user['Language']) )
+  if ( isset($user['Language']) and $user['Language'] ) {
     $userLangFile = $prefix.'lang/'.$user['Language'].'.php';
 
-  if ( isset($userLangFile) && file_exists($userLangFile) )
-    return $userLangFile;
-  elseif ( file_exists($systemLangFile) )
+    if ( file_exists($userLangFile) ) {
+      return $userLangFile;
+    } else {
+      ZM\Warning("User language file $userLangFile does not exist.");
+    }
+  }
+
+  $systemLangFile = $prefix.'lang/'.ZM_LANG_DEFAULT.'.php';
+  if ( file_exists($systemLangFile) ) {
     return $systemLangFile;
-  elseif ( file_exists($fallbackLangFile) )
+  } else {
+    ZM\Warning("System language file $systemLangFile does not exist.");
+  }
+
+  $fallbackLangFile = $prefix.'lang/en_gb.php';
+  if ( file_exists($fallbackLangFile) ) {
     return $fallbackLangFile;
-  else
-    return false;
+  } else {
+    ZM\Error("Default language file $fallbackLangFile does not exist.");
+  }
+  return false;
 }
 
 if ( $langFile = loadLanguage() ) {
   require_once($langFile);
   require_once('lang/default.php');
   foreach ($DLANG as $key => $value) {
-    if ( ! array_key_exists($key, $SLANG) )
+    if ( ! (isset($SLANG[$key]) || array_key_exists($key, $SLANG)) )
       $SLANG[$key] = $DLANG[$key];
   }
 }
diff --git a/web/includes/logger.php b/web/includes/logger.php
index 3aa8f891b..b616f7458 100644
--- a/web/includes/logger.php
+++ b/web/includes/logger.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace ZM;
-require_once( 'config.php' );
+require_once('config.php');
 
 class Logger {
   private static $instance;
@@ -70,7 +70,7 @@ class Logger {
     $this->terminate();
   }
 
-  public function initialise( $options=array() ) {
+  public function initialise($options=array()) {
     if ( !empty($options['id']) )
       $this->id = $options['id'];
 
@@ -100,14 +100,17 @@ class Logger {
       $tempDatabaseLevel = $options['databaseLevel'];
     else
       $tempDatabaseLevel = ZM_LOG_LEVEL_DATABASE;
+
     if ( isset($options['fileLevel']) )
       $tempFileLevel = $options['fileLevel'];
     else
       $tempFileLevel = ZM_LOG_LEVEL_FILE;
+
     if ( isset($options['weblogLevel']) )
       $tempWeblogLevel = $options['weblogLevel'];
     else
       $tempWeblogLevel = ZM_LOG_LEVEL_WEBLOG;
+
     if ( isset($options['syslogLevel']) )
       $tempSyslogLevel = $options['syslogLevel'];
     else
@@ -215,7 +218,7 @@ class Logger {
         }
       }
     }
-    return( $this->id );
+    return $this->id;
   }
 
   public function level( $level ) {
@@ -237,31 +240,31 @@ class Logger {
         $this->effectiveLevel = $this->level;
       if ( !$this->hasTerm ) {
         if ( $lastLevel < self::DEBUG && $this->level >= self::DEBUG ) {
-          $this->savedErrorReporting = error_reporting( E_ALL );
-          $this->savedDisplayErrors = ini_set( 'display_errors', true );
+          $this->savedErrorReporting = error_reporting(E_ALL);
+          $this->savedDisplayErrors = ini_set('display_errors', true);
         } elseif ( $lastLevel >= self::DEBUG && $this->level < self::DEBUG ) {
-          error_reporting( $this->savedErrorReporting );
-          ini_set( 'display_errors', $this->savedDisplayErrors );
+          error_reporting($this->savedErrorReporting);
+          ini_set('display_errors', $this->savedDisplayErrors);
         }
       }
     }
-    return( $this->level );
+    return $this->level;
   }
 
   public function debugOn() {
     return( $this->effectiveLevel >= self::DEBUG );
   }
 
-  public function termLevel( $termLevel ) {
+  public function termLevel($termLevel) {
     if ( isset($termLevel) ) {
       $termLevel = $this->limit($termLevel);
       if ( $this->termLevel != $termLevel )
         $this->termLevel = $termLevel;
     }
-    return( $this->termLevel );
+    return $this->termLevel;
   }
 
-  public function databaseLevel( $databaseLevel=NULL ) {
+  public function databaseLevel($databaseLevel=NULL) {
     if ( !is_null($databaseLevel) ) {
       $databaseLevel = $this->limit($databaseLevel);
       if ( $this->databaseLevel != $databaseLevel ) {
@@ -269,15 +272,15 @@ class Logger {
         if ( $this->databaseLevel > self::NOLOG ) {
           if ( (include_once 'database.php') === FALSE ) {
             $this->databaseLevel = self::NOLOG;
-            Warning( 'Unable to write log entries to DB, database.php not found' );
+            Warning('Unable to write log entries to DB, database.php not found');
           }
         }
       }
     }
-    return( $this->databaseLevel );
+    return $this->databaseLevel;
   }
 
-  public function fileLevel( $fileLevel ) {
+  public function fileLevel($fileLevel) {
     if ( isset($fileLevel) ) {
       $fileLevel = $this->limit($fileLevel);
       if ( $this->fileLevel != $fileLevel ) {
@@ -288,25 +291,25 @@ class Logger {
           $this->openFile();
       }
     }
-    return( $this->fileLevel );
+    return $this->fileLevel;
   }
 
-  public function weblogLevel( $weblogLevel ) {
+  public function weblogLevel($weblogLevel) {
     if ( isset($weblogLevel) ) {
       $weblogLevel = $this->limit($weblogLevel);
       if ( $this->weblogLevel != $weblogLevel ) {
         if ( $weblogLevel > self::NOLOG && $this->weblogLevel <= self::NOLOG ) {
-          $this->savedLogErrors = ini_set( 'log_errors', true );
+          $this->savedLogErrors = ini_set('log_errors', true);
         } elseif ( $weblogLevel <= self::NOLOG && $this->weblogLevel > self::NOLOG ) {
-          ini_set( 'log_errors', $this->savedLogErrors );
+          ini_set('log_errors', $this->savedLogErrors);
         }
         $this->weblogLevel = $weblogLevel;
       }
     }
-    return( $this->weblogLevel );
+    return $this->weblogLevel;
   }
 
-  public function syslogLevel( $syslogLevel ) {
+  public function syslogLevel($syslogLevel) {
     if ( isset($syslogLevel) ) {
       $syslogLevel = $this->limit($syslogLevel);
       if ( $this->syslogLevel != $syslogLevel ) {
@@ -317,30 +320,31 @@ class Logger {
           $this->openSyslog();
       }
     }
-    return( $this->syslogLevel );
+    return $this->syslogLevel;
   }
 
   private function openSyslog() {
-    openlog( $this->id, LOG_PID|LOG_NDELAY, LOG_LOCAL1 );
+    openlog($this->id, LOG_PID|LOG_NDELAY, LOG_LOCAL1);
   }
 
   private function closeSyslog() {
     closelog();
   }
 
-  private function logFile( $logFile ) {
-    if ( preg_match( '/^(.+)\+$/', $logFile, $matches ) )
+  private function logFile($logFile) {
+    if ( preg_match('/^(.+)\+$/', $logFile, $matches) ) {
       $this->logFile = $matches[1].'.'.getmypid();
-    else
+    } else {
       $this->logFile = $logFile;
+    }
   }
 
   private function openFile() {
     if ( !$this->useErrorLog ) {
-      if ( $this->logFd = fopen( $this->logFile, 'a+' ) ) {
-        if ( strnatcmp( phpversion(), '5.2.0' ) >= 0 ) {
+      if ( $this->logFd = fopen($this->logFile, 'a+') ) {
+        if ( strnatcmp(phpversion(), '5.2.0') >= 0 ) {
           $error = error_get_last();
-          trigger_error( "Can't open log file '$logFile': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR );
+          trigger_error("Can't open log file '$logFile': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR);
         }
         $this->fileLevel = self::NOLOG;
       }
@@ -349,73 +353,86 @@ class Logger {
 
   private function closeFile() {
     if ( $this->logFd )
-      fclose( $this->logFd );
+      fclose($this->logFd);
   }
 
-  public function logPrint( $level, $string, $file=NULL, $line=NULL ) {
-    if ( $level <= $this->effectiveLevel ) {
-      $string = preg_replace( '/[\r\n]+$/', '', $string );
-      $code = self::$codes[$level];
+  public function logPrint($level, $string, $file=NULL, $line=NULL) {
+    if ( $level > $this->effectiveLevel ) {
+      return;
+    }
 
-      $time = gettimeofday();
-      $message = sprintf( '%s.%06d %s[%d].%s [%s]', strftime( '%x %H:%M:%S', $time['sec'] ), $time['usec'], $this->id, getmypid(), $code, $string );
+    $string = preg_replace('/[\r\n]+$/', '', $string);
+    $code = self::$codes[$level];
 
-      if ( is_null($file) ) {
-        if ( $this->useErrorLog || $this->databaseLevel > self::NOLOG ) {
-          $backTrace = debug_backtrace();
-          $file = $backTrace[1]['file'];
-          $line = $backTrace[1]['line'];
-          if ( $this->hasTerm )
-            $rootPath = getcwd();
-          else
-            $rootPath = $_SERVER['DOCUMENT_ROOT'];
-          $file = preg_replace( '/^'.addcslashes($rootPath,'/').'\/?/', '', $file );
-        }
-      }
+    $time = gettimeofday();
+    $message = sprintf('%s.%06d %s[%d].%s [%s] [%s]',
+      strftime('%x %H:%M:%S', $time['sec']), $time['usec'],
+      $this->id, getmypid(), $code, $_SERVER['REMOTE_ADDR'], $string);
 
-      if ( $this->useErrorLog )
-        $message .= ' at '.$file.' line '.$line;
-      else
-        $message = $message;
-
-      if ( $level <= $this->termLevel )
+    if ( is_null($file) ) {
+      if ( $this->useErrorLog || ($this->databaseLevel > self::NOLOG) ) {
+        $backTrace = debug_backtrace();
+        $file = $backTrace[1]['file'];
+        $line = $backTrace[1]['line'];
         if ( $this->hasTerm )
-          print( $message."\n" );
+          $rootPath = getcwd();
         else
-          print( preg_replace( "/\n/", '<br/>', htmlspecialchars($message) ).'<br/>' );
-
-      if ( $level <= $this->fileLevel )
-        if ( $this->useErrorLog ) {
-          if ( !error_log( $message."\n", 3, $this->logFile ) ) {
-            if ( strnatcmp( phpversion(), '5.2.0' ) >= 0 ) {
-              $error = error_get_last();
-              trigger_error( "Can't write to log file '".$this->logFile."': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR );
-            }
-          }
-        } elseif ( $this->logFd ) {
-          fprintf( $this->logFd, $message."\n" );
-        }
-
-      $message = $code.' ['.$string.']';
-      if ( $level <= $this->syslogLevel )
-        syslog( self::$syslogPriorities[$level], $message );
-      if ( $level <= $this->databaseLevel ) {
-        try {
-          global $dbConn;
-          $sql = 'INSERT INTO Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ?, ?, ?, ?, ?, ?, ?, ? )';
-          $stmt = $dbConn->prepare( $sql );
-          $result = $stmt->execute( array( sprintf( '%d.%06d', $time['sec'], $time['usec'] ), $this->id, getmypid(), $level, $code, $string, $file, $line ) );
-        } catch(PDOException $ex) {
-          $this->databaseLevel = self::NOLOG;
-          Error("Can't write log entry '$sql': ". $ex->getMessage());
-        }
+          $rootPath = $_SERVER['DOCUMENT_ROOT'];
+        $file = preg_replace('/^'.addcslashes($rootPath, '/').'\/?/', '', $file);
       }
-      // This has to be last as trigger_error can be fatal
-      if ( $level <= $this->weblogLevel ) {
-        if ( $this->useErrorLog )
-          error_log( $message, 0 );
-        else
-          trigger_error( $message, self::$phpErrorLevels[$level] );
+    }
+
+    if ( $this->useErrorLog ) {
+      $message .= ' at '.$file.' line '.$line;
+    }
+
+    if ( $level <= $this->termLevel ) {
+      if ( $this->hasTerm ) {
+        print($message."\n");
+      } else {
+        // Didn't we already replace all newlines with spaces above?
+        print(preg_replace('/\n/', '<br/>', htmlspecialchars($message)).'<br/>');
+      }
+    }
+
+    if ( $level <= $this->fileLevel ) {
+      if ( $this->useErrorLog ) {
+        if ( !error_log($message."\n", 3, $this->logFile) ) {
+          if ( strnatcmp(phpversion(), '5.2.0') >= 0 ) {
+            $error = error_get_last();
+            trigger_error("Can't write to log file '".$this->logFile."': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR);
+          }
+        }
+      } else if ( $this->logFd ) {
+        fprintf($this->logFd, $message."\n");
+      } else {
+        $this->fileLevel = self::NOLOG;
+        Error('No logFd but have fileLevel logging!?');
+      }
+    }
+
+    $message = $code.' ['.$string.']';
+    if ( $level <= $this->syslogLevel )
+      syslog( self::$syslogPriorities[$level], $message );
+
+    if ( $level <= $this->databaseLevel ) {
+      try {
+        global $dbConn;
+        $sql = 'INSERT INTO `Logs` ( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? )';
+        $stmt = $dbConn->prepare($sql);
+        $result = $stmt->execute(array(sprintf('%d.%06d', $time['sec'], $time['usec']), $this->id,
+          (defined('ZM_SERVER_ID') ? ZM_SERVER_ID : null), getmypid(), $level, $code, $string, $file, $line));
+      } catch(PDOException $ex) {
+        $this->databaseLevel = self::NOLOG;
+        Error("Can't write log entry '$sql': ". $ex->getMessage());
+      }
+    }
+    // This has to be last as trigger_error can be fatal
+    if ( $level <= $this->weblogLevel ) {
+      if ( $this->useErrorLog ) {
+        error_log($message, 0);
+      } else {
+        trigger_error($message, self::$phpErrorLevels[$level]);
       }
     }
   }
diff --git a/web/includes/session.php b/web/includes/session.php
index 77ce43143..47f85d877 100644
--- a/web/includes/session.php
+++ b/web/includes/session.php
@@ -1,34 +1,50 @@
 <?php
 // ZM session start function support timestamp management
 function zm_session_start() {
-  // Make sure use_strict_mode is enabled.
-  // use_strict_mode is mandatory for security reasons.
-  ini_set('session.use_strict_mode', 1);
 
-  $currentCookieParams = session_get_cookie_params(); 
-  $currentCookieParams['lifetime'] = ZM_COOKIE_LIFETIME;
+  if ( ini_get('session.name') != 'ZMSESSID' ) {
+    // Make sure use_strict_mode is enabled.
+    // use_strict_mode is mandatory for security reasons.
+    ini_set('session.use_strict_mode', 1);
 
-  ZM\Logger::Debug('Setting cookie parameters to lifetime('.$currentCookieParams['lifetime'].') path('.$currentCookieParams['path'].') domain ('.$currentCookieParams['domain'].') secure('.$currentCookieParams['secure'].') httpOnly(1)');
-  session_set_cookie_params( 
-    $currentCookieParams['lifetime'],
-    $currentCookieParams['path'],
-    $currentCookieParams['domain'],
-    $currentCookieParams['secure'],
-    true
-  );
-
-  ini_set('session.name', 'ZMSESSID');
+    $currentCookieParams = session_get_cookie_params(); 
+    $currentCookieParams['lifetime'] = ZM_COOKIE_LIFETIME;
+    $currentCookieParams['httponly'] = true;
+    if ( version_compare(phpversion(), '7.3.0', '<') ) {
+      session_set_cookie_params(
+        $currentCookieParams['lifetime'],
+        $currentCookieParams['path'],
+        $currentCookieParams['domain'],
+        $currentCookieParams['secure'],
+        $currentCookieParams['httponly']
+      );
+    } else {
+      # samesite was introduced in 7.3.0
+      $currentCookieParams['samesite'] = 'Strict';
+      session_set_cookie_params($currentCookieParams);
+    }
 
+    ini_set('session.name', 'ZMSESSID');
+    ZM\Logger::Debug('Setting cookie parameters to '.print_r($currentCookieParams, true));
+  }
   session_start();
+  $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
+  $now = time();
   // Do not allow to use expired session ID
-  if ( !empty($_SESSION['last_time']) && ($_SESSION['last_time'] < (time() - 180)) ) {
-    ZM\Info('Destroying session due to timeout. ');
+  if ( !empty($_SESSION['last_time']) && ($_SESSION['last_time'] < ($now - 180)) ) {
+    ZM\Info('Destroying session due to timeout.');
     session_destroy();
     session_start();
+  } else if ( !empty($_SESSION['generated_at']) ) {
+    if ( $_SESSION['generated_at']<($now-(ZM_COOKIE_LIFETIME/2)) ) {
+      ZM\Logger::Debug('Regenerating session because generated_at ' . $_SESSION['generated_at'] . ' < ' . $now . '-'.ZM_COOKIE_LIFETIME.'/2 = '.($now-ZM_COOKIE_LIFETIME/2));
+      zm_session_regenerate_id();
+    }
   }
 } // function zm_session_start()
 
-// My session regenerate id function
+// session regenerate id function
+// Assumes that zm_session_start has been called previously
 function zm_session_regenerate_id() {
   if ( session_status() != PHP_SESSION_ACTIVE ) {
     session_start();
@@ -42,6 +58,7 @@ function zm_session_regenerate_id() {
   session_start();
   session_regenerate_id();
   unset($_SESSION['last_time']);
+  $_SESSION['generated_at'] = time();
 } // function zm_session_regenerate_id()
 
 function is_session_started() {
@@ -67,5 +84,7 @@ function zm_session_clear() {
   }
   session_unset();
   session_destroy();
+  session_write_close();
+  session_start();
 } // function zm_session_clear()
 ?>
diff --git a/web/index.php b/web/index.php
index 8c0350142..3d6f24fc7 100644
--- a/web/index.php
+++ b/web/index.php
@@ -34,7 +34,7 @@ if ( version_compare(phpversion(), '4.1.0', '<') ) {
 }
 
 // Useful debugging lines for mobile devices
-if ( true ) {
+if ( false ) {
   ob_start();
   phpinfo(INFO_VARIABLES);
   $fp = fopen('/tmp/env.html', 'w+');
@@ -52,6 +52,17 @@ require_once('includes/Event.php');
 require_once('includes/Group.php');
 require_once('includes/Monitor.php');
 
+// Useful debugging lines for mobile devices
+if ( 0 and ZM\Logger::fetch()->debugOn() ) {
+  ob_start();
+  phpinfo(INFO_VARIABLES);
+  ZM\Logger::Debug(ob_get_contents());
+  ob_end_clean();
+}
+
+global $Servers;
+$Servers = ZM\Server::find();
+
 if (
   (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
   or
@@ -71,13 +82,12 @@ define('ZM_BASE_URL', '');
 
 require_once('includes/functions.php');
 if ( $_SERVER['REQUEST_METHOD'] == 'OPTIONS' ) {
-  ZM\Logger::Debug("OPTIONS Method, only doing CORS");
+  ZM\Logger::Debug('OPTIONS Method, only doing CORS');
   # Add Cross domain access headers
   CORSHeaders();
   return;
 }
 
-
 if ( isset($_GET['skin']) ) {
   $skin = $_GET['skin'];
 } else if ( isset($_COOKIE['zmSkin']) ) {
@@ -88,27 +98,38 @@ if ( isset($_GET['skin']) ) {
   $skin = 'classic';
 }
 
-$skins = array_map('basename', glob('skins/*', GLOB_ONLYDIR));
+if ( ! is_dir("skins/$skin") ) {
+  $skins = array_map('basename', glob('skins/*', GLOB_ONLYDIR));
 
-if ( ! in_array($skin, $skins) ) {
-  ZM\Error("Invalid skin '$skin' setting to " . $skins[0]);
-  $skin = $skins[0];
+  if ( !in_array($skin, $skins) ) {
+    ZM\Error("Invalid skin '$skin' setting to ".$skins[0]);
+    $skin = $skins[0];
+  }
 }
-
+global $css;
 if ( isset($_GET['css']) ) {
   $css = $_GET['css'];
-} elseif ( isset($_COOKIE['zmCSS']) ) {
+} else if ( isset($_COOKIE['zmCSS']) ) {
   $css = $_COOKIE['zmCSS'];
-} elseif ( defined('ZM_CSS_DEFAULT') ) {
+} else if ( defined('ZM_CSS_DEFAULT') ) {
   $css = ZM_CSS_DEFAULT;
 } else {
   $css = 'classic';
 }
 
-$css_skins = array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR));
-if ( !in_array($css, $css_skins) ) {
-  ZM\Error("Invalid skin css '$css' setting to " . $css_skins[0]);
-  $css = $css_skins[0];
+if ( !is_dir("skins/$skin/css/$css") ) {
+  $css_skins = array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR));
+  if ( count($css_skins) ) {
+    if ( !in_array($css, $css_skins) ) {
+      ZM\Error("Invalid skin css '$css' setting to " . $css_skins[0]);
+      $css = $css_skins[0];
+    } else {
+      $css = '';
+    }
+  } else {
+    ZM\Error("No css options found at skins/$skin/css");
+    $css = '';
+  }
 }
 
 define('ZM_BASE_PATH', dirname($_SERVER['REQUEST_URI']));
@@ -117,7 +138,7 @@ define('ZM_SKIN_NAME', $skin);
 
 $skinBase = array(); // To allow for inheritance of skins
 if ( !file_exists(ZM_SKIN_PATH) )
-  Fatal("Invalid skin '$skin'");
+  ZM\Fatal("Invalid skin '$skin'");
 $skinBase[] = $skin;
 
 zm_session_start();
@@ -126,7 +147,7 @@ if (
   !isset($_SESSION['skin']) ||
   isset($_REQUEST['skin']) ||
   !isset($_COOKIE['zmSkin']) ||
-  $_COOKIE['zmSkin'] != $skin
+  ($_COOKIE['zmSkin'] != $skin)
 ) {
   $_SESSION['skin'] = $skin;
   setcookie('zmSkin', $skin, time()+3600*24*30*12*10);
@@ -136,18 +157,12 @@ if (
   !isset($_SESSION['css']) ||
   isset($_REQUEST['css']) ||
   !isset($_COOKIE['zmCSS']) ||
-  $_COOKIE['zmCSS'] != $css
+  ($_COOKIE['zmCSS'] != $css)
 ) {
   $_SESSION['css'] = $css;
   setcookie('zmCSS', $css, time()+3600*24*30*12*10);
 }
 
-# Only one request can open the session file at a time, so let's close the session here to improve concurrency.
-# Any file/page that sets session variables must re-open it.
-session_write_close();
-
-require_once('includes/lang.php');
-
 # Running is global but only do the daemonCheck if it is actually needed
 $running = null;
 
@@ -164,29 +179,33 @@ $action = null;
 $error_message = null;
 $redirect = null;
 $view = null;
+$user = null;
 if ( isset($_REQUEST['view']) )
   $view = detaintPath($_REQUEST['view']);
 
-
 # Add CSP Headers
-$cspNonce = bin2hex(openssl_random_pseudo_bytes(16));
+$cspNonce = bin2hex(zm_random_bytes(16));
 
 $request = null;
 if ( isset($_REQUEST['request']) )
   $request = detaintPath($_REQUEST['request']);
 
-# User Login will be performed in auth.php
 require_once('includes/auth.php');
 
+# Only one request can open the session file at a time, so let's close the session here to improve concurrency.
+# Any file/page that sets session variables must re-open it.
+session_write_close();
+
+// lang references $user[Language] so must come after auth
+require_once('includes/lang.php');
+
 foreach ( getSkinIncludes('skin.php') as $includeFile ) {
-  #ZM\Logger::Debug("including $includeFile");
   require_once $includeFile;
 }
 
 if ( isset($_REQUEST['action']) )
   $action = detaintPath($_REQUEST['action']);
 
-
 # The only variable we really need to set is action. The others are informal.
 isset($view) || $view = NULL;
 isset($request) || $request = NULL;
@@ -194,6 +213,8 @@ isset($action) || $action = NULL;
 
 if ( (!$view and !$request) or ($view == 'console') ) {
   // Verify the system, php, and mysql timezones all match
+  #if ( ZM_TIMEZONE )
+  #date_default_timezone_set(ZM_TIMEZONE);
   check_timezone();
 }
 
@@ -201,19 +222,19 @@ ZM\Logger::Debug("View: $view Request: $request Action: $action User: " . ( isse
 if (
   ZM_ENABLE_CSRF_MAGIC &&
   ( $action != 'login' ) &&
-  ( $view != 'view_video' ) &&
-  ( $view != 'image' ) &&
+  ( $view != 'view_video' ) && // only video no html
+  ( $view != 'image' ) && // view=image doesn't return html, just image data.
   ( $request != 'control' ) && 
-  ( $view != 'frames' ) && 
-  ( $view != 'archive' )
+  //( $view != 'frames' ) &&  // big html can overflow ob
+  ( $view != 'archive' ) // returns data
 ) {
-  require_once( 'includes/csrf/csrf-magic.php' );
+  require_once('includes/csrf/csrf-magic.php');
   #ZM\Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");
   csrf_check();
 }
 
 # Need to include actions because it does auth
-if ( $action ) {
+if ( $action and !$request ) {
   if ( file_exists('includes/actions/'.$view.'.php') ) {
     ZM\Logger::Debug("Including includes/actions/$view.php");
     require_once('includes/actions/'.$view.'.php');
@@ -223,7 +244,7 @@ if ( $action ) {
 }
 
 # If I put this here, it protects all views and popups, but it has to go after actions.php because actions.php does the actual logging in.
-if ( ZM_OPT_USE_AUTH and !isset($user) and ($view != 'login') ) {
+if ( ZM_OPT_USE_AUTH and (!isset($user)) and ($view != 'login') and ($view != 'none') ) {
   /* AJAX check  */
   if ( !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
     && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' ) {
@@ -233,6 +254,11 @@ if ( ZM_OPT_USE_AUTH and !isset($user) and ($view != 'login') ) {
   ZM\Logger::Debug('Redirecting to login');
   $view = 'none';
   $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=login';
+  if ( ! $request ) {
+    zm_session_start();
+    $_SESSION['postLoginQuery'] = $_SERVER['QUERY_STRING'];
+    session_write_close();
+  }
   $request = null;
 } else if ( ZM_SHOW_PRIVACY && ($view != 'privacy') && ($view != 'options') && (!$request) && canEdit('System') ) {
   $view = 'none';
@@ -240,7 +266,6 @@ if ( ZM_OPT_USE_AUTH and !isset($user) and ($view != 'login') ) {
   $request = null;
 }
 
-CSPHeaders($view, $cspNonce);
 
 if ( $redirect ) {
   ZM\Logger::Debug("Redirecting to $redirect");
@@ -258,6 +283,7 @@ if ( $request ) {
 }
 
 if ( $includeFiles = getSkinIncludes('views/'.$view.'.php', true, true) ) {
+  ob_start();
   foreach ( $includeFiles as $includeFile ) {
     if ( !file_exists($includeFile) )
       ZM\Fatal("View '$view' does not exist");
@@ -271,6 +297,9 @@ if ( $includeFiles = getSkinIncludes('views/'.$view.'.php', true, true) ) {
     foreach ( getSkinIncludes('views/login.php', true, true) as $includeFile )
       require_once $includeFile;
   }
+
+  CSPHeaders($view, $cspNonce);
+  ob_end_flush();
 }
 // If the view is missing or the view still returned error with the user logged in,
 // then it is not recoverable.
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
new file mode 100644
index 000000000..24996344a
--- /dev/null
+++ b/web/js/MonitorStream.js
@@ -0,0 +1,271 @@
+
+function MonitorStream(monitorData) {
+  this.id = monitorData.id;
+  this.connKey = monitorData.connKey;
+  this.url = monitorData.url;
+  this.width = monitorData.width;
+  this.height = monitorData.height;
+  this.status = null;
+  this.alarmState = STATE_IDLE;
+  this.lastAlarmState = STATE_IDLE;
+  this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
+  if ( auth_hash ) {
+    this.streamCmdParms += '&auth='+auth_hash;
+  } else if ( auth_relay ) {
+    this.streamCmdParms += '&'+auth_relay;
+  }
+  this.streamCmdTimer = null;
+  this.type = monitorData.type;
+  this.refresh = monitorData.refresh;
+  this.start = function(delay) {
+    // Step 1 make sure we are streaming instead of a static image
+    var stream = $j('#liveStream'+this.id)[0];
+    if ( ! stream ) {
+      console.log('No live stream');
+      return;
+    }
+    src = stream.src.replace(/mode=single/i, 'mode=jpeg');
+    if ( -1 == src.search('connkey') ) {
+      src += '&connkey='+this.connKey;
+    }
+    if ( stream.src != src ) {
+      console.log("Setting to streaming");
+      stream.src = '';
+      stream.src = src;
+    }
+
+    if ( this.streamCmdQuery ) {
+      this.streamCmdTimer = this.streamCmdQuery.delay(delay, this);
+    } else {
+      console.log("No streamCmdQuery");
+    }
+
+    console.log("queueing for " + this.id + " " + this.connKey + " timeout is: " + AJAX_TIMEOUT);
+    requestQueue.addRequest("cmdReq"+this.id, this.streamCmdReq);
+  };
+  this.stop = function() {
+    if ( 0 ) {
+      var stream = $j('#liveStream'+this.id)[0];
+      if ( ! stream ) {
+        console.log('No live stream');
+        return;
+      }
+      src = stream.src.replace(/mode=jpeg/i, 'mode=single');
+      if ( stream.src != src ) {
+        console.log("Setting to stopped");
+        stream.src = '';
+        stream.src = src;
+      }
+    }
+    this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_STOP);
+  };
+  this.pause = function() {
+    this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_PAUSE);
+  };
+  this.play = function() {
+    this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_PLAY);
+  };
+
+  this.eventHandler = function(event) {
+    console.log(event);
+  };
+
+  this.onclick = function(evt) {
+    var el = evt.currentTarget;
+    var tag = 'watch';
+    var id = el.getAttribute("data-monitor-id");
+    var width = el.getAttribute("data-width");
+    var height = el.getAttribute("data-height");
+    var url = '?view=watch&mid='+id;
+    var name = 'zmWatch'+id;
+    evt.preventDefault();
+    createPopup(url, name, tag, width, height);
+  };
+
+  this.setup_onclick = function() {
+    var el = document.getElementById('imageFeed'+this.id);
+    if ( el ) el.addEventListener('click', this.onclick, false);
+  };
+  this.disable_onclick = function() {
+    document.getElementById('imageFeed'+this.id).removeEventListener('click', this.onclick );
+  };
+
+  this.setStateClass = function(element, stateClass) {
+    if ( !element ) {
+      return;
+    }
+    if ( !element.hasClass( stateClass ) ) {
+      if ( stateClass != 'alarm' ) {
+        element.removeClass('alarm');
+      }
+      if ( stateClass != 'alert' ) {
+        element.removeClass('alert');
+      }
+      if ( stateClass != 'idle' ) {
+        element.removeClass('idle');
+      }
+      element.addClass(stateClass);
+    }
+  };
+
+  this.onError = function(text, error) {
+    console.log('onerror: ' + text + ' error:'+error);
+    // Requeue, but want to wait a while.
+    var streamCmdTimeout = 10*statusRefreshTimeout;
+    this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this);
+  };
+  this.onFailure = function(xhr) {
+    console.log('onFailure: ' + this.connKey);
+    console.log(xhr);
+    if ( ! requestQueue.hasNext('cmdReq'+this.id) ) {
+      console.log('Not requeuing because there is one already');
+      requestQueue.addRequest('cmdReq'+this.id, this.streamCmdReq);
+    }
+    if ( 0 ) {
+    // Requeue, but want to wait a while.
+      if ( this.streamCmdTimer ) {
+        this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
+      }
+      var streamCmdTimeout = 1000*statusRefreshTimeout;
+      this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this, true);
+      requestQueue.resume();
+    }
+    console.log('done failure');
+  };
+
+  this.getStreamCmdResponse = function(respObj, respText) {
+    if ( this.streamCmdTimer ) {
+      this.streamCmdTimer = clearTimeout(this.streamCmdTimer);
+    }
+
+    var stream = $j('#liveStream'+this.id)[0];
+    if ( ! stream ) {
+      console.log('No live stream');
+      return;
+    }
+
+    if ( respObj.result == 'Ok' ) {
+      if ( respObj.status ) {
+        this.status = respObj.status;
+        this.alarmState = this.status.state;
+
+        var stateClass = '';
+        if ( this.alarmState == STATE_ALARM ) {
+          stateClass = 'alarm';
+        } else if ( this.alarmState == STATE_ALERT ) {
+          stateClass = 'alert';
+        } else {
+          stateClass = 'idle';
+        }
+
+        if ( (
+          (typeof COMPACT_MONTAGE === 'undefined') ||
+          !COMPACT_MONTAGE) &&
+          (this.type != 'WebSite')
+        ) {
+          fpsValue = $('fpsValue'+this.id);
+          if ( fpsValue ) {
+            fpsValue.set('text', this.status.fps);
+          }
+          stateValue = $('stateValue'+this.id);
+          if ( stateValue ) {
+            stateValue.set('text', stateStrings[this.alarmState]);
+          }
+
+          monitorState = $('monitorState'+this.id);
+          if ( monitorState ) {
+            this.setStateClass(monitorState, stateClass);
+          }
+        }
+
+        this.setStateClass($('monitor'+this.id), stateClass);
+
+        /*Stream could be an applet so can't use moo tools*/
+        //stream.parentNode().className = stateClass;
+
+        var isAlarmed = ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT );
+        var wasAlarmed = ( this.lastAlarmState == STATE_ALARM || this.lastAlarmState == STATE_ALERT );
+
+        var newAlarm = ( isAlarmed && !wasAlarmed );
+        var oldAlarm = ( !isAlarmed && wasAlarmed );
+
+        if ( newAlarm ) {
+          if ( false && SOUND_ON_ALARM ) {
+            // Enable the alarm sound
+            $('alarmSound').removeClass('hidden');
+          }
+          if ( (typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM ) {
+            windowToFront();
+          }
+        }
+        if ( false && SOUND_ON_ALARM ) {
+          if ( oldAlarm ) {
+            // Disable alarm sound
+            $('alarmSound').addClass('hidden');
+          }
+        }
+        if ( this.status.auth ) {
+          if ( this.status.auth != auth_hash ) {
+            // Try to reload the image stream.
+            if ( stream ) {
+              stream.src = stream.src.replace(/auth=\w+/i, 'auth='+this.status.auth);
+            }
+            console.log("Changed auth from " + auth_hash + " to " + this.status.auth);
+            auth_hash = this.status.auth;
+          }
+        } // end if have a new auth hash
+      } // end if has state
+    } else {
+      console.error(respObj.message);
+      // Try to reload the image stream.
+      if ( stream ) {
+        if ( stream.src ) {
+          console.log('Reloading stream: ' + stream.src);
+          src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
+          if ( src != stream.src ) {
+            stream.src = src;
+          } else {
+            console.log("Failed to update rand on stream src");
+          }
+        } else {
+        }
+      } else {
+        console.log('No stream to reload?');
+      }
+    } // end if Ok or not
+
+    var streamCmdTimeout = statusRefreshTimeout;
+    // The idea here is if we are alarmed, do updates faster.
+    // However, there is a timeout in the php side which isn't getting modified,
+    // so this may cause a problem. Also the server may only be able to update so fast.
+    //if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ) {
+    //streamCmdTimeout = streamCmdTimeout/5;
+    //}
+    this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this);
+    this.lastAlarmState = this.alarmState;
+  };
+
+  this.streamCmdQuery = function(resent) {
+    if ( resent ) {
+      console.log(this.connKey+': timeout: Resending');
+      this.streamCmdReq.cancel();
+    }
+    //console.log("Starting CmdQuery for " + this.connKey );
+    if ( this.type != 'WebSite' ) {
+      this.streamCmdReq.send(this.streamCmdParms+'&command='+CMD_QUERY);
+    }
+  };
+
+  if ( this.type != 'WebSite' ) {
+    this.streamCmdReq = new Request.JSON( {
+      url: this.url,
+      method: 'get',
+      timeout: AJAX_TIMEOUT,
+      onSuccess: this.getStreamCmdResponse.bind(this),
+      onTimeout: this.streamCmdQuery.bind(this, true),
+      onError: this.onError.bind(this),
+      onFailure: this.onFailure.bind(this),
+      link: 'cancel'
+    } );
+  }
+} // end function MonitorStream
diff --git a/web/js/logger.js b/web/js/logger.js
index 0a1195043..20e52b726 100644
--- a/web/js/logger.js
+++ b/web/js/logger.js
@@ -49,16 +49,21 @@ function logReport( level, message, file, line ) {
   /* eslint-disable no-caller */
   if ( arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.caller && arguments.callee.caller.caller.name ) {
     message += ' - '+arguments.callee.caller.caller.name+'()';
+    //console.log("arguments");
+  } else {
+    //message += new Error().stack;
+    //console.log("stack");
   }
   /* eslint-enable no-caller */
 
   if ( !debugReq ) {
+    debugParms = "view=request&request=log&task=create";
     if ( Browser ) {
-      debugParms = "view=request&request=log&task=create&browser[name]="+Browser.name+"&browser[version]="+Browser.version+"&browser[platform]="+(Browser.Platform?Browser.Platform.name:'unknown');
+      debugParms += "&browser[name]="+Browser.name+"&browser[version]="+Browser.version+"&browser[platform]="+(Browser.Platform?Browser.Platform.name:'unknown');
     } else {
-      debugParms = "view=request&request=log&task=create&browser[name]=unknown&browser[version]=unknown&browser[platform]=unknown";
+      debugParms += "&browser[name]=unknown&browser[version]=unknown&browser[platform]=unknown";
     }
-    debugReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'chain'} );
+    debugReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'chain'});
   }
   var requestParms = debugParms;
   requestParms += "&level="+level+"&message="+encodeURIComponent(message);
@@ -71,57 +76,57 @@ function logReport( level, message, file, line ) {
   if ( line ) {
     requestParms += "&line="+line;
   }
-  debugReq.send( requestParms );
+  debugReq.send(requestParms);
 }
 
-function Panic( message ) {
-  console.error( message );
-  logReport( "PNC", message );
-  alert( "PANIC: "+message );
+function Panic(message) {
+  console.error(message);
+  logReport("PNC", message);
+  alert("PANIC: "+message);
 }
 
-function Fatal( message ) {
-  console.error( message );
+function Fatal(message) {
+  console.error(message);
   logReport( "FAT", message );
   alert( "FATAL: "+message );
 }
 
-function Error( message ) {
-  console.error( message );
-  logReport( "ERR", message );
+function Error(message) {
+  console.error(message);
+  logReport("ERR", message);
 }
 
-function Warning( message ) {
-  console.warn( message );
-  logReport( "WAR", message );
+function Warning(message) {
+  console.warn(message);
+  logReport("WAR", message);
 }
 
-function Info( message ) {
-  console.info( message );
-  logReport( "INF", message );
+function Info(message) {
+  console.info(message);
+  logReport("INF", message);
 }
 
-function Debug( message ) {
-  console.debug( message );
-  //logReport( "DBG", message );
+function Debug(message) {
+  console.debug(message);
+  //logReport("DBG", message);
 }
 
-function Dump( value, label ) {
+function Dump(value, label) {
   if ( label ) {
-    console.debug( label+" => " );
+    console.debug(label+" => ");
   }
-  console.debug( value );
+  console.debug(value);
 }
 
 window.onerror =
     function( message, url, line ) {
-      logReport( "ERR", message, url, line );
+      logReport("ERR", message, url, line);
     };
 
 window.addEventListener("securitypolicyviolation", function logCSP(evt) {
   var level = evt.disposition == "enforce" ? "ERR" : "DBG";
   var message = evt.blockedURI + " violated CSP " + evt.violatedDirective;
-  if (evt.sample) {
+  if ( evt.sample ) {
     message += " (Sample: " + evt.sample + ")";
   }
   logReport(level, message, evt.sourceFile, evt.lineNumber);
diff --git a/web/js/overlay.js b/web/js/overlay.js
index 6517d2d7d..84547c53f 100644
--- a/web/js/overlay.js
+++ b/web/js/overlay.js
@@ -51,8 +51,8 @@ var Overlay = new Class({
   },
   show: function() {
     this.mask.show();
-    window.addEventListener( 'resize', this.update.bind(this) );
-    window.addEventListener( 'scroll', this.update.bind(this) );
+    window.addEventListener( 'resize', this.update.bind(this), {passive: true} );
+    window.addEventListener( 'scroll', this.update.bind(this), {passive: true} );
     this.element.tween( 'opacity', [0, 1.0] );
     this.element.show();
     this.element.position();
@@ -80,8 +80,8 @@ var Overlay = new Class({
     }
     updateOverlayLoading();
     this.loading.setStyle( 'display', 'block' );
-    window.addEventListener( 'resize', this.update.bind(this) );
-    window.addEventListener( 'scroll', this.update.bind(this) );
+    window.addEventListener( 'resize', this.update.bind(this), {passive: true} );
+    window.addEventListener( 'scroll', this.update.bind(this), {passive: true} );
   },
   hideAnimation: function() {
     if ( this.loading ) {
diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php
index 0a751023e..9cdd9c4f1 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/cn_zh.php
@@ -74,12 +74,14 @@ $SLANG = array(
     '24BitColour'           => '24 位彩色',
     '32BitColour'           => '32 位彩色',          // Added - 2011-06-15
     '8BitGrey'              => '8 位灰度',
+    'API'                  => 'API',                    // Added - 2020-04-09
+    'APIEnabled'           => 'API已启用',            // Added - 2020-04-09
     'Action'                => '活动动作',
     'Actual'                => '实际',
     'AddNewControl'         => '新建控制',
     'AddNewMonitor'         => '新建监视器',
-    'AddNewServer'         => 'Add New Server',         // Added - 2018-08-30
-    'AddNewStorage'        => 'Add New Storage',        // Added - 2018-08-30
+    'AddNewServer'         => '新建服务器',         // Added - 2018-08-30
+    'AddNewStorage'        => '新建存储',        // Added - 2018-08-30
     'AddNewUser'            => '新建用户',
     'AddNewZone'            => '新建区域',
     'Alarm'                 => '报警',
@@ -90,11 +92,12 @@ $SLANG = array(
     'AlarmMaximumFPS'       => '报警最大帧率FPS',
     'AlarmPx'               => '报警像素',
     'AlarmRGBUnset'         => '你必须设置一个报警颜色(RGB)',
-    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
+    'AlarmRefImageBlendPct'=> '报警参考影像混合 %ge', // Added - 2015-04-18
     'Alert'                 => '警报',
     'All'                   => '全部',
-    'AnalysisFPS'          => 'Analysis FPS',           // Added - 2015-07-22
-    'AnalysisUpdateDelay'  => 'Analysis Update Delay',  // Added - 2015-07-23
+    'AllTokensRevoked'     => '已撤销所有tokens',     // Added - 2020-04-09
+    'AnalysisFPS'          => '分析帧率 FPS',           // Added - 2015-07-22
+    'AnalysisUpdateDelay'  => '分析更新延迟',  // Added - 2015-07-23
     'Apply'                 => '应用',
     'ApplyingStateChange'   => '状态改变生效',
     'ArchArchived'          => '仅限于存档',
@@ -107,30 +110,31 @@ $SLANG = array(
     'AttrArchiveStatus'     => '存档状态',
     'AttrAvgScore'          => '平均分数',
     'AttrCause'             => '原因',
-    'AttrDiskBlocks'        => '磁碟区块',
-    'AttrDiskPercent'       => '磁碟百分比',
-    'AttrDiskSpace'        => 'Disk Space',             // Added - 2018-08-30
+    'AttrDiskBlocks'        => '磁盘区块',
+    'AttrDiskPercent'       => '磁盘百分比',
+    'AttrDiskSpace'        => '磁盘空间',             // Added - 2018-08-30
     'AttrDuration'          => '过程',
-    'AttrEndDate'          => 'End Date',               // Added - 2018-08-30
-    'AttrEndDateTime'      => 'End Date/Time',          // Added - 2018-08-30
-    'AttrEndTime'          => 'End Time',               // Added - 2018-08-30
-    'AttrEndWeekday'       => 'End Weekday',            // Added - 2018-08-30
-    'AttrFilterServer'     => 'Server Filter is Running On', // Added - 2018-08-30
+    'AttrEndDate'          => '结束日期',               // Added - 2018-08-30
+    'AttrEndDateTime'      => '结束日期/时间',          // Added - 2018-08-30
+    'AttrEndTime'          => '结束时间',               // Added - 2018-08-30
+    'AttrEndWeekday'       => '结束星期',            // Added - 2018-08-30
+    'AttrFilterServer'     => '过滤服务正运行在', // Added - 2018-08-30
     'AttrFrames'            => '帧',
     'AttrId'                => 'Id',
     'AttrMaxScore'          => '最大分数',
     'AttrMonitorId'         => '监视器 Id',
     'AttrMonitorName'       => '监视器名称',
-    'AttrMonitorServer'    => 'Server Monitor is Running On', // Added - 2018-08-30
+    'AttrMonitorServer'    => '监控服务正运行在', // Added - 2018-08-30
     'AttrName'              => '名称',
     'AttrNotes'             => '备注',
-    'AttrStartDate'        => 'Start Date',             // Added - 2018-08-30
-    'AttrStartDateTime'    => 'Start Date/Time',        // Added - 2018-08-30
-    'AttrStartTime'        => 'Start Time',             // Added - 2018-08-30
-    'AttrStartWeekday'     => 'Start Weekday',          // Added - 2018-08-30
-    'AttrStateId'          => 'Run State',              // Added - 2018-08-30
-    'AttrStorageArea'      => 'Storage Area',           // Added - 2018-08-30
-    'AttrStorageServer'    => 'Server Hosting Storage', // Added - 2018-08-30
+    'AttrSecondaryStorageArea'=> '第二存储区域', // Added - 2020-04-09
+    'AttrStartDate'        => '开始日期',             // Added - 2018-08-30
+    'AttrStartDateTime'    => '开始日期/时间',        // Added - 2018-08-30
+    'AttrStartTime'        => '开始时间',             // Added - 2018-08-30
+    'AttrStartWeekday'     => '开始星期',          // Added - 2018-08-30
+    'AttrStateId'          => '运行状态',              // Added - 2018-08-30
+    'AttrStorageArea'      => '存储区域',           // Added - 2018-08-30
+    'AttrStorageServer'    => '存储服务器', // Added - 2018-08-30
     'AttrSystemLoad'        => '系统负载',
     'AttrTotalScore'        => '总分数',
     'Auto'                  => '自动',
@@ -141,10 +145,10 @@ $SLANG = array(
     'BackgroundFilter'      => '在后台运行筛选器',
     'BadAlarmFrameCount'    => '报警帧数必须设为大于1的整数',
     'BadAlarmMaxFPS'        => '报警最大帧率必须是正整数或正浮点数',
-    'BadAnalysisFPS'       => 'Analysis FPS must be a positive integer or floating point value', // Added - 2015-07-22
-    'BadAnalysisUpdateDelay'=> 'Analysis update delay must be set to an integer of zero or more', // Added - 2015-07-23
+    'BadAnalysisFPS'       => '分析帧率 FPS 必须是正整数或正浮点数', // Added - 2015-07-22
+    'BadAnalysisUpdateDelay'=> '分析更新延迟必须设为大于零的整数', // Added - 2015-07-23
     'BadChannel'            => '通道必须设为大于零的整数',
-    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2011-06-15
+    'BadColours'           => '颜色必须设置为有效值', // Added - 2011-06-15
     'BadDevice'             => '必须为器件设置有效值',
     'BadFPSReportInterval'  => 'FPS帧数报告间隔缓冲数必须是0以上整数',
     'BadFormat'             => '格式必须设为大于零的整数',
@@ -155,9 +159,10 @@ $SLANG = array(
     'BadLabelX'             => '标签 X 坐标必须设为大于零的整数',
     'BadLabelY'             => '标签 Y 坐标必须设为大于零的整数',
     'BadMaxFPS'             => '最大帧数FPS必须设为正整数或着浮点数',
-    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
+    'BadMotionFrameSkip'    => '运动跳帧数必须设为大于零的整数',
     'BadNameChars'          => '名称只可以包含字母，数字，波折号和下划线',
-    'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
+    'BadNoSaveJPEGsOrVideoWriter'=> '保存为JPEGs和保存为视频同时禁用后。不会有任何记录 ', // Added - 2020-04-09
+    'BadPalette'           => '调色板必须设为有效值', // Added - 2009-03-31
     'BadPath'               => '路径必须设为有效值',
     'BadPort'               => '端口必须设为有效数字',
     'BadPostEventCount'     => '之后事件影像数目必须设为大于零的整数',
@@ -165,11 +170,11 @@ $SLANG = array(
     'BadRefBlendPerc'       => '参考混合百分比必须设为一个正整数',
     'BadSectionLength'      => '节长度必须设为30的整数倍',
     'BadSignalCheckColour'  => '信号检查颜色必须设为有效的RGB颜色字符',
-    'BadSourceType'        => 'Source Type \"Web Site\" requires the Function to be set to \"Monitor\"', // Added - 2018-08-30
+    'BadSourceType'        => '源类型 \"网站\" 要求 功能 设置为 \"监视\"', // Added - 2018-08-30
     'BadStreamReplayBuffer' => '流重放缓冲必须为零或更多整数',
     'BadWarmupCount'        => '预热帪必须设为零或更多整数',
     'BadWebColour'          => 'Web颜色必须设为有效Web颜色字符',
-    'BadWebSitePath'       => 'Please enter a complete website url, including the http:// or https:// prefix.', // Added - 2018-08-30
+    'BadWebSitePath'       => '请输入一个完整的网站链接，包括http://或https://前缀。', // Added - 2018-08-30
     'BadWidth'              => '宽度必须设为有效值',
     'Bandwidth'             => '带宽',
     'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
@@ -177,9 +182,9 @@ $SLANG = array(
     'BlobSizes'             => 'Blob大小',
     'Blobs'                 => 'Blobs',
     'Brightness'            => '亮度',
-    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
+    'Buffer'               => '缓冲',                 // Added - 2015-04-18
     'Buffers'               => '缓冲器',
-    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
+    'CSSDescription'       => '改变本机默认css', // Added - 2015-04-18
     'CanAutoFocus'          => '可以自动对焦',
     'CanAutoGain'           => '可以自动增益控制',
     'CanAutoIris'           => '可以自动光圈',
@@ -204,8 +209,8 @@ $SLANG = array(
     'CanMoveMap'            => '可以映射网格移动',
     'CanMoveRel'            => '可以相对移动',
     'CanPan'                => '可以平移' ,
+	'CanReboot'             => '可以重启',
     'CanReset'              => '可以复位',
-	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => '可以进行预设',
     'CanSleep'              => '可以休眠',
     'CanTilt'               => '可以倾斜',
@@ -224,22 +229,23 @@ $SLANG = array(
     'CaptureHeight'         => '捕获高度',
     'CaptureMethod'         => '捕获方式',
     'CapturePalette'        => '捕获调色板',
-    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
+    'CaptureResolution'    => '捕获分辨率',     // Added - 2015-04-18
     'CaptureWidth'          => '捕获宽度',
     'Cause'                 => '原因',
     'CheckMethod'           => '报警检查方式',
-    'ChooseDetectedCamera' => 'Choose Detected Camera', // Added - 2009-03-31
+    'ChooseDetectedCamera' => '选择检测到的摄像头', // Added - 2009-03-31
+    'ChooseDetectedProfile'=> '选择检测到的流媒体', // Added - 2020-04-09
     'ChooseFilter'          => '选择筛选器',
-    'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
+    'ChooseLogFormat'      => '选择日志格式',    // Added - 2011-06-17
     'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
     'ChoosePreset'          => '选择预置',
-    'Clear'                => 'Clear',                  // Added - 2011-06-16
-    'CloneMonitor'         => 'Clone',                  // Added - 2018-08-30
+    'Clear'                => '清除',                  // Added - 2011-06-16
+    'CloneMonitor'         => '克隆',                  // Added - 2018-08-30
     'Close'                 => '关闭',
     'Colour'                => '彩色',
     'Command'               => '命令',
-    'Component'            => 'Component',              // Added - 2011-06-16
-    'ConcurrentFilter'     => 'Run filter concurrently', // Added - 2018-08-30
+    'Component'            => '组件',              // Added - 2011-06-16
+    'ConcurrentFilter'     => '同时应用筛选器', // Added - 2018-08-30
     'Config'                => '配置',
     'ConfiguredFor'         => '配置标的',
     'ConfirmDeleteEvents'   => '确认希望删除所选事件？',
@@ -257,24 +263,25 @@ $SLANG = array(
     'ControlDevice'         => '控制设备',
     'ControlType'           => '控制类型',
     'Controllable'          => '可控',
-    'Current'              => 'Current',                // Added - 2015-04-18
+    'Current'              => '现在',                // Added - 2015-04-18
     'Cycle'                 => '循环',
     'CycleWatch'            => '循环监视',
-    'DateTime'             => 'Date/Time',              // Added - 2011-06-16
+    'DateTime'             => '日期',              // Added - 2011-06-16
     'Day'                   => '日',
     'Debug'                 => '调试',
+    'DefaultCodec'         => '默认即时观看方法', // Added - 2020-04-09
     'DefaultRate'           => '缺省速率',
     'DefaultScale'          => '缺省缩放',
     'DefaultView'           => '缺省视角',
-    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
-    'Delay'                => 'Delay',                  // Added - 2015-04-18
+    'Deinterlacing'        => '去隔行',          // Added - 2015-04-18
+    'Delay'                => '延迟',                  // Added - 2015-04-18
     'Delete'                => '删除',
     'DeleteAndNext'         => '删除并下一个',
     'DeleteAndPrev'         => '删除并前一个',
     'DeleteSavedFilter'     => '删除存储过滤器',
     'Description'           => '描述',
-    'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
-    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
+    'DetectedCameras'      => '检测到的摄像头',       // Added - 2009-03-31
+    'DetectedProfiles'     => '检测到的流媒体',      // Added - 2015-04-18
     'Device'                => '设备',
     'DeviceChannel'         => '设备通道',
     'DeviceFormat'          => '设备格式',
@@ -283,10 +290,10 @@ $SLANG = array(
     'Devices'               => '设备',
     'Dimensions'            => '维度',
     'DisableAlarms'         => '关闭警报',
-    'Disk'                  => '磁碟',
-    'Display'              => 'Display',                // Added - 2011-01-30
-    'Displaying'           => 'Displaying',             // Added - 2011-06-16
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
+    'Disk'                  => '磁盘',
+    'Display'              => '显示',                // Added - 2011-01-30
+    'Displaying'           => '正在显示',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> '在本机进行运动检测',
     'Donate'                => '请捐款',
     'DonateAlready'         => '不，我已经捐赠过了',
     'DonateEnticement'      => '迄今，您已经运行ZoneMinder有一阵子了，希望它能够有助于增强您家或者办公区域的安全。尽管ZoneMinder是，并将保持免费和开源，该项目依然在研发和支持中投入了资金和精力。如果您愿意支持今后的开发和新功能，那么请考虑为该项目捐款。捐款不是必须的，任何数量的捐赠，我们都很感谢。<br/><br/>如果您愿意捐款，请选择下列选项，或者访问 https://zoneminder.com/donate/ 捐赠主页。<br/><br/>感谢您使用ZoneMinder，并且不要忘记访问访问ZoneMinder.com的论坛以获得支持或建议，这可以提升您的ZoneMinder的体验。',
@@ -297,11 +304,11 @@ $SLANG = array(
     'DonateRemindWeek'      => '现在不，1星期内再次提醒我',
     'DonateYes'             => '好，我现在就捐款',
     'Download'              => '下载',
-    'DownloadVideo'        => 'Download Video',         // Added - 2018-08-30
+    'DownloadVideo'        => '下载视频',         // Added - 2018-08-30
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'              => 'Duration',
     'Edit'                  => '编辑',
-    'EditLayout'           => 'Edit Layout',            // Added - 2018-08-30
+    'EditLayout'           => '编辑布局',            // Added - 2018-08-30
     'Email'                 => 'Email',
     'EnableAlarms'          => '启动报警',
     'Enabled'               => '已启动',
@@ -318,8 +325,9 @@ $SLANG = array(
     'Events'                => '事件',
     'Exclude'               => '排除',
     'Execute'               => '执行',
-    'Exif'                 => 'Embed EXIF data into image', // Added - 2018-08-30
+    'Exif'                 => '嵌入EXIF信息到图片', // Added - 2018-08-30
     'Export'                => '导出',
+    'ExportCompress'       => '使用压缩',        // Added - 2020-04-09
     'ExportDetails'         => '导出时间详情',
     'ExportFailed'          => '导出失败',
     'ExportFormat'          => '导出文件格式',
@@ -327,7 +335,8 @@ $SLANG = array(
     'ExportFormatZip'       => 'Zip',
     'ExportFrames'          => '导出帧详情',
     'ExportImageFiles'      => '导出影像文件',
-    'ExportLog'            => 'Export Log',             // Added - 2011-06-17
+    'ExportLog'            => '导出日志',             // Added - 2011-06-17
+    'ExportMatches'        => '导出匹配项',         // Added - 2020-04-09
     'ExportMiscFiles'       => '导出其他文件 (如果存在)',
     'ExportOptions'         => '导出选项',
     'ExportSucceeded'       => '导出成功',
@@ -341,29 +350,30 @@ $SLANG = array(
     'Feed'                  => '转送源',
     'Ffmpeg'                => 'Ffmpeg',
     'File'                  => '文件',
-    'Filter'               => 'Filter',                 // Added - 2015-04-18
-    'FilterArchiveEvents'   => '将全部匹配项存档',
-    'FilterDeleteEvents'    => '将全部匹配项删除',
-    'FilterEmailEvents'     => '将全部匹配项详情电邮出去',
+    'Filter'               => '过滤器',                 // Added - 2015-04-18
+    'FilterArchiveEvents'   => '存档全部匹配项',
+    'FilterCopyEvents'     => '复制全部匹配项',       // Added - 2020-04-09
+    'FilterDeleteEvents'    => '删除全部匹配项',
+    'FilterEmailEvents'     => '邮件发送全部匹配项详情',
     'FilterExecuteEvents'   => '执行全部匹配项命令',
-    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
+    'FilterLog'            => '过滤日志',             // Added - 2015-04-18
     'FilterMessageEvents'   => '全部匹配项的信息详情',
-    'FilterMoveEvents'     => 'Move all matches',       // Added - 2018-08-30
+    'FilterMoveEvents'     => '移除全部匹配项',       // Added - 2018-08-30
     'FilterPx'              => '过滤器像素',
     'FilterUnset'           => '您必须指定过滤器宽度和高度',
-    'FilterUpdateDiskSpace'=> 'Update used disk space', // Added - 2018-08-30
+    'FilterUpdateDiskSpace'=> '刷新磁盘空间', // Added - 2018-08-30
     'FilterUploadEvents'    => '上传全部匹配项',
     'FilterVideoEvents'     => '为全部匹配项创建视频',
     'Filters'               => '过滤器',
     'First'                 => '首先',
     'FlippedHori'           => '水平翻转',
     'FlippedVert'           => '垂直翻转',
-    'FnMocord'              => 'Mocord',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
+    'FnMocord'              => '运动侦测并录制',            // Added 2013.08.16.
+    'FnModect'              => '运动侦测',            // Added 2013.08.16.
+    'FnMonitor'             => '监视',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
+    'FnNone'                => '无',            // Added 2013.08.16.
+    'FnRecord'              => '录制',            // Added 2013.08.16.
     'Focus'                 => '聚焦',
     'ForceAlarm'            => '强制报警',
     'Format'                => '格式',
@@ -376,7 +386,7 @@ $SLANG = array(
     'Function'              => '功能',
     'Gain'                  => '增益',
     'General'               => '一般',
-    'GenerateDownload'     => 'Generate Download',      // Added - 2018-08-30
+    'GenerateDownload'     => '创建下载项',      // Added - 2018-08-30
     'GenerateVideo'         => '创建视频',
     'GeneratingVideo'       => '正在创建视频',
     'GoToZoneMinder'        => '访问 ZoneMinder.com',
@@ -397,7 +407,7 @@ $SLANG = array(
     'High'                  => '高',
     'HighBW'                => '高&nbsp;B/W',
     'Home'                  => '主页',
-    'Hostname'             => 'Hostname',               // Added - 2018-08-30
+    'Hostname'             => '主机名',               // Added - 2018-08-30
     'Hour'                  => '小时',
     'Hue'                   => '色调',
     'Id'                    => 'Id',
@@ -408,6 +418,7 @@ $SLANG = array(
     'Images'                => '影像',
     'In'                    => '在',
     'Include'               => '包含',
+    'InvalidateTokens'     => '使所有创建的tokens无效', // Added - 2020-04-09
     'Inverted'              => '反向',
     'Iris'                  => '光圈',
     'KeyString'             => '密钥字符',
@@ -415,19 +426,19 @@ $SLANG = array(
     'Language'              => '语言',
     'Last'                  => '最后',
     'Layout'                => '布局',
-    'Level'                => 'Level',                  // Added - 2011-06-16
+    'Level'                => '级别',                  // Added - 2011-06-16
     'Libvlc'               => 'Libvlc',
     'LimitResultsPost'      => '个结果', // This is used at the end of the phrase 'Limit to first N results only'
     'LimitResultsPre'       => '仅限于开始', // This is used at the beginning of the phrase 'Limit to first N results only'
-    'Line'                 => 'Line',                   // Added - 2011-06-16
+    'Line'                 => '行',                   // Added - 2011-06-16
     'LinkedMonitors'        => '管理监视器',
     'List'                  => '列表',
-    'ListMatches'          => 'List Matches',           // Added - 2018-08-30
+    'ListMatches'          => '列出匹配项',           // Added - 2018-08-30
     'Load'                  => '加载',
     'Local'                 => '本地',
-    'Log'                  => 'Log',                    // Added - 2011-06-16
+    'Log'                  => '日志',                    // Added - 2011-06-16
     'LoggedInAs'            => '登录为',
-    'Logging'              => 'Logging',                // Added - 2011-06-16
+    'Logging'              => '日志',                // Added - 2011-06-16
     'LoggingIn'             => '登录',
     'Login'                 => '登入',
     'Logout'                => '登出',
@@ -465,7 +476,7 @@ $SLANG = array(
     'MaximumFPS'            => '最大帧率 FPS',
     'Medium'                => '中等',
     'MediumBW'              => '中等&nbsp;B/W',
-    'Message'              => 'Message',                // Added - 2011-06-16
+    'Message'              => '消息',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'     => '最小报警区域应该小于最大区域',
     'MinAlarmAreaUnset'     => '您必须指定最小报警像素数量',
     'MinBlobAreaLtMax'      => '最小blob区必须小数最大区域',
@@ -500,25 +511,25 @@ $SLANG = array(
     'MinZoomSpeed'          => '最小缩放速度',
     'MinZoomStep'           => '最小缩放步进',
     'Misc'                  => '杂项',
-    'Mode'                 => 'Mode',                   // Added - 2015-04-18
+    'Mode'                 => '模式',                   // Added - 2015-04-18
     'Monitor'               => '监视器',
     'MonitorIds'            => '监视器&nbsp;Ids',
     'MonitorPreset'         => '监视器预设值',
     'MonitorPresetIntro'    => '从以下列表中选择一个合适的预设值.<br/><br/>请注意该方式可能覆盖您为该监视器配置的数值.<br/><br/>',
-    'MonitorProbe'         => 'Monitor Probe',          // Added - 2009-03-31
-    'MonitorProbeIntro'    => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2009-03-31
+    'MonitorProbe'         => '监视器探测',          // Added - 2009-03-31
+    'MonitorProbeIntro'    => '以下列表显示了检测到的模拟和网络摄像头，以及其可用状态<br/><br/>请从列表中选择你想要的项<br/><br/>请注意可能有些摄像头并没有检测到，而且选择一个摄像头可能覆盖一些你已经设置的配置。<br/><br/>', // Added - 2009-03-31
     'Monitors'              => '监视器',
     'Montage'               => '镜头组接',
     'MontageReview'        => 'Montage Review',         // Added - 2018-08-30
     'Month'                 => '月',
-    'More'                 => 'More',                   // Added - 2011-06-16
-    'MotionFrameSkip'       => 'Motion Frame Skip',
+    'More'                 => '更多',                   // Added - 2011-06-16
+    'MotionFrameSkip'       => '运动侦测跳帧',
     'Move'                  => '移动',
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
     'Mtg3widgrx'            => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
     'Mtg4widgrd'            => '4-wide grid',              // Added 2013.08.15.
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
+    'MtgDefault'            => '默认',              // Added 2013.08.15.
     'MustBeGe'              => '必须大于等于',
     'MustBeLe'              => '必须小于等于',
     'MustConfirmPassword'   => '您必须确认密码',
@@ -534,9 +545,10 @@ $SLANG = array(
     'NewState'              => '新状态',
     'NewUser'               => '新用户',
     'Next'                  => '下一个',
+    'NextMonitor'          => '下一个监视器',           // Added - 2020-04-09
     'No'                    => '不',
-    'NoDetectedCameras'    => 'No Detected Cameras',    // Added - 2009-03-31
-    'NoDetectedProfiles'   => 'No Detected Profiles',   // Added - 2018-08-30
+    'NoDetectedCameras'    => '没有检测到摄像头',    // Added - 2009-03-31
+    'NoDetectedProfiles'   => '没有检测到流媒体',   // Added - 2018-08-30
     'NoFramesRecorded'      => '该事件没有相关帧的记录',
     'NoGroup'               => '无组',
     'NoSavedFilters'        => '没有保存过滤器',
@@ -548,25 +560,27 @@ $SLANG = array(
     'NumPresets'            => '数值预置',
     'Off'                   => '关',
     'On'                    => '开',
-    'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>', // Added - 2015-04-18
+    'OnvifCredentialsIntro'=> '请为所选摄像头提供用户名和密码。<br/>如果还没有为这台摄像头创建过用户，那么将会使用提供的用户名和密码创建用户<br/><br/>', // Added - 2015-04-18
     'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
-    'OnvifProbeIntro'      => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
+    'OnvifProbeIntro'      => '以下列表显示了检测到的ONVIF摄像头和其可用状态。<br/><br/>选择一个你想要的项<br/><br/>请注意可能有些摄像头并没有检测到，而且选择一个摄像头可能覆盖一些你已经设置的配置。<br/><br/>', // Added - 2015-04-18
     'OpEq'                  => '等于',
     'OpGt'                  => '大于',
     'OpGtEq'                => '大于等于',
     'OpIn'                  => '在集',
-    'OpIs'                 => 'is',                     // Added - 2018-08-30
-    'OpIsNot'              => 'is not',                 // Added - 2018-08-30
+    'OpIs'                 => '是',                     // Added - 2018-08-30
+    'OpIsNot'              => '不是',                 // Added - 2018-08-30
+    'OpLike'               => '包含',               // Added - 2020-04-09
     'OpLt'                  => '小于',
     'OpLtEq'                => '小于等于',
     'OpMatches'             => '匹配',
     'OpNe'                  => '不等于',
     'OpNotIn'               => '未在集',
+    'OpNotLike'            => '未包含',       // Added - 2020-04-09
     'OpNotMatches'          => '不匹配',
     'Open'                  => '打开',
     'OptionHelp'            => '选项帮助',
     'OptionRestartWarning'  => '这些改动在系统运行时可以不会完全生效.\n 当你设置完毕改动后\n请确认\n您重新启动 ZoneMinder.',
-    'OptionalEncoderParam' => 'Optional Encoder Parameters', // Added - 2018-08-30
+    'OptionalEncoderParam' => '编码参数(可选)', // Added - 2018-08-30
     'Options'               => '选项',
     'OrEnterNewName'        => '或输入新名词',
     'Order'                 => '次序',
@@ -579,10 +593,15 @@ $SLANG = array(
     'PanRight'              => '向右平移',
     'PanTilt'               => '平移/倾斜',
     'Parameter'             => '参数',
+    'ParentGroup'          => '父组',           // Added - 2020-04-09
     'Password'              => '密码',
     'PasswordsDifferent'    => '新建密码和确认密码不一致',
+    'PathToApi'            => 'Api路径',            // Added - 2020-04-09
+    'PathToIndex'          => 'Index路径',          // Added - 2020-04-09
+    'PathToZMS'            => 'ZMS路径',            // Added - 2020-04-09
     'Paths'                 => '路径',
     'Pause'                 => '暂停',
+    'PauseCycle'           => 'Pause Cycle',            // Added - 2020-04-09
     'Phone'                 => '电话',
     'PhoneBW'               => '电话&nbsp;B/W',
     'Pid'                  => 'PID',                    // Added - 2011-06-16
@@ -590,8 +609,9 @@ $SLANG = array(
     'Pixels'                => '像素',
     'Play'                  => '播放',
     'PlayAll'               => '播放全部',
+    'PlayCycle'            => 'Play Cycle',             // Added - 2020-04-09
     'PleaseWait'            => '请等待',
-    'Plugins'              => 'Plugins',
+    'Plugins'              => '插件',
     'Point'                 => '点',
     'PostEventImageBuffer'  => '事件之后影像数',
     'PreEventImageBuffer'   => '时间之前影像数',
@@ -599,18 +619,31 @@ $SLANG = array(
     'Preset'                => '预置',
     'Presets'               => '预置',
     'Prev'                  => '前',
-    'Probe'                => 'Probe',                  // Added - 2009-03-31
-    'ProfileProbe'         => 'Stream Probe',           // Added - 2015-04-18
-    'ProfileProbeIntro'    => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
+    'PreviousMonitor'      => '前一个监视器',       // Added - 2020-04-09
+    'Privacy'              => 'Privacy',                // Added - 2020-04-09
+    'PrivacyAbout'         => '关于',                  // Added - 2020-04-09
+    'PrivacyAboutText'     => 'Since 2002, ZoneMinder has been the premier free and open-source Video Management System (VMS) solution for Linux platforms. ZoneMinder is supported by the community and is managed by those who choose to volunteer their spare time to the project. The best way to improve ZoneMinder is to get involved.', // Added - 2020-04-09
+    'PrivacyConclusionText'=> 'We are <u>NOT</u> collecting any image specific data from your cameras. We don’t know what your cameras are watching. This data will not be sold or used for any purpose not stated herein. By clicking accept, you agree to send us this data to help make ZoneMinder a better product. By clicking decline, you can still freely use ZoneMinder and all its features.', // Added - 2020-04-09
+    'PrivacyContact'       => '联系',                // Added - 2020-04-09
+    'PrivacyContactText'   => 'Please contact us <a href="https://zoneminder.com/contact/">here</a> for any questions regarding our privacy policy or to have your information removed.<br><br>For support, there are three primary ways to engage with the community:<ul><li>The ZoneMinder <a href="https://forums.zoneminder.com/">user forum</a></li><li>The ZoneMinder <a href="https://zoneminder-chat.herokuapp.com/">Slack channel</a></li><li>The ZoneMinder <a href="https://github.com/ZoneMinder/zoneminder/issues">Github forum</a></li></ul><p>Our Github forum is only for bug reporting. Please use our user forum or slack channel for all other questions or comments.</p>', // Added - 2020-04-09
+    'PrivacyCookies'       => 'Cookies',                // Added - 2020-04-09
+    'PrivacyCookiesText'   => 'Whether you use a web browser or a mobile app to communicate with the ZoneMinder server, a ZMSESSID cookie is created on the client to uniquely identify a session with the ZoneMinder server. ZmCSS and zmSkin cookies are created to remember your style and skin choices.', // Added - 2020-04-09
+    'PrivacyMonitorList'   => 'The following configuration parameters from each monitor are collected:<ul><li>Id<li>Name<li>Type<li>Function<li>Width<li>Height<li>Colours<li>MaxFPS<li>AlarmMaxFPS</ul>', // Added - 2020-04-09
+    'PrivacyTelemetry'     => 'Telemetry',              // Added - 2020-04-09
+    'PrivacyTelemetryList' => 'The ZoneMinder Telemetry daemon collects the following data about your system:<ul><li>A unique identifier (UUID) <li>City based location is gathered by querying <a href="https://ipinfo.io/geo">ipinfo.io</a>. City, region, country, latitude, and longitude parameters are saved. The latitude and longitude coordinates are accurate down to the city or town level only!<li>Current time<li>Total number of monitors<li>Total number of events<li>System architecture<li>Operating system kernel, distro, and distro version<li>Version of ZoneMinder<li>Total amount of memory<li>Number of cpu cores</ul>', // Added - 2020-04-09
+    'PrivacyTelemetryText' => 'Because ZoneMinder is open-source, anyone can install it without registering. This makes it difficult to  answer questions such as: how many systems are out there, what is the largest system out there, what kind of systems are out there, or where are these systems located? Knowing the answers to these questions, helps users who ask us these questions, and it helps us set priorities based on the majority user base.', // Added - 2020-04-09
+    'Probe'                => '探测',                  // Added - 2009-03-31
+    'ProfileProbe'         => '流媒体探测',           // Added - 2015-04-18
+    'ProfileProbeIntro'    => '以下列表显示了所选摄像头可用的流媒体。<br/><br/>从列表中选择一个你想要的项<br/><br/>请注意ZoneMinder不能设置额外的配置并且选择摄像头可能会覆盖一些你已设置的配置。<br/><br/>', // Added - 2015-04-18
     'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'              => '协议',
-    'RTSPDescribe'         => 'Use RTSP Response Media URL', // Added - 2018-08-30
-    'RTSPTransport'        => 'RTSP Transport Protocol', // Added - 2018-08-30
+    'RTSPDescribe'         => '使用 RTSP Response 媒体链接', // Added - 2018-08-30
+    'RTSPTransport'        => 'RTSP传输协议', // Added - 2018-08-30
     'Rate'                  => '速率',
     'Real'                  => '实际',
-    'RecaptchaWarning'     => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // Added - 2018-08-30
+    'RecaptchaWarning'     => '你的reCaptcha秘匙无效。 请更正，否则reCaptcha无法工作', // Added - 2018-08-30
     'Record'                => '记录',
-    'RecordAudio'          => 'Whether to store the audio stream when saving an event.', // Added - 2018-08-30
+    'RecordAudio'          => '记录事件时保存音频.', // Added - 2018-08-30
     'RefImageBlendPct'      => '参考影像混合 %ge',
     'Refresh'               => '刷新',
     'Remote'                => '远程',
@@ -626,7 +659,7 @@ $SLANG = array(
     'ReplayAll'             => '全部事件',
     'ReplayGapless'         => '无间隙事件',
     'ReplaySingle'          => '单一事件',
-    'ReportEventAudit'     => 'Audit Events Report',    // Added - 2018-08-30
+    'ReportEventAudit'     => '事件报表',    // Added - 2018-08-30
     'Reset'                 => '重置',
     'ResetEventCounts'      => '重置事件数',
     'Restart'               => '重启动',
@@ -635,24 +668,29 @@ $SLANG = array(
     'RestrictedMonitors'    => '受限监视器',
     'ReturnDelay'           => '返回延时',
     'ReturnLocation'        => '返回位置',
+    'RevokeAllTokens'      => '撤销所有Tokens',      // Added - 2020-04-09
     'Rewind'                => '重绕',
     'RotateLeft'            => '向左旋转',
     'RotateRight'           => '向右旋转',
-    'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
+    'RunAudit'             => '审计',      // Added - 2020-04-09
+    'RunEventNotification' => '事件提醒', // Added - 2020-04-09
+    'RunLocalUpdate'       => '请运行zmupdate.pl来更新', // Added - 2011-05-25
     'RunMode'               => '运行模式',
     'RunState'              => '运行状态',
+    'RunStats'             => '状态检测',      // Added - 2020-04-09
+    'RunTrigger'           => '触发',    // Added - 2020-04-09
     'Running'               => '运行',
     'Save'                  => '保存',
     'SaveAs'                => '另存为',
     'SaveFilter'            => '存储过滤器',
-    'SaveJPEGs'            => 'Save JPEGs',             // Added - 2018-08-30
+    'SaveJPEGs'            => '保存为JPEGs',             // Added - 2018-08-30
     'Scale'                 => '比例',
     'Score'                 => '分数',
     'Secs'                  => '秒',
     'Sectionlength'         => '段长度',
     'Select'                => '选择',
-    'SelectFormat'         => 'Select Format',          // Added - 2011-06-17
-    'SelectLog'            => 'Select Log',             // Added - 2011-06-17
+    'SelectFormat'         => '选择格式',          // Added - 2011-06-17
+    'SelectLog'            => '选择日志',             // Added - 2011-06-17
     'SelectMonitors'        => '选择监视器',
     'SelfIntersecting'      => '多边形边线不得交叉',
     'Set'                   => '设置',
@@ -661,10 +699,11 @@ $SLANG = array(
     'Settings'              => '设置',
     'ShowFilterWindow'      => '显示过滤器视窗',
     'ShowTimeline'          => '显示时间轴',
-    'SignalCheckColour'     => '型号检查颜色',
-    'SignalCheckPoints'    => 'Signal Check Points',    // Added - 2018-08-30
+    'Shutdown'             => '关机',               // Added - 2020-04-09
+    'SignalCheckColour'     => '信号检查颜色',
+    'SignalCheckPoints'    => '信号检测点数目',    // Added - 2018-08-30
     'Size'                  => '大小',
-    'SkinDescription'      => 'Change the default skin for this computer', // Added - 2011-01-30
+    'SkinDescription'      => '改变本机默认皮肤', // Added - 2011-01-30
     'Sleep'                 => '睡眠',
     'SortAsc'               => '升序',
     'SortBy'                => '排序',
@@ -682,10 +721,10 @@ $SLANG = array(
     'State'                 => '状态',
     'Stats'                 => '统计',
     'Status'                => '状况',
-    'StatusConnected'      => 'Capturing',              // Added - 2018-08-30
-    'StatusNotRunning'     => 'Not Running',            // Added - 2018-08-30
-    'StatusRunning'        => 'Not Capturing',          // Added - 2018-08-30
-    'StatusUnknown'        => 'Unknown',                // Added - 2018-08-30
+    'StatusConnected'      => '正在捕获',              // Added - 2018-08-30
+    'StatusNotRunning'     => '未运行',            // Added - 2018-08-30
+    'StatusRunning'        => '未捕获',          // Added - 2018-08-30
+    'StatusUnknown'        => '未知',                // Added - 2018-08-30
     'Step'                  => '步进',
     'StepBack'              => '单步后退',
     'StepForward'           => '单步前进',
@@ -696,14 +735,16 @@ $SLANG = array(
     'Stills'                => '静止',
     'Stop'                  => '停止',
     'Stopped'               => '已停止',
-    'StorageArea'          => 'Storage Area',           // Added - 2018-08-30
-    'StorageScheme'        => 'Scheme',                 // Added - 2018-08-30
+    'StorageArea'          => '存储区域',           // Added - 2018-08-30
+    'StorageDoDelete'      => '开始删除',             // Added - 2020-04-09
+    'StorageScheme'        => '存储方案',                 // Added - 2018-08-30
     'Stream'                => '流',
     'StreamReplayBuffer'    => '流重放影像缓冲',
     'Submit'                => '发送',
     'System'                => '系统',
-    'SystemLog'            => 'System Log',             // Added - 2011-06-16
-    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
+    'SystemLog'            => '系统日志',             // Added - 2011-06-16
+    'TZUnset'              => '未设置 - 使用php.ini的配置', // Added - 2020-04-09
+    'TargetColorspace'     => '色彩空间',      // Added - 2015-04-18
     'Tele'                  => 'Tele',
     'Thumbnail'             => '缩略图',
     'Tilt'                  => '倾斜',
@@ -711,18 +752,18 @@ $SLANG = array(
     'TimeDelta'             => '相对时间',
     'TimeStamp'             => '时间戳',
     'Timeline'              => '时间轴',
-    'TimelineTip1'          => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
-    'TimelineTip2'          => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
+    'TimelineTip1'          => '移动你的鼠标到图表上来查看快照图片和事件详情。',              // Added 2013.08.15.
+    'TimelineTip2'          => '单击图形或图像的彩色部分来查看事件。',              // Added 2013.08.15.
     'TimelineTip3'          => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
     'TimelineTip4'          => 'Use the controls below to zoom out or navigate back and forward through the time range.',              // Added 2013.08.15.
     'Timestamp'             => '时间戳',
     'TimestampLabelFormat'  => '时间戳标签格式',
-    'TimestampLabelSize'   => 'Font Size',              // Added - 2018-08-30
+    'TimestampLabelSize'   => '字体大小',              // Added - 2018-08-30
     'TimestampLabelX'       => '时间戳标签 X',
     'TimestampLabelY'       => '时间戳标签 Y',
     'Today'                 => '今天',
     'Tools'                 => '工具',
-    'Total'                => 'Total',                  // Added - 2011-06-16
+    'Total'                => '总',                  // Added - 2011-06-16
     'TotalBrScore'          => '总<br/>分数',
     'TrackDelay'            => '轨迹延时',
     'TrackMotion'           => '轨迹运动',
@@ -737,23 +778,24 @@ $SLANG = array(
     'Update'                => '更新',
     'UpdateAvailable'       => '有新版本的ZoneMinder.',
     'UpdateNotNecessary'    => '无须更新',
-    'Updated'              => 'Updated',                // Added - 2011-06-16
-    'Upload'               => 'Upload',                 // Added - 2011-08-23
+    'Updated'              => '已更新',                // Added - 2011-06-16
+    'Upload'               => '上传',                 // Added - 2011-08-23
     'UseFilter'             => '使用筛选器',
     'UseFilterExprsPost'    => '&nbsp;筛选器&nbsp;表达式', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'     => '使用&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
-    'UsedPlugins'	   => 'Used Plugins',
+    'UsedPlugins'	   => '已使用的插件',
     'User'                  => '用户',
     'Username'              => '用户名',
     'Users'                 => '用户',
     'V4L'                  => 'V4L',                    // Added - 2015-04-18
-    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
-    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => '每帧捕获',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => '多缓冲',        // Added - 2015-04-18
     'Value'                 => '数值',
     'Version'               => '版本',
     'VersionIgnore'         => '忽略该版本',
     'VersionRemindDay'      => '一天内再次提醒',
     'VersionRemindHour'     => '一小时内再次提醒',
+    'VersionRemindMonth'   => '一个月内再次提醒', // Added - 2020-04-09
     'VersionRemindNever'    => '不再提醒新版本',
     'VersionRemindWeek'     => '一周内再次提醒',
     'Video'                 => '视频',
@@ -764,17 +806,18 @@ $SLANG = array(
     'VideoGenParms'         => '视频产生参数',
     'VideoGenSucceeded'     => '视频产生成功!',
     'VideoSize'             => '视频尺寸',
-    'VideoWriter'          => 'Video Writer',           // Added - 2018-08-30
+    'VideoWriter'          => '保存为视频',           // Added - 2018-08-30
     'View'                  => '查看',
     'ViewAll'               => '查看全部',
     'ViewEvent'             => '查看事件',
+    'ViewMatches'          => '查看匹配项',           // Added - 2020-04-09
     'ViewPaged'             => '查看分页',
     'Wake'                  => '唤醒',
     'WarmupFrames'          => '预热帪',
     'Watch'                 => '观察',
     'Web'                   => 'Web',
     'WebColour'             => 'Web颜色',
-    'WebSiteUrl'           => 'Website URL',            // Added - 2018-08-30
+    'WebSiteUrl'           => '网站链接',            // Added - 2018-08-30
     'Week'                  => '周',
     'White'                 => '白',
     'WhiteBalance'          => '白平衡',
@@ -797,7 +840,7 @@ $SLANG = array(
     'ZoneMinMaxBlobs'       => '最小/最大污渍区数 Blobs',
     'ZoneMinMaxFiltArea'    => '最小/最大过滤区域',
     'ZoneMinMaxPixelThres'  => '最小/最大像素阈值(0-255)',
-    'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
+    'ZoneMinderLog'        => 'ZoneMinder日志',         // Added - 2011-06-17
     'ZoneOverloadFrames'    => '忽略过载帪数',
     'Zones'                 => '区域',
     'Zoom'                  => '缩放',
@@ -814,7 +857,7 @@ $CLANG = array(
     'MonitorCount'          => '%1$s %2$s', // For example '4 Monitors' (from Vlang below)
     'MonitorFunction'       => '监视器 %1$s 功能',
     'RunningRecentVer'      => '您运行的是最新版的 ZoneMinder, v%s.',
-    'VersionMismatch'      => 'Version mismatch, system is version %1$s, database is %2$s.', // Added - 2011-05-25
+    'VersionMismatch'      => '版本不匹配, 系统版本是 %1$s, 数据库版本是 %2$s.', // Added - 2011-05-25
 );
 
 // The next section allows you to describe a series of word ending and counts used to 
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 0e575fd1f..671bcbaff 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -87,6 +87,7 @@ $SLANG = array(
     'Actual'                => 'Actual',
     'AddNewControl'         => 'Add New Control',
     'AddNewMonitor'         => 'Add',
+    'AddMonitorDisabled'    => 'Your user is not allowed to add a new monitor',
     'AddNewServer'          => 'Add New Server',
     'AddNewStorage'         => 'Add New Storage',
     'AddNewUser'            => 'Add New User',
@@ -116,6 +117,7 @@ $SLANG = array(
     'Area'                  => 'Area',
     'AreaUnits'             => 'Area (px/%)',
     'AttrAlarmFrames'       => 'Alarm Frames',
+    'AttrAlarmedZone'       => 'Alarmed Zone',
     'AttrArchiveStatus'     => 'Archive Status',
     'AttrAvgScore'          => 'Avg. Score',
     'AttrCause'             => 'Cause',
@@ -123,7 +125,8 @@ $SLANG = array(
     'AttrEndDate'           => 'End Date',
     'AttrStartDateTime'     => 'Start Date/Time',
     'AttrEndDateTime'       => 'End Date/Time',
-    'AttrDiskSpace'         => 'Disk Space',
+    'AttrEventDiskSpace'    => 'Event Disk Space',
+    'AttrDiskSpace'         => 'File System Disk Space',
     'AttrDiskBlocks'        => 'Disk Blocks',
     'AttrDiskPercent'       => 'Disk Percent',
     'AttrDuration'          => 'Duration',
@@ -177,6 +180,7 @@ $SLANG = array(
     'BadPostEventCount'     => 'Post event image count must be an integer of zero or more',
     'BadPreEventCount'      => 'Pre event image count must be at least zero, and less than image buffer size',
     'BadRefBlendPerc'       => 'Reference blend percentage must be a positive integer',
+    'BadNoSaveJPEGsOrVideoWriter' => 'SaveJPEGs and VideoWriter are both set to disabled.  Nothing will be recorded!',
     'BadSectionLength'      => 'Section length must be an integer of 30 or more',
     'BadSignalCheckColour'  => 'Signal check colour must be a valid RGB colour string',
     'BadStreamReplayBuffer' => 'Stream replay buffer must be an integer of zero or more',
@@ -253,7 +257,10 @@ $SLANG = array(
     'Command'               => 'Command',
     'ConcurrentFilter'      => 'Run filter concurrently',
     'Config'                => 'Config',
+    'ConfigOptions'         => 'ConfigOptions',
+    'ConfigType'            => 'Config Type',
     'ConfiguredFor'         => 'Configured for',
+    'ConfigURL'             => 'Config Base URL',
     'ConfirmDeleteEvents'   => 'Are you sure you wish to delete the selected events?',
     'ConfirmPassword'       => 'Confirm Password',
     'ConjAnd'               => 'and',
@@ -300,7 +307,7 @@ $SLANG = array(
     'Display'               => 'Display',
     'Displaying'            => 'Displaying',
     'DonateAlready'         => 'No, I\'ve already donated',
-    'DonateEnticement'      => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to https://zoneminder.com/donate/ in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on ZoneMinder.com for support or suggestions about how to make your ZoneMinder experience even better.',
+    'DonateEnticement'      => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to <a href="https://zoneminder.com/donate/" target="_blank">https://zoneminder.com/donate/</a> in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on <a href="https://forums.zoneminder.com">ZoneMinder.com</a> for support or suggestions about how to make your ZoneMinder experience even better.',
     'Donate'                => 'Please Donate',
     'DonateRemindDay'       => 'Not yet, remind again in 1 day',
     'DonateRemindHour'      => 'Not yet, remind again in 1 hour',
@@ -337,6 +344,7 @@ $SLANG = array(
     'Export'                => 'Export',
     'DownloadVideo'         => 'Download Video',
     'GenerateDownload'      => 'Generate Download',
+    'ExistsInFileSystem'    => 'Exists In File System',
     'ExportFailed'          => 'Export Failed',
     'ExportFormat'          => 'Export File Format',
     'ExportFormatTar'       => 'Tar',
@@ -360,6 +368,9 @@ $SLANG = array(
     'FilterCopyEvents'      => 'Copy all matches',
     'FilterMoveEvents'      => 'Move all matches',
     'FilterEmailEvents'     => 'Email details of all matches',
+    'FilterEmailTo'    			=> 'Email To',
+    'FilterEmailSubject'	  => 'Email Subject',
+    'FilterEmailBody'   	  => 'Email Body',
     'FilterExecuteEvents'   => 'Execute command on all matches',
     'FilterLog'             => 'Filter log',
     'FilterMessageEvents'   => 'Message details of all matches',
@@ -368,6 +379,7 @@ $SLANG = array(
     'Filters'               => 'Filters',
     'FilterUnset'           => 'You must specify a filter width and height',
     'FilterUploadEvents'    => 'Upload all matches',
+    'FilterUser'            => 'User to run filter as',
     'FilterVideoEvents'     => 'Create video for all matches',
     'First'                 => 'First',
     'FlippedHori'           => 'Flipped Horizontally',
@@ -378,6 +390,7 @@ $SLANG = array(
     'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnExtdect'             => 'Extdect',           // Added 2014.12.14.
     'Focus'                 => 'Focus',
     'ForceAlarm'            => 'Force Alarm',
     'Format'                => 'Format',
@@ -481,6 +494,7 @@ $SLANG = array(
     'MaxZoomStep'           => 'Max Zoom Step',
     'MediumBW'              => 'Medium&nbsp;B/W',
     'Medium'                => 'Medium',
+    'MetaConfig'            => 'Meta Config',
     'MinAlarmAreaLtMax'     => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'     => 'You must specify the minimum alarm pixel count',
     'MinBlobAreaLtMax'      => 'Minimum blob area should be less than maximum',
@@ -578,6 +592,8 @@ $SLANG = array(
     'OpNotMatches'          => 'does not match',
     'OpIs'                  => 'is',
     'OpIsNot'               => 'is not',
+    'OpLike'                => 'contains',
+    'OpNotLike'             => 'does not contain',
     'OptionalEncoderParam'  => 'Optional Encoder Parameters',
     'OptionHelp'            => 'Option Help',
     'OptionRestartWarning'  => 'These changes may not come into effect fully\nwhile the system is running. When you have\nfinished making your changes please ensure that\nyou restart ZoneMinder.',
@@ -593,6 +609,7 @@ $SLANG = array(
     'PanRight'              => 'Pan Right',
     'PanTilt'               => 'Pan/Tilt',
     'Parameter'             => 'Parameter',
+    'ParentGroup'           => 'Parent Group',
     'Password'              => 'Password',
     'PasswordsDifferent'    => 'The new and confirm passwords are different',
     'PathToIndex'           => 'Path To Index',
@@ -767,6 +784,7 @@ $SLANG = array(
     'TurboPanSpeed'         => 'Turbo Pan Speed',
     'TurboTiltSpeed'        => 'Turbo Tilt Speed',
     'Type'                  => 'Type',
+    'TZUnset'               => 'Unset - use value in php.ini',
     'Unarchive'             => 'Unarchive',
     'Undefined'             => 'Undefined',
     'Units'                 => 'Units',
@@ -789,6 +807,7 @@ $SLANG = array(
     'VersionRemindHour'     => 'Remind again in 1 hour',
     'VersionRemindNever'    => 'Don\'t remind about new versions',
     'VersionRemindWeek'     => 'Remind again in 1 week',
+    'VersionRemindMonth'    => 'Remind again in 1 month',
     'Version'               => 'Version',
     'ViewMatches'           => 'View Matches',
     'VideoFormat'           => 'Video Format',
@@ -804,7 +823,6 @@ $SLANG = array(
     'ViewEvent'             => 'View Event',
     'ViewPaged'             => 'View Paged',
     'View'                  => 'View',
-	'V4L'					=> 'V4L',
 	'V4LCapturesPerFrame'	=> 'Captures Per Frame',
 	'V4LMultiBuffer'		=> 'Multi Buffering',
     'Wake'                  => 'Wake',
@@ -977,6 +995,26 @@ $OLANG = array(
       "loglevel=debug" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)
     '
 	),
+  'OPTIONS_ENCODER_PARAMETERS' => array(
+    'Help' => '
+    Parameters passed to the encoding codec. name=value separated by either , or newline.~~
+    For example to changing quality, use the crf option.  1 is best, 51 is worst 23 is default.~~
+~~
+    crf=23~~
+    ~~
+    You might want to alter the movflags value to support different behaviours. Some people have troubles viewing videos due to the frag_keyframe option, but that option is supposed to allow viewing of incomplete events. See 
+    [https://ffmpeg.org/ffmpeg-formats.html](https://ffmpeg.org/ffmpeg-formats.html)
+    for more information.  ZoneMinder\'s default is frag_keyframe,empty_moov~~
+    ',
+  ),
+  'OPTIONS_DECODERHWACCELNAME' => array(
+    'Help' => '
+    This is equivalent to the ffmpeg -hwaccel command line option.  With intel graphics support, use "vaapi".  For NVIDIA cuda support use "cuda". To check for support, run ffmpeg -hwaccels on the command line.'
+    ),
+  'OPTIONS_DECODERHWACCELDEVICE' => array(
+    'Help' => '
+    This is equivalent to the ffmpeg -hwaccel_device command line option.  You should only have to specify this if you have multiple GPUs.  A typical value for Intel VAAPI would be /dev/dri/renderD128.'
+    ),
     'OPTIONS_RTSPTrans' => array(
       'Help' => '
         This sets the RTSP Transport Protocol for FFmpeg.~~
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index b3e03c225..ff4440053 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -50,7 +50,7 @@
 // do this by default, uncomment this if required.
 //
 // Example
-header( "Content-Type: text/html; charset=iso-8859-8-i" );
+header( "Content-Type: text/html; charset=UTF-8" );
 
 // You may need to change your locale here if your default one is incorrect for the
 // language described in this file, or if you have multiple languages supported.
@@ -71,59 +71,59 @@ setlocale( LC_ALL, 'he_IL' ); //All locale settings 4.3.0 and after
 
 // Simple String Replacements
 $SLANG = array(
-    '24BitColour'          => 'öáò 24 áéè',
-    '32BitColour'          => 'öáò 32 áéè',          // Added - 2011-06-15
-    '8BitGrey'             => 'âååðé àôåø 8 áéè',
-    'Action'               => 'ôòåìä',
-    'Actual'               => 'î÷åøé',
-    'AddNewControl'        => 'äåñó ÷åðèøåì çãù',
-    'AddNewMonitor'        => 'äåñó îåðéèåø çãù',
+    '24BitColour'          => 'צבע 24 ביט',
+    '32BitColour'          => 'צבע 32 ביט',          // Added - 2011-06-15
+    '8BitGrey'             => 'גווני אפור 8 ביט',
+    'Action'               => 'פעולה',
+    'Actual'               => 'מקורי',
+    'AddNewControl'        => 'הוסף קונטרול חדש',
+    'AddNewMonitor'        => 'הוסף מוניטור חדש',
     'AddNewServer'         => 'Add New Server',         // Added - 2018-08-30
     'AddNewStorage'        => 'Add New Storage',        // Added - 2018-08-30
-    'AddNewUser'           => 'äåñó îùúîù çãù',
-    'AddNewZone'           => 'äåñó àéæåø çãù',
-    'Alarm'                => 'àæò÷ä',
-    'AlarmBrFrames'        => 'àæò÷ú<br/>ôøééîéí',
-    'AlarmFrame'           => 'àæò÷ú ôøééîéí',
-    'AlarmFrameCount'      => 'ñôéøú àæò÷åú ôøééîéí',
-    'AlarmLimits'          => 'äâáìåú àæò÷ä',
+    'AddNewUser'           => 'הוסף משתמש חדש',
+    'AddNewZone'           => 'הוסף איזור חדש',
+    'Alarm'                => 'אזעקה',
+    'AlarmBrFrames'        => 'אזעקת<br/>פריימים',
+    'AlarmFrame'           => 'אזעקת פריימים',
+    'AlarmFrameCount'      => 'ספירת אזעקות פריימים',
+    'AlarmLimits'          => 'הגבלות אזעקה',
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
-    'AlarmPx'              => 'àæò÷ú Px',
-    'AlarmRGBUnset'        => 'äéðê çééá ìàúçì àæò÷ú öáò',
+    'AlarmPx'              => 'אזעקת Px',
+    'AlarmRGBUnset'        => 'הינך חייב לאתחל אזעקת צבע',
     'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
-    'Alert'                => 'äúøàä',
-    'All'                  => 'äëì',
+    'Alert'                => 'התראה',
+    'All'                  => 'הכל',
     'AnalysisFPS'          => 'Analysis FPS',           // Added - 2015-07-22
     'AnalysisUpdateDelay'  => 'Analysis Update Delay',  // Added - 2015-07-23
-    'Apply'                => 'äçì',
-    'ApplyingStateChange'  => 'äçì ùéðåé îöá',
-    'ArchArchived'         => 'àøëéá áìáã',
-    'ArchUnarchived'       => 'ìà ìàøëéá áìáã',
-    'Archive'              => 'àøëéá',
-    'Archived'             => 'àåøëá',
-    'Area'                 => 'àæåø',
-    'AreaUnits'            => 'àæåø (px/%)',
+    'Apply'                => 'החל',
+    'ApplyingStateChange'  => 'החל שינוי מצב',
+    'ArchArchived'         => 'ארכיב בלבד',
+    'ArchUnarchived'       => 'לא לארכיב בלבד',
+    'Archive'              => 'ארכיב',
+    'Archived'             => 'אורכב',
+    'Area'                 => 'אזור',
+    'AreaUnits'            => 'אזור (px/%)',
     'AttrAlarmFrames'      => 'Alarm Frames',
     'AttrArchiveStatus'    => 'Archive Status',
-    'AttrAvgScore'         => 'ðé÷åã îîåöò',
-    'AttrCause'            => 'ñéáä',
+    'AttrAvgScore'         => 'ניקוד ממוצע',
+    'AttrCause'            => 'סיבה',
     'AttrDiskBlocks'       => 'Disk Blocks',
     'AttrDiskPercent'      => 'Disk Percent',
     'AttrDiskSpace'        => 'Disk Space',             // Added - 2018-08-30
-    'AttrDuration'         => 'îùê æîï',
+    'AttrDuration'         => 'משך זמן',
     'AttrEndDate'          => 'End Date',               // Added - 2018-08-30
     'AttrEndDateTime'      => 'End Date/Time',          // Added - 2018-08-30
     'AttrEndTime'          => 'End Time',               // Added - 2018-08-30
     'AttrEndWeekday'       => 'End Weekday',            // Added - 2018-08-30
     'AttrFilterServer'     => 'Server Filter is Running On', // Added - 2018-08-30
-    'AttrFrames'           => 'ôøééîéí',
+    'AttrFrames'           => 'פריימים',
     'AttrId'               => 'Id',
-    'AttrMaxScore'         => 'ðé÷åã î÷ñéîìé',
+    'AttrMaxScore'         => 'ניקוד מקסימלי',
     'AttrMonitorId'        => 'Monitor Id',
-    'AttrMonitorName'      => 'ùí îåðéèåø',
+    'AttrMonitorName'      => 'שם מוניטור',
     'AttrMonitorServer'    => 'Server Monitor is Running On', // Added - 2018-08-30
-    'AttrName'             => 'ùí',
-    'AttrNotes'            => 'äòøåú',
+    'AttrName'             => 'שם',
+    'AttrNotes'            => 'הערות',
     'AttrStartDate'        => 'Start Date',             // Added - 2018-08-30
     'AttrStartDateTime'    => 'Start Date/Time',        // Added - 2018-08-30
     'AttrStartTime'        => 'Start Time',             // Added - 2018-08-30
@@ -132,13 +132,13 @@ $SLANG = array(
     'AttrStorageArea'      => 'Storage Area',           // Added - 2018-08-30
     'AttrStorageServer'    => 'Server Hosting Storage', // Added - 2018-08-30
     'AttrSystemLoad'       => 'System Load',
-    'AttrTotalScore'       => 'ñê ñëåí',
-    'Auto'                 => 'àåèå',
-    'AutoStopTimeout'      => 'ôñ÷ æîï òöéøä àåèå',
+    'AttrTotalScore'       => 'סך סכום',
+    'Auto'                 => 'אוטו',
+    'AutoStopTimeout'      => 'פסק זמן עצירה אוטו',
     'Available'            => 'Available',              // Added - 2009-03-31
-    'AvgBrScore'           => 'ðé÷åã<br/>îîåöò',
-    'Background'           => 'ø÷ò',
-    'BackgroundFilter'     => 'äøõ îñðï áø÷ò',
+    'AvgBrScore'           => 'ניקוד<br/>ממוצע',
+    'Background'           => 'רקע',
+    'BackgroundFilter'     => 'הרץ מסנן ברקע',
     'BadAlarmFrameCount'   => 'Alarm frame count must be an integer of one or more',
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadAnalysisFPS'       => 'Analysis FPS must be a positive integer or floating point value', // Added - 2015-07-22
@@ -165,30 +165,30 @@ $SLANG = array(
     'BadRefBlendPerc'      => 'Reference blend percentage must be a positive integer',
     'BadSectionLength'     => 'Section length must be an integer of 30 or more',
     'BadSignalCheckColour' => 'Signal check colour must be a valid RGB colour string',
-    'BadSourceType'        => 'Source Type \"Web Site\" requires the Function to be set to \"Monitor\"', // Added - 2018-08-30
+    'BadSourceType'        => 'Source Type "Web Site" requires the Function to be set to "Monitor"', // Added - 2018-08-30
     'BadStreamReplayBuffer'=> 'Stream replay buffer must be an integer of zero or more',
     'BadWarmupCount'       => 'Warmup frames must be an integer of zero or more',
     'BadWebColour'         => 'Web colour must be a valid web colour string',
     'BadWebSitePath'       => 'Please enter a complete website url, including the http:// or https:// prefix.', // Added - 2018-08-30
     'BadWidth'             => 'Width must be set to a valid value',
-    'Bandwidth'            => 'øåçá ôñ',
+    'Bandwidth'            => 'רוחב פס',
     'BandwidthHead'        => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
     'BlobPx'               => 'Blob Px',
     'BlobSizes'            => 'Blob Sizes',
     'Blobs'                => 'Blobs',
-    'Brightness'           => 'áäéøåú',
+    'Brightness'           => 'בהירות',
     'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
     'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
-    'CanAutoFocus'         => 'àôùø äúî÷ãåú àåèåîèé',
+    'CanAutoFocus'         => 'אפשר התמקדות אוטומטי',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
     'CanAutoWhite'         => 'Can Auto White Bal.',
-    'CanAutoZoom'          => 'àôùø æåí àåèåîèé',
-    'CanFocus'             => 'àôùø äúî÷ãåú',
-    'CanFocusAbs'          => 'àôùø äúî÷ãåú àáñåìåèé',
-    'CanFocusCon'          => 'àôùø äúî÷ãåú îúîùê',
-    'CanFocusRel'          => 'àôùø äúî÷ãåú éçñé',
+    'CanAutoZoom'          => 'אפשר זום אוטומטי',
+    'CanFocus'             => 'אפשר התמקדות',
+    'CanFocusAbs'          => 'אפשר התמקדות אבסולוטי',
+    'CanFocusCon'          => 'אפשר התמקדות מתמשך',
+    'CanFocusRel'          => 'אפשר התמקדות יחסי',
     'CanGain'              => 'Can Gain ',
     'CanGainAbs'           => 'Can Gain Absolute',
     'CanGainCon'           => 'Can Gain Continuous',
@@ -197,142 +197,141 @@ $SLANG = array(
     'CanIrisAbs'           => 'Can Iris Absolute',
     'CanIrisCon'           => 'Can Iris Continuous',
     'CanIrisRel'           => 'Can Iris Relative',
-    'CanMove'              => 'àôùø úðåòä',
-    'CanMoveAbs'           => 'àôùø úðåòä àáñåìåèéú',
-    'CanMoveCon'           => 'àôùø úæåæä îúîùëú',
+    'CanMove'              => 'אפשר תנועה',
+    'CanMoveAbs'           => 'אפשר תנועה אבסולוטית',
+    'CanMoveCon'           => 'אפשר תזוזה מתמשכת',
     'CanMoveDiag'          => 'Can Move Diagonally',
     'CanMoveMap'           => 'Can Move Mapped',
-    'CanMoveRel'           => 'àôùø úæåæä éçñéú',
+    'CanMoveRel'           => 'אפשר תזוזה יחסית',
     'CanPan'               => 'Can Pan' ,
-    'CanReset'             => 'àôùø àúçåì',
-	'CanReboot'             => 'Can Reboot',
+    'CanReset'             => 'אפשר אתחול',
     'CanSetPresets'        => 'Can Set Presets',
-    'CanSleep'             => 'àôùø îöá ùéðä',
-    'CanTilt'              => 'àôùø æòæåò',
-    'CanWake'              => 'àôùø éöéàä îîöá ùéðä',
+    'CanSleep'             => 'אפשר מצב שינה',
+    'CanTilt'              => 'אפשר זעזוע',
+    'CanWake'              => 'אפשר יציאה ממצב שינה',
     'CanWhite'             => 'Can White Balance',
     'CanWhiteAbs'          => 'Can White Bal. Absolute',
     'CanWhiteBal'          => 'Can White Bal.',
     'CanWhiteCon'          => 'Can White Bal. Continuous',
     'CanWhiteRel'          => 'Can White Bal. Relative',
-    'CanZoom'              => 'àôùø æåí',
-    'CanZoomAbs'           => 'àôùø æåí àáñåìåèé',
-    'CanZoomCon'           => 'àôùø æåí îúîùê',
-    'CanZoomRel'           => 'àôùø æåí éçñé',
-    'Cancel'               => 'áèì',
+    'CanZoom'              => 'אפשר זום',
+    'CanZoomAbs'           => 'אפשר זום אבסולוטי',
+    'CanZoomCon'           => 'אפשר זום מתמשך',
+    'CanZoomRel'           => 'אפשר זום יחסי',
+    'Cancel'               => 'בטל',
     'CancelForcedAlarm'    => 'Cancel Forced Alarm',
     'CaptureHeight'        => 'Capture Height',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Capture Palette',
     'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Capture Width',
-    'Cause'                => 'ñéáä',
+    'Cause'                => 'סיבה',
     'CheckMethod'          => 'Alarm Check Method',
     'ChooseDetectedCamera' => 'Choose Detected Camera', // Added - 2009-03-31
-    'ChooseFilter'         => 'áçø îñðï',
+    'ChooseFilter'         => 'בחר מסנן',
     'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
     'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
     'ChoosePreset'         => 'Choose Preset',
     'Clear'                => 'Clear',                  // Added - 2011-06-16
     'CloneMonitor'         => 'Clone',                  // Added - 2018-08-30
-    'Close'                => 'ñâåø',
-    'Colour'               => 'öáò',
-    'Command'              => 'ô÷åãä',
+    'Close'                => 'סגור',
+    'Colour'               => 'צבע',
+    'Command'              => 'פקודה',
     'Component'            => 'Component',              // Added - 2011-06-16
     'ConcurrentFilter'     => 'Run filter concurrently', // Added - 2018-08-30
-    'Config'               => 'úöåøä',
-    'ConfiguredFor'        => 'úöåøä òáåø',
+    'Config'               => 'תצורה',
+    'ConfiguredFor'        => 'תצורה עבור',
     'ConfirmDeleteEvents'  => 'Are you sure you wish to delete the selected events?',
-    'ConfirmPassword'      => 'àùø ñéñîà',
-    'ConjAnd'              => 'å',
-    'ConjOr'               => 'àå',
-    'Console'              => '÷åðñåì',
-    'ContactAdmin'         => 'öåø ÷ùø òí îðäì äîòøëú áùáéì ôøèéí ðåñôéí.',
-    'Continue'             => 'äîùê',
-    'Contrast'             => 'ðéâåãéåú',
-    'Control'              => '÷åðèøåì',
-    'ControlAddress'       => 'ëúåáú ä÷åðèøåì',
-    'ControlCap'           => 'éëåìú ä÷åðèøåì',
-    'ControlCaps'          => 'éëåìåú ä÷åðèøåì',
-    'ControlDevice'        => 'äú÷ï ä÷åðèøåì',
-    'ControlType'          => 'ñåâ ä÷åðèøåì',
+    'ConfirmPassword'      => 'אשר סיסמא',
+    'ConjAnd'              => 'ו',
+    'ConjOr'               => 'או',
+    'Console'              => 'קונסול',
+    'ContactAdmin'         => 'צור קשר עם מנהל המערכת בשביל פרטים נוספים.',
+    'Continue'             => 'המשך',
+    'Contrast'             => 'ניגודיות',
+    'Control'              => 'קונטרול',
+    'ControlAddress'       => 'כתובת הקונטרול',
+    'ControlCap'           => 'יכולת הקונטרול',
+    'ControlCaps'          => 'יכולות הקונטרול',
+    'ControlDevice'        => 'התקן הקונטרול',
+    'ControlType'          => 'סוג הקונטרול',
     'Controllable'         => 'Controllable',
     'Current'              => 'Current',                // Added - 2015-04-18
-    'Cycle'                => 'îçæåøé',
-    'CycleWatch'           => 'öôééä îçæåøéú',
+    'Cycle'                => 'מחזורי',
+    'CycleWatch'           => 'צפייה מחזורית',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
-    'Day'                  => 'éåí',
+    'Day'                  => 'יום',
     'Debug'                => 'Debug',
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
     'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
     'Delay'                => 'Delay',                  // Added - 2015-04-18
-    'Delete'               => 'îç÷',
-    'DeleteAndNext'        => 'îç÷ &amp; äáà',
-    'DeleteAndPrev'        => 'îç÷ &amp; ä÷åãí',
-    'DeleteSavedFilter'    => 'îç÷ îñðï ùîåø',
-    'Description'          => 'úéàåø',
+    'Delete'               => 'מחק',
+    'DeleteAndNext'        => 'מחק & הבא',
+    'DeleteAndPrev'        => 'מחק & הקודם',
+    'DeleteSavedFilter'    => 'מחק מסנן שמור',
+    'Description'          => 'תיאור',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
     'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
-    'DeviceChannel'        => 'òøåõ ääú÷ï',
-    'DeviceFormat'         => 'úáðéú ääú÷ï',
-    'DeviceNumber'         => 'îñôø ääú÷ï',
-    'DevicePath'           => 'ðúéá ääú÷ï',
-    'Devices'              => 'äú÷ðéí',
-    'Dimensions'           => 'îéîãéí',
-    'DisableAlarms'        => 'ðèøì àæò÷åú',
-    'Disk'                 => 'ãéñ÷',
+    'DeviceChannel'        => 'ערוץ ההתקן',
+    'DeviceFormat'         => 'תבנית ההתקן',
+    'DeviceNumber'         => 'מספר ההתקן',
+    'DevicePath'           => 'נתיב ההתקן',
+    'Devices'              => 'התקנים',
+    'Dimensions'           => 'מימדים',
+    'DisableAlarms'        => 'נטרל אזעקות',
+    'Disk'                 => 'דיסק',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
     'DoNativeMotionDetection'=> 'Do Native Motion Detection',
-    'Donate'               => 'úøåí áá÷ùä',
-    'DonateAlready'        => 'ìà, úøîúé ëáø',
-    'DonateEnticement'     => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br><br>If you would like to donate please select the option below or go to https://zoneminder.com/donate/ in your browser.<br><br>Thank you for using ZoneMinder and don\'t forget to visit the forums on ZoneMinder.com for support or suggestions about how to make your ZoneMinder experience even better.',
-    'DonateRemindDay'      => 'òãééï ìà, äæëø ìà áòåã éåí àçã',
-    'DonateRemindHour'     => 'òãééï ìà, äæëø ìé áòåã ùòä àçú',
-    'DonateRemindMonth'    => 'òãééï ìà, äæëø ìé áòåã çåãù àçã',
-    'DonateRemindNever'    => 'ìà, àðé ìà øåöä ìúøåí, àì úúæëø àåúé',
-    'DonateRemindWeek'     => 'òãééï ìà, äæëø ìé áòåã ùáåò àçã',
-    'DonateYes'            => 'ëï, àðé îòåðééï ìúøåí òëùéå',
-    'Download'             => 'äåøã',
+    'Donate'               => 'תרום בבקשה',
+    'DonateAlready'        => 'לא, תרמתי כבר',
+    'DonateEnticement'     => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br><br>If you would like to donate please select the option below or go to http://www.zoneminder.com/donate.html in your browser.<br><br>Thank you for using ZoneMinder and don\'t forget to visit the forums on ZoneMinder.com for support or suggestions about how to make your ZoneMinder experience even better.',
+    'DonateRemindDay'      => 'עדיין לא, הזכר לא בעוד יום אחד',
+    'DonateRemindHour'     => 'עדיין לא, הזכר לי בעוד שעה אחת',
+    'DonateRemindMonth'    => 'עדיין לא, הזכר לי בעוד חודש אחד',
+    'DonateRemindNever'    => 'לא, אני לא רוצה לתרום, אל תתזכר אותי',
+    'DonateRemindWeek'     => 'עדיין לא, הזכר לי בעוד שבוע אחד',
+    'DonateYes'            => 'כן, אני מעוניין לתרום עכשיו',
+    'Download'             => 'הורד',
     'DownloadVideo'        => 'Download Video',         // Added - 2018-08-30
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
-    'Duration'             => 'îùê æîï',
-    'Edit'                 => 'òøåê',
+    'Duration'             => 'משך זמן',
+    'Edit'                 => 'ערוך',
     'EditLayout'           => 'Edit Layout',            // Added - 2018-08-30
-    'Email'                => 'ãåà"ì',
-    'EnableAlarms'         => 'àôùø àæò÷åú',
-    'Enabled'              => 'àôùø',
-    'EnterNewFilterName'   => 'äæï îñðï çãù',
-    'Error'                => 'ùâéàä',
+    'Email'                => 'דוא"ל',
+    'EnableAlarms'         => 'אפשר אזעקות',
+    'Enabled'              => 'אפשר',
+    'EnterNewFilterName'   => 'הזן מסנן חדש',
+    'Error'                => 'שגיאה',
     'ErrorBrackets'        => 'Error, please check you have an equal number of opening and closing brackets',
     'ErrorValidValue'      => 'Error, please check that all terms have a valid value',
-    'Etc'                  => 'åëå\'',
-    'Event'                => 'àéøåò',
-    'EventFilter'          => 'îñðï àéøåò',
-    'EventId'              => 'æéäåé àéøåò',
-    'EventName'            => 'ùí àéøåò',
+    'Etc'                  => 'וכו\'',
+    'Event'                => 'אירוע',
+    'EventFilter'          => 'מסנן אירוע',
+    'EventId'              => 'זיהוי אירוע',
+    'EventName'            => 'שם אירוע',
     'EventPrefix'          => 'Event Prefix',
-    'Events'               => 'àéøåòéí',
-    'Exclude'              => 'ììà',
-    'Execute'              => 'áöò',
+    'Events'               => 'אירועים',
+    'Exclude'              => 'ללא',
+    'Execute'              => 'בצע',
     'Exif'                 => 'Embed EXIF data into image', // Added - 2018-08-30
-    'Export'               => 'éöà',
-    'ExportDetails'        => 'éöà ôøèé àéøåò',
-    'ExportFailed'         => 'éöåà ðëùì',
-    'ExportFormat'         => 'éöà úáðéú ÷åáõ',
+    'Export'               => 'יצא',
+    'ExportDetails'        => 'יצא פרטי אירוע',
+    'ExportFailed'         => 'יצוא נכשל',
+    'ExportFormat'         => 'יצא תבנית קובץ',
     'ExportFormatTar'      => 'Tar',
     'ExportFormatZip'      => 'Zip',
     'ExportFrames'         => 'Export Frame Details',
-    'ExportImageFiles'     => 'éöà ÷áöé úîåðä',
+    'ExportImageFiles'     => 'יצא קבצי תמונה',
     'ExportLog'            => 'Export Log',             // Added - 2011-06-17
-    'ExportMiscFiles'      => 'éöà ÷áöéí àçøéí (àí éùðí)',
-    'ExportOptions'        => 'éöà àôùøåéåú',
+    'ExportMiscFiles'      => 'יצא קבצים אחרים (אם ישנם)',
+    'ExportOptions'        => 'יצא אפשרויות',
     'ExportSucceeded'      => 'Export Succeeded',       // Added - 2009-02-08
     'ExportVideoFiles'     => 'Export Video Files (if present)',
-    'Exporting'            => 'îééöà',
+    'Exporting'            => 'מייצא',
     'FPS'                  => 'fps',
     'FPSReportInterval'    => 'FPS Report Interval',
     'FTP'                  => 'FTP',
@@ -340,22 +339,22 @@ $SLANG = array(
     'FastForward'          => 'Fast Forward',
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
-    'File'                 => '÷åáõ',
+    'File'                 => 'קובץ',
     'Filter'               => 'Filter',                 // Added - 2015-04-18
-    'FilterArchiveEvents'  => 'àøëá úåàîéí',
-    'FilterDeleteEvents'   => 'îç÷ úåàîéí',
-    'FilterEmailEvents'    => 'ùìç ãåàø ùì ëì äúåàîéí',
+    'FilterArchiveEvents'  => 'ארכב תואמים',
+    'FilterDeleteEvents'   => 'מחק תואמים',
+    'FilterEmailEvents'    => 'שלח דואר של כל התואמים',
     'FilterExecuteEvents'  => 'Execute command on all matches',
     'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Message details of all matches',
     'FilterMoveEvents'     => 'Move all matches',       // Added - 2018-08-30
     'FilterPx'             => 'Filter Px',
-    'FilterUnset'          => 'òìéê ìöééï øåçá åâåáä îñðï',
+    'FilterUnset'          => 'עליך לציין רוחב וגובה מסנן',
     'FilterUpdateDiskSpace'=> 'Update used disk space', // Added - 2018-08-30
-    'FilterUploadEvents'   => 'òìä àú ëì äúåàîéí',
-    'FilterVideoEvents'    => 'öåø åéãàå ìëì äúåàîéí',
-    'Filters'              => 'îñððéí',
-    'First'                => 'äøàùåï',
+    'FilterUploadEvents'   => 'עלה את כל התואמים',
+    'FilterVideoEvents'    => 'צור וידאו לכל התואמים',
+    'Filters'              => 'מסננים',
+    'First'                => 'הראשון',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
@@ -364,25 +363,25 @@ $SLANG = array(
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
     'FnNone'                => 'None',            // Added 2013.08.16.
     'FnRecord'              => 'Record',            // Added 2013.08.16.
-    'Focus'                => 'äúî÷ã',
-    'ForceAlarm'           => 'äëøç àæò÷ä',
-    'Format'               => 'úáðéú',
-    'Frame'                => 'ôøééí',
+    'Focus'                => 'התמקד',
+    'ForceAlarm'           => 'הכרח אזעקה',
+    'Format'               => 'תבנית',
+    'Frame'                => 'פריים',
     'FrameId'              => 'Frame Id',
     'FrameRate'            => 'Frame Rate',
-    'FrameSkip'            => 'ãìâ ôøééí',
-    'Frames'               => 'ôøééîéí',
-    'Func'                 => 'ôåð÷',
-    'Function'             => 'ôåð÷öéä',
+    'FrameSkip'            => 'דלג פריים',
+    'Frames'               => 'פריימים',
+    'Func'                 => 'פונק',
+    'Function'             => 'פונקציה',
     'Gain'                 => 'Gain',
-    'General'              => 'ëììé',
+    'General'              => 'כללי',
     'GenerateDownload'     => 'Generate Download',      // Added - 2018-08-30
-    'GenerateVideo'        => 'öåø åéãàå',
-    'GeneratingVideo'      => 'îééöø åéãàå',
-    'GoToZoneMinder'       => 'á÷ø ZoneMinder.com',
-    'Grey'                 => 'àôåø',
-    'Group'                => '÷áåöä',
-    'Groups'               => '÷áåöåú',
+    'GenerateVideo'        => 'צור וידאו',
+    'GeneratingVideo'      => 'מייצר וידאו',
+    'GoToZoneMinder'       => 'בקר ZoneMinder.com',
+    'Grey'                 => 'אפור',
+    'Group'                => 'קבוצה',
+    'Groups'               => 'קבוצות',
     'HasFocusSpeed'        => 'Has Focus Speed',
     'HasGainSpeed'         => 'Has Gain Speed',
     'HasHomePreset'        => 'Has Home Preset',
@@ -394,53 +393,53 @@ $SLANG = array(
     'HasTurboTilt'         => 'Has Turbo Tilt',
     'HasWhiteSpeed'        => 'Has White Bal. Speed',
     'HasZoomSpeed'         => 'Has Zoom Speed',
-    'High'                 => 'âáåä',
-    'HighBW'               => 'âáåä&nbsp;ø/ô',
-    'Home'                 => 'áéú',
+    'High'                 => 'גבוה',
+    'HighBW'               => 'גבוה ר/פ',
+    'Home'                 => 'בית',
     'Hostname'             => 'Hostname',               // Added - 2018-08-30
-    'Hour'                 => 'ùòä',
+    'Hour'                 => 'שעה',
     'Hue'                  => 'Hue',
-    'Id'                   => 'æéäåé',
-    'Idle'                 => 'äîúðä',
-    'Ignore'               => 'äúòìí',
-    'Image'                => 'úîåðä',
+    'Id'                   => 'זיהוי',
+    'Idle'                 => 'המתנה',
+    'Ignore'               => 'התעלם',
+    'Image'                => 'תמונה',
     'ImageBufferSize'      => 'Image Buffer Size (frames)',
-    'Images'               => 'úîåðåú',
-    'In'                   => 'áúåê',
-    'Include'              => 'ëìåì',
-    'Inverted'             => 'äôåê',
+    'Images'               => 'תמונות',
+    'In'                   => 'בתוך',
+    'Include'              => 'כלול',
+    'Inverted'             => 'הפוך',
     'Iris'                 => 'Iris',
-    'KeyString'            => 'îçøåæú úåéí',
-    'Label'                => 'úååéú',
-    'Language'             => 'ùôä',
-    'Last'                 => 'àçøåï',
+    'KeyString'            => 'מחרוזת תוים',
+    'Label'                => 'תווית',
+    'Language'             => 'שפה',
+    'Last'                 => 'אחרון',
     'Layout'               => 'Layout',                 // Added - 2009-02-08
     'Level'                => 'Level',                  // Added - 2011-06-16
     'Libvlc'               => 'Libvlc',
-    'LimitResultsPost'     => 'úåöàåú áìáã;', // This is used at the end of the phrase 'Limit to first N results only'
-    'LimitResultsPre'      => 'äâáì ìøàùåï', // This is used at the beginning of the phrase 'Limit to first N results only'
+    'LimitResultsPost'     => 'תוצאות בלבד;', // This is used at the end of the phrase 'Limit to first N results only'
+    'LimitResultsPre'      => 'הגבל לראשון', // This is used at the beginning of the phrase 'Limit to first N results only'
     'Line'                 => 'Line',                   // Added - 2011-06-16
-    'LinkedMonitors'       => 'îåðéèåøéí î÷åùøéí',
-    'List'                 => 'øùéîä',
+    'LinkedMonitors'       => 'מוניטורים מקושרים',
+    'List'                 => 'רשימה',
     'ListMatches'          => 'List Matches',           // Added - 2018-08-30
-    'Load'                 => 'èòï',
-    'Local'                => 'î÷åîé',
+    'Load'                 => 'טען',
+    'Local'                => 'מקומי',
     'Log'                  => 'Log',                    // Added - 2011-06-16
-    'LoggedInAs'           => 'äúçáø ë',
+    'LoggedInAs'           => 'התחבר כ',
     'Logging'              => 'Logging',                // Added - 2011-06-16
-    'LoggingIn'            => 'îúçáø',
-    'Login'                => 'äúçáø',
-    'Logout'               => 'äúðú÷',
+    'LoggingIn'            => 'מתחבר',
+    'Login'                => 'התחבר',
+    'Logout'               => 'התנתק',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
-    'Low'                  => 'ðîåê',
-    'LowBW'                => 'ðîåê&nbsp;ø/ô',
-    'Main'                 => 'îøëæé',
-    'Man'                  => 'îãøéê',
-    'Manual'               => 'îãøéê',
-    'Mark'                 => 'ñîï',
-    'Max'                  => 'î÷ñ',
-    'MaxBandwidth'         => 'øåçá ôñ î÷ñ',
-    'MaxBrScore'           => 'ðé÷åã<br/>î÷ñéîìé',
+    'Low'                  => 'נמוך',
+    'LowBW'                => 'נמוך ר/פ',
+    'Main'                 => 'מרכזי',
+    'Man'                  => 'מדריך',
+    'Manual'               => 'מדריך',
+    'Mark'                 => 'סמן',
+    'Max'                  => 'מקס',
+    'MaxBandwidth'         => 'רוחב פס מקס',
+    'MaxBrScore'           => 'ניקוד<br/>מקסימלי',
     'MaxFocusRange'        => 'Max Focus Range',
     'MaxFocusSpeed'        => 'Max Focus Speed',
     'MaxFocusStep'         => 'Max Focus Step',
@@ -463,8 +462,8 @@ $SLANG = array(
     'MaxZoomSpeed'         => 'Max Zoom Speed',
     'MaxZoomStep'          => 'Max Zoom Step',
     'MaximumFPS'           => 'Maximum FPS',
-    'Medium'               => 'áéðåðé',
-    'MediumBW'             => 'Medium&nbsp;B/W',
+    'Medium'               => 'בינוני',
+    'MediumBW'             => 'Medium B/W',
     'Message'              => 'Message',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'    => 'You must specify the minimum alarm pixel count',
@@ -501,19 +500,19 @@ $SLANG = array(
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => 'Misc',
     'Mode'                 => 'Mode',                   // Added - 2015-04-18
-    'Monitor'              => 'îåðéèåø',
-    'MonitorIds'           => 'Monitor&nbsp;Ids',
+    'Monitor'              => 'מוניטור',
+    'MonitorIds'           => 'Monitor Ids',
     'MonitorPreset'        => 'Monitor Preset',
     'MonitorPresetIntro'   => 'Select an appropriate preset from the list below.<br><br>Please note that this may overwrite any values you already have configured for this monitor.<br><br>',
     'MonitorProbe'         => 'Monitor Probe',          // Added - 2009-03-31
     'MonitorProbeIntro'    => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2009-03-31
-    'Monitors'             => 'îåðéèåøéí',
+    'Monitors'             => 'מוניטורים',
     'Montage'              => 'Montage',
     'MontageReview'        => 'Montage Review',         // Added - 2018-08-30
-    'Month'                => 'çåãù',
+    'Month'                => 'חודש',
     'More'                 => 'More',                   // Added - 2011-06-16
     'MotionFrameSkip'      => 'Motion Frame Skip',
-    'Move'                 => 'äææ',
+    'Move'                 => 'הזז',
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
     'Mtg3widgrx'            => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
@@ -524,52 +523,52 @@ $SLANG = array(
     'MustConfirmPassword'  => 'You must confirm the password',
     'MustSupplyPassword'   => 'You must supply a password',
     'MustSupplyUsername'   => 'You must supply a username',
-    'Name'                 => 'ùí',
-    'Near'                 => 'ìéã',
-    'Network'              => 'øùú',
-    'New'                  => 'çãù',
-    'NewGroup'             => '÷áåöä çãùä',
-    'NewLabel'             => 'úååéú çãùä',
-    'NewPassword'          => 'ñéñîà çãùä',
-    'NewState'             => 'îöá çãù',
-    'NewUser'              => 'îùúîù çãù',
-    'Next'                 => 'äáà',
-    'No'                   => 'ìà',
+    'Name'                 => 'שם',
+    'Near'                 => 'ליד',
+    'Network'              => 'רשת',
+    'New'                  => 'חדש',
+    'NewGroup'             => 'קבוצה חדשה',
+    'NewLabel'             => 'תווית חדשה',
+    'NewPassword'          => 'סיסמא חדשה',
+    'NewState'             => 'מצב חדש',
+    'NewUser'              => 'משתמש חדש',
+    'Next'                 => 'הבא',
+    'No'                   => 'לא',
     'NoDetectedCameras'    => 'No Detected Cameras',    // Added - 2009-03-31
     'NoDetectedProfiles'   => 'No Detected Profiles',   // Added - 2018-08-30
     'NoFramesRecorded'     => 'There are no frames recorded for this event',
-    'NoGroup'              => 'ììà ÷áåöä',
+    'NoGroup'              => 'ללא קבוצה',
     'NoSavedFilters'       => 'NoSavedFilters',
     'NoStatisticsRecorded' => 'There are no statistics recorded for this event/frame',
-    'None'                 => 'øé÷',
-    'NoneAvailable'        => 'áìúé æîéï',
-    'Normal'               => 'ðåøîìé',
+    'None'                 => 'ריק',
+    'NoneAvailable'        => 'בלתי זמין',
+    'Normal'               => 'נורמלי',
     'Notes'                => 'Notes',
     'NumPresets'           => 'Num Presets',
-    'Off'                  => 'ëáåé',
-    'On'                   => 'ãìå÷',
+    'Off'                  => 'כבוי',
+    'On'                   => 'דלוק',
     'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>', // Added - 2015-04-18
     'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
     'OnvifProbeIntro'      => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
-    'OpEq'                 => 'ùååä ì',
-    'OpGt'                 => 'âãåì î',
+    'OpEq'                 => 'שווה ל',
+    'OpGt'                 => 'גדול מ',
     'OpGtEq'               => 'greater than or equal to',
     'OpIn'                 => 'in set',
     'OpIs'                 => 'is',                     // Added - 2018-08-30
     'OpIsNot'              => 'is not',                 // Added - 2018-08-30
-    'OpLt'                 => 'ôçåú î',
+    'OpLt'                 => 'פחות מ',
     'OpLtEq'               => 'less than or equal to',
     'OpMatches'            => 'matches',
-    'OpNe'                 => 'àéðå ùååä',
+    'OpNe'                 => 'אינו שווה',
     'OpNotIn'              => 'not in set',
-    'OpNotMatches'         => 'àéðå úåàí',
-    'Open'                 => 'ôúç',
+    'OpNotMatches'         => 'אינו תואם',
+    'Open'                 => 'פתח',
     'OptionHelp'           => 'OptionHelp',
     'OptionRestartWarning' => 'These changes may not come into effect fully\nwhile the system is running. When you have\nfinished making your changes please ensure that\nyou restart ZoneMinder.',
     'OptionalEncoderParam' => 'Optional Encoder Parameters', // Added - 2018-08-30
-    'Options'              => 'àôùøåéåú',
+    'Options'              => 'אפשרויות',
     'OrEnterNewName'       => 'or enter new name',
-    'Order'                => 'îéåï',
+    'Order'                => 'מיון',
     'Orientation'          => 'Orientation',
     'Out'                  => 'Out',
     'OverwriteExisting'    => 'Overwrite Existing',
@@ -578,27 +577,27 @@ $SLANG = array(
     'PanLeft'              => 'Pan Left',
     'PanRight'             => 'Pan Right',
     'PanTilt'              => 'Pan/Tilt',
-    'Parameter'            => 'ôøîèø',
-    'Password'             => 'ñéñîà',
+    'Parameter'            => 'פרמטר',
+    'Password'             => 'סיסמא',
     'PasswordsDifferent'   => 'The new and confirm passwords are different',
-    'Paths'                => 'ðúéáéí',
+    'Paths'                => 'נתיבים',
     'Pause'                => 'Pause',
-    'Phone'                => 'èìôåï',
-    'PhoneBW'              => 'ø/ô&nbsp;èìôåï',
+    'Phone'                => 'טלפון',
+    'PhoneBW'              => 'ר/פ טלפון',
     'Pid'                  => 'PID',                    // Added - 2011-06-16
     'PixelDiff'            => 'Pixel Diff',
-    'Pixels'               => 'ôé÷ñìéí',
+    'Pixels'               => 'פיקסלים',
     'Play'                 => 'Play',
-    'PlayAll'              => 'ðâï äëì',
-    'PleaseWait'           => 'äîúï áá÷ùä',
+    'PlayAll'              => 'נגן הכל',
+    'PleaseWait'           => 'המתן בבקשה',
     'Plugins'              => 'Plugins',
-    'Point'                => 'ð÷åãä',
+    'Point'                => 'נקודה',
     'PostEventImageBuffer' => 'Post Event Image Count',
     'PreEventImageBuffer'  => 'Pre Event Image Count',
     'PreserveAspect'       => 'Preserve Aspect Ratio',
     'Preset'               => 'Preset',
     'Presets'              => 'Presets',
-    'Prev'                 => 'ä÷åãí',
+    'Prev'                 => 'הקודם',
     'Probe'                => 'Probe',                  // Added - 2009-03-31
     'ProfileProbe'         => 'Stream Probe',           // Added - 2015-04-18
     'ProfileProbeIntro'    => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
@@ -606,188 +605,188 @@ $SLANG = array(
     'Protocol'             => 'Protocol',
     'RTSPDescribe'         => 'Use RTSP Response Media URL', // Added - 2018-08-30
     'RTSPTransport'        => 'RTSP Transport Protocol', // Added - 2018-08-30
-    'Rate'                 => 'ãéøåâ',
-    'Real'                 => 'àîéúé',
+    'Rate'                 => 'דירוג',
+    'Real'                 => 'אמיתי',
     'RecaptchaWarning'     => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // Added - 2018-08-30
-    'Record'               => 'ä÷ìèä',
+    'Record'               => 'הקלטה',
     'RecordAudio'          => 'Whether to store the audio stream when saving an event.', // Added - 2018-08-30
     'RefImageBlendPct'     => 'Reference Image Blend %ge',
-    'Refresh'              => 'øòðåï',
-    'Remote'               => 'îøåç÷',
-    'RemoteHostName'       => 'ùí îàøç îøåç÷',
-    'RemoteHostPath'       => 'ðúéá îàøç îøåç÷',
-    'RemoteHostPort'       => 'ôåøè îàøç îøåç÷',
+    'Refresh'              => 'רענון',
+    'Remote'               => 'מרוחק',
+    'RemoteHostName'       => 'שם מארח מרוחק',
+    'RemoteHostPath'       => 'נתיב מארח מרוחק',
+    'RemoteHostPort'       => 'פורט מארח מרוחק',
     'RemoteHostSubPath'    => 'Remote Host SubPath',    // Added - 2009-02-08
     'RemoteImageColours'   => 'Remote Image Colours',
     'RemoteMethod'         => 'Remote Method',          // Added - 2009-02-08
     'RemoteProtocol'       => 'Remote Protocol',        // Added - 2009-02-08
-    'Rename'               => 'ùðä ùí',
+    'Rename'               => 'שנה שם',
     'Replay'               => 'Replay',
     'ReplayAll'            => 'All Events',
     'ReplayGapless'        => 'Gapless Events',
     'ReplaySingle'         => 'Single Event',
     'ReportEventAudit'     => 'Audit Events Report',    // Added - 2018-08-30
-    'Reset'                => 'àôñ',
+    'Reset'                => 'אפס',
     'ResetEventCounts'     => 'Reset Event Counts',
-    'Restart'              => 'àúçì',
-    'Restarting'           => 'îàúçì',
+    'Restart'              => 'אתחל',
+    'Restarting'           => 'מאתחל',
     'RestrictedCameraIds'  => 'Restricted Camera Ids',
     'RestrictedMonitors'   => 'Restricted Monitors',
-    'ReturnDelay'          => 'çæøä îäùäéä',
-    'ReturnLocation'       => 'îé÷åí çæøä',
+    'ReturnDelay'          => 'חזרה מהשהיה',
+    'ReturnLocation'       => 'מיקום חזרה',
     'Rewind'               => 'Rewind',
-    'RotateLeft'           => 'ñåáá ùîàìä',
-    'RotateRight'          => 'ñåáá éîéðä',
+    'RotateLeft'           => 'סובב שמאלה',
+    'RotateRight'          => 'סובב ימינה',
     'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
-    'RunMode'              => 'öåøú øéöä',
-    'RunState'             => 'îöá øéöä',
-    'Running'              => 'îøéõ',
-    'Save'                 => 'ùîåø',
-    'SaveAs'               => 'ùîåø áùí',
-    'SaveFilter'           => 'ùîåø îñðï',
+    'RunMode'              => 'צורת ריצה',
+    'RunState'             => 'מצב ריצה',
+    'Running'              => 'מריץ',
+    'Save'                 => 'שמור',
+    'SaveAs'               => 'שמור בשם',
+    'SaveFilter'           => 'שמור מסנן',
     'SaveJPEGs'            => 'Save JPEGs',             // Added - 2018-08-30
-    'Scale'                => 'ñ÷àìä',
-    'Score'                => 'ðé÷åã',
-    'Secs'                 => 'ùðéåú',
-    'Sectionlength'        => 'àåøê ÷èò',
-    'Select'               => 'áçø',
+    'Scale'                => 'סקאלה',
+    'Score'                => 'ניקוד',
+    'Secs'                 => 'שניות',
+    'Sectionlength'        => 'אורך קטע',
+    'Select'               => 'בחר',
     'SelectFormat'         => 'Select Format',          // Added - 2011-06-17
     'SelectLog'            => 'Select Log',             // Added - 2011-06-17
-    'SelectMonitors'       => 'áçø îåðéèåøéí',
+    'SelectMonitors'       => 'בחר מוניטורים',
     'SelfIntersecting'     => 'Polygon edges must not intersect',
-    'Set'                  => '÷áò',
+    'Set'                  => 'קבע',
     'SetNewBandwidth'      => 'Set New Bandwidth',
     'SetPreset'            => 'Set Preset',
-    'Settings'             => 'äâãøåú',
+    'Settings'             => 'הגדרות',
     'ShowFilterWindow'     => 'Show Filter Window',
     'ShowTimeline'         => 'Show Timeline',
     'SignalCheckColour'    => 'Signal Check Colour',
     'SignalCheckPoints'    => 'Signal Check Points',    // Added - 2018-08-30
-    'Size'                 => 'âåãì',
+    'Size'                 => 'גודל',
     'SkinDescription'      => 'Change the default skin for this computer', // Added - 2011-01-30
-    'Sleep'                => 'ùéðä',
+    'Sleep'                => 'שינה',
     'SortAsc'              => 'Asc',
     'SortBy'               => 'Sort by',
     'SortDesc'             => 'Desc',
-    'Source'               => 'î÷åø',
+    'Source'               => 'מקור',
     'SourceColours'        => 'Source Colours',         // Added - 2009-02-08
     'SourcePath'           => 'Source Path',            // Added - 2009-02-08
-    'SourceType'           => 'ñåâ î÷åø',
-    'Speed'                => 'îäéøåú',
-    'SpeedHigh'            => 'îäéøåú âáåää',
-    'SpeedLow'             => 'îäéøåú ðîåëä',
-    'SpeedMedium'          => 'îöìîä áéðåðéú',
-    'SpeedTurbo'           => 'îäéøåú èåøáå',
-    'Start'                => 'äúçì',
-    'State'                => 'îöá',
-    'Stats'                => 'îöáéí',
-    'Status'               => 'ñèèåñ',
+    'SourceType'           => 'סוג מקור',
+    'Speed'                => 'מהירות',
+    'SpeedHigh'            => 'מהירות גבוהה',
+    'SpeedLow'             => 'מהירות נמוכה',
+    'SpeedMedium'          => 'מצלמה בינונית',
+    'SpeedTurbo'           => 'מהירות טורבו',
+    'Start'                => 'התחל',
+    'State'                => 'מצב',
+    'Stats'                => 'מצבים',
+    'Status'               => 'סטטוס',
     'StatusConnected'      => 'Capturing',              // Added - 2018-08-30
     'StatusNotRunning'     => 'Not Running',            // Added - 2018-08-30
     'StatusRunning'        => 'Not Capturing',          // Added - 2018-08-30
     'StatusUnknown'        => 'Unknown',                // Added - 2018-08-30
-    'Step'                 => 'öòã',
+    'Step'                 => 'צעד',
     'StepBack'             => 'Step Back',
     'StepForward'          => 'Step Forward',
-    'StepLarge'            => 'öòã âãåì',
-    'StepMedium'           => 'öòã áéðåðé',
-    'StepNone'             => 'àì úöòã',
-    'StepSmall'            => 'öòã ÷èï',
-    'Stills'               => 'ñèéìñ',
-    'Stop'                 => 'òöåø',
-    'Stopped'              => 'ðòöø',
+    'StepLarge'            => 'צעד גדול',
+    'StepMedium'           => 'צעד בינוני',
+    'StepNone'             => 'אל תצעד',
+    'StepSmall'            => 'צעד קטן',
+    'Stills'               => 'סטילס',
+    'Stop'                 => 'עצור',
+    'Stopped'              => 'נעצר',
     'StorageArea'          => 'Storage Area',           // Added - 2018-08-30
     'StorageScheme'        => 'Scheme',                 // Added - 2018-08-30
-    'Stream'               => 'ñèøéí',
+    'Stream'               => 'סטרים',
     'StreamReplayBuffer'   => 'Stream Replay Image Buffer',
     'Submit'               => 'Submit',
-    'System'               => 'îòøëú',
+    'System'               => 'מערכת',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
     'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
-    'Tele'                 => 'èì',
+    'Tele'                 => 'טל',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
-    'Time'                 => 'æîï',
-    'TimeDelta'            => 'ùéðåé áæîï',
-    'TimeStamp'            => 'çåúîú æîï',
-    'Timeline'             => '÷å æîï',
+    'Time'                 => 'זמן',
+    'TimeDelta'            => 'שינוי בזמן',
+    'TimeStamp'            => 'חותמת זמן',
+    'Timeline'             => 'קו זמן',
     'TimelineTip1'          => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
     'TimelineTip2'          => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
     'TimelineTip3'          => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
     'TimelineTip4'          => 'Use the controls below to zoom out or navigate back and forward through the time range.',              // Added 2013.08.15.
-    'Timestamp'            => 'çåúîú æîï',
+    'Timestamp'            => 'חותמת זמן',
     'TimestampLabelFormat' => 'Timestamp Label Format',
     'TimestampLabelSize'   => 'Font Size',              // Added - 2018-08-30
     'TimestampLabelX'      => 'Timestamp Label X',
     'TimestampLabelY'      => 'Timestamp Label Y',
-    'Today'                => 'äéåí',
-    'Tools'                => 'ëìéí',
+    'Today'                => 'היום',
+    'Tools'                => 'כלים',
     'Total'                => 'Total',                  // Added - 2011-06-16
-    'TotalBrScore'         => 'ñê<br/>ðé÷åã',
+    'TotalBrScore'         => 'סך<br/>ניקוד',
     'TrackDelay'           => 'Track Delay',
     'TrackMotion'          => 'Track Motion',
-    'Triggers'             => 'èøéâøéí',
+    'Triggers'             => 'טריגרים',
     'TurboPanSpeed'        => 'Turbo Pan Speed',
     'TurboTiltSpeed'       => 'Turbo Tilt Speed',
-    'Type'                 => 'ñåâ',
-    'Unarchive'            => 'áìúé àøëéá',
+    'Type'                 => 'סוג',
+    'Unarchive'            => 'בלתי ארכיב',
     'Undefined'            => 'Undefined',              // Added - 2009-02-08
-    'Units'                => 'éçéãåú',
-    'Unknown'              => 'áìúé éãåò',
-    'Update'               => 'òãëåï',
-    'UpdateAvailable'      => 'òãëåï ìæåï-îéðãø àôùøé.',
-    'UpdateNotNecessary'   => 'òãëåï àéðå äëøçé.',
+    'Units'                => 'יחידות',
+    'Unknown'              => 'בלתי ידוע',
+    'Update'               => 'עדכון',
+    'UpdateAvailable'      => 'עדכון לזון-מינדר אפשרי.',
+    'UpdateNotNecessary'   => 'עדכון אינו הכרחי.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UseFilter'            => 'ùéîåù áîñðï',
-    'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
-    'UseFilterExprsPre'    => 'ùéîåù&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UseFilter'            => 'שימוש במסנן',
+    'UseFilterExprsPost'   => ' filter expressions', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPre'    => 'שימוש ', // This is used at the beginning of the phrase 'use N filter expressions'
     'UsedPlugins'	   => 'Used Plugins',
-    'User'                 => 'îùúîù',
-    'Username'             => 'ùí îùúîù',
-    'Users'                => 'îùúîùéí',
+    'User'                 => 'משתמש',
+    'Username'             => 'שם משתמש',
+    'Users'                => 'משתמשים',
     'V4L'                  => 'V4L',                    // Added - 2015-04-18
     'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
     'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
-    'Value'                => 'òøê',
-    'Version'              => 'âéøñä',
-    'VersionIgnore'        => 'äúòìí îâéøñä æå',
-    'VersionRemindDay'     => 'äæëø ìé áòåã éåí àçã',
-    'VersionRemindHour'    => 'äæëø ìé áòåã ùòä àçú',
+    'Value'                => 'ערך',
+    'Version'              => 'גירסה',
+    'VersionIgnore'        => 'התעלם מגירסה זו',
+    'VersionRemindDay'     => 'הזכר לי בעוד יום אחד',
+    'VersionRemindHour'    => 'הזכר לי בעוד שעה אחת',
     'VersionRemindNever'   => 'Don\'t remind about new versions',
     'VersionRemindWeek'    => 'Remind again in 1 week',
-    'Video'                => 'åéãàå',
-    'VideoFormat'          => 'úáðéú åéãàå',
+    'Video'                => 'וידאו',
+    'VideoFormat'          => 'תבנית וידאו',
     'VideoGenFailed'       => 'Video Generation Failed!',
     'VideoGenFiles'        => 'Existing Video Files',
     'VideoGenNoFiles'      => 'No Video Files Found',
     'VideoGenParms'        => 'Video Generation Parameters',
     'VideoGenSucceeded'    => 'Video Generation Succeeded!',
-    'VideoSize'            => 'âåãì åéãàå',
+    'VideoSize'            => 'גודל וידאו',
     'VideoWriter'          => 'Video Writer',           // Added - 2018-08-30
-    'View'                 => 'äöâ',
-    'ViewAll'              => 'äöâ äëì',
-    'ViewEvent'            => 'äöâ àéøåò',
+    'View'                 => 'הצג',
+    'ViewAll'              => 'הצג הכל',
+    'ViewEvent'            => 'הצג אירוע',
     'ViewPaged'            => 'View Paged',
-    'Wake'                 => 'äòø',
+    'Wake'                 => 'הער',
     'WarmupFrames'         => 'Warmup Frames',
-    'Watch'                => 'öôä',
-    'Web'                  => 'àéðèøðè',
-    'WebColour'            => 'öáò àéðèøðè',
+    'Watch'                => 'צפה',
+    'Web'                  => 'אינטרנט',
+    'WebColour'            => 'צבע אינטרנט',
     'WebSiteUrl'           => 'Website URL',            // Added - 2018-08-30
-    'Week'                 => 'ùáåò',
-    'White'                => 'ìáï',
+    'Week'                 => 'שבוע',
+    'White'                => 'לבן',
     'WhiteBalance'         => 'White Balance',
-    'Wide'                 => 'øçá',
+    'Wide'                 => 'רחב',
     'X'                    => 'X',
     'X10'                  => 'X10',
     'X10ActivationString'  => 'X10 Activation String',
     'X10InputAlarmString'  => 'X10 Input Alarm String',
     'X10OutputAlarmString' => 'X10 Output Alarm String',
     'Y'                    => 'Y',
-    'Yes'                  => 'ëï',
-    'YouNoPerms'           => 'àéï ìê äøùàä ìäéëðñ ìî÷åø æä.',
-    'Zone'                 => 'àæåø',
+    'Yes'                  => 'כן',
+    'YouNoPerms'           => 'אין לך הרשאה להיכנס למקור זה.',
+    'Zone'                 => 'אזור',
     'ZoneAlarmColour'      => 'Alarm Colour (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
     'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
@@ -799,10 +798,10 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'Zones'                => 'àæåøéí',
-    'Zoom'                 => 'æåí',
-    'ZoomIn'               => 'æåí ôðéîä',
-    'ZoomOut'              => 'æåí äçåöä',
+    'Zones'                => 'אזורים',
+    'Zoom'                 => 'זום',
+    'ZoomIn'               => 'זום פנימה',
+    'ZoomOut'              => 'זום החוצה',
 );
 
 // Complex replacements with formatting and/or placements, must be passed through sprintf
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index cf2dbab8d..05aa524b0 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -83,8 +83,8 @@ $SLANG = array(
     'Actual'               => 'Attuale',
     'AddNewControl'        => 'Aggiungi nuovo Controllo',
     'AddNewMonitor'        => 'Aggiungi nuovo Monitor',
-    'AddNewServer'         => 'Add New Server',         // Added - 2018-08-30
-    'AddNewStorage'        => 'Add New Storage',        // Added - 2018-08-30
+    'AddNewServer'         => 'Aggiungi nuovo Server',         // Added - 2018-08-30
+    'AddNewStorage'        => 'Aggiungi nuovo Storage',        // Added - 2018-08-30
     'AddNewUser'           => 'Aggiungi nuovo Utente',
     'AddNewZone'           => 'Aggiungi nuova Zona',
     'Alarm'                => 'Allarme',
@@ -103,7 +103,7 @@ $SLANG = array(
     'Apply'                => 'Applica',
     'ApplyingStateChange'  => 'Sto applicando le modifiche',
     'ArchArchived'         => 'Archiviato',
-    'ArchUnarchived'       => 'Non archiviare',
+    'ArchUnarchived'       => 'Non archiviato',
     'Archive'              => 'Archivio',
     'Archived'             => 'Archiviato',
     'Area'                 => 'Area',
@@ -142,14 +142,14 @@ $SLANG = array(
     'AutoStopTimeout'      => 'Auto Stop Timeout',
     'Available'            => 'Disponibile',              // Added - 2009-03-31
     'AvgBrScore'           => 'Punteggio<br/>medio',
-    'Background'           => 'Background',
+    'Background'           => 'Sfondo',
     'BackgroundFilter'     => 'Esegui filtro in background',
-    'BadAlarmFrameCount'   => 'Il numero di frame di un allarme deve essere un numero intero superiore a uno',
-    'BadAlarmMaxFPS'       => 'Il numero massimo di FPS dell\'allarme deve essere un numero intero positivo o un valore in virgola mobile',
-    'BadAnalysisFPS'       => 'Analysis FPS must be a positive integer or floating point value', // Added - 2015-07-22
-    'BadAnalysisUpdateDelay'=> 'Analysis update delay must be set to an integer of zero or more', // Added - 2015-07-23
+    'BadAlarmFrameCount'   => 'Il numero di immagini per secondo (FPS) di un allarme deve essere un numero intero superiore a uno',
+    'BadAlarmMaxFPS'       => 'Il numero massimo di immagini per secondo (FPS) dell\'allarme deve essere un numero intero positivo o un valore in virgola mobile',
+    'BadAnalysisFPS'       => 'Il numero di immagini per secondo (FPS) di analisi deve essere un numero intero positivo o un valore in virgola mobile', // Added - 2015-07-22
+    'BadAnalysisUpdateDelay'=> 'Il ritardo di aggiornamento dell\'analisi deve essere impostato su un numero intero pari a zero o superiore', // Added - 2015-07-23
     'BadChannel'           => 'Il canale deve essere settato con un numero intero uguale o maggiore di zero',
-    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2011-06-15
+    'BadColours'           => 'Il colore target deve essere impostato su un valore valido', // Added - 2011-06-15
     'BadDevice'            => 'Il dispositivo deve essere impostato con un valore valido',
     'BadFPSReportInterval' => 'L\'intervallo di FPS per i report deve essere un numero intero superiore a 0',
     'BadFormat'            => 'Il formato deve essere impostato con un numero intero come 0 o maggiore',
@@ -160,24 +160,24 @@ $SLANG = array(
     'BadLabelX'            => 'L\'etichetta della coordinata X deve essere un numero intero pari a 0 o maggiore',
     'BadLabelY'            => 'L\'etichetta della coordinata Y deve essere un numero intero pari a 0 o maggiore',
     'BadMaxFPS'            => 'I frame per secondo (FPS) massimi devono essere un numero intero positivo o un valore in virgola mobile',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
+    'BadMotionFrameSkip'   => 'Il conteggio dei salti di Motion Frame deve essere un numero intero pari a zero o superiore',
     'BadNameChars'         => 'I nomi possono contenere solo caratteri alfanumerici pi&ugrave; i caratteri - e _',
-    'BadPalette'           => 'La palette dei colori deve essere impostata ad un valore valido', // Added - 2009-03-31
+    'BadPalette'           => 'La tavolozza dei colori deve essere impostata ad un valore valido', // Added - 2009-03-31
     'BadPath'              => 'Il percorso deve essere impostato con un valore valido',
     'BadPort'              => 'La porta deve essere settata con un valore valido',
     'BadPostEventCount'    => 'Il buffer d\'immagine successivo ad un evento deve essere un numero maggiore o uguale a zero',
     'BadPreEventCount'     => 'Il buffer d\'immagine antecedente ad un evento deve essere minimo 0 e comunque minore della dimensione del buffer d\'immagine',
     'BadRefBlendPerc'      => 'La percentuale di miscela di riferimento deve essere un intero positivo',
     'BadSectionLength'     => 'La lunghezza della sezione deve essere un numero intero pari a 30 o maggiore',
-    'BadSignalCheckColour' => 'Signal check colour must be a valid RGB colour string',
-    'BadSourceType'        => 'Source Type \"Web Site\" requires the Function to be set to \"Monitor\"', // Added - 2018-08-30
-    'BadStreamReplayBuffer'=> 'Stream replay buffer must be an integer of zero or more',
+    'BadSignalCheckColour' => 'Il colore di controllo del segnale deve essere una stringa di colore RGB valida',
+    'BadSourceType'        => 'Il tipo di origine \"Sito Web\" richiede che la funzione sia impostata su \"Monitor\"', // Added - 2018-08-30
+    'BadStreamReplayBuffer'=> 'Il buffer di riproduzione dello stream deve essere un numero intero pari a zero o superiore',
     'BadWarmupCount'       => 'Il numero di frame di allarme deve essere un numero intero maggiore o uguale a zero',
     'BadWebColour'         => 'L\'identificativo del colore deve essere una stringa valida', 
-    'BadWebSitePath'       => 'Please enter a complete website url, including the http:// or https:// prefix.', // Added - 2018-08-30
+    'BadWebSitePath'       => 'Inserisci un URL completo del sito Web, incluso il prefisso http: // o https: //.', // Added - 2018-08-30
     'BadWidth'             => 'La larghezza deve essere impostata con un valore valido',
     'Bandwidth'            => 'Banda',
-    'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
+    'BandwidthHead'         => 'Larghezza di banda',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
     'BlobPx'               => 'Blob Px',
     'BlobSizes'            => 'Dimensioni Blob',
     'Blobs'                => 'Blobs',
@@ -228,15 +228,15 @@ $SLANG = array(
     'CancelForcedAlarm'    => 'Annulla Allarme Forzato',
     'CaptureHeight'        => 'Altezza img catturata',
     'CaptureMethod'        => 'Metodo di cattura',         // Added - 2009-02-08
-    'CapturePalette'       => 'Paletta img Catturata',
-    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
+    'CapturePalette'       => 'Paletta img catturata',
+    'CaptureResolution'    => 'Risoluzione di cattura',     // Added - 2015-04-18
     'CaptureWidth'         => 'Larghezza img Catturata',
     'Cause'                => 'Causa',
     'CheckMethod'          => 'Metodo di Controllo Allarme',
     'ChooseDetectedCamera' => 'Scegli telecamera rilevata', // Added - 2009-03-31
     'ChooseFilter'         => 'Scegli Filtro',
-    'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
-    'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
+    'ChooseLogFormat'      => 'Scegli un formato di registro',    // Added - 2011-06-17
+    'ChooseLogSelection'   => 'Scegli una selezione del registro', // Added - 2011-06-17
     'ChoosePreset'         => 'Scegli Preset',
     'Clear'                => 'Clear',                  // Added - 2011-06-16
     'CloneMonitor'         => 'Clone',                  // Added - 2018-08-30
@@ -301,12 +301,12 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, io non voglio donare, non lo faro\' mai',
     'DonateRemindWeek'     => 'Non ancora, ricordamelo ancora tra 1 settimana',
     'DonateYes'            => 'Si,mi piacerebbe donare qualcosa ora',
-    'Download'             => 'Download',
-    'DownloadVideo'        => 'Download Video',         // Added - 2018-08-30
-    'DuplicateMonitorName' => 'Il nome del monitor e\' gia\' presente', // Added - 2009-03-31
+    'Download'             => 'Scarica',
+    'DownloadVideo'        => 'Scarica video',         // Added - 2018-08-30
+    'DuplicateMonitorName' => 'Il nome del monitor è già presente', // Added - 2009-03-31
     'Duration'             => 'Durata',
     'Edit'                 => 'Modifica',
-    'EditLayout'           => 'Edit Layout',            // Added - 2018-08-30
+    'EditLayout'           => 'Modifica Layout',            // Added - 2018-08-30
     'Email'                => 'Email',
     'EnableAlarms'         => 'Abilita Allarmi',
     'Enabled'              => 'Attivo',
@@ -323,7 +323,7 @@ $SLANG = array(
     'Events'               => 'Eventi',
     'Exclude'              => 'Escludi',
     'Execute'              => 'Esegui',
-    'Exif'                 => 'Embed EXIF data into image', // Added - 2018-08-30
+    'Exif'                 => 'Includi dati EXIF nell\'immagine', // Added - 2018-08-30
     'Export'               => 'Esporta',
     'ExportDetails'        => 'Esp. dettagli eventi',
     'ExportFailed'         => 'Esp. Fallita ',
@@ -346,17 +346,17 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
-    'Filter'               => 'Filter',                 // Added - 2015-04-18
+    'Filter'               => 'Filtro',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archivia gli eventi',
     'FilterDeleteEvents'   => 'Elimina gli eventi',
     'FilterEmailEvents'    => 'Invia dettagli via email',
     'FilterExecuteEvents'  => 'Esegui un comando',
     'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Invia dettagli tramite messaggio',
-    'FilterMoveEvents'     => 'Move all matches',       // Added - 2018-08-30
+    'FilterMoveEvents'     => 'Sposta tutti gli eventi',       // Added - 2018-08-30
     'FilterPx'             => 'Px Filtro',
     'FilterUnset'          => 'Devi specificare altezza e larghezza per il filtro',
-    'FilterUpdateDiskSpace'=> 'Update used disk space', // Added - 2018-08-30
+    'FilterUpdateDiskSpace'=> 'Aggiorna spazio disco utilizzato', // Added - 2018-08-30
     'FilterUploadEvents'   => 'Fai upload eventi (FTP)',
     'FilterVideoEvents'    => 'Crea video per tutte le corrispondenze',
     'Filters'              => 'Filtri',
@@ -381,9 +381,9 @@ $SLANG = array(
     'Function'             => 'Funzione',
     'Gain'                 => 'Gain',
     'General'              => 'Generale',
-    'GenerateDownload'     => 'Generate Download',      // Added - 2018-08-30
-    'GenerateVideo'        => 'Genera Video',
-    'GeneratingVideo'      => 'Sto generando il Video',
+    'GenerateDownload'     => 'Genera download',      // Added - 2018-08-30
+    'GenerateVideo'        => 'Genera video',
+    'GeneratingVideo'      => 'Sto generando il video',
     'GoToZoneMinder'       => 'Vai su zoneminder.com',
     'Grey'                 => 'Grigio',
     'Group'                => 'Gruppo',
@@ -402,7 +402,7 @@ $SLANG = array(
     'High'                 => 'Alta',
     'HighBW'               => 'Banda&nbsp;Alta',
     'Home'                 => 'Home',
-    'Hostname'             => 'Hostname',               // Added - 2018-08-30
+    'Hostname'             => 'Nome Host',               // Added - 2018-08-30
     'Hour'                 => 'Ora',
     'Hue'                  => 'Tinta',
     'Id'                   => 'Id',
@@ -420,14 +420,14 @@ $SLANG = array(
     'Language'             => 'Linguaggio',
     'Last'                 => 'Ultimo',
     'Layout'               => 'Layout',                 // Added - 2009-02-08
-    'Level'                => 'Level',                  // Added - 2011-06-16
+    'Level'                => 'Livello',                  // Added - 2011-06-16
     'Libvlc'               => 'Libvlc',
     'LimitResultsPost'     => 'risultati;', // This is used at the end of the phrase 'Limit to first N results only'
     'LimitResultsPre'      => 'Limita ai primi', // This is used at the beginning of the phrase 'Limit to first N results only'
     'Line'                 => 'Line',                   // Added - 2011-06-16
     'LinkedMonitors'       => 'Monitor Collegati',
     'List'                 => 'Lista',
-    'ListMatches'          => 'List Matches',           // Added - 2018-08-30
+    'ListMatches'          => 'Elenca le corrispondenze',           // Added - 2018-08-30
     'Load'                 => 'Carico Sistema',
     'Local'                => 'Locale',
     'Log'                  => 'Log',                    // Added - 2011-06-16
@@ -505,12 +505,12 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Velocita\' minima dello zoom',
     'MinZoomStep'          => 'Step minimo dello zoom',
     'Misc'                 => 'Altro',
-    'Mode'                 => 'Mode',                   // Added - 2015-04-18
+    'Mode'                 => 'Modalità',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Monitor&nbsp;Ids',
     'MonitorPreset'        => 'Monitor Presenti',
     'MonitorPresetIntro'   => 'Selezionare un appropriato pre settaggio dalla lista riportata qui sotto.<br><br>Per favore notare che questo potrebbe sovrascrivere ogni valore che hai gi&agrave;  configurato su questo monitor.<br><br>',
-    'MonitorProbe'         => 'Monitor Probe',          // Added - 2009-03-31
+    'MonitorProbe'         => 'Prova Monitor',          // Added - 2009-03-31
     'MonitorProbeIntro'    => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2009-03-31
     'Monitors'             => 'Monitors',
     'Montage'              => 'Montaggio',
@@ -523,7 +523,7 @@ $SLANG = array(
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
     'Mtg3widgrx'           => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
     'Mtg4widgrd'           => '4-wide grid',              // Added 2013.08.15.
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
+    'MtgDefault'           => 'Predefinito',              // Added 2013.08.15.
     'MustBeGe'             => 'deve essere superiore a',
     'MustBeLe'             => 'deve essere inferiore o pari a',
     'MustConfirmPassword'  => 'Devi confermare la password',
@@ -541,10 +541,10 @@ $SLANG = array(
     'Next'                 => 'Prossimo',
     'No'                   => 'No',
     'NoDetectedCameras'    => 'Nessuna telecamera rilevata',    // Added - 2009-03-31
-    'NoDetectedProfiles'   => 'No Detected Profiles',   // Added - 2018-08-30
+    'NoDetectedProfiles'   => 'Nessun profilo rilevato',   // Added - 2018-08-30
     'NoFramesRecorded'     => 'Non ci sono immagini salvate per questo evento',
     'NoGroup'              => 'Nessun gruppo',               // Added - 2009-02-08
-    'NoSavedFilters'       => 'NessunFiltroSalvato',
+    'NoSavedFilters'       => 'Nessun filtro salvato',
     'NoStatisticsRecorded' => 'Non ci sono statistiche salvate per questo evento/immagine',
     'None'                 => 'Nessuno',
     'NoneAvailable'        => 'Nessuno disponibile',
@@ -553,15 +553,15 @@ $SLANG = array(
     'NumPresets'           => 'Num Presets',
     'Off'                  => 'Off',
     'On'                   => 'On',
-    'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>', // Added - 2015-04-18
+    'OnvifCredentialsIntro'=> 'Fornire nome utente e password per la telecamera selezionata.<br/>Se non è stato creato alcun utente per la videocamera, l\'utente qui indicato verrà creato con la password specificata.<br/><br/>', // Added - 2015-04-18
     'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
-    'OnvifProbeIntro'      => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
+    'OnvifProbeIntro'      => 'L\'elenco seguente mostra le telecamere ONVIF rilevate e se sono già in uso o disponibili per la selezione. Selezionare la voce desiderata dall\'elenco seguente. Si noti che non tutte le telecamere potrebbero essere rilevate e che la scelta di una telecamera qui può sovrascrivere tutti i valori già configurati per il monitor corrente.', // Added - 2015-04-18
     'OpEq'                 => 'uguale a',
     'OpGt'                 => 'maggiore di',
     'OpGtEq'               => 'maggiore o uguale a',
     'OpIn'                 => 'impostato',
-    'OpIs'                 => 'is',                     // Added - 2018-08-30
-    'OpIsNot'              => 'is not',                 // Added - 2018-08-30
+    'OpIs'                 => 'è',                     // Added - 2018-08-30
+    'OpIsNot'              => 'non è',                 // Added - 2018-08-30
     'OpLt'                 => 'minore di',
     'OpLtEq'               => 'minore o uguale a',
     'OpMatches'            => 'corrisponde',
@@ -571,7 +571,7 @@ $SLANG = array(
     'Open'                 => 'Apri',
     'OptionHelp'           => 'Opzioni di Aiuto',
     'OptionRestartWarning' => 'Queste modifiche potrebbero essere attive solo dopo un riavvio del sistema. Riavviare ZoneMinder.',
-    'OptionalEncoderParam' => 'Optional Encoder Parameters', // Added - 2018-08-30
+    'OptionalEncoderParam' => 'Parametri Encoder opzionali', // Added - 2018-08-30
     'Options'              => 'Opzioni',
     'OrEnterNewName'       => 'o inserisci un nuovo nome',
     'Order'                => 'Ordine',
@@ -605,24 +605,24 @@ $SLANG = array(
     'Presets'              => 'Presets',
     'Prev'                 => 'Prec',
     'Probe'                => 'Prova la telecamera',                  // Added - 2009-03-31
-    'ProfileProbe'         => 'Stream Probe',           // Added - 2015-04-18
-    'ProfileProbeIntro'    => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
-    'Progress'             => 'Progress',               // Added - 2015-04-18
-    'Protocol'             => 'Protocol',
+    'ProfileProbe'         => 'Prova lo stream',           // Added - 2015-04-18
+    'ProfileProbeIntro'    => 'L\'elenco seguente mostra i profili di streaming esistenti della telecamera selezionata.<br/><br/>Selezionare la voce desiderata dall\'elenco seguente.<br/><br/>Si noti che ZoneMinder non è in grado di configurare profili aggiuntivi e che la scelta di una telecamera qui può sovrascrivere qualsiasi valore già configurato per il monitor corrente.<br/><br/>', // Added - 2015-04-18
+    'Progress'             => 'Progresso',               // Added - 2015-04-18
+    'Protocol'             => 'Protocollo',
     'RTSPDescribe'         => 'Use RTSP Response Media URL', // Added - 2018-08-30
     'RTSPTransport'        => 'RTSP Transport Protocol', // Added - 2018-08-30
-    'Rate'                 => 'Velocita\'',
+    'Rate'                 => 'Velocità',
     'Real'                 => 'Reale',
-    'RecaptchaWarning'     => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // Added - 2018-08-30
+    'RecaptchaWarning'     => 'La chiave segreta reCaptcha non è valida. Correggila o reCaptcha non funzionerà', // Added - 2018-08-30
     'Record'               => 'Registra',
-    'RecordAudio'          => 'Whether to store the audio stream when saving an event.', // Added - 2018-08-30
+    'RecordAudio'          => 'Memorizza flusso audio quando salva un evento.', // Added - 2018-08-30
     'RefImageBlendPct'     => 'Riferimento Miscela Immagine percentuale',
     'Refresh'              => 'Aggiorna',
     'Remote'               => 'Remoto',
     'RemoteHostName'       => 'Nome dell\'Host Remoto',
     'RemoteHostPath'       => 'Percorso dell\'Host Remoto',
     'RemoteHostPort'       => 'Porta dell\'Host Remoto',
-    'RemoteHostSubPath'    => 'Remote Host SubPath',    // Added - 2009-02-08
+    'RemoteHostSubPath'    => 'SubPath host remoto',    // Added - 2009-02-08
     'RemoteImageColours'   => 'Colori delle immagini Remote',
     'RemoteMethod'         => 'Metodo Remoto',          // Added - 2009-02-08
     'RemoteProtocol'       => 'Protocollo Remoto',        // Added - 2009-02-08
@@ -631,7 +631,7 @@ $SLANG = array(
     'ReplayAll'            => 'All Events',
     'ReplayGapless'        => 'Gapless Events',
     'ReplaySingle'         => 'Single Event',
-    'ReportEventAudit'     => 'Audit Events Report',    // Added - 2018-08-30
+    'ReportEventAudit'     => 'Rapporto Eventi di controllo',    // Added - 2018-08-30
     'Reset'                => 'Resetta',
     'ResetEventCounts'     => 'Resetta Contatore Eventi',
     'Restart'              => 'Riavvia',
@@ -643,21 +643,21 @@ $SLANG = array(
     'Rewind'               => 'Riavvolgi',
     'RotateLeft'           => 'Ruota a Sinista',
     'RotateRight'          => 'Ruota a Destra',
-    'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
+    'RunLocalUpdate'       => 'Eseguire zmupdate.pl per l\'aggiornamento', // Added - 2011-05-25
     'RunMode'              => 'Modalita\' funzionamento',
     'RunState'             => 'Stato di funzionamento',
     'Running'              => 'Attivo',
     'Save'                 => 'Salva',
     'SaveAs'               => 'Salva come',
-    'SaveFilter'           => 'salva Filtro',
-    'SaveJPEGs'            => 'Save JPEGs',             // Added - 2018-08-30
+    'SaveFilter'           => 'Salva Filtro',
+    'SaveJPEGs'            => 'Salva JPEGs',             // Added - 2018-08-30
     'Scale'                => 'Scala',
     'Score'                => 'Punteggio',
     'Secs'                 => 'Secs',
     'Sectionlength'        => 'Lunghezza Sezione',
     'Select'               => 'Seleziona',
-    'SelectFormat'         => 'Select Format',          // Added - 2011-06-17
-    'SelectLog'            => 'Select Log',             // Added - 2011-06-17
+    'SelectFormat'         => 'Seleziona Formato',          // Added - 2011-06-17
+    'SelectLog'            => 'Seleziona Log',             // Added - 2011-06-17
     'SelectMonitors'       => 'Monitor Selezionati',
     'SelfIntersecting'     => 'I vertici del poligono non devono intersecarsi',
     'Set'                  => 'Imposta',
@@ -666,10 +666,10 @@ $SLANG = array(
     'Settings'             => 'Impostazioni',
     'ShowFilterWindow'     => 'MostraFinestraFiltri',
     'ShowTimeline'         => 'Mostra linea temporale',
-    'SignalCheckColour'    => 'Signal Check Colour',
-    'SignalCheckPoints'    => 'Signal Check Points',    // Added - 2018-08-30
+    'SignalCheckColour'    => 'Colore controllo segnale',
+    'SignalCheckPoints'    => 'Punti di controllo segnale',    // Added - 2018-08-30
     'Size'                 => 'grandezza',
-    'SkinDescription'      => 'Change the default skin for this computer', // Added - 2011-01-30
+    'SkinDescription'      => 'Cambia la skin predefinita per questo computer', // Added - 2011-01-30
     'Sleep'                => 'Sleep',
     'SortAsc'              => 'Cresc',
     'SortBy'               => 'Ordina per',
@@ -692,8 +692,8 @@ $SLANG = array(
     'StatusRunning'        => 'Not Capturing',          // Added - 2018-08-30
     'StatusUnknown'        => 'Unknown',                // Added - 2018-08-30
     'Step'                 => 'Passo',
-    'StepBack'             => 'Step Back',
-    'StepForward'          => 'Step Forward',
+    'StepBack'             => 'Passo indietro',
+    'StepForward'          => 'Passo avanti',
     'StepLarge'            => 'Lungo passo',
     'StepMedium'           => 'Medio passo',
     'StepNone'             => 'No passo',
@@ -701,13 +701,13 @@ $SLANG = array(
     'Stills'               => 'Foto',
     'Stop'                 => 'Stop',
     'Stopped'              => 'Inattivo',
-    'StorageArea'          => 'Storage Area',           // Added - 2018-08-30
+    'StorageArea'          => 'Area di salvataggio',           // Added - 2018-08-30
     'StorageScheme'        => 'Scheme',                 // Added - 2018-08-30
     'Stream'               => 'Flusso',
     'StreamReplayBuffer'   => 'Stream Replay Image Buffer',
     'Submit'               => 'Accetta',
     'System'               => 'Sistema',
-    'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'SystemLog'            => 'Log di sistema',             // Added - 2011-06-16
     'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Anteprima',
@@ -716,18 +716,18 @@ $SLANG = array(
     'TimeDelta'            => 'Tempo di Delta',
     'TimeStamp'            => 'Time Stamp',
     'Timeline'             => 'Linea Temporale',
-    'TimelineTip1'          => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
-    'TimelineTip2'          => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
-    'TimelineTip3'          => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
-    'TimelineTip4'          => 'Use the controls below to zoom out or navigate back and forward through the time range.',              // Added 2013.08.15.
+    'TimelineTip1'          => 'Passa il mouse sul grafico per visualizzare un\'immagine dell\'istantanea e i dettagli dell\'evento.',              // Added 2013.08.15.
+    'TimelineTip2'          => 'Fai clic sulle sezioni colorate del grafico o sull\'immagine per visualizzare l\'evento.',              // Added 2013.08.15.
+    'TimelineTip3'          => 'Fare clic sullo sfondo per ingrandire un periodo di tempo più piccolo basato sul clic.',              // Added 2013.08.15.
+    'TimelineTip4'          => 'Utilizzare i controlli seguenti per ridurre o spostarsi avanti e indietro nell\'intervallo di tempo.',              // Added 2013.08.15.
     'Timestamp'            => 'Timestamp',
     'TimestampLabelFormat' => 'Formato etichetta timestamp',
-    'TimestampLabelSize'   => 'Font Size',              // Added - 2018-08-30
+    'TimestampLabelSize'   => 'Dimensione carattere',              // Added - 2018-08-30
     'TimestampLabelX'      => 'coordinata X etichetta',
     'TimestampLabelY'      => 'coordinata Y etichetta',
     'Today'                => 'Oggi ',
     'Tools'                => 'Strumenti',
-    'Total'                => 'Total',                  // Added - 2011-06-16
+    'Total'                => 'Totale',                  // Added - 2011-06-16
     'TotalBrScore'         => 'Punteggio<br/>Totale',
     'TrackDelay'           => 'Track Delay',
     'TrackMotion'          => 'Track Motion',
@@ -737,10 +737,10 @@ $SLANG = array(
     'Type'                 => 'Tipo',
     'Unarchive'            => 'Togli dall\'archivio',
     'Undefined'            => 'Non specificato',              // Added - 2009-02-08
-    'Units'                => 'Unit&agrave;',
+    'Units'                => 'Unità',
     'Unknown'              => 'Sconosciuto',
     'Update'               => 'Aggiorna',
-    'UpdateAvailable'      => 'Un aggiornamento di ZoneMinder &egrave; disponibilie.',
+    'UpdateAvailable'      => 'Un aggiornamento di ZoneMinder è disponibilie.',
     'UpdateNotNecessary'   => 'Nessun aggiornamento necessario.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
@@ -769,8 +769,8 @@ $SLANG = array(
     'VideoGenParms'        => 'Parametri Generazione Video',
     'VideoGenSucceeded'    => 'Successo: Generato Video  !',
     'VideoSize'            => 'Dimensioni Video',
-    'VideoWriter'          => 'Video Writer',           // Added - 2018-08-30
-    'View'                 => 'vedi',
+    'VideoWriter'          => 'Scrittore video',           // Added - 2018-08-30
+    'View'                 => 'Vedi',
     'ViewAll'              => 'Vedi Tutto',
     'ViewEvent'            => 'Vedi Evento',
     'ViewPaged'            => 'Vedi con paginazione',
@@ -819,7 +819,7 @@ $CLANG = array(
     'MonitorCount'         => '%1$s %2$s', // For example '4 Monitors' (from Vlang below)
     'MonitorFunction'      => 'Funzione Monitor %1$s',
     'RunningRecentVer'     => 'Stai usando la versione pi&ugrave; aggiornata di ZoneMinder, v%s.',
-    'VersionMismatch'      => 'Version mismatch, system is version %1$s, database is %2$s.', // Added - 2011-05-25
+    'VersionMismatch'      => 'Versioni non corrispondenti: versione sistema %1$s, versione database %2$s.', // Added - 2011-05-25
 );
 
 // The next section allows you to describe a series of word ending and counts used to 
@@ -876,7 +876,7 @@ function zmVlang( $langVarArray, $count )
             return( $value );
         }
     }
-    die( 'Errore, sono incapace di correlare le stringhe del file-linguaggio');
+    die( 'Errore, non sono in grado di correlare le stringhe del file-linguaggio');
 }
 
 // This is an version that could be used in the Russian example above
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 20b2bf647..eca21478d 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -864,10 +864,6 @@ $OLANG = array(
         'Prompt' => "&#206;nregistrare imagini intermediare de diagnosticare, foarte lent",
         'Help' => "Pe l&#226;ng&#259; faptul c&#259; se pot &#238;nregistra statisticile evenimentelor se pot deasemenea &#238;nregistra imagini intermediare de diagnosticare care afi&#351;eaz&#259; rezultatele diferitelor verific&#259;ri care au loc c&#226;nd se &#238;ncearc&#259; determinarea unei posibile alarme. Aceste imagini sunt generate pentru fiecare cadru, zon&#259; &#351;i alarm&#259;, deci impactul asupra performan&#355;ei va fi foarte mare. Activa&#355;i aceast&#259; op&#355;iune doar pentru depanare sau analiz&#259; &#351;i nu uita&#355;i s&#259; o dezactiva&#355;i."
     ),
-    'CREATE_ANALYSIS_IMAGES' => array(
-        'Prompt' => "Creaz&#259; imagini analizate cu marcaje ale mi&#351;c&#259;rii",
-        'Help' => "Implicit, &#238;n cazul unei alarme, ZoneMinder &#238;nregistreaz&#259; at&#226;t imaginile neprelucrate c&#226;t &#351;i cele ce au fost analizate &#351;i au zone marcate unde a fost detectat&#259; mi&#351;care. Acest lucru poate fi foarte folositor la configurarea zonelor sau &#238;n analiza evenimentelor. Acest parametru permite oprirea &#238;nregistr&#259;rii imaginilor cu zone de mi&#351;care marcate."
-    ),
     'OPT_CONTROL' => array(
         'Prompt' => "Suport camere controlabile (rotire/&#238;nclinare/zoom)",
         'Help' => "ZoneMinder include suport limitat pentru camere controlabile. Sunt incluse c&#226;teva protocoale mostr&#259; &#351;i pot fi ad&#259;ugate cu u&#351;urin&#355;&#259; &#351;i altele. Dac&#259; vre&#355;i s&#259; controla&#355;i camerele prin intermediul ZoneMinder selecta&#355;i aceast&#259; op&#355;iune."
diff --git a/web/skins/classic/css/base/export.css b/web/skins/classic/css/base/export.css
index 757b49057..8cccfddad 100644
--- a/web/skins/classic/css/base/export.css
+++ b/web/skins/classic/css/base/export.css
@@ -52,3 +52,42 @@ td.monoRow {
   background-color: #ffffff;
 }
 
+ul.tabs {
+  margin: 0;
+  margin-bottom: -1px;
+  padding: 0;
+  float: left;
+  list-style: none;
+  height: 32px;
+  border-bottom: 1px solid #7f7fb2;
+  border-left: 1px solid #7f7fb2;
+  width: 100%;
+}
+ul.tabs li {
+  float: left;
+  margin: 0;
+  padding: 0;
+  height: 31px;
+  line-height: 31px;
+  border: 1px solid #7f7fb2;
+  border-left: none;
+  margin-bottom: -1px;
+  background: #fff;
+  overflow: hidden;
+  position: relative;
+}
+ul.tabs li a {
+  text-decoration: none;
+  color: #000;
+  display: block;
+  font-size: 1.2em;
+  padding: 0 20px;
+  outline: none;
+}
+ul.tabs li a:hover {
+  background: #ccc;
+}
+html ul.tabs li.active, html ul.tabs li.active a:hover  {
+  background: #dddddd;
+  border-bottom: 1px solid #e0e0e0;
+}
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index cd0eaebc3..a347cee39 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -326,24 +326,10 @@ ul.tabList li.active a {
     color: #dc143c;
 }
 
-fieldset {
-    border: 1px solid black;
-    padding: 4px;
-    margin-bottom: 8px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-fieldset > legend {
-    padding: 0 2px;
-}
-
 /*
  * Behavior classes
  */
 
-
 .ok, .infoText {
     color: #0fb9b1;
 }
@@ -445,14 +431,14 @@ th.table-th-sort span.table-th-sort-span {
     float: right;
     width: 12px;
     height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-u.png") no-repeat 0 0;
+    background: url("../skins/classic/graphics/arrow-s-u.png") no-repeat 0 0;
 }
 
 th.table-th-sort-rev span.table-th-sort-span {
     float: right;
     width: 12px;
     height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-d.png") no-repeat 0 0;
+    background: url("../skins/classic/graphics/arrow-s-d.png") no-repeat 0 0;
 }
 
 .table-tr-odd {
@@ -476,6 +462,15 @@ th.table-th-sort-rev span.table-th-sort-span {
     color: white;
     font-weight: 300;
 }
+#header:after {
+  content: ".";
+  display: block;
+  height: 0;
+    font-size: 0;
+  clear: both;
+  visibility: hidden;
+}
+
 
 #header h2 {
     left: 0;
@@ -509,7 +504,7 @@ th.table-th-sort-rev span.table-th-sort-span {
 }
 
 #content {
-    width: 96%;
+    width: 100%;
     margin: 0 auto 8px auto;
     line-height: 130%;
     text-align: center;
@@ -576,6 +571,13 @@ input[type=submit],
     text-align: center;
 }
 
+.btn-normal,
+.btn-normal:link {
+    color: #fff;
+    background-color: #3498db;
+    border: 1px solid #3498db;
+}
+
 button:hover,
 input[type=button]:hover,
 input[type=submit]:hover,
@@ -662,6 +664,11 @@ margin-left: 0;
 .nav-pills > li > a {
   border-radius: 0;
 }
+
+ul.nav.nav-pills.flex-column {
+  background-color: #f5f5f5; 
+}
+
 .chosen-container {
 text-align: left;
 }
@@ -696,8 +703,52 @@ li.search-choice {
 .gi-4x{font-size: 4em;}
 .gi-5x{font-size: 5em;}
 
+.fa:hover{
+  color: black;
+}
+
 .filterBar {
   margin-top:5px;
   margin-bottom:5px;
 }
    
+.form-check-inline {
+  display: inline-block;
+}
+
+#dropdown_storage+div,
+#dropdown_reminder+div,
+#dropdown_bandwidth+div {
+  background-color:#485460;
+}
+
+#framesTable td:hover {
+    cursor: pointer;
+}
+
+.zoom {
+  padding: 50px;
+  transition: transform .2s; /* Animation */
+  margin: 0 auto;
+}
+
+.zoom:hover {
+  transform-origin: 70% 50%;
+  transform: scale(5); /* (arbitray zoom value - Note if the zoom is too large, it will go outside of the viewport) */
+}
+
+.zoom-right {
+  padding: 0px;
+  transition: transform .2s; /* Animation */
+  margin: 0 auto;
+}
+
+.zoom-right:hover {
+  transform-origin: 0% 50%;
+  transform: scale(5); /* (arbitray zoom value - Note if the zoom is too large, it will go outside of the viewport) */
+}
+
+a.flip {
+  float: right;
+  margin-right: -20px;
+}
diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css
index 4a5470b6b..1b0e77b4f 100644
--- a/web/skins/classic/css/base/views/console.css
+++ b/web/skins/classic/css/base/views/console.css
@@ -75,7 +75,7 @@
 
 .consoleTable .colMark {
     width: 52px;
-    text-align: center;
+    text-align: left;
 }
 
 .consoleTable .colEvents {
diff --git a/web/skins/classic/css/base/views/control.css b/web/skins/classic/css/base/views/control.css
index 2c9faf455..473802a90 100644
--- a/web/skins/classic/css/base/views/control.css
+++ b/web/skins/classic/css/base/views/control.css
@@ -1,7 +1,7 @@
 .ptzControls {
     vertical-align: top;
     margin: 10px auto 0;
-    width: 520px;
+    width: 90%;
 }
 
 .ptzControls::after {
@@ -15,7 +15,7 @@
 .ptzControls input.ptzTextBtn {
     margin-top: 2px;
 }
-.ptzControls button {
+.ptzControls .pantiltPanel button {
   border: none;
 }
 
@@ -24,15 +24,15 @@
 }
 
 .ptzControls input[type=image] {
-    border: 0px;
+    border: none;
 }
 
 .ptzControls .controlsPanel .arrowControl {
-    width: 40px;
+    width: 60px;
     margin: 0 4px;
 }
 
-.ptzControls .controlsPanel .arrowControl input {
+.ptzControls .controlsPanel .arrowControl button.longArrowBtn {
     display: block;
 }
 
@@ -72,10 +72,13 @@
 
 .ptzControls .controlsPanel .irisControls {
     float: right;
+    text-align: center;
 }
 
 .ptzControls .controlsPanel .whiteControls {
     float: right;
+    width: 120px;
+    text-align: center;
 }
 
 .ptzControls .controlsPanel .pantiltPanel {
@@ -90,8 +93,8 @@
     border: 1px solid #006699;
     text-align: center;
     padding: 1px;
-    width: 102px;
-    height: 102px;
+    width: 100px;
+    height: 100px;
 }
 
 .ptzControls .controlsPanel .pantiltPanel .pantiltControls .arrowBtn {
@@ -137,21 +140,15 @@
     background: url("../skins/classic/graphics/arrow-dr.png") no-repeat 0 0;
 }
 
-.ptzControls .controlsPanel .powerControls {
-    margin: 5px auto;
+.ptzControls .controlsPanel .powerControls,
+.ptzControls .presetControls div {
+    margin: 5px 200px 5px 180px;
 }
 
-.ptzControls .presetControls {
-    margin: 5px auto;
-}
-
-.ptzControls .presetControls input {
+.ptzControls .presetControls button {
     margin: 1px;
 }
 
-.ptzControls .presetControls input.ptzNumBtn {
-    padding: 1px 2px;
-    width: 24px;
-    color: #ffffff;
-    text-align: center;
+.ptzControls .presetControls button.ptzNumBtn {
+    width: 45px;
 }
diff --git a/web/skins/classic/css/base/views/controlcap.css b/web/skins/classic/css/base/views/controlcap.css
new file mode 100644
index 000000000..ed9a664e7
--- /dev/null
+++ b/web/skins/classic/css/base/views/controlcap.css
@@ -0,0 +1,4 @@
+
+input[type="number"] {
+  width: 70px;
+}
diff --git a/web/skins/classic/css/base/views/controlcaps.css b/web/skins/classic/css/base/views/controlcaps.css
index 1a2783fd7..d860d88ae 100644
--- a/web/skins/classic/css/base/views/controlcaps.css
+++ b/web/skins/classic/css/base/views/controlcaps.css
@@ -1,3 +1,9 @@
-#content table.major .colCanMove, #content table.major .colCanZoom, #content table.major .colCanFocus, #content table.major .colCanIris, #content table.major .colCanWhiteBal, #content table.major .colHasPresets {
+#content table.major .colCanMove,
+#content table.major .colCanZoom,
+#content table.major .colCanFocus,
+#content table.major .colCanIris,
+#content table.major .colCanWhiteBal,
+#content table.major .colHasPresets {
     text-align: center;
 }
+
diff --git a/web/skins/classic/css/base/views/events.css b/web/skins/classic/css/base/views/events.css
index c167fc92d..a446743b8 100644
--- a/web/skins/classic/css/base/views/events.css
+++ b/web/skins/classic/css/base/views/events.css
@@ -1,5 +1,5 @@
 .archived {
-    background-color: #f8f8f8;;
+    background-color: #ffc107;;
 }
 
 #contentTable.major .colTime {
diff --git a/web/skins/classic/css/base/views/export.css b/web/skins/classic/css/base/views/export.css
index e22851ca0..2b090a77a 100644
--- a/web/skins/classic/css/base/views/export.css
+++ b/web/skins/classic/css/base/views/export.css
@@ -1,4 +1,4 @@
-#contentTable + input {
+input {
     margin-top: 6px;
 }
 
@@ -13,3 +13,7 @@
 #downloadLink {
     margin-top: 8px;
 }
+
+.form-group {
+  text-align: right;
+}
diff --git a/web/skins/classic/css/base/views/filter.css b/web/skins/classic/css/base/views/filter.css
index 638b85c9b..88854988e 100644
--- a/web/skins/classic/css/base/views/filter.css
+++ b/web/skins/classic/css/base/views/filter.css
@@ -56,9 +56,14 @@ select {
   width: 300px;
   text-align: right;
 }
+input[name="filter[EmailSubject]"],
+input[name="filter[EmailTo]"],
+textarea[name="filter[EmailBody]"] {
+width: 500px;
+}
 select#Id {
-min-width: 400px;
+min-width: 500px;
 }
 .Name input {
-min-width: 400px;
+min-width: 500px;
 }
diff --git a/web/skins/classic/css/base/views/monitor.css b/web/skins/classic/css/base/views/monitor.css
index aa9ce1c26..2cdc0c400 100644
--- a/web/skins/classic/css/base/views/monitor.css
+++ b/web/skins/classic/css/base/views/monitor.css
@@ -8,3 +8,37 @@
 .SourcePath input {
   width: 100%;
 }
+
+textarea,
+input[name="newMonitor[Name]"],
+input[name="newMonitor[LabelFormat]"],
+input[name="newMonitor[ControlDevice]"],
+input[name="newMonitor[ControlAddress]"] {
+  width: 100%;
+}
+input[name="newMonitor[AnalysisFPSLimit]"],
+input[name="newMonitor[MaxFPS]"],
+input[name="newMonitor[AlarmMaxFPS]"],
+input[name="newMonitor[V4LCapturesPerFrame]"]{
+    width: 60px;
+}
+input[name="newMonitor[Port]"],
+input[name="newMonitor[Refresh]"],
+input[name="newMonitor[LabelX]"],
+input[name="newMonitor[LabelY]"],
+input[name="newMonitor[ImageBufferCount]"],
+input[name="newMonitor[WarmupCount]"],
+input[name="newMonitor[PreEventCount]"],
+input[name="newMonitor[PostEventCount]"],
+input[name="newMonitor[StreamReplayBuffer]"],
+input[name="newMonitor[AlarmFrameCount]"],
+input[name="newMonitor[AutoStopTimeout]"],
+input[name="newMonitor[TrackDelay]"],
+input[name="newMonitor[ReturnDelay]"],
+input[name="newMonitor[Width]"],
+input[name="newMonitor[Height]"] {
+  width: 80px;
+}
+select.chosen {
+  width: 100%;
+}
diff --git a/web/skins/classic/css/base/views/montage.css b/web/skins/classic/css/base/views/montage.css
index e9ec28bd0..aef963e79 100644
--- a/web/skins/classic/css/base/views/montage.css
+++ b/web/skins/classic/css/base/views/montage.css
@@ -3,7 +3,9 @@
 }
 
 #content {
+  /*
     width: 99%;
+    */
 }
 
 #monitors:after {
diff --git a/web/skins/classic/css/base/views/newlog.css b/web/skins/classic/css/base/views/newlog.css
new file mode 100644
index 000000000..918c1097c
--- /dev/null
+++ b/web/skins/classic/css/base/views/newlog.css
@@ -0,0 +1,18 @@
+tr.log-fat td {
+    background-color:#ffcccc;
+    font-weight: bold;
+}
+
+tr.log-err td {
+    background-color:#ffcccc;
+}
+
+tr.log-war td {
+    background-color: #ffe4b5;
+}
+
+tr.log-dbg td {
+    color: #666666;
+    font-style: italic;
+}
+
diff --git a/web/skins/classic/css/base/views/options.css b/web/skins/classic/css/base/views/options.css
index f7123086c..e13409b35 100644
--- a/web/skins/classic/css/base/views/options.css
+++ b/web/skins/classic/css/base/views/options.css
@@ -21,3 +21,15 @@ input.large {
 #contentTable.userTable .colMonitor, #contentTable.userTable .colUsername {
     text-align: left;
 }
+#contentTable th {
+  text-align: left;
+}
+
+input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SITEKEY]"],
+input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SECRETKEY]"] {
+  width: 100%;
+}
+
+#options label {
+  font-weight: bold;
+}
diff --git a/web/skins/classic/css/base/views/settings.css b/web/skins/classic/css/base/views/settings.css
new file mode 100644
index 000000000..622976b2a
--- /dev/null
+++ b/web/skins/classic/css/base/views/settings.css
@@ -0,0 +1,3 @@
+input[type="number"] {
+    width: 50px;
+}
diff --git a/web/skins/classic/css/base/views/storage.css b/web/skins/classic/css/base/views/storage.css
index afb83e441..9a3c1bcdd 100644
--- a/web/skins/classic/css/base/views/storage.css
+++ b/web/skins/classic/css/base/views/storage.css
@@ -1,3 +1,5 @@
-input[type="url"] {
+input[name="newStorage[Name]"],
+input[name="newStorage[Path]"],
+input[name="newStorage[Url]"] {
   width: 100%;
 }
diff --git a/web/skins/classic/css/base/views/timeline.css b/web/skins/classic/css/base/views/timeline.css
index 4e78e82cf..c2efed713 100644
--- a/web/skins/classic/css/base/views/timeline.css
+++ b/web/skins/classic/css/base/views/timeline.css
@@ -48,20 +48,24 @@
 }
 
 #topPanel #image {
-    float: right;
     margin: 0 auto;
-    width: 90%;
     text-align: right;
     margin-right: 2px;
     background-color: #eeeeee;
     border: 1px solid #c8c8c8;
+    position: relative;
+    width: 100%;
 }
 
 #topPanel #image img {
-    float: left;
-    top: 0px;
-    background-color: #f8f8f8;
-    width: 100%;
+    width: auto;
+    max-width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
 }
 
 #topPanel #dataPanel {
@@ -97,6 +101,7 @@
 }
 
 #chartPanel {
+  clear: both;
     position: relative;
     margin: 0 auto;
 }
@@ -110,22 +115,25 @@
 
 #chartPanel #activity {
     position: absolute;
+    top: 0;
+    left: 0;
     text-align: center;
-    left: 0px;
     border-bottom: 1px solid #cccccc;
+    width: 100%;
 }
 
-#chartPanel #activity div.activity {
+#chartPanel div.activity {
     position: absolute;
-    bottom: 0px;
+    bottom: 0;
     z-index: 3;
-    width: 1px;
+    width: 0.17%;
 }
 
 #chartPanel .events {
     position: absolute;
     text-align: center;
-    left: 0px;
+    left: 0;
+    width: 100%;
     background-color: #fcfcfc;
     border-bottom: 1px solid black;
 }
@@ -159,8 +167,9 @@
 span.keyEntry {
 }
 
-img.keyBox {
+div.keyBox {
     position: relative;
+  display: inline-block;
     border: 1px solid black;
     width: 16px;
     height: 16px;
diff --git a/web/skins/classic/css/base/views/timeline.css.php b/web/skins/classic/css/base/views/timeline.css.php
index 85078d107..d993ce9a0 100644
--- a/web/skins/classic/css/base/views/timeline.css.php
+++ b/web/skins/classic/css/base/views/timeline.css.php
@@ -1,10 +1,17 @@
+<?php
+  global $chart;
+  global $max_aspect_ratio;
+  global $monitors;
+  global $mode;
+  global $monEventSlots;
+?>
+
+
 .chartSize {
-    width: <?php echo $chart['width'] ?>px;
     height: <?php echo $chart['height'] ?>px;
 }
 
 .graphSize {
-    width: <?php echo $chart['graph']['width'] ?>px;
     height: <?php echo $chart['graph']['height'] ?>px;
 }
 
@@ -13,47 +20,56 @@
 }
 
 .graphWidth {
-    width: <?php echo $chart['graph']['width'] ?>px;
 }
 
 .imageSize {
-    width: <?php echo $chart['image']['width'] ?>px;
-    height: <?php echo $chart['image']['height'] ?>px;
 }
 
 .imageHeight {
-    height: <?php echo $chart['image']['height'] ?>px;
+<?php
+switch ( $max_aspect_ratio ) {
+  case null:
+  case 1:
+    echo 'padding-top: 100%;'; break;
+  case 1.33: // 4:3
+    echo 'padding-top: 75%;'; break;
+  case 1.47:
+   echo 'padding-top: 68.18%;'; break;
+  case 1.5: // 3:2
+    echo 'padding-top: 66.66%'; break;
+  case 1.6: // 8:5
+    echo 'padding-top: 62.5%'; break;
+  case 1.78: // 16:9
+   echo 'padding-top: 56.25%;'; break;
+  default:
+    ZM\Error("Unknown aspect ratio $max_aspect_ratio");
+    echo 'padding-top: 100%;';
+}
+?>
 }
 
 .activitySize {
-    width: <?php echo $chart['graph']['width'] ?>px;
     height: <?php echo $chart['graph']['activityHeight'] ?>px;
 }
 
 .eventsSize {
-    width: <?php echo $chart['graph']['width'] ?>px;
     height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
 }
 
-.eventsHeight {
+.events .event {
     height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
 }
 <?php
-if ( $mode == "overlay" )
-{
-    foreach ( array_keys($monitorIds) as $monitorId )
-    {
+if ( $mode == 'overlay' ) {
+    foreach ( array_keys($monitors) as $monitorId ) {
 ?>
 #chartPanel .eventsPos<?php echo $monitorId ?> {
     top: <?php echo $chart['eventBars'][$monitorId]['top'] ?>px;
 }
 <?php
     }
-}
-elseif ( $mode == "split" )
-{
-    foreach ( array_keys($monitorIds) as $monitorId )
-    {
+} else if ( $mode == 'split' ) {
+    foreach ( array_keys($monitors) as $monitorId ) {
 ?>
 #chartPanel .activityPos<?php echo $monitorId ?> {
     top: <?php echo $char['activityBars'][$monitorId]['top'] ?>px;
@@ -66,11 +82,10 @@ elseif ( $mode == "split" )
     }
 }
 
-foreach( array_keys($monEventSlots) as $monitorId )
-{
+foreach ( array_keys($monEventSlots) as $monitorId ) {
 ?>
 .monitorColour<?php echo $monitorId ?> {
-    background-color: <?php echo $monitors[$monitorId]['WebColour'] ?>;
+  background-color: <?php echo $monitors[$monitorId]->WebColour() ?>;
 }
 <?php
 }
diff --git a/web/skins/classic/css/base/views/zone.css b/web/skins/classic/css/base/views/zone.css
index c2feb6734..626600eb2 100644
--- a/web/skins/classic/css/base/views/zone.css
+++ b/web/skins/classic/css/base/views/zone.css
@@ -1,16 +1,23 @@
-#settingsPanel {
-    float: left;
-    margin: 0 2px;
+.monitor, #settingsPanel, .buttons, #zonePoints  {
+  float: left;
+  margin: 2px;
+}
+#settingsPanel,
+#zonePoints {
+	max-width: 600px;
+  width: 50%;
 }
 
 #zoneSettings {
-    border-collapse: collapse;
+  border-collapse: collapse;
+  width: 100%;
 }
 
-#zoneSettings th, #zoneSettings td {
-    border: 1px solid #7f7fb2;
-    padding: 3px;
-    text-align: left;
+#zoneSettings th,
+#zoneSettings td {
+  border: 1px solid #7f7fb2;
+  padding: 3px;
+  text-align: left;
 }
 
 #zoneSettings th[scope=row] {
@@ -21,16 +28,20 @@
 
 #definitionPanel {
     float: left;
-    margin: 0 2px;
+    margin: 2px;
     text-align: center;
 }
 
-#definitionPanel input[type=submit], #definitionPanel input[type=submit] {
-    margin: 0 4px;
+#definitionPanel input[type=submit],
+#definitionPanel input[type=submit] {
+  margin: 0 4px;
 }
 
 #imagePanel {
+  float: left;
     position: relative;
+    width: 50%;
+    min-width: 647px; /* extra 6 px for padding */
 }
 
 /* NB: The size of the imageFrame determines the area within which the markers
@@ -39,7 +50,23 @@
  * the extreme edges of the imageFrame. */
 #imageFrame {
     position: relative;
-    padding: 0 3px 3px 0; /* Compensate for negative margins in the markers just below. */
+    padding: 3px 4px 4px 3px;
+}
+#imageFrame svg {
+  box-sizing: border-box;
+ position:absolute;
+ top: 3px;
+ left: 3px; 
+ right: 3px;
+ background: none;
+ }
+#imageFrame img {
+  width: 100%;
+  display: block;
+}
+#imageFrame img.alarm ,
+#imageFrame img.alert {
+  padding: 1px;
 }
 
 #imageFrame div {
@@ -52,20 +79,19 @@
 }
 
 #imageFrame div {
-    background-image: url(/zm/skins/classic/graphics/point-g.png);
+    background-image: url(../skins/classic/graphics/point-g.png);
 }
 
 #imageFrame div.highlight {
-    background-image: url(/zm/skins/classic/graphics/point-o.png);
+    background-image: url(../skins/classic/graphics/point-o.png);
 }
 
 #imageFrame div.active {
-    background-image: url(../../../graphics/point-r.png);
+    background-image: url(../skins/classic/graphics/point-r.png);
 }
 
 #zonePoints {
-    margin: 8px 0;
-    border-collapse: collapse;
+	float: left;
 }
 
 #zonePoints td {
@@ -73,18 +99,22 @@
 }
 
 #zonePoints table {
-    border-collapse: collapse;
+  border-collapse: collapse;
+	width: 100%;
+}
+#zonePoints table table {
 }
 
-#zonePoints table tr.highlight {
+#zonePoints table table tr.highlight {
     background-color: #f0e68c;
 }
 
-#zonePoints table tr.active {
+#zonePoints table table tr.active {
     background-color: #ffa07a;
 }
 
-#zonePoints table th, #zonePoints table td {
+#zonePoints table table th,
+#zonePoints table table td {
     border: 1px solid #7f7fb2;
     padding: 3px;
     text-align: center;
@@ -116,3 +146,44 @@
 	stroke: #0000FF;
 	fill: #0000FF;
 }
+
+input[name="newZone[Name]"] {
+width: 100%;
+}
+input[name="newAlarmRgbR"],
+input[name="newAlarmRgbG"],
+input[name="newAlarmRgbB"] {
+width: 25%;
+}
+input[name="newZone[MinPixelThreshold]"],
+input[name="newZone[MaxPixelThreshold]"],
+input[name="newZone[FilterX]"],
+input[name="newZone[FilterY]"],
+input[name="newZone[MinFilterPixels]"],
+input[name="newZone[MaxFilterPixels]"],
+input[name="newZone[MinBlobPixels]"],
+input[name="newZone[MaxBlobPixels]"],
+input[name="newZone[MinBlobs]"],
+input[name="newZone[MaxBlobs]"],
+input[name="newZone[MinAlarmPixels]"],
+input[name="newZone[MaxAlarmPixels]"] {
+  width: 90px;
+}
+input.ZonePoint {
+    width: 75px;
+}
+svg {
+  overflow: visible;
+}
+svg circle {
+  fill: green;
+    overflow: visible;
+}
+#monitorState {
+  display: inline;
+  float: left;
+}
+#StreamControlButtons {
+  display: inline;
+  float: right;
+}
diff --git a/web/skins/classic/css/base/views/zones.css b/web/skins/classic/css/base/views/zones.css
index 9952e5db4..125a558ec 100644
--- a/web/skins/classic/css/base/views/zones.css
+++ b/web/skins/classic/css/base/views/zones.css
@@ -18,3 +18,37 @@
 	stroke: #0000FF;
 	fill: #0000FF;
 }
+
+.zones, .ZonesImage {
+  position: relative;
+  width: 50%;
+  min-width: 500px;
+	float: left;
+}
+.ZonesImage img {
+  top:0;
+  left:0;
+  position: relative;
+}
+.ZonesImage svg {
+  width: 100%;
+  position:absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  background: none;
+}
+
+#content {
+width: 97%;
+position: relative;
+}
+
+.Monitor:after {
+  content: ".";
+  display: block;
+  height: 0;
+    font-size: 0;
+  clear: both;
+  visibility: hidden;
+}
diff --git a/web/skins/classic/css/classic/export.css b/web/skins/classic/css/classic/export.css
index 757b49057..e69de29bb 100644
--- a/web/skins/classic/css/classic/export.css
+++ b/web/skins/classic/css/classic/export.css
@@ -1,54 +0,0 @@
-body {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size:10px;
-  font-weight: normal;
-  color: #333333;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-th, td {
-  border: 1px solid #7f7fb2;
-  text-align: center;
-  padding: 2px 4px;
-}   
-
-a:link {
-  color: #7f7fb2;
-  text-decoration: none
-}
-
-a:visited {
-  color: #7f7fb2;
-  text-decoration: none
-}
-
-a:hover {
-  color: #666699;
-  text-decoration: underline
-}
-
-img.thumb {
-  width: 40px;
-}
-
-td.monoRow {
-  line-height: 200%;
-  text-align: center;
-  vertical-align: middle;
-}
-
-#eventFrames tr.alarm {
-  background-color: #fa8072;
-}
-
-#eventFrames tr.bulk {
-  background-color: #cccccc;
-}
-
-#eventFrames tr.normal {
-  background-color: #ffffff;
-}
-
diff --git a/web/skins/classic/css/classic/skin.css b/web/skins/classic/css/classic/skin.css
index b90412093..570baafbd 100644
--- a/web/skins/classic/css/classic/skin.css
+++ b/web/skins/classic/css/classic/skin.css
@@ -324,14 +324,14 @@ th.table-th-sort span.table-th-sort-span {
     float: right;
     width: 12px;
     height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-u.png") no-repeat 0 0;
+    background: url("../skins/classic/graphics/arrow-s-u.png") no-repeat 0 0;
 }
 
 th.table-th-sort-rev span.table-th-sort-span {
     float: right;
     width: 12px;
     height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-d.png") no-repeat 0 0;
+    background: url("../skins/classic/graphics/arrow-s-d.png") no-repeat 0 0;
 }
 
 .table-tr-odd {
@@ -492,12 +492,16 @@ margin-left: 0px;
 	border-radius: 0;
 }
 
+.nav-pills .nav-link.active, .nav-pills .show>.nav-link {
+  background-color: #337ab7;
+}
+
 button,
 input[type=button],
 input[type=submit],
 .btn-primary,
 .btn-primary:link {
-  padding: 1px 6px;
+  padding: 0 6px 1px 6px;
   background-color: #eeeeee;
   color: #333333;
   border: 1px solid #7f7fb2;
diff --git a/web/skins/classic/css/classic/views/control.css b/web/skins/classic/css/classic/views/control.css
index 55613d041..1234e0b12 100644
--- a/web/skins/classic/css/classic/views/control.css
+++ b/web/skins/classic/css/classic/views/control.css
@@ -1,7 +1,7 @@
 .ptzControls {
     vertical-align: top;
     margin: 10px auto 0;
-    width: 500px;
+    width: 90%;
 }
 
 .ptzControls::after {
@@ -25,7 +25,7 @@
 }
 
 .ptzControls .controlsPanel .arrowControl {
-    width: 40px;
+    width: 70px;
     margin: 0 4px;
 }
 
@@ -134,22 +134,18 @@
     background: url("../skins/classic/graphics/arrow-dr.png") no-repeat 0 0;
 }
 
-.ptzControls .controlsPanel .powerControls {
-    margin: 5px auto;
-}
-
+.ptzControls .controlsPanel .powerControls,
 .ptzControls .presetControls {
-    margin: 5px auto;
+    margin: 5px 200px 5px 180px;
 }
 
 .ptzControls .presetControls input {
     margin: 1px;
 }
 
-.ptzControls .presetControls input.ptzNumBtn {
-    padding: 1px 2px;
-    width: 24px;
-    color: #ffffff;
-    text-align: center;
+.ptzControls .presetControls button.ptzNumBtn {
+  /*
     background-color: #016A9D;
+    */
+  border: 1px solid #7f7fb2;
 }
diff --git a/web/skins/classic/css/classic/views/timeline.css b/web/skins/classic/css/classic/views/timeline.css
index fd9832568..4f57aab3a 100644
--- a/web/skins/classic/css/classic/views/timeline.css
+++ b/web/skins/classic/css/classic/views/timeline.css
@@ -74,7 +74,7 @@
 #topPanel #textPanel {
     text-align: left;
     width: 100%;
-    height: 140px;
+    height: 160px;
     margin: 0 auto;
     color: #016A9D;
     font-size: 11px;
diff --git a/web/skins/classic/css/classic/views/timeline.css.php b/web/skins/classic/css/classic/views/timeline.css.php
index 85078d107..3ea2abe03 100644
--- a/web/skins/classic/css/classic/views/timeline.css.php
+++ b/web/skins/classic/css/classic/views/timeline.css.php
@@ -35,43 +35,7 @@
     height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
 }
 
-.eventsHeight {
+.events .event {
     height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
 }
-<?php
-if ( $mode == "overlay" )
-{
-    foreach ( array_keys($monitorIds) as $monitorId )
-    {
-?>
-#chartPanel .eventsPos<?php echo $monitorId ?> {
-    top: <?php echo $chart['eventBars'][$monitorId]['top'] ?>px;
-}
-<?php
-    }
-}
-elseif ( $mode == "split" )
-{
-    foreach ( array_keys($monitorIds) as $monitorId )
-    {
-?>
-#chartPanel .activityPos<?php echo $monitorId ?> {
-    top: <?php echo $char['activityBars'][$monitorId]['top'] ?>px;
-}
-
-#chartPanel .eventsPos<?php echo $monitorId ?> {
-    top: <?php echo $char['eventBars'][$monitorId]['top'] ?>px;
-}
-<?php
-    }
-}
-
-foreach( array_keys($monEventSlots) as $monitorId )
-{
-?>
-.monitorColour<?php echo $monitorId ?> {
-    background-color: <?php echo $monitors[$monitorId]['WebColour'] ?>;
-}
-<?php
-}
 ?>
diff --git a/web/skins/classic/css/dark/export.css b/web/skins/classic/css/dark/export.css
index 757b49057..e69de29bb 100644
--- a/web/skins/classic/css/dark/export.css
+++ b/web/skins/classic/css/dark/export.css
@@ -1,54 +0,0 @@
-body {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size:10px;
-  font-weight: normal;
-  color: #333333;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-th, td {
-  border: 1px solid #7f7fb2;
-  text-align: center;
-  padding: 2px 4px;
-}   
-
-a:link {
-  color: #7f7fb2;
-  text-decoration: none
-}
-
-a:visited {
-  color: #7f7fb2;
-  text-decoration: none
-}
-
-a:hover {
-  color: #666699;
-  text-decoration: underline
-}
-
-img.thumb {
-  width: 40px;
-}
-
-td.monoRow {
-  line-height: 200%;
-  text-align: center;
-  vertical-align: middle;
-}
-
-#eventFrames tr.alarm {
-  background-color: #fa8072;
-}
-
-#eventFrames tr.bulk {
-  background-color: #cccccc;
-}
-
-#eventFrames tr.normal {
-  background-color: #ffffff;
-}
-
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index 13bfa125e..b1a1506b3 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -528,12 +528,18 @@ input[type=submit]:disabled,
   margin-left: 0;
 }
 
+.table {
+  width: 100%;
+  margin-bottom: 1rem;
+  color: #eeeeee;
+}
+
 .table-striped > tbody > tr:nth-of-type(2n+1) {
   background-color: #333333;
 }
 
-.table-hover>tbody>tr:hover {
-  background-color: #444444;
+.table-hover > tbody > tr:hover {
+  background-color: orange;
 }
 
 .nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
diff --git a/web/skins/classic/css/dark/views/timeline.css.php b/web/skins/classic/css/dark/views/timeline.css.php
index 85078d107..e69de29bb 100644
--- a/web/skins/classic/css/dark/views/timeline.css.php
+++ b/web/skins/classic/css/dark/views/timeline.css.php
@@ -1,77 +0,0 @@
-.chartSize {
-    width: <?php echo $chart['width'] ?>px;
-    height: <?php echo $chart['height'] ?>px;
-}
-
-.graphSize {
-    width: <?php echo $chart['graph']['width'] ?>px;
-    height: <?php echo $chart['graph']['height'] ?>px;
-}
-
-.graphHeight {
-    height: <?php echo $chart['graph']['height'] ?>px;
-}
-
-.graphWidth {
-    width: <?php echo $chart['graph']['width'] ?>px;
-}
-
-.imageSize {
-    width: <?php echo $chart['image']['width'] ?>px;
-    height: <?php echo $chart['image']['height'] ?>px;
-}
-
-.imageHeight {
-    height: <?php echo $chart['image']['height'] ?>px;
-}
-
-.activitySize {
-    width: <?php echo $chart['graph']['width'] ?>px;
-    height: <?php echo $chart['graph']['activityHeight'] ?>px;
-}
-
-.eventsSize {
-    width: <?php echo $chart['graph']['width'] ?>px;
-    height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
-}
-
-.eventsHeight {
-    height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
-}
-<?php
-if ( $mode == "overlay" )
-{
-    foreach ( array_keys($monitorIds) as $monitorId )
-    {
-?>
-#chartPanel .eventsPos<?php echo $monitorId ?> {
-    top: <?php echo $chart['eventBars'][$monitorId]['top'] ?>px;
-}
-<?php
-    }
-}
-elseif ( $mode == "split" )
-{
-    foreach ( array_keys($monitorIds) as $monitorId )
-    {
-?>
-#chartPanel .activityPos<?php echo $monitorId ?> {
-    top: <?php echo $char['activityBars'][$monitorId]['top'] ?>px;
-}
-
-#chartPanel .eventsPos<?php echo $monitorId ?> {
-    top: <?php echo $char['eventBars'][$monitorId]['top'] ?>px;
-}
-<?php
-    }
-}
-
-foreach( array_keys($monEventSlots) as $monitorId )
-{
-?>
-.monitorColour<?php echo $monitorId ?> {
-    background-color: <?php echo $monitors[$monitorId]['WebColour'] ?>;
-}
-<?php
-}
-?>
diff --git a/web/skins/classic/includes/config.php b/web/skins/classic/includes/config.php
index 2eded5690..091b72c85 100644
--- a/web/skins/classic/includes/config.php
+++ b/web/skins/classic/includes/config.php
@@ -31,7 +31,7 @@ $rates = array(
 );
 
 $scales = array(
-    'auto' => translate('Scale to Fit'),
+    '0' => translate('Scale to Fit'),
     '' => translate('Fixed Width/Height'),
     '400' => '4x',
     '300' => '3x',
@@ -45,7 +45,7 @@ $scales = array(
     '12.5' => '1/8x',
 );
 
-if (isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage')) {
+if ( isset($_REQUEST['view']) && ($_REQUEST['view'] == 'montage') ) {
   unset($scales['auto']); //Remove auto on montage, use everywhere else
 } else {
   unset($scales['']); //Remove fixed on everything but montage
diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index 2c3fbd73a..61138612f 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -18,126 +18,22 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-function getControlCommands( $monitor ) {
-  $cmds = array();
 
-  $cmds['Wake'] = 'wake';
-  $cmds['Sleep'] = 'sleep';
-  $cmds['Reset'] = 'reset';
-  $cmds['Reboot'] = 'reboot';
-
-  $cmds['PresetSet'] = 'presetSet';
-  $cmds['PresetGoto'] = 'presetGoto';
-  $cmds['PresetHome'] = 'presetHome';
-
-  if ( $monitor->CanZoom() ) {
-    if ( $monitor->CanZoomCon() )
-      $cmds['ZoomRoot'] = 'zoomCon';
-    elseif ( $monitor->CanZoomRel() )
-      $cmds['ZoomRoot'] = 'zoomRel';
-    elseif ( $monitor->CanZoomAbs() )
-      $cmds['ZoomRoot'] = 'zoomAbs';
-    $cmds['ZoomTele'] = $cmds['ZoomRoot'].'Tele';
-    $cmds['ZoomWide'] = $cmds['ZoomRoot'].'Wide';
-    $cmds['ZoomStop'] = 'zoomStop';
-    $cmds['ZoomAuto'] = 'zoomAuto';
-    $cmds['ZoomMan'] = 'zoomMan';
-  }
-
-  if ( $monitor->CanFocus() ) {
-    if ( $monitor->CanFocusCon() )
-      $cmds['FocusRoot'] = 'focusCon';
-    elseif ( $monitor->CanFocusRel() )
-      $cmds['FocusRoot'] = 'focusRel';
-    elseif ( $monitor->CanFocusAbs() )
-      $cmds['FocusRoot'] = 'focusAbs';
-    $cmds['FocusFar'] = $cmds['FocusRoot'].'Far';
-    $cmds['FocusNear'] = $cmds['FocusRoot'].'Near';
-    $cmds['FocusStop'] = 'focusStop';
-    $cmds['FocusAuto'] = 'focusAuto';
-    $cmds['FocusMan'] = 'focusMan';
-  }
-
-  if ( $monitor->CanIris() ) {
-    if ( $monitor->CanIrisCon() )
-      $cmds['IrisRoot'] = 'irisCon';
-    elseif ( $monitor->CanIrisRel() )
-      $cmds['IrisRoot'] = 'irisRel';
-    elseif ( $monitor->CanIrisAbs() )
-      $cmds['IrisRoot'] = 'irisAbs';
-    $cmds['IrisOpen'] = $cmds['IrisRoot'].'Open';
-    $cmds['IrisClose'] = $cmds['IrisRoot'].'Close';
-    $cmds['IrisStop'] = 'irisStop';
-    $cmds['IrisAuto'] = 'irisAuto';
-    $cmds['IrisMan'] = 'irisMan';
-  }
-
-  if ( $monitor->CanWhite() ) {
-    if ( $monitor->CanWhiteCon() )
-      $cmds['WhiteRoot'] = 'whiteCon';
-    elseif ( $monitor->CanWhiteRel() )
-      $cmds['WhiteRoot'] = 'whiteRel';
-    elseif ( $monitor->CanWhiteAbs() )
-      $cmds['WhiteRoot'] = 'whiteAbs';
-    $cmds['WhiteIn'] = $cmds['WhiteRoot'].'In';
-    $cmds['WhiteOut'] = $cmds['WhiteRoot'].'Out';
-    $cmds['WhiteAuto'] = 'whiteAuto';
-    $cmds['WhiteMan'] = 'whiteMan';
-  }
-
-  if ( $monitor->CanGain() ) {
-    if ( $monitor->CanGainCon() )
-      $cmds['GainRoot'] = 'gainCon';
-    elseif ( $monitor->CanGainRel() )
-      $cmds['GainRoot'] = 'gainRel';
-    elseif ( $monitor->CanGainAbs() )
-      $cmds['GainRoot'] = 'gainAbs';
-    $cmds['GainUp'] = $cmds['GainRoot'].'Up';
-    $cmds['GainDown'] = $cmds['GainRoot'].'Down';
-    $cmds['GainAuto'] = 'gainAuto';
-    $cmds['GainMan'] = 'gainMan';
-  }
-
-  if ( $monitor->CanMove() ) {
-    if ( $monitor->CanMoveCon() ) {
-      $cmds['MoveRoot'] = 'moveCon';
-      $cmds['Center'] = 'moveStop';
-    } elseif ( $monitor->CanMoveRel() ) {
-      $cmds['MoveRoot'] = 'moveRel';
-      $cmds['Center'] = $cmds['PresetHome'];
-    } elseif ( $monitor->CanMoveAbs() ) {
-      $cmds['MoveRoot'] = 'moveAbs';
-      $cmds['Center'] = $cmds['PresetHome'];
-    } else {
-      $cmds['MoveRoot'] = '';
-    }
-
-    $cmds['MoveUp'] = $cmds['MoveRoot'].'Up';
-    $cmds['MoveDown'] = $cmds['MoveRoot'].'Down';
-    $cmds['MoveLeft'] = $cmds['MoveRoot'].'Left';
-    $cmds['MoveRight'] = $cmds['MoveRoot'].'Right';
-    $cmds['MoveUpLeft'] = $cmds['MoveRoot'].'UpLeft';
-    $cmds['MoveUpRight'] = $cmds['MoveRoot'].'UpRight';
-    $cmds['MoveDownLeft'] = $cmds['MoveRoot'].'DownLeft';
-    $cmds['MoveDownRight'] = $cmds['MoveRoot'].'DownRight';
-  }
-  return( $cmds );
-}
-
-function controlFocus( $monitor, $cmds ) {
+function controlFocus($monitor, $cmds) {
+  $control = $monitor->Control();
   ob_start();
 ?>
 <div class="arrowControl focusControls">
   <div class="arrowLabel"><?php echo translate('Near') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['FocusNear'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $monitor->CanFocusCon() ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo translate('Focus') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['FocusFar'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" value="<?php echo $cmds['FocusNear'] ?>" data-on-click="controlCmd" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanFocusCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['FocusStop'] ?>"<?php } ?>><?php echo translate('Focus') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['FocusFar'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Far') ?></div>
 <?php
-  if ( $monitor->CanAutoFocus() ) {
+  if ( $control->CanAutoFocus() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusAuto'] ?>" onclick="controlCmd('<?php echo $cmds['FocusAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusMan'] ?>" onclick="controlCmd('<?php echo $cmds['FocusMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusAuto'] ?>" data-on-click="controlCmd"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusMan'] ?>" data-on-click="controlCmd"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -146,22 +42,21 @@ function controlFocus( $monitor, $cmds ) {
   return ob_get_clean();
 }
 
-function controlZoom( $monitor, $cmds ) {
-  global $SLANG;
-
+function controlZoom($monitor, $cmds) {
+  $control = $monitor->Control();
   ob_start();
 ?>
 <div class="arrowControl zoomControls">
   <div class="arrowLabel"><?php echo translate('Tele') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['ZoomTele'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $monitor->CanZoomCon() ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo translate('Zoom') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['ZoomWide'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomTele'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanZoomCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['ZoomStop'] ?>"<?php } ?>><?php echo translate('Zoom') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomWide'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Wide') ?></div>
 <?php
-  if ( $monitor->CanAutoZoom() ) {
+  if ( $control->CanAutoZoom() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="Auto" onclick="controlCmd('<?php echo $cmds['ZoomAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="Man" onclick="controlCmd('<?php echo $cmds['ZoomMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomAuto'] ?>"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomMan'] ?>"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -169,22 +64,21 @@ function controlZoom( $monitor, $cmds ) {
   return ob_get_clean();
 }
 
-function controlIris( $monitor, $cmds ) {
-  global $SLANG;
-
+function controlIris($monitor, $cmds) {
+  $control = $monitor->Control();
   ob_start();
 ?>
 <div class="arrowControl irisControls">
   <div class="arrowLabel"><?php echo translate('Open') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['IrisOpen'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $monitor->CanIrisCon() ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo translate('Iris') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['IrisClose'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisOpen'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanIrisCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['IrisStop'] ?>"<?php } ?>><?php echo translate('Iris') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisClose'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Close') ?></div>
 <?php
-  if ( $monitor->CanAutoIris() ) {
+  if ( $control->CanAutoIris() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="Auto" onclick="controlCmd('<?php echo $cmds['IrisAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="Man" onclick="controlCmd('<?php echo $cmds['IrisMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisAuto'] ?>"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisMan'] ?>"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -193,22 +87,21 @@ function controlIris( $monitor, $cmds ) {
   return ob_get_clean();
 }
 
-function controlWhite( $monitor, $cmds ) {
-  global $SLANG;
-
+function controlWhite($monitor, $cmds) {
+  $control = $monitor->Control();
   ob_start();
 ?>
 <div class="arrowControl whiteControls">
   <div class="arrowLabel"><?php echo translate('In') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['WhiteIn'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $monitor->CanWhiteCon() ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo translate('White') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['WhiteOut'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteIn'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanWhiteCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['WhiteStop'] ?>"<?php } ?>><?php echo translate('White') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteOut'] ?>" data-xtell="0" data-ytell="1)"></button>
   <div class="arrowLabel"><?php echo translate('Out') ?></div>
 <?php
-  if ( $monitor->CanAutoWhite() ) {
+  if ( $control->CanAutoWhite() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="Auto" onclick="controlCmd('<?php echo $cmds['WhiteAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="Man" onclick="controlCmd('<?php echo $cmds['WhiteMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteAuto'] ?>"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteMan'] ?>"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -217,51 +110,49 @@ function controlWhite( $monitor, $cmds ) {
   return ob_get_clean();
 }
 
-function controlPanTilt( $monitor, $cmds ) {
-  global $SLANG;
-
+function controlPanTilt($monitor, $cmds) {
+  $control = $monitor->Control();
   ob_start();
 ?>
 <div class="pantiltControls">
   <div class="pantiltLabel"><?php echo translate('PanTilt') ?></div>
   <div class="pantiltButtons">
 <?php
-  $hasPan = $monitor->CanPan();
-  $hasTilt = $monitor->CanTilt();
-  $hasDiag = $hasPan && $hasTilt && $monitor->CanMoveDiag();
+  $hasPan = $control->CanPan();
+  $hasTilt = $control->CanTilt();
+  $hasDiag = $hasPan && $hasTilt && $control->CanMoveDiag();
 ?>
-    <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpLeft'] ?>',event,-1,-1)"></button>
-    <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUp'] ?>',event,0,-1)"></button>
-    <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpRight'] ?>',event,1,-1)"></button>
-    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveLeft'] ?>',event,1,0)"></button>
+    <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUpLeft'] ?>" data-xtell="-1" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUp'] ?>" data-xtell="0" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUpRight'] ?>" data-xtell="1" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveLeft'] ?>" data-xtell="-1" data-ytell="0"></button>
 <?php if ( isset($cmds['Center']) ) { ?>
-    <button type="button" class="arrowBtn centerBtn" onclick="controlCmd('<?php echo $cmds['Center'] ?>')"></button>
+    <button type="button" class="arrowBtn centerBtn" data-on-click="controlCmd" value="<?php echo $cmds['Center'] ?>"></button>
 <?php } else { ?>
     <button type="button" class="arrowBtn NocenterBtn"></button>
 <?php } ?>
-    <button type="button" class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveRight'] ?>',event,1,0)"></button>
-    <button type="button" class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDownLeft'] ?>',event,-1,1)"></button>
-    <button type="button" class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDown'] ?>',event,0,1)"></button>
-    <button type="button" class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDownRight'] ?>',event,1,1)"></button>
+    <button type="button" class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveRight'] ?>" data-xtell="1" data-ytell="0"></button>
+    <button type="button" class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDownLeft'] ?>" data-xtell="-1" data-ytell="1"></button>
+    <button type="button" class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDown'] ?>" data-xtell="0" data-ytell="1"></button>
+    <button type="button" class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDownRight'] ?>" data-xtell="1" data-ytell="1"></button>
   </div>
 </div>
 <?php
   return ob_get_clean();
 }
 
-function controlPresets( $monitor, $cmds ) {
-  global $SLANG;
-
+function controlPresets($monitor, $cmds) {
+  $control = $monitor->Control();
   // MAX_PRESETS IS PER LINE
-  define( 'MAX_PRESETS', '12' );
+  define('MAX_PRESETS', '12');
 
   $sql = 'SELECT * FROM ControlPresets WHERE MonitorId = ?';
   $labels = array();
-  foreach( dbFetchAll( $sql, NULL, array( $monitor->Id() ) ) as $row ) {
+  foreach ( dbFetchAll($sql, NULL, array($monitor->Id())) as $row ) {
     $labels[$row['Preset']] = $row['Label'];
   }
 
-  $presetBreak = (int)(($monitor->NumPresets()+1)/((int)(($monitor->NumPresets()-1)/MAX_PRESETS)+1));
+  $presetBreak = (int)(($control->NumPresets()+1)/((int)(($control->NumPresets()-1)/MAX_PRESETS)+1));
 
   ob_start();
 ?>
@@ -269,24 +160,21 @@ function controlPresets( $monitor, $cmds ) {
   <!--<div><?php echo translate('Presets') ?></div>-->
   <div>
 <?php
-  for ( $i = 1; $i <= $monitor->NumPresets(); $i++ ) {
+  for ( $i = 1; $i <= $control->NumPresets(); $i++ ) {
     ?>
-      <button type="button" class="ptzNumBtn" title="<?php echo isset($labels[$i])?htmlentities($labels[$i]):'' ?>" value="<?php echo $i ?>" onclick="controlCmd('<?php echo $cmds['PresetGoto'] ?><?php echo $i ?>');"/><?php echo $i ?></button>
+      <button type="button" class="ptzNumBtn" title="<?php echo isset($labels[$i])?htmlentities($labels[$i]):'' ?>" data-on-click="controlCmd" value="<?php echo $cmds['PresetGoto'].$i ?>"/><?php echo $i ?></button>
 <?php
-    if ( $i && (($i%$presetBreak) == 0) ) {
-?><br/><?php
-    }
   } // end foreach preset
 ?>
   </div>
   <div>
 <?php
-  if ( $monitor->HasHomePreset() ) {
+  if ( $control->HasHomePreset() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Home" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"><?php echo translate('Home') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['PresetHome'] ?>"><?php echo translate('Home') ?></button>
 <?php
   }
-  if ( canEdit('Monitors') && $monitor->CanSetPresets() ) {
+  if ( canEdit('Monitors') && $control->CanSetPresets() ) {
 ?>
     <button type="button" class="ptzTextBtn popup-link" value="Set" data-url="?view=controlpreset&amp;mid=<?php echo $monitor->Id() ?>" data-window-name="zmPreset" data-window-tag="preset"><?php echo translate('Set') ?></button>
 <?php
@@ -298,33 +186,32 @@ function controlPresets( $monitor, $cmds ) {
   return ob_get_clean();
 }
 
-function controlPower( $monitor, $cmds ) {
-  global $SLANG;
-
+function controlPower($monitor, $cmds) {
+  $control = $monitor->Control();
   ob_start();
 ?>
 <div class="powerControls">
   <div class="powerLabel"><?php echo translate('Control') ?></div>
   <div>
 <?php
-  if ( $monitor->CanWake() ) {
+  if ( $control->CanWake() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Wake" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"><?php echo translate('Wake') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Wake'] ?>"><?php echo translate('Wake') ?></button>
 <?php
   }
-  if ( $monitor->CanSleep() ) {
+  if ( $control->CanSleep() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Sleep" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"><?php echo translate('Sleep') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Sleep'] ?>"><?php echo translate('Sleep') ?></button>
 <?php
   }
-  if ( $monitor->CanReset() ) {
+  if ( $control->CanReset() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Reset" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"><?php echo translate('Reset') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Reset'] ?>"><?php echo translate('Reset') ?></button>
 <?php
   }
-  if ( $monitor->CanReboot() ) {
+  if ( $control->CanReboot() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Reboot" onclick="controlCmd('<?php echo $cmds['Reboot'] ?>')"><?php echo translate('Reboot') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Reboot'] ?>"><?php echo translate('Reboot') ?></button>
 <?php
   }
 ?>
@@ -334,30 +221,31 @@ function controlPower( $monitor, $cmds ) {
   return ob_get_clean();
 }
 
-function ptzControls( $monitor ) {
-  $cmds = getControlCommands($monitor);
+function ptzControls($monitor) {
+  $control = $monitor->Control();
+  $cmds = $control->commands();
   ob_start();
 ?>
 <div class="controlsPanel">
 <?php
-  if ( $monitor->CanFocus() )
+  if ( $control->CanFocus() )
     echo controlFocus($monitor, $cmds);
-  if ( $monitor->CanZoom() )
+  if ( $control->CanZoom() )
     echo controlZoom($monitor, $cmds);
-  if ( $monitor->CanIris() )
+  if ( $control->CanIris() )
     echo controlIris($monitor, $cmds);
-  if ( $monitor->CanWhite() )
+  if ( $control->CanWhite() )
     echo controlWhite($monitor, $cmds);
-  if ( $monitor->CanMove() ) {
+  if ( $control->CanMove() ) {
 ?>
   <div class="pantiltPanel">
 <?php echo controlPanTilt($monitor, $cmds); ?>
   </div>
 <?php
   }
-  if ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() )
+  if ( $control->CanWake() || $control->CanSleep() || $control->CanReset() )
     echo controlPower($monitor, $cmds);
-  if ( $monitor->HasPresets() )
+  if ( $control->HasPresets() )
     echo controlPresets($monitor, $cmds);
 ?>
 </div>
diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 02d0d86dd..052277434 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -20,52 +20,19 @@
 
 function exportHeader($title) {
 ?>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <title><?php echo $title ?></title>
-    <style type="text/css">
-<?php include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/'.ZM_SKIN_NAME.'/export.css'); ?>
-
-ul.tabs {
-	margin: 0;
-  margin-bottom: -1px;
-	padding: 0;
-	float: left;
-	list-style: none;
-	height: 32px;
-	border-bottom: 1px solid #7f7fb2;
-	border-left: 1px solid #7f7fb2;
-	width: 100%;
-}
-ul.tabs li {
-	float: left;
-	margin: 0;
-	padding: 0;
-	height: 31px;
-	line-height: 31px;
-	border: 1px solid #7f7fb2;
-	border-left: none;
-	margin-bottom: -1px;
-	background: #fff;
-	overflow: hidden;
-	position: relative;
-}
-ul.tabs li a {
-	text-decoration: none;
-	color: #000;
-	display: block;
-	font-size: 1.2em;
-	padding: 0 20px;
-	outline: none;
-}
-ul.tabs li a:hover {
-	background: #ccc;
-}
-html ul.tabs li.active, html ul.tabs li.active a:hover  {
-	background: #dddddd;
-	border-bottom: 1px solid #e0e0e0;
-}
+    <style>
+<?php 
+  global $css;
+  include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/base/export.css');
+  if ( $css != 'base' ) {
+    include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/'.$css.'/export.css');
+  }
+?>
     </style>
     <script src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>jquery.js"></script>
     <!--<script type="text/javascript" src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>video.js"></script>-->
@@ -95,35 +62,35 @@ html ul.tabs li.active, html ul.tabs li.active a:hover  {
     </script>
   </head>
 <?php
-}
+} // end exportHeader
 
 function exportEventDetail($event, $exportFrames, $exportImages) {
   ob_start();
   exportHeader(translate('Event').' '.$event->Id());
 	
 	$otherlinks = '';
-	if( $exportFrames ) $otherlinks .= '<a href="zmEventFrames.html">'.translate('Frames').'</a>,';
-	if( $exportImages ) $otherlinks .= '<a href="zmEventImages.html">'.translate('Images').'</a>,';
-	$otherlinks = substr($otherlinks,0,-1);
+	if ( $exportFrames ) $otherlinks .= ' <a href="zmEventFrames.html">'.translate('Frames').'</a>,';
+	if ( $exportImages ) $otherlinks .= ' <a href="zmEventImages.html">'.translate('Images').'</a>,';
+	$otherlinks = substr($otherlinks, 0, -1);
 ?>
 <body>
   <div id="page">
     <div id="content">
-		<h2><?php echo translate('Event') ?>: <?php echo validHtmlStr($event->Name()) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+		  <h2><?php echo translate('Event') .': '.validHtmlStr($event->Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.') ' : '' ) ?></h2>
       <table id="eventDetail">
         <tr><th scope="row"><?php echo translate('Id') ?></th><td><?php echo $event->Id() ?></td></tr>
         <tr><th scope="row"><?php echo translate('Name') ?></th><td><?php echo validHtmlStr($event->Name()) ?></td></tr>
-        <tr><th scope="row"><?php echo translate('Monitor') ?></th><td><?php echo validHtmlStr($event->MonitorName()) ?> (<?php echo $event->MonitorId() ?>)</td></tr>
+        <tr><th scope="row"><?php echo translate('Monitor') ?></th><td><?php echo validHtmlStr($event->Monitor()->Name()) ?> (<?php echo $event->MonitorId() ?>)</td></tr>
         <tr><th scope="row"><?php echo translate('Cause') ?></th><td><?php echo validHtmlStr($event->Cause()) ?></td></tr>
         <tr><th scope="row"><?php echo translate('Notes') ?></th><td><?php echo validHtmlStr($event->Notes()) ?></td></tr>
-        <tr><th scope="row"><?php echo translate('Time') ?></th><td><?php echo strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime()) ) ?></td></tr>
+        <tr><th scope="row"><?php echo translate('Time') ?></th><td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) ?></td></tr>
         <tr><th scope="row"><?php echo translate('Duration') ?></th><td><?php echo $event->Length() ?></td></tr>
         <tr><th scope="row"><?php echo translate('Frames') ?></th><td><?php echo $event->Frames() ?></td></tr>
         <tr><th scope="row"><?php echo translate('AttrAlarmFrames') ?></th><td><?php echo $event->AlarmFrames() ?></td></tr>
         <tr><th scope="row"><?php echo translate('AttrTotalScore') ?></th><td><?php echo $event->TotScore() ?></td></tr>
         <tr><th scope="row"><?php echo translate('AttrAvgScore') ?></th><td><?php echo $event->AvgScore() ?></td></tr>
         <tr><th scope="row"><?php echo translate('AttrMaxScore') ?></th><td><?php echo $event->MaxScore() ?></td></tr>
-        <tr><th scope="row"><?php echo translate('Archived') ?></th><td><?php echo $event->Archived()?translate('Yes'):translate('No') ?></td></tr>
+        <tr><th scope="row"><?php echo translate('Archived') ?></th><td><?php echo translate($event->Archived()?'Yes':'No') ?></td></tr>
       </table>
     </div>
   </div>
@@ -134,21 +101,21 @@ function exportEventDetail($event, $exportFrames, $exportImages) {
 }
 
 function exportEventFrames($event, $exportDetail, $exportImages) {
-  $sql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames WHERE EventID = ? ORDER BY FrameId';
+  $sql = 'SELECT *, unix_timestamp(TimeStamp) AS UnixTimeStamp FROM Frames WHERE EventID = ? ORDER BY FrameId';
   $frames = dbFetchAll($sql, NULL, array($event->Id()));
 
   ob_start();
   exportHeader(translate('Frames').' '.$event->Id());
 	
 	$otherlinks = '';
-	if ( $exportDetail ) $otherlinks .= '<a href="zmEventDetail.html">'.translate('Event').'</a>,';
-	if ( $exportImages ) $otherlinks .= '<a href="zmEventImages.html">'.translate('Images').'</a>,';
-	$otherlinks = substr($otherlinks,0,-1);
+	if ( $exportDetail ) $otherlinks .= ' <a href="zmEventDetail.html">'.translate('Event').'</a>,';
+	if ( $exportImages ) $otherlinks .= ' <a href="zmEventImages.html">'.translate('Images').'</a>,';
+	$otherlinks = substr($otherlinks, 0, -1);
 ?>
 <body>
   <div id="page">
     <div id="content">
-		<h2><?php echo translate('Frames') ?>: <?php echo validHtmlStr($event->Name()) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+		<h2><?php echo translate('Frames').': '.validHtmlStr($event->Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.')':'') ?></h2>
       <table id="eventFrames">
         <tr>
           <th><?php echo translate('FrameId') ?></th>
@@ -208,35 +175,54 @@ function exportEventFrames($event, $exportDetail, $exportImages) {
 </html>
 <?php
   return ob_get_clean();
-}
+} // end function exportEventFrames($event, $exportDetail, $exportImages)
 
 function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
   ob_start();
   exportHeader(translate('Images').' '.$event->Id());
 	
 	$otherlinks = '';
-	if( $exportDetail ) $otherlinks .= '<a href="zmEventDetail.html">'.translate('Event').'</a>,';
-	if( $exportFrames ) $otherlinks .= '<a href="zmEventFrames.html">'.translate('Frames').'</a>,';
-	$otherlinks = substr($otherlinks,0,-1);
+	if ( $exportDetail ) $otherlinks .= ' <a href="zmEventDetail.html">'.translate('Event').'</a>,';
+	if ( $exportFrames ) $otherlinks .= ' <a href="zmEventFrames.html">'.translate('Frames').'</a>,';
+	$otherlinks = substr($otherlinks, 0, -1);
 
 	$filelist = array_keys($myfilelist);
-	sort($filelist,SORT_NUMERIC);
+	sort($filelist, SORT_NUMERIC);
 	$slides = '"'.implode('","',$filelist).'"';
 	$listcount = count($filelist);
 ?>
 <body>
 <style>
-*.horizontal_track {background-color: #bbb;width: <?php echo$event->Width()?>px;line-height: 0px;font-size: 0px;text-align: left;padding: 4px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
-*.horizontal_slider {background-color: #666;width: 16px;height: 8px;position: relative;z-index: 2;line-height: 0;margin: 0;border: 2px solid;border-color: #999 #333 #333 #999;}
-*.horizontal_slit {background-color: #333;width: <?php echo($event->Width()-10)?>px;height: 2px;margin: 4px 4px 2px 4px;line-height: 0;position: absolute;z-index: 1;border: 1px solid;border-color: #999 #ddd #ddd #999;}
-*.vertical_track {background-color: #bbb;padding: 3px 5px 15px 5px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
-*.vertical_slider {background-color: #666;width: 18px;height: 8px;font: 0px;text-align: left;line-height: 0px;position: relative;z-index: 1;border: 2px solid;border-color: #999 #333 #333 #999;}
-*.vertical_slit {background-color: #000;width: 2px;height: 100px;position: absolute;margin: 4px 10px 4px 10px;padding: 4px 0 1px 0;line-height: 0;font-size: 0;border: 1px solid;border-color: #666 #ccc #ccc #666;}
-*.display_holder {background-color: #bbb;color: #fff;width: 34px;height: 20px;text-align: right;padding: 0;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
+.horizontal_track {
+  background-color: #bbb;
+  width: <?php echo $event->Width()?>px;
+  line-height: 0;
+  font-size: 0;
+  text-align: left;
+  padding: 4px;
+  border: 1px solid;
+  border-color: #ddd #999 #999 #ddd;
+}
+.horizontal_slider {
+  background-color: #666;
+  width: 16px;
+  height: 8px;
+  position: relative;
+  z-index: 2;
+  line-height: 0;
+  margin: 0;
+  border: 2px solid;
+  border-color: #999 #333 #333 #999;
+}
+.horizontal_slit {background-color: #333;width: <?php echo($event->Width()-10)?>px;height: 2px;margin: 4px 4px 2px 4px;line-height: 0;position: absolute;z-index: 1;border: 1px solid;border-color: #999 #ddd #ddd #999;}
+.vertical_track {background-color: #bbb;padding: 3px 5px 15px 5px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
+.vertical_slider {background-color: #666;width: 18px;height: 8px;font: 0px;text-align: left;line-height: 0px;position: relative;z-index: 1;border: 2px solid;border-color: #999 #333 #333 #999;}
+.vertical_slit {background-color: #000;width: 2px;height: 100px;position: absolute;margin: 4px 10px 4px 10px;padding: 4px 0 1px 0;line-height: 0;font-size: 0;border: 1px solid;border-color: #666 #ccc #ccc #666;}
+.display_holder {background-color: #bbb;color: #fff;width: 34px;height: 20px;text-align: right;padding: 0;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
 .value_display {background-color: #bbb;color: #333;width: 30px;margin: 0 2px;text-align: right;font-size: 8pt;font-face: verdana, arial, helvetica, sans-serif;font-weight: bold;line-height: 12px;border: 0;cursor: default;}
 </style>
 
-<h2><?php echo translate('Images') ?>: <?php echo validHtmlStr($event->Name()) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+<h2><?php echo translate('Images').': '.validHtmlStr($event->Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.') ' : '' ) ?></h2>
 
 <?php
   if ( $event->DefaultVideo() ) {
@@ -247,12 +233,12 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
     if ( $Monitor->VideoWriter() == '2' ) {
       # Passthrough
       $Rotation = $event->Orientation();
-      if ( in_array($event->Orientation(),array('90','270')) )
+      if ( in_array($event->Orientation(), array('ROTATE_90','ROTATE_270')) )
         $Zoom = $event->Height()/$event->Width();
-    }
+    } # end if passthrough
 ?>
     <div id="videoFeed">
-      <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0)"
+      <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0);"
         width="<?php echo $event->Width() ?>"
         height="<?php echo $event->Height() ?>"
         data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
@@ -280,7 +266,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
 <div align="center"><div class="horizontal_track">
 	<div class="horizontal_slit">&nbsp;</div>
     <div class="horizontal_slider" id="imageslider_id" style="left: 0px;"
-        onmousedown="slide(event,'horizontal', <?php echo($event->Width()-20)?>, 1, <?php echo$listcount?>, <?php echo$listcount?>,0, 'imageslider_display_id');">&nbsp;</div>
+        onmousedown="slide(event,'horizontal', <?php echo($event->Width()-20)?>, 1, <?php echo $listcount?>, <?php echo $listcount?>,0, 'imageslider_display_id');">&nbsp;</div>
   </div>
 </div>
 <div align="center"><div class="display_holder"><input id="imageslider_display_id" class="value_display" type="text" value="0" onfocus="blur(this);"/></div></div>
@@ -582,48 +568,57 @@ else if (document.layers) window.onload=start_slider;
 </html>
 <?php
   return ob_get_clean();
-}
+} # end function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist)
 
-function eventlist_html($Event) {
-?>
-<div class="event">
-<?php 
+function eventlist_html($Event, $exportDetail, $exportFrames) {
+  $html = '<div class="event">
+';
 	if ( $Event->SaveJPEGs() ) {
-?>	
-<a href="#" onclick="switchevent('<?php echo $Event->Id(); ?>/zmEventImages.html');return false;">
-<?php if ( ZM_WEB_LIST_THUMBS ) { ?>
-<img width="<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>" src="<?php echo $Event->Id(); ?>/snapshot.jpg" alt="<?php echo $Event->Id()?>"/>
-<?php } else { echo $Event->Id(); } ?>
-</a>
-<?php
+    $html .= '<a href="#" onclick="switchevent(\''.$Event->Id().'/zmEventImages.html\');return false;">
+';
+    if ( ZM_WEB_LIST_THUMBS ) {
+      $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().'/snapshot.jpg" alt="'.$Event->Id().'"/>
+';
+    } else {
+      $html .= $Event->Id();
+    }
+    $html .= '</a><br/>
+';
 	} # end if has jpegs
 	if ( $Event->DefaultVideo() ) {
 		if ( ZM_WEB_LIST_THUMBS ) {
-?>
-	<a href="<?php echo $Event->Id().'/'.$Event->DefaultVideo() ?>">
-    <img width="<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>" src="<?php echo $Event->Id(); ?>/snapshot.jpg" alt="<?php echo $Event->Id()?>"/>
-  </a>
-<?php
+      $html .= '<a href="'.$Event->Id().'/'.$Event->DefaultVideo() .'">';
+      $html .= '<img width="'.ZM_WEB_LIST_THUMB_WIDTH.'" src="'. $Event->Id().'/snapshot.jpg" alt="'.$Event->Id().'"/>';
+      $html .= '</a><br/>
+        ';
 		}
 	}
-?>
-	</div><!--event-->
-<?php
-}
+  if ( $exportDetail ) {
+    $html .= '<a href="#" onclick="switchevent(\''.$Event->Id().'/zmEventDetail.html\');return false;">Detail</a>
+';
+  }
+  if ( $exportFrames ) {
+    $html .= '<a href="#" onclick="switchevent(\''.$Event->Id().'/zmEventFrames.html\');return false;">Frames</a>
+';
+  }
+  $html .= '</div><!--event-->
+';
+  return $html;
+} // end function eventlist_html
 
-function exportEventImagesMaster($eids) {
+function exportEventImagesMaster($eids, $exportDetail, $exportFrames) {
   ob_start();
   exportHeader(translate('Images').' Master');
 ?>
 <body>
 <h2><?php echo translate('Images') ?> Master</h2>
 <?php
-  // TODO: Should use find to make this 1 db query
-	foreach ($eids as $eid) {
+  $events = ZM\Event::find(array('Id'=>$eids));
+
+	foreach ( $events as $event ) {
 		//get monitor id and event id
-		$event = new ZM\Event($eid);
-		$eventMonitorId[$eid] = $event->MonitorId();
-		$eventPath[$eid] = $event->Relative_Path();
+		$eventMonitorId[$event->Id()] = $event->MonitorId();
+		$eventPath[$event->Id()] = $event->Relative_Path();
 	}
 	
 	$monitors = array_values(array_flip(array_flip($eventMonitorId))); //unique monitors and reindex the array
@@ -631,11 +626,10 @@ function exportEventImagesMaster($eids) {
 	
 	//*
 	if ( !empty($monitors) ) {
-		$tmp = dbFetchAll('SELECT Id,Name FROM Monitors WHERE Id IN ('.implode(',', $monitors).') ');
+		$tmp = dbFetchAll('SELECT Id, Name FROM Monitors WHERE Id IN ('.implode(',', $monitors).') ');
 		foreach ( $tmp as $row ) { $monitorNames[$row['Id']] = $row['Name']; }
 	}
 	//*/
-	//trigger_error(print_r($monitorNames,1));
 ?>
 <div id="tabs">
 	<ul class="tabs">
@@ -647,33 +641,32 @@ function exportEventImagesMaster($eids) {
 		?>
 	</ul>
 </div>
-<table width="100%" height="100%">
+<table>
   <tr>
     <td valign="top" bgcolor="#dddddd" style="padding:10px;">
       <div class="tab_content" id="all">
         <h2> All </h2>
 <?php
-	foreach($eids as $eid) {
-    $Event = new ZM\Event($eid);
-		eventlist_html($Event);
-	} # end foreach event id
+	foreach($events as $event) {
+		echo eventlist_html($event, $exportDetail, $exportFrames);
+	} # end foreach event
 ?>
-	</div>
+	    </div>
 <?php
-  foreach ($monitors as $monitor_id) {
-		echo "<div class=\"tab_content\" id=\"tab$monitor_id\">";
-		echo '<h2>Monitor: ' . $monitorNames[$monitor_id] . ' </h2>';
-		foreach ( $eids as $eid ) {
-			$Event = new ZM\Event($eid);
-			if ( $Event->MonitorId() == $monitor_id ) {
-				eventlist_html($Event);
+  foreach ( $monitors as $monitor_id ) {
+		echo '<div class="tab_content" id="tab'.$monitor_id.'">';
+		echo '<h2>Monitor: '.$monitorNames[$monitor_id].'</h2>';
+		foreach ( $events as $event ) {
+			if ( $event->MonitorId() == $monitor_id ) {
+		    echo eventlist_html($event, $exportDetail, $exportFrames);
 			} # end if its the right monitor
 		} # end foreach event
 		echo '</div>';
 	} # end foreach monitor
 ?>
-    </td><td>
-      <iframe id="myframe" onload="resizeCaller();" name="myframe" src="#"
+
+</td><td valign="top">
+      <iframe id="myframe" onload="resizeCaller();" name="myframe" src="about:blank"
         scrolling="no" marginwidth="0" marginheight="0" frameborder="0"
         vspace="0" hspace="0" style="overflow:visible; width:100%; display:none">
       </iframe>
@@ -683,7 +676,7 @@ function exportEventImagesMaster($eids) {
 
 <script>
 function switchevent(src) { 
-  $('#myframe').attr('src',src);
+  $('#myframe').attr('src', src);
   $('#myframe').show();
 }
 
@@ -704,48 +697,66 @@ var getFFVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Fire
 var FFextraHeight=parseFloat(getFFVersion)>=0.1? 16 : 0; //extra height in px to add to iframe in FireFox 1.0+ browsers
 
 function resizeCaller() {
-	var dyniframe=new Array();
-	for (i=0; i<iframeids.length; i++){
-		if (document.getElementById) resizeIframe(iframeids[i]);
-		//reveal iframe for lower end browsers? (see var above):
-		if ( (document.all || document.getElementById) && iframehide=="no" ) {
-			var tempobj=document.all? document.all[iframeids[i]] : document.getElementById(iframeids[i]);
-			tempobj.style.display="block";
-		}
-	}
+  var dyniframe=new Array();
+  for (i=0; i<iframeids.length; i++){
+    if (document.getElementById) resizeIframe(iframeids[i]);
+    //reveal iframe for lower end browsers? (see var above):
+    if ( (document.all || document.getElementById) && iframehide=="no" ) {
+      var tempobj=document.all? document.all[iframeids[i]] : document.getElementById(iframeids[i]);
+      tempobj.style.display="block";
+    }
+  }
 }
 
 function resizeIframe(frameid) {
-	var currentfr = document.getElementById(frameid);
-	if ( currentfr && !window.opera ) {
-		currentfr.style.display = "block";
-		if ( currentfr.contentDocument && currentfr.contentDocument.body.offsetHeight ) //ns6 syntax
-			currentfr.height = currentfr.contentDocument.body.offsetHeight+FFextraHeight; 
-		else if ( currentfr.Document && currentfr.Document.body.scrollHeight ) //ie5+ syntax
-			currentfr.height = currentfr.Document.body.scrollHeight;
+  var currentfr = document.getElementById(frameid);
+  if ( currentfr && !window.opera ) {
+    currentfr.style.display = "block";
+    if ( currentfr.contentDocument && currentfr.contentDocument.body.offsetHeight ) //ns6 syntax
+      currentfr.height = currentfr.contentDocument.body.offsetHeight+FFextraHeight;
+    else if ( currentfr.Document && currentfr.Document.body.scrollHeight ) //ie5+ syntax
+      currentfr.height = currentfr.Document.body.scrollHeight;
 
     if ( currentfr.addEventListener ) {
       currentfr.addEventListener("load", readjustIframe, false);
     } else if ( currentfr.attachEvent ) {
-			currentfr.detachEvent("onload", readjustIframe); // Bug fix line
-			currentfr.attachEvent("onload", readjustIframe);
-		}
-	}
+      currentfr.detachEvent("onload", readjustIframe); // Bug fix line
+      currentfr.attachEvent("onload", readjustIframe);
+    }
+  }
 }
-
 function readjustIframe(loadevt) {
-	var crossevt = window.event ? event : loadevt;
-	var iframeroot = crossevt.currentTarget ? crossevt.currentTarget : crossevt.srcElement;
-	if (iframeroot) resizeIframe(iframeroot.id);
+  var crossevt = window.event ? event : loadevt;
+  var iframeroot = crossevt.currentTarget ? crossevt.currentTarget : crossevt.srcElement;
+  if (iframeroot) resizeIframe(iframeroot.id);
+  $('#myframe').load($('#myframe').src);
 }
 
 function loadintoIframe(iframeid, url) {
-	if (document.getElementById) document.getElementById(iframeid).src=url;
+  if (document.getElementById) document.getElementById(iframeid).src=url;
 }
 
-//if (window.addEventListener) window.addEventListener("load", resizeCaller, false)
-//else if (window.attachEvent) window.attachEvent("onload", resizeCaller)
-//else window.onload=resizeCaller
+    /*==========[tab code]==========*/
+    $(document).ready(function() {
+
+      //When page loads...
+      $(".tab_content").hide(); //Hide all content
+      $("ul.tabs li:first").addClass("active").show(); //Activate first tab
+      $(".tab_content:first").show(); //Show first tab content
+
+      //On Click Event
+      $("ul.tabs li").click(function() {
+
+        $("ul.tabs li").removeClass("active"); //Remove any "active" class
+        $(this).addClass("active"); //Add "active" class to selected tab
+        $(".tab_content").hide(); //Hide all tab content
+
+        var activeTab = $(this).find("a").attr("href"); //Find the href attribute value to identify the active tab + content
+        $(activeTab).fadeIn(); //Fade in the active ID content
+        return false;
+      });
+
+    });
     </script>
   </body>
 </html>
@@ -753,7 +764,14 @@ function loadintoIframe(iframeid, url) {
   return ob_get_clean();
 }
 
-function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc) {
+function exportFileList(
+  $event,
+  $exportDetail,
+  $exportFrames,
+  $exportImages,
+  $exportVideo,
+  $exportMisc
+) {
 
   if ( !canView('Events') or !$event ) {
     return;
@@ -775,29 +793,32 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
 
   if ( $exportDetail ) {
     $file = 'zmEventDetail.html';
-    if ( !($fp = fopen($eventPath.'/'.$file, 'w')) ) {
-      ZM\Fatal("Can't open event detail export file '$file'");
+    if ( $fp = fopen($eventPath.'/'.$file, 'w') ) {
+      fwrite($fp, exportEventDetail($event, $exportFrames, $exportImages));
+      fclose($fp);
+      $exportFileList[$file] = $file;
+    } else {
+      ZM\Error("Can't open event detail export file '$file'");
     }
-    fwrite($fp, exportEventDetail($event, $exportFrames, $exportImages));
-    fclose($fp);
-    $exportFileList[$file] = $event->Id().'/'.$file;
   }
+
   if ( $exportFrames ) {
     $file = 'zmEventFrames.html';
-    if ( !($fp = fopen($eventPath.'/'.$file, 'w')) ) {
-      ZM\Fatal("Can't open event frames export file '$file'");
+    if ( $fp = fopen($eventPath.'/'.$file, 'w') ) {
+      fwrite($fp, exportEventFrames($event, $exportDetail, $exportImages));
+      fclose($fp);
+      $exportFileList[$file] = $file;
+    } else {
+      ZM\Error("Can't open event frames export file '$file'");
     }
-    fwrite($fp, exportEventFrames($event, $exportDetail, $exportImages));
-    fclose($fp);
-    $exportFileList[$file] = $event->Id().'/'.$file;
   }
 
   if ( $exportImages ) {
     $filesLeft = array();
     $myfilelist = array();
     foreach ( $files as $file ) {
-      if ( preg_match('/-(?:capture|analyse).jpg$/', $file ) ) {
-        $myfilelist[$file] = $exportFileList[$file] = $event->Id().'/'.$file;
+      if ( preg_match('/-(?:capture|analyse).jpg$/', $file) ) {
+        $myfilelist[$file] = $exportFileList[$file] = $file;
       } else {
         $filesLeft[$file] = $file;
       }
@@ -806,12 +827,14 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
 
     // create an image slider
     if ( !empty($myfilelist) ) {
-      $file = $event->Id().'/zmEventImages.html';
-      if ( !($fp = fopen($file, 'w')) )
-        ZM\Fatal("Can't open event images export file '$file'");
-      fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist));
-      fclose($fp);
-      $exportFileList[$file] = $event->Id().'/'.$file;
+      $file = 'zmEventImages.html';
+      if ( $fp = fopen($eventPath.'/'.$file, 'w') ) {
+        fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist));
+        fclose($fp);
+        $exportFileList[$file] = $file;
+      } else {
+        ZM\Error("Can't open event images export file '$file'");
+      }
     }
   } # end if exportImages
 
@@ -819,17 +842,17 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
     $filesLeft = array();
     foreach ( $files as $file ) {
       if ( preg_match('/\.(?:mpg|mpeg|mov|swf|mp4|mkv|avi|asf|3gp)$/', $file) ) {
-        $exportFileList[$file] = $event->Id().'/'.$file;
+        $exportFileList[$file] = $file;
       } else {
         $filesLeft[$file] = $file;
       }
     }
     $files = $filesLeft;
-  } # end if  exportVideo
+  } # end if exportVideo
 
   if ( $exportMisc ) {
     foreach ( $files as $file ) {
-      $exportFileList[$file] = $event->Id().'/'.$file;
+      $exportFileList[$file] = $file;
     }
     $files = array();
   }
@@ -850,10 +873,10 @@ function exportEvents(
 ) {
 
   if ( !canView('Events') ) {
-    ZM\Error("You do not have permission to view events.");
+    ZM\Error('You do not have permission to view events.');
     return false;
   } else if ( empty($eids) ) {
-    ZM\Error("Attempt to export an empty list of events.");
+    ZM\Error('Attempt to export an empty list of events.');
     return false;
   }
 
@@ -863,23 +886,23 @@ function exportEvents(
   }
 
   # Ensure that we are going to be able to do this.
-  if ( ! file_exists(ZM_DIR_EXPORTS) ) {
-    if ( ! mkdir(ZM_DIR_EXPORTS) ) {
-      ZM\Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
-    }
+  if ( ! ( mkdir(ZM_DIR_EXPORTS) or file_exists(ZM_DIR_EXPORTS) ) ) {
+    ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\'');
   }
+  chmod(ZM_DIR_EXPORTS, 0700);
   $export_dir = ZM_DIR_EXPORTS.'/zmExport_'.$connkey;
 
   # Ensure that we are going to be able to do this.
-  if ( ! file_exists($export_dir) ) {
-    if ( ! mkdir($export_dir) ) {
-      ZM\Fatal("Can't create exports dir at '$export_dir'");
-    } else {
-      ZM\Logger::Debug("Successfully created dir '$export_dir'");
-    }
+  if ( ! ( mkdir($export_dir) or file_exists($export_dir) ) ) {
+    ZM\Error("Can't create exports dir at '$export_dir'");
+    return false;
+  }
+  ZM\Logger::Debug("Successfully created dir '$export_dir'");
+  chmod($export_dir, 0700);
+  if ( !chdir($export_dir) ) {
+    ZM\Error("Can't chdir to $export_dir");
+    return;
   }
-  if ( !chdir($export_dir) )
-    ZM\Fatal("Can't chdir to $export_dir");
 
   $export_root = 'zmExport';
   $export_listFile = 'zmFileList.txt';
@@ -889,40 +912,37 @@ function exportEvents(
   if ( !is_array($eids) ) {
     $eids = array($eids);
   }
-  ZM\Logger::Debug("Eids: " . print_r($eids,true));
   foreach ( $eids as $eid ) {
     $event = new ZM\Event($eid);
     $event_dir = $export_dir.'/'.$event->Id();
-    if ( !mkdir($event_dir) )
+    if ( !(mkdir($event_dir) or file_exists($event_dir)) ) {
       ZM\Error("Can't mkdir $event_dir");
+    }
     $event_exportFileList = exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc);
-    ZM\Logger::Debug("File list for event $eid " . print_r($event_exportFileList, true));
-    $exportFileList = array_merge($exportFileList,$event_exportFileList);
+    $exportFileList = array_merge($exportFileList, $event_exportFileList);
     foreach ( $event_exportFileList as $file ) {
-     if ( preg_match('/\.html$/', $file ) )
-        continue;
-      ZM\Logger::Debug('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file);
-      exec('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file);
-    }
-  }
+     #if ( preg_match('/\.html$/', $file) )
+        #continue;
+      $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'/'.$file. ' 2>&1';
+      exec($cmd, $output, $return);
+      ZM\Logger::Debug($cmd.' return code: '.$return.' output: '.print_r($output,true));
+    } # end foreach event_exportFile
+  } # end foreach event
 
-  // create an master image 
-  if ( $exportImages ) {
-    if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
-      ZM\Error("Failed linking jquery.js");
-    //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
-      //Error("Failed linking video.js");
+  if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
+    ZM\Error('Failed linking jquery.js');
+  //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
+    //Error("Failed linking video.js");
 
-    $html_eventMaster_file = 'zmEventImagesMaster_'.date('Ymd_His'). '.html';
-    $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
+  $html_eventMaster_file = 'zmEventImagesMaster.html';
+  $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
 
-    if ( ($fp = fopen($html_eventMaster_path, 'w')) ) {
-      fwrite($fp, exportEventImagesMaster($eids));
-      fclose($fp);
-      $exportFileList[] = $html_eventMaster_file;
-    } else {
-      ZM\Error("Can't open event images export file '$html_eventMaster_path'");
-    }
+  if ( ($fp = fopen($html_eventMaster_path, 'w')) ) {
+    fwrite($fp, exportEventImagesMaster($eids, $exportDetail, $exportFrames));
+    fclose($fp);
+    $exportFileList[] = $html_eventMaster_file;
+  } else {
+    ZM\Error("Can't open event images export file '$html_eventMaster_path'");
   }
 
   $listFile = $export_dir.'/'.$export_listFile;
@@ -940,6 +960,8 @@ function exportEvents(
   $archive = '';
   if ( $exportFormat == 'tar' ) {
     $archive = ZM_DIR_EXPORTS.'/'.$export_root.($connkey?'_'.$connkey:'').'.tar';
+    $version = shell_exec('tar -v');
+
     $command = 'tar --create --dereference';
     if ( $exportCompressed ) {
       $archive .= '.gz';
@@ -947,8 +969,11 @@ function exportEvents(
       $exportFormat .= '.gz';
     }
     if ( $exportStructure == 'flat' ) {
-      //strip file paths if we 
-      $command .= " --xform='s#^.+/##x'";
+      if ( preg_match('/BSD/i', $version) ) {
+        $command .= ' -s \'#^.*/##\'';
+      } else {
+        $command .= ' --xform=\'s#^.+/##x\'';
+      }
     }
     $command .= ' --file='.escapeshellarg($archive);
   } elseif ( $exportFormat == 'zip' ) {
@@ -960,19 +985,19 @@ function exportEvents(
 
   @unlink($archive);
   $command .= ' zmExport_' . $connkey.'/';
-  ZM\Logger::Debug("Command is $command");
   exec($command, $output, $status);
   if ( $status ) {
     ZM\Error("Command '$command' returned with status $status");
-    if ( isset($output[0]) )
-      ZM\Error("First line of output is '".$output[0]."'");
+    if ( isset($output[0]) ) {
+      ZM\Error('First line of output is \''.$output[0].'\'');
+    }
     return false;
   }
 
-  //clean up temporary files
+  // clean up temporary files
   if ( !empty($html_eventMaster) ) {
     unlink($monitorPath.'/'.$html_eventMaster);
   }
 
   return '?view=archive%26type='.$exportFormat.'%26connkey='.$connkey;
-}
+} // end function exportEvents
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 67866e247..203d3ffc2 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web function library, $Date: 2008-07-08 16:06:45 +0100 (Tue, 08 Jul 2008) $, $Revision: 2484 $
+// ZoneMinder web function library
 // Copyright (C) 2001-2008 Philip Coombes
 // 
 // This program is free software; you can redistribute it and/or
@@ -18,11 +18,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-
 function xhtmlHeaders($file, $title) {
+  ob_start();
+
   global $css;
   global $skin;
   global $view;
+  global $cspNonce;
+  global $basename;
 
   # This idea is that we always include the classic css files, 
   # and then any different skin only needs to contain things that are different.
@@ -30,17 +33,11 @@ function xhtmlHeaders($file, $title) {
 
   $skinCssPhpFile = getSkinFile('css/'.$css.'/skin.css.php');
 
-  $skinJsFile = getSkinFile('js/skin.js');
-  $skinJsPhpFile = getSkinFile('js/skin.js.php');
-  $cssJsFile = getSkinFile('js/'.$css.'.js');
 
   $basename = basename($file, '.php');
 
+  $baseViewCssPhpFile = getSkinFile('/css/base/views/'.$basename.'.css.php');
   $viewCssPhpFile = getSkinFile('/css/'.$css.'/views/'.$basename.'.css.php');
-  $viewJsFile = getSkinFile('views/js/'.$basename.'.js');
-  $viewJsPhpFile = getSkinFile('views/js/'.$basename.'.js.php');
-
-  extract($GLOBALS, EXTR_OVERWRITE);
 
   function output_link_if_exists($files) {
     global $skin;
@@ -50,7 +47,17 @@ function xhtmlHeaders($file, $title) {
         $html[] = '<link rel="stylesheet" href="'.cache_bust('skins/'.$skin.'/'.$file).'" type="text/css"/>';
       }
     }
-    return implode("\n", $html);
+    $html[] = ''; // So we ge a trailing \n
+    return implode(PHP_EOL, $html);
+  }
+  
+  function output_cache_busted_stylesheet_links($files) {
+    $html = array();
+    foreach ( $files as $file ) {
+        $html[] = '<link rel="stylesheet" href="'.cache_bust($file).'" type="text/css"/>';
+    }
+    $html[] = ''; // So we ge a trailing \n
+    return implode(PHP_EOL, $html);
   }
 ?>
 <!DOCTYPE html>
@@ -58,10 +65,10 @@ function xhtmlHeaders($file, $title) {
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-  <title><?php echo validHtmlStr(ZM_WEB_TITLE_PREFIX); ?> - <?php echo validHtmlStr($title) ?></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title><?php echo validHtmlStr(ZM_WEB_TITLE_PREFIX) . ' - ' . validHtmlStr($title) ?></title>
 <?php
-if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
+if ( file_exists("skins/$skin/css/$css/graphics/favicon.ico") ) {
   echo "
   <link rel=\"icon\" type=\"image/ico\" href=\"skins/$skin/css/$css/graphics/favicon.ico\"/>
   <link rel=\"shortcut icon\" href=\"skins/$skin/css/$css/graphics/favicon.ico\"/>
@@ -72,130 +79,52 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
   <link rel="shortcut icon" href="graphics/favicon.ico"/>
 ';
 }
-?>
-  <link rel="stylesheet" href="css/reset.css" type="text/css"/>
-  <link rel="stylesheet" href="css/overlay.css" type="text/css"/>
-  <link rel="stylesheet" href="css/bootstrap.min.css" type="text/css"/>
-  
-<?php 
-echo output_link_if_exists( array(
+echo output_cache_busted_stylesheet_links(array(
+  'css/reset.css',
+  'css/overlay.css',
+  'css/font-awesome.min.css',
+  'css/bootstrap.min.css',
+  'css/bootstrap-table.min.css',
+  'css/bootstrap-table-page-jump-to.min.css',
+));
+
+echo output_link_if_exists(array(
   'css/base/skin.css',
   'css/base/views/'.$basename.'.css',
   'js/dateTimePicker/jquery-ui-timepicker-addon.css',
   'js/jquery-ui-1.12.1/jquery-ui.structure.min.css',
-  #'js/jquery-ui-1.12.1/jquery-ui.theme.min.css',
-)
-);
+));
 if ( $css != 'base' )
-  echo output_link_if_exists( array(
+  echo output_link_if_exists(array(
     'css/'.$css.'/skin.css',
     'css/'.$css.'/views/'.$basename.'.css',
     'css/'.$css.'/jquery-ui-theme.css',
-  )
-);
+  ));
 ?>
-<link rel="stylesheet" href="skins/classic/js/jquery-ui-1.12.1/jquery-ui.theme.min.css" type="text/css"/>
-  <!--Chosen can't be cache-busted because it loads sprites by relative path-->
-<link rel="stylesheet" href="skins/classic/js/chosen/chosen.min.css" type="text/css"/>
+  <link rel="stylesheet" href="skins/classic/js/jquery-ui-1.12.1/jquery-ui.theme.min.css" type="text/css"/>
+  <?php #Chosen can't be cache-busted because it loads sprites by relative path ?>
+  <link rel="stylesheet" href="skins/classic/js/chosen/chosen.min.css" type="text/css"/>
 <?php
   if ( $basename == 'watch' ) {
-    echo output_link_if_exists( array(
-      '/css/base/views/control.css',
-      '/css/'.$css.'/views/control.css'
-    ) );
+    echo output_link_if_exists(array('/css/base/views/control.css'));
+    if ( $css != 'base' )
+      echo output_link_if_exists(array('/css/'.$css.'/views/control.css'));
+  }
+?>
+  <style>
+<?php
+  if ( $baseViewCssPhpFile ) {
+    require_once($baseViewCssPhpFile);
   }
   if ( $viewCssPhpFile ) {
-?>
-  <style type="text/css">
-<?php
     require_once($viewCssPhpFile);
+  }
 ?>
   </style>
-<?php
-  }
-?>
 
-  <script src="tools/mootools/mootools-core.js"></script>
-  <script src="tools/mootools/mootools-more.js"></script>
-  <script src="js/mootools.ext.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/jquery.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/chosen/chosen.jquery.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/dateTimePicker/jquery-ui-timepicker-addon.js"></script>
-
-  <script src="<?php echo cache_bust('js/Server.js'); ?>"></script>
-  <script nonce="<?php echo $cspNonce; ?>">
-  jQuery(document).ready(function() {
-    jQuery("#flip").click(function() {
-      jQuery("#panel").slideToggle("slow");
-      jQuery("#flip").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
-      Cookie.write( 'zmHeaderFlip', jQuery('#flip').hasClass('glyphicon-menu-up') ? 'up' : 'down', {duration: 10*365} );
-    });
-  });
-  var $j = jQuery.noConflict();
-  // $j is now an alias to the jQuery function; creating the new alias is optional.
-  </script>
-  <script src="<?php echo cache_bust('skins/'.$skin.'/views/js/state.js') ?>"></script>
-<?php
-  if ( $title == 'Login' && (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA) ) {
-?>
-  <script src='https://www.google.com/recaptcha/api.js'></script>
-<?php
-  } else if ( $view == 'event' ) {
-?>
-  <link href="skins/<?php echo $skin ?>/js/video-js.css" rel="stylesheet">
-  <link href="skins/<?php echo $skin ?>/js/video-js-skin.css" rel="stylesheet">
-  <script src="skins/<?php echo $skin ?>/js/video.js"></script>
-  <script src="./js/videojs.zoomrotate.js"></script>
-<?php
-  }
-?>
-  <script src="skins/<?php echo $skin ?>/js/moment.min.js"></script>
-<?php
-  if ( $skinJsPhpFile ) {
-?>
-  <script nonce="<?php echo $cspNonce; ?>">
-<?php
-    require_once( $skinJsPhpFile );
-?>
-  </script>
-<?php
-  }
-  if ( $viewJsPhpFile ) {
-?>
-  <script nonce="<?php echo $cspNonce; ?>">
-<?php
-    require_once( $viewJsPhpFile );
-?>
-  </script>
-<?php
-  }
-	if ( $cssJsFile ) {
-?>
-  <script src="<?php echo cache_bust($cssJsFile) ?>"></script>
-<?php
-} else {
-?>
-  <script src="<?php echo cache_bust('skins/classic/js/base.js') ?>"></script>
-<?php } ?>
-  <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
-  <script src="<?php echo cache_bust('js/logger.js')?>"></script>
-<?php 
-  if ($basename == 'watch' or $basename == 'log' ) {
-  // This is used in the log popup for the export function. Not sure if it's used anywhere else
-?>
-    <script src="<?php echo cache_bust('js/overlay.js') ?>"></script>
-<?php } ?>
-<?php
-  if ( $viewJsFile ) {
-?>
-  <script src="<?php echo cache_bust($viewJsFile) ?>"></script>
-<?php
-  }
-?>
 </head>
 <?php
+  echo ob_get_clean();
 } // end function xhtmlHeaders( $file, $title )
 
 // Outputs an opening body tag, and any additional content that should go at the very top, like warnings and error messages.
@@ -215,220 +144,765 @@ function getBodyTopHTML() {
   }
 } // end function getBodyTopHTML
 
-function getNavBarHTML($reload = null) {
+function getNavBarHTML() {
   # Provide a facility to turn off the headers if you put navbar=0 into the url
-  if ( isset($_REQUEST['navbar']) and $_REQUEST['navbar']=='0' )
+  if ( isset($_REQUEST['navbar']) and $_REQUEST['navbar'] == '0' )
     return '';
 
-  $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
   global $running;
   global $user;
   global $bandwidth_options;
   global $view;
-  global $filterQuery;
-  global $sortQuery;
-  global $limitQuery;
+  global $skin;
 
-  if (!$sortQuery) {
-    parseSort();
+  ob_start();
+  
+  if ( ZM_WEB_NAVBAR_TYPE == "normal" ) {
+    echo getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin);
+  } else {
+    echo getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $skin);
   }
-  if ( (!$filterQuery) and isset($_REQUEST['filter']) ) {
-    parseFilter($_REQUEST['filter']);
-    $filterQuery = $_REQUEST['filter']['query'];
-  }
-  if ( $reload === null ) {
-    ob_start();
-    if ( $running == null )
-      $running = daemonCheck();
-    if ( $running ) {
-      $state = dbFetchOne('SELECT Name FROM States WHERE isActive=1', 'Name');
-      if ( $state == 'default' )
-        $state = '';
-    }
-    $status = $running ? ($state ? $state : translate('Running')) : translate('Stopped');
+
+  return ob_get_clean();
+}
+
+//
+// The legacy navigation bar that collapses into a pulldown menu on small screens.
+//
+function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin) {
+
+  $status = runtimeStatus($running);
+
 ?>
-<div class="navbar navbar-inverse navbar-static-top">
-	<div class="container-fluid">
-		<div class="navbar-header">
-			<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-header-nav" aria-expanded="false">
-				<span class="sr-only">Toggle navigation</span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-			</button>
-      <div class="navbar-brand">
-        <a href="<?php echo validHtmlStr(ZM_HOME_URL); ?>" target="<?php echo validHtmlStr(ZM_WEB_TITLE); ?>"><?php echo ZM_HOME_CONTENT ?></a>
+<div class="fixed-top container-fluid p-0">
+  <nav class="navbar navbar-expand-md navbar-dark bg-dark justify-content-center flex-row">
+
+    <div class="navbar-brand justify-content-start align-self-start">
+      <?php echo getNavBrandHTML() ?>
+    </div>
+
+    <!-- the Navigation Bar Hamburger Button   -->
+    <div class="nav justify-content-end flex-grow-1">
+      <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#main-header-nav" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="navbar-toggler-icon"></span>
+      </button>
+   </div>
+
+    <div class="collapse navbar-collapse" id="main-header-nav">
+<?php
+
+  // *** Build the navigation bar menu items ***
+  if ( $user and $user['Username'] ) {
+        echo '<ul class="navbar-nav align-self-start justify-content-center">';
+          echo getConsoleHTML();
+          echo getOptionsHTML();
+          echo getLogHTML();
+          echo getDevicesHTML();
+          echo getGroupsHTML($view);
+          echo getFilterHTML($view);
+          echo getCycleHTML($view);
+          echo getMontageHTML($view);
+          echo getMontageReviewHTML($view);
+          echo getRprtEvntAuditHTML($view);
+          echo getHeaderFlipHTML();
+        echo '</ul>';
+
+        echo '<ul class="nav navbar-nav justify-content-end align-self-start flex-grow-1">';
+          echo getAcctCircleHTML($skin, $user);
+          echo getStatusBtnHTML($status);
+        echo '</ul>';
+  }
+?>
+    </div>
+  </nav><!-- End First Navbar -->
+
+  <nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
+    <div class="container-fluid" id="panel"<?php echo ( isset($_COOKIE['zmHeaderFlip']) and $_COOKIE['zmHeaderFlip'] == 'down' ) ? 'style="display:none;"' : '' ?>>
+<?php
+
+  if ( (!ZM_OPT_USE_AUTH) or $user ) {
+
+// *** Build the statistics shown on the navigation bar ***
+?>
+      <div id="reload" class="container-fluid">
+        <ul id="Bandwidth" class="navbar-nav justify-content-start">
+          <?php echo getBandwidthHTML($bandwidth_options, $user) ?>
+        </ul>
+        
+        <ul class="navbar-nav list-inline justify-content-center">
+          <?php
+          echo getSysLoadHTML();
+          echo getDbConHTML();
+          echo getStorageHTML();
+          echo getShmHTML();
+          echo getLogIconHTML();
+          ?>
+        </ul>
+
+        <ul id="Version" class="nav navbar-nav justify-content-end">
+          <?php echo getZMVersionHTML() ?>
+        </ul>
       </div>
-		</div>
-
-		<div class="collapse navbar-collapse" id="main-header-nav">
-		<ul class="nav navbar-nav">
-<?php if ( $user and $user['Username'] ) { ?>
-<?php if ( canView('Monitors') ) { ?>
-			<li><a href="?view=console"><?php echo translate('Console') ?></a></li>
-<?php } // end if canView('Monitors') ?>
-<?php if ( canView('System') ) { ?>
-			<li><a href="?view=options"><?php echo translate('Options') ?></a></li>
-			<li>
 <?php
-  if ( ZM\logToDatabase() > ZM\Logger::NOLOG ) { 
-    if ( ! ZM_RUN_AUDIT ) {
-     # zmaudit can clean the logs, but if we aren't running it, then we should clean them regularly
-      if ( preg_match('/^\d+$/', ZM_LOG_DATABASE_LIMIT) ) {
-        # Number of lines, instead of an interval
-        $rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows');
-        if ( $rows > ZM_LOG_DATABASE_LIMIT ) {
-          dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT));
-        }
-      } else if ( preg_match('/^\d\s*(hour|minute|day|week|month|year)$/', ZM_LOG_DATABASE_LIMIT, $matches) ) {
-        dbQuery('DELETE FROM Logs WHERE TimeKey < unix_timestamp( NOW() - interval '.ZM_LOG_DATABASE_LIMIT.') LIMIT 100');
-      } else {
-        ZM\Error('Potentially invalid value for ZM_LOG_DATABASE_LIMIT: ' . ZM_LOG_DATABASE_LIMIT);
-      }
-    }
-    echo makePopupLink('?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.translate('Log').'</span>');
-  }
-?></li>
-<?php
-} // end if canview(System)
-if ( ZM_OPT_X10 && canView('Devices') ) { ?>
-			<li><a href="?view=devices">Devices</a></li>
-<?php } ?>
-<li><a href="?view=groups"<?php echo $view=='groups'?' class="selected"':''?>><?php echo translate('Groups') ?></a></li>
-      <li><a href="?view=filter<?php echo $filterQuery.$sortQuery.$limitQuery ?>"<?php echo $view=='filter'?' class="selected"':''?>><?php echo translate('Filters') ?></a></li>
-
-<?php 
-  if ( canView('Stream') ) {
+  } // end if (!ZM_OPT_USE_AUTH) or $user )
 ?>
-      <li><a href="?view=cycle"<?php echo $view=='cycle'?' class="selected"':''?>><?php echo translate('Cycle') ?></a></li>
-      <li><a href="?view=montage"<?php echo $view=='montage'?' class="selected"':''?>><?php echo translate('Montage') ?></a></li>
-<?php
-   }
-   // if canview_reports
-?>
-<?php
-if ( isset($_REQUEST['filter']['Query']['terms']['attr']) ) {
-  $terms = $_REQUEST['filter']['Query']['terms'];
-  $count = 0;
-  foreach ($terms as $term) {
-    if ( $term['attr'] == 'StartDateTime' ) {
-      $count += 1;
-      if ($term['op'] == '>=') $minTime = $term['val'];
-      if ($term['op'] == '<=') $maxTime = $term['val'];
-    }
-  }
-  if ( $count == 2 ) {
-    $montageReviewQuery = '&minTime='.$minTime.'&maxTime='.$maxTime;
-  }
-}
-  if ( canView('Events') ) {
- ?>
-      <li><a href="?view=montagereview<?php echo isset($montageReviewQuery)?'&fit=1'.$montageReviewQuery.'&live=0':'' ?>"<?php echo $view=='montagereview'?' class="selected"':''?>><?php echo translate('MontageReview')?></a></li>
-<?php
-  }
-?>
-      <li><a href="?view=report_event_audit"<?php echo $view=='report_event_audit'?' class="selected"':''?>><?php echo translate('ReportEventAudit') ?></a></li>
-      <li><a href="#"><span id="flip" class="glyphicon glyphicon-menu-<?php echo ( isset($_COOKIE['zmHeaderFlip']) and $_COOKIE['zmHeaderFlip'] == 'down') ? 'down' : 'up' ?> pull-right"></span></a></li>
-		</ul>
-
-<div class="navbar-right">
-<?php
-if ( ZM_OPT_USE_AUTH and $user ) {
-?>
-  <p class="navbar-text">
-    <i class="material-icons">account_circle</i>
-    <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>
-  </p>
-<?php
-}
-if ( canEdit('System') ) {
-?>
-		<button type="button" class="btn btn-default navbar-btn" data-toggle="modal" data-target="#modalState"><?php echo $status ?></button>
-  <?php if ( ZM_SYSTEM_SHUTDOWN ) { ?>
-  <p class="navbar-text">
-  <?php echo makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i>' ) ?>
-  </p>
-  <?php } ?>
-<?php } else if ( canView('System') ) { ?>
-		<p class="navbar-text"><?php echo $status ?></p>
-<?php } ?>
+    </div><!-- End Collapsible Panel -->
+  </nav><!-- End Second Navbar -->
+  
+  <nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
+    <?php echo getConsoleBannerHTML() ?>
+  </nav><!-- End Third Navbar -->
 </div>
-<?php } # end if !$user or $user['Id'] meaning logged in ?>
-		</div><!-- End .navbar-collapse -->
-	</div> <!-- End .container-fluid -->
-  <div id="panel"<?php echo ( isset($_COOKIE['zmHeaderFlip']) and $_COOKIE['zmHeaderFlip'] == 'down' ) ? 'style="display:none;"' : '' ?>>
 <?php
-} //end reload null.  Runs on full page load
+} // end function getNormalNavBarHTML()
 
-if ( (!ZM_OPT_USE_AUTH) or $user ) {
-  if ($reload == 'reload') ob_start();
-?>
-	<div id="reload" class="container-fluid reduced-text">
-    <div id="Bandwidth" class="pull-left">
-      <?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', "<i class='material-icons md-18'>network_check</i>&nbsp;".$bandwidth_options[$_COOKIE['zmBandwidth']] . ' ', ($user && $user['MaxBandwidth'] != 'low' ) ) ?>
+//
+// A new, slimmer navigation bar, permanently collapsed into a dropdown
+//
+function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $skin) {
+
+  $status = runtimeStatus($running);
+
+  ?>
+  <div class="fixed-top container-fluid p-0">
+  <nav class="navbar navbar-dark bg-dark px-1 flex-nowrap">
+
+    <div class="navbar-brand align-self-start px-0">
+      <?php echo getNavBrandHTML() ?>
     </div>
-    <div id="Version" class="pull-right">
-      <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="version '.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit('System') ) ?>
+
+    <nav class="navbar navbar-expand-md align-self-start px-0">
+    <ul class="nav navbar-nav list-group px-0">
+    <?php
+
+  // *** Build the statistics shown on the navigation bar ***
+  if ( (!ZM_OPT_USE_AUTH) or $user ) {
+    ?>
+    <div id="reload" class="collapse navbar-collapse px-0">
+
+      <ul id="Version" class="pr-2">
+        <?php echo getZMVersionHTML() ?>
+      </ul>
+
+      <ul id="Bandwidth" class="px-2">
+        <?php echo getBandwidthHTML($bandwidth_options, $user) ?>
+      </ul>
+
+        <?php
+        echo getSysLoadHTML();
+        echo getDbConHTML();
+        echo getStorageHTML();
+        echo getShmHTML();
+        echo getLogIconHTML();
+        ?>
+
     </div>
-    <ul class="list-inline">
-      <li class="Load"><i class="material-icons md-18">trending_up</i>&nbsp;<?php echo translate('Load') ?>: <?php echo getLoad() ?></li>
-      <i class="material-icons md-18">storage</i>
+
 <?php 
-  $connections = dbFetchOne( "SHOW status WHERE variable_name='threads_connected'", 'Value' );
-  $max_connections = dbFetchOne( "SHOW variables WHERE variable_name='max_connections'", 'Value' );
+  } // end if (!ZM_OPT_USE_AUTH) or $user )
+?> 
+    </nav>
+
+        <ul class="list-group list-group-horizontal ml-auto">
+        <?php
+        echo getAcctCircleHTML($skin, $user);
+        echo getStatusBtnHTML($status);
+        ?>
+        </ul>
+      </ul>
+
+    <!-- the Navigation Bar Hamburger Button   -->
+    <?php if ( (!ZM_OPT_USE_AUTH) or $user ) { ?>
+      <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#main-header-nav" aria-haspopup="true" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="navbar-toggler-icon"></span>
+      </button>
+    <?php } ?>
+
+  <div style="background-color:#485460" class="dropdown-menu dropdown-menu-right px-3" id="main-header-nav">
+    <?php
+    if ( $user and $user['Username'] ) {
+        echo '<ul class="navbar-nav">';
+          echo getConsoleHTML();
+          echo getOptionsHTML();
+          echo getLogHTML();
+          echo getDevicesHTML();
+          echo getGroupsHTML($view);
+          echo getFilterHTML($view);
+          echo getCycleHTML($view);
+          echo getMontageHTML($view);
+          echo getMontageReviewHTML($view);
+          echo getRprtEvntAuditHTML($view);
+        echo '</ul>';
+    }
+    ?>
+  </div>
+
+  </nav><!-- End First Navbar -->
+
+  <nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
+    <?php echo getConsoleBannerHTML() ?>
+  </nav><!-- End Second Navbar -->
+  </div>
+  
+  <?php
+} // End function getCollapsedNavBarHTML
+
+// Returns the html representing the current unix style system load
+function getSysLoadHTML() {
+  $result = '';
+
+  $result .= '<li id="getSysLoadHTML" class="Load nav-item mx-2">'.PHP_EOL;
+  $result .= '<i class="material-icons md-18">trending_up</i>'.PHP_EOL;
+  $result .= '&nbsp;'.translate('Load').': '.getLoad().PHP_EOL;
+  $result .= '</li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the current number of connections made to the database
+function getDbConHTML() {
+  $result = '';
+  
+  $connections = dbFetchOne('SHOW status WHERE variable_name=\'threads_connected\'', 'Value');
+  $max_connections = dbFetchOne('SHOW variables WHERE variable_name=\'max_connections\'', 'Value');
   $percent_used = $max_connections ? 100 * $connections / $max_connections : 100;
-  echo '<li'. ( $percent_used > 90 ? ' class="warning"' : '' ).'>'.translate('DB').':'.$connections.'/'.$max_connections.'</li>';
-?>
-	  <li><?php echo translate('Storage') ?>:
-<?php
-  $storage_areas = ZM\Storage::find();
-  $storage_paths = null;
-  foreach ( $storage_areas as $area ) {
-    $storage_paths[$area->Path()] = $area;
-  }
-  $func = function($S){
+  $class = ( $percent_used > 90 ) ? ' text-warning' : '';
+
+  $result .= '<li id="getDbConHTML" class="nav-item dropdown mx-2' .$class. '">'.PHP_EOL;
+  $result .= '<i class="material-icons md-18 mr-1">storage</i>'.PHP_EOL;
+  $result .= translate('DB'). ': ' .$connections. '/' .$max_connections.PHP_EOL;   
+  $result .= '</li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns an html dropdown showing capacity of all storage areas
+function getStorageHTML() {
+  $result = '';
+
+  $func = function($S) {
     $class = '';
     if ( $S->disk_usage_percent() > 98 ) {
-      $class = 'error';
+      $class = 'text-danger';
     } else if ( $S->disk_usage_percent() > 90 ) {
-      $class = 'warning';
+      $class = 'text-warning';
     }
     $title = human_filesize($S->disk_used_space()) . ' of ' . human_filesize($S->disk_total_space()). 
       ( ( $S->disk_used_space() != $S->event_disk_space() ) ? ' ' .human_filesize($S->event_disk_space()) . ' used by events' : '' );
+    return '<a class="dropdown-item '.$class.'" title="'.$title.'" href="?view=options&amp;tab=storage">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</a>';
+  };
 
-    return '<span class="'.$class.'" title="'.$title.'">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</span>
-'; };
-  #$func =  function($S){ return '<span title="">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</span>'; };
-  if ( count($storage_areas) > 4 ) 
-    $storage_areas = ZM\Storage::find( array('ServerId'=>null) );
-  if ( count($storage_areas) <= 4 )
-    echo implode( ', ', array_map ( $func, $storage_areas ) );
-  echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%';
-?></li>
-  </ul>
-    <?php if ( defined('ZM_WEB_CONSOLE_BANNER') and ZM_WEB_CONSOLE_BANNER != '' ) { ?>
-        <h3 id="development"><?php echo validHtmlStr(ZM_WEB_CONSOLE_BANNER); ?></h3>
-    <?php } ?>	
-<!-- End .footer/reload --></div>
-<?php
-  if ($reload == 'reload') return ob_get_clean();
-} // end if (!ZM_OPT_USE_AUTH) or $user )
-?>
-  </div>
-</div><!-- End .navbar .navbar-default -->
-<?php
-  return ob_get_clean();
-} // end function getNavBarHTML()
+  $storage_areas = ZM\Storage::find(array('Enabled'=>true));
+  $num_storage_areas = count($storage_areas);  
+  
+  $full_warning = 0;
+  $full_error = 0;
+  foreach ( $storage_areas as $area ) {  
+    if ( $area->disk_usage_percent() > 98 ) { $full_error++; continue; }
+    if ( $area->disk_usage_percent() > 90 ) $full_warning++;    
+  } 
+  
+  $class = '';
+  if ( $full_error ) {
+    $class = 'text-danger'; 
+  } else if ( $full_warning ) {
+    $class = 'text-warning'; 
+  }
+  
+  $result .= '<li id="getStorageHTML" class="nav-item dropdown mx-2">'.PHP_EOL;
+  $result .= '<a class="dropdown-toggle mr-2 '.$class.'" href="#" id="dropdown_storage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="material-icons md-18 mr-1">folder_shared</i>Storage</a>'.PHP_EOL;
+  $result .= '<div class="dropdown-menu" aria-labelledby="dropdown_storage">'.PHP_EOL;
+  
+  foreach ( $storage_areas as $area ) {  
+    $result .= $func($area).PHP_EOL;
+  } 
+  $result .= '</div>'.PHP_EOL;
+  $result .= '</li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the current capacity of mapped memory filesystem (usually /dev/shm)
+function getShmHTML() {
+  $result = '';
+  
+  $shm_percent = getDiskPercent(ZM_PATH_MAP);
+  $shm_total_space = disk_total_space(ZM_PATH_MAP);
+  $shm_used = $shm_total_space - disk_free_space(ZM_PATH_MAP);
+
+  $class = '';
+  if ( $shm_percent > 98 ) {
+    $class = 'text-danger';
+  } else if ( $shm_percent > 90 ) {
+    $class = 'text-warning';
+  }
+  $result .= ' <li id="getShmHTML" class="nav-item dropdown mx-2' .$class. '" title="' .human_filesize($shm_used). ' of ' .human_filesize($shm_total_space). '">' .ZM_PATH_MAP. ': '.$shm_percent.'%</li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the optional web console banner text
+function getConsoleBannerHTML() {
+  $result = '';
+
+  if ( defined('ZM_WEB_CONSOLE_BANNER') and ZM_WEB_CONSOLE_BANNER != '' ) {
+    $result .= '<h2 id="getConsoleBannerHTML">'.validHtmlStr(ZM_WEB_CONSOLE_BANNER).'</h2>';
+  }
+  return $result;
+}
+
+// Returns the html representing the current high,medium,low bandwidth setting
+function getBandwidthHTML($bandwidth_options, $user) {
+
+  # Limit available options to what are available in user
+  if ( $user && !empty($user['MaxBandwidth']) ) {
+    if ( $user['MaxBandwidth'] == 'low' ) {
+      unset($bandwidth_options['high']);
+      unset($bandwidth_options['medium']);
+    } else if ( $user['MaxBandwidth'] == 'medium' ) {
+      unset($bandwidth_options['high']);
+    }
+  }
+
+  $result = '<li id="getBandwidthHTML" class="nav-item dropdown mx-2">'.PHP_EOL;
+  $result .= '<a class="dropdown-toggle mr-2" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdown_bandwidth"><i class="material-icons md-18 mr-1">network_check</i>'.translate($bandwidth_options[$_COOKIE['zmBandwidth']]).'</a>'.PHP_EOL;
+
+  $result .= '<div class="dropdown-menu" aria-labelledby="dropdown_bandwidth">'.PHP_EOL;  
+  if ( count($bandwidth_options) > 1 ) {
+    if ( isset($bandwidth_options['high']) )
+      $result .= '<a data-pdsa-dropdown-val="high" class="dropdown-item" href="#">' .translate('High'). '</a>'.PHP_EOL;
+    if ( isset($bandwidth_options['medium']) )
+      $result .= '<a data-pdsa-dropdown-val="medium" class="dropdown-item" href="#">' .translate('Medium'). '</a>'.PHP_EOL;
+    # low is theoretically always available
+    $result .= '<a data-pdsa-dropdown-val="low" class="dropdown-item" href="#">' .translate('Low'). '</a>'.PHP_EOL;    
+  }
+  $result .= '</div>'.PHP_EOL;
+
+  $result .= '</li>'.PHP_EOL;
+    
+  return $result;
+}
+
+// Returns the html representing the version of ZoneMinder
+function getZMVersionHTML() {
+  $result = '';
+  $content = '';
+  
+  if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) {  // Must upgrade before proceeding
+    $class = 'text-danger';
+    $tt_text = translate('RunLocalUpdate');
+    $content = 'v'.ZM_VERSION.PHP_EOL;
+  } else if ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) ) { // No update needed
+    $class = ''; // Don't change the text color under normal conditions
+    $tt_text = translate('UpdateNotNecessary');
+    $content = 'v'.ZM_VERSION.PHP_EOL;
+  } else if ( canEdit('System') ) { // An update is available and the user is an administrator
+    $class = 'text-warning';
+    $tt_text = translate('UpdateAvailable');
+    $content = '<a class="dropdown ' .$class. '" data-toggle="dropdown" href="#" id="dropdown_reminder">v' .ZM_VERSION. '</a>'.PHP_EOL;
+    $content .= '<div class="dropdown-menu" aria-labelledby="dropdown_reminder">'.PHP_EOL;  
+      $content .= '<h6 class="dropdown-header">' .translate('UpdateAvailable'). '</h6>'.PHP_EOL;
+      $content .= '<a class="dropdown-item" data-pdsa-dropdown-val="ignore" href="#">' .translate('VersionIgnore'). '</a>'.PHP_EOL;
+      $content .= '<a class="dropdown-item" data-pdsa-dropdown-val="hour" href="#">' .translate('VersionRemindHour'). '</a>'.PHP_EOL;
+      $content .= '<a class="dropdown-item" data-pdsa-dropdown-val="day" href="#">' .translate('VersionRemindDay'). '</a>'.PHP_EOL;
+      $content .= '<a class="dropdown-item" data-pdsa-dropdown-val="week" href="#">' .translate('VersionRemindWeek'). '</a>'.PHP_EOL;
+      $content .= '<a class="dropdown-item" data-pdsa-dropdown-val="month" href="#">' .translate('VersionRemindMonth'). '</a>'.PHP_EOL;
+      $content .= '<a class="dropdown-item" data-pdsa-dropdown-val="never" href="#">' .translate('VersionRemindNever'). '</a>'.PHP_EOL;  
+    $content .= '</div>'.PHP_EOL;
+  } else { // An update is available and the user is NOT an administrator
+    $class = 'text-warning';
+    $tt_text = translate('UpdateAvailable');
+    $content = 'v'.ZM_VERSION.PHP_EOL;
+  }
+
+  $result .= '<li id="getZMVersionHTML" class="nav-item dropdown ' .$class. '" data-placement="bottom" title="' .$tt_text. '">'.PHP_EOL; 
+  $result .= $content;
+  $result .= '</li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the ZoneMinder logo and about menu
+function getNavBrandHTML() {
+  $result = '';
+
+  if ( ZM_HOME_ABOUT ) {
+  $result .= '<a id="getNavBrandHTML" class="dropdown" data-toggle="dropdown" href="#">ZoneMinder</a>'.PHP_EOL;
+    $result .= '<ul style="background-color:#485460" class="dropdown-menu">'.PHP_EOL;
+      $result .= '<li><a class="dropdown-item" href="https://zoneminder.com/" target="_blank">ZoneMinder</a></li>'.PHP_EOL;
+      $result .= '<li><a class="dropdown-item" href="https://zoneminder.readthedocs.io/en/stable/" target="_blank">Documentation</a></li>'.PHP_EOL;
+      $result .= '<li><a class="dropdown-item" href="https://forums.zoneminder.com/" target="_blank">Support</a></li>'.PHP_EOL;
+    $result .= '</ul>'.PHP_EOL;
+  } else {
+  $result .= '<a id="getNavBrandHTML" href="' .validHtmlStr(ZM_HOME_URL). '" target="' .validHtmlStr(ZM_WEB_TITLE). '">' .ZM_HOME_CONTENT. '</a>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the Console menu item
+function getConsoleHTML() {
+  $result = '';
+  
+  if ( canView('Monitors') ) {
+    $result .= '<li id="getConsoleHTML" class="nav-item dropdown"><a class="nav-link" href="?view=console">'.translate('Console').'</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the Options menu item
+function getOptionsHTML() {
+  $result = '';
+  
+  if ( canView('System') ) {
+    $result .= '<li id="getOptionsHTML" class="nav-item dropdown"><a class="nav-link" href="?view=options">'.translate('Options').'</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the Log menu item
+function getLogHTML() {
+  $result = '';
+  
+  if ( canView('System') ) {
+    if ( ZM\logToDatabase() > ZM\Logger::NOLOG ) { 
+      $logstate = logState();
+      $class = ($logstate == 'ok') ? 'text-success' : ($logstate == 'alert' ? 'text-warning' : (($logstate == 'alarm' ? 'text-danger' : '')));
+      $result .= '<li id="getLogHTML" class="nav-item dropdown mx-2">'.makeLink('?view=log', '<span class="nav-link '.$class.'">'.translate('Log').'</span>').'</li>'.PHP_EOL;
+    }
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the log icon
+function getLogIconHTML() {
+  $result = '';
+  
+  if ( canView('System') ) {
+    if ( ZM\logToDatabase() > ZM\Logger::NOLOG ) { 
+      $logstate = logState();
+      $class = ( $logstate == 'alert' ) ? 'text-warning' : (( $logstate == 'alarm' ) ? 'text-danger' : '');
+      $result .= '<li id="getLogIconHTML" class="nav-item dropdown">'.
+        makeLink('?view=log', '<span class="mx-1 ' .$class. '"><i class="material-icons md-18">report</i>'.translate('Log').'</span>').
+        '</li>'.PHP_EOL;
+    }
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the X10 Devices menu item
+function getDevicesHTML() {
+  $result = '';
+  
+  if ( ZM_OPT_X10 && canView('Devices') ) {
+    $result .= '<li id="getDevicesHTML" class="nav-item dropdown"><a class="nav-link" href="?view=devices">Devices</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the Groups menu item
+function getGroupsHTML($view) {
+  $result = '';
+  
+  $class = $view == 'groups' ? ' selected' : '';
+  $result .= '<li id="getGroupsHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=groups">'. translate('Groups') .'</a></li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the Filter menu item
+function getFilterHTML($view) {
+  $result = '';
+  
+  $class = $view == 'filter' ? ' selected' : '';
+  $result .= '<li id="getFilterHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=filter">'.translate('Filters').'</a></li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the Cycle menu item
+function getCycleHTML($view) {
+  $result = '';
+  
+  if ( canView('Stream') ) {
+    $class = $view == 'cycle' ? ' selected' : '';
+    $result .= '<li id="getCycleHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=cycle">' .translate('Cycle'). '</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the Montage menu item
+function getMontageHTML($view) {
+  $result = '';
+  
+  if ( canView('Stream') ) {
+    $class = $view == 'cycle' ? ' selected' : '';
+    $result .= '<li id="getMontageHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=montage">' .translate('Montage'). '</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the MontageReview menu item
+function getMontageReviewHTML($view) {
+  $result = '';
+  
+  if ( canView('Events') ) {
+    if ( isset($_REQUEST['filter']['Query']['terms']['attr']) ) {
+      $terms = $_REQUEST['filter']['Query']['terms'];
+      $count = 0;
+      foreach ($terms as $term) {
+        if ( $term['attr'] == 'StartDateTime' ) {
+          $count += 1;
+          if ($term['op'] == '>=') $minTime = $term['val'];
+          if ($term['op'] == '<=') $maxTime = $term['val'];
+        }
+      }
+      if ( $count == 2 ) {
+        $montageReviewQuery = '&minTime='.$minTime.'&maxTime='.$maxTime;
+      }
+    }
+    $live = isset($montageReviewQuery) ? '&fit=1'.$montageReviewQuery.'&live=0' : '';
+    $class = $view == 'montagereview' ? ' selected' : '';
+    $result .= '<li id="getMontageReviewHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=montagereview' .$live. '">'.translate('MontageReview').'</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the Audit Events Report menu item
+function getRprtEvntAuditHTML($view) {
+  $result = '';
+  
+  if ( canView('Events') ) {
+    $class = $view == 'report_event_audit' ? ' selected' : '';
+    $result .= '<li id="getRprtEvntAuditHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=report_event_audit">'.translate('ReportEventAudit').'</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the header collapse toggle menu item
+function getHeaderFlipHTML() {
+  $result = '';
+  
+  $header = ( isset($_COOKIE['zmHeaderFlip']) and $_COOKIE['zmHeaderFlip'] == 'down') ? 'down' : 'up';
+  $result .= '<li id="getHeaderFlipHTML" class="nav-item dropdown"><a class="nav-link" href="#"><i id="flip" class="material-icons md-18">keyboard_arrow_' .$header. '</i></a></li>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Returns the html representing the logged in user name and avatar
+function getAcctCircleHTML($skin, $user=null) {
+  $result = '';
+  
+  if ( ZM_OPT_USE_AUTH and $user ) {
+    $result .= '<p id="getAcctCircleHTML" class="navbar-text mr-2">'.PHP_EOL;
+    $result .= makeLink('#', '<i class="material-icons">account_circle</i> '.  $user['Username'],
+      (ZM_AUTH_TYPE == 'builtin'), 'data-toggle="modal" data-target="#modalLogout" data-backdrop="false"' ).PHP_EOL;
+    $result .= '</p>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+// Returns the html representing the runtime status button
+function getStatusBtnHTML($status) {
+  $result = '';
+  
+  if ( canEdit('System') ) {
+    //$result .= '<li class="nav-item dropdown">'.PHP_EOL;
+    $result .= '<form id="getStatusBtnHTML" class="form-inline">'.PHP_EOL;
+    $result .= '<button type="button" class="btn btn-default navbar-btn" id="stateModalBtn">' .$status. '</button>'.PHP_EOL;
+    $result .= '</form>'.PHP_EOL;
+    //$result .= '</li>'.PHP_EOL;
+
+    if ( ZM_SYSTEM_SHUTDOWN ) {
+      $result .= '<p class="navbar-text">'.PHP_EOL;
+      $result .= makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i>' ).PHP_EOL;
+      $result .= '</p>'.PHP_EOL;
+     } 
+
+  } else if ( canView('System') ) {
+    $result .= '<p id="getStatusBtnHTML" class="navbar-text">'.PHP_EOL;
+    $result .= $status.PHP_EOL;
+    $result .= '</p>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
+function runtimeStatus($running=null) {
+  if ( $running == null )
+    $running = daemonCheck();
+  if ( $running ) {
+    $state = dbFetchOne('SELECT Name FROM States WHERE isActive=1', 'Name');
+    if ( $state == 'default' )
+      $state = '';
+  }
+
+  return $running ? ($state ? $state : translate('Running')) : translate('Stopped');
+}
+
+function getStatsTableHTML($eid, $fid, $row='') {
+  if ( !canView('Events') ) return;
+  $result = '';
+  
+  $sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId';
+  $stats = dbFetchAll( $sql, NULL, array( $eid, $fid ) );
+  
+  $result .= '<table id="contentStatsTable' .$row. '"'.PHP_EOL;
+    $result .= 'data-toggle="table"'.PHP_EOL;
+    $result .= 'data-toolbar="#toolbar"'.PHP_EOL;
+    $result .= 'class="table-sm table-borderless contentStatsTable"'.PHP_EOL;
+    $result .= 'cellspacing="0">'.PHP_EOL;
+    
+    $result .= '<caption>' .translate('Stats'). ' - ' .$eid. ' - ' .$fid. '</caption>'.PHP_EOL;
+    $result .= '<thead>'.PHP_EOL;
+      $result .= '<tr>'.PHP_EOL;
+        $result .= '<th class="colZone font-weight-bold" data-align="center">' .translate('Zone'). '</th>'.PHP_EOL;
+        $result .= '<th class="colPixelDiff font-weight-bold" data-align="center">' .translate('PixelDiff'). '</th>'.PHP_EOL;
+        $result .= '<th class="colAlarmPx font-weight-bold" data-align="center">' .translate('AlarmPx'). '</th>'.PHP_EOL;
+        $result .= '<th class="colFilterPx font-weight-bold" data-align="center">' .translate('FilterPx'). '</th>'.PHP_EOL;
+        $result .= '<th class="colBlobPx font-weight-bold" data-align="center">' .translate('BlobPx'). '</th>'.PHP_EOL;
+        $result .= '<th class="colBlobs font-weight-bold" data-align="center">' .translate('Blobs'). '</th>'.PHP_EOL;
+        $result .= '<th class="colBlobSizes font-weight-bold" data-align="center">' .translate('BlobSizes'). '</th>'.PHP_EOL;
+        $result .= '<th class="colAlarmLimits font-weight-bold" data-align="center">' .translate('AlarmLimits'). '</th>'.PHP_EOL;
+        $result .= '<th class="colScore font-weight-bold" data-align="center">' .translate('Score'). '</th>'.PHP_EOL;
+      $result .= '</tr>'.PHP_EOL;
+    $result .= '</thead>'.PHP_EOL;
+
+    $result .= '<tbody>'.PHP_EOL;
+    
+    if ( count($stats) ) {
+      foreach ( $stats as $stat ) {
+        $result .= '<tr>'.PHP_EOL;
+          $result .= '<td class="colZone">' .validHtmlStr($stat['ZoneName']). '</td>'.PHP_EOL;
+          $result .= '<td class="colPixelDiff">' .validHtmlStr($stat['PixelDiff']). '</td>'.PHP_EOL;
+          $result .= '<td class="colAlarmPx">' .sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ). '</td>'.PHP_EOL;
+          $result .= '<td class="colFilterPx">' .sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ).'</td>'.PHP_EOL;
+          $result .= '<td class="colBlobPx">' .sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ). '</td>'.PHP_EOL;
+          $result .= '<td class="colBlobs">' .validHtmlStr($stat['Blobs']). '</td>'.PHP_EOL;
+          
+          if ( $stat['Blobs'] > 1 ) {
+            $result .= '<td class="colBlobSizes">' .sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ). '</td>'.PHP_EOL;
+          } else {
+            $result .= '<td class="colBlobSizes">' .sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ). '</td>'.PHP_EOL;
+          }
+          
+          $result .= '<td class="colAlarmLimits">' .validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']). '</td>'.PHP_EOL;
+          $result .= '<td class="colScore">' .$stat['Score']. '</td>'.PHP_EOL;
+      }
+    } else {
+      $result .= '<tr>'.PHP_EOL;
+        $result .= '<td class="rowNoStats" colspan="9">' .translate('NoStatisticsRecorded'). '</td>'.PHP_EOL;
+      $result .= '</tr>'.PHP_EOL;
+    }
+
+    $result .= '</tbody>'.PHP_EOL;
+  $result .= '</table>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Use this function to manually insert the csrf key into the form when using a modal generated via ajax call
+function getCSRFinputHTML() {
+  if ( isset($GLOBALS['csrf']['key']) ) {
+    $result = '<input type="hidden" name="__csrf_magic" value="key:' .csrf_hash($GLOBALS['csrf']['key']). '" />'.PHP_EOL;
+  } else {
+    $result = '';
+  }
+  
+  return $result;
+}
 
 function xhtmlFooter() {
+  global $css;
   global $cspNonce;
   global $view;
   global $skin;
-  global $running;
-  if ( canEdit('System') ) {
-    include("skins/$skin/views/state.php");
+  global $basename;
+  $skinJsPhpFile = getSkinFile('js/skin.js.php');
+  $cssJsFile = getSkinFile('js/'.$css.'.js');
+  $viewJsFile = getSkinFile('views/js/'.$basename.'.js');
+  $viewJsPhpFile = getSkinFile('views/js/'.$basename.'.js.php');
+?>
+<?php if ( $basename != 'login' and $basename != 'postlogin' ) { ?>
+  <script src="tools/mootools/mootools-core.js"></script>
+  <script src="tools/mootools/mootools-more.js"></script>
+  <script src="js/mootools.ext.js"></script>
+<?php } ?>
+  <script src="skins/<?php echo $skin; ?>/js/jquery.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/tableExport.min.js"></script> 
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-export.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-page-jump-to.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-cookie.min.js"></script> 
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-toolbar.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-auto-refresh.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/chosen/chosen.jquery.min.js"></script>
+  <script src="skins/<?php echo $skin; ?>/js/dateTimePicker/jquery-ui-timepicker-addon.js"></script>
+
+  <script src="<?php echo cache_bust('js/Server.js'); ?>"></script>
+  <script nonce="<?php echo $cspNonce; ?>">var $j = jQuery.noConflict();</script>
+<?php
+  if ( $view == 'event' ) {
+?>
+  <link href="skins/<?php echo $skin ?>/js/video-js.css" rel="stylesheet">
+  <link href="skins/<?php echo $skin ?>/js/video-js-skin.css" rel="stylesheet">
+  <script src="skins/<?php echo $skin ?>/js/video.js"></script>
+  <script src="./js/videojs.zoomrotate.js"></script>
+<?php
   }
 ?>
+  <script src="skins/<?php echo $skin ?>/js/moment.min.js"></script>
+<?php
+?>
+  <script nonce="<?php echo $cspNonce; ?>">
+<?php
+  if ( $skinJsPhpFile ) {
+    require_once( $skinJsPhpFile );
+  }
+  if ( $viewJsPhpFile ) {
+    require_once( $viewJsPhpFile );
+  }
+?>
+  </script>
+<?php
+	if ( $cssJsFile ) {
+?>
+  <script src="<?php echo cache_bust($cssJsFile) ?>"></script>
+<?php
+  } else {
+?>
+  <script src="<?php echo cache_bust('skins/classic/js/base.js') ?>"></script>
+<?php
+  }
+  if ( $viewJsFile ) {
+?>
+  <script src="<?php echo cache_bust($viewJsFile) ?>"></script>
+<?php
+  }
+  $skinJsFile = getSkinFile('js/skin.js');
+?>
+  <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
+  <script src="<?php echo cache_bust('js/logger.js')?>"></script>
+<?php 
+  if ($basename == 'watch' or $basename == 'log' ) {
+  // This is used in the log popup for the export function. Not sure if it's used anywhere else
+?>
+    <script src="<?php echo cache_bust('js/overlay.js') ?>"></script>
+<?php } ?>
   <script nonce="<?php echo $cspNonce; ?>">$j('.chosen').chosen();</script>
   </body>
 </html>
diff --git a/web/skins/classic/includes/timeline_functions.php b/web/skins/classic/includes/timeline_functions.php
index b5cc3909c..c81f150d2 100644
--- a/web/skins/classic/includes/timeline_functions.php
+++ b/web/skins/classic/includes/timeline_functions.php
@@ -1,6 +1,6 @@
 <?php
 
-function getDateScale( $scales, $range, $minLines, $maxLines ) {
+function getDateScale($scales, $range, $minLines, $maxLines) {
 	foreach ( $scales as $scale ) {
 		$align = isset($scale['align'])?$scale['align']:1;
 		$scaleRange = (int)($range/($scale['factor']*$align));
@@ -18,10 +18,10 @@ function getDateScale( $scales, $range, $minLines, $maxLines ) {
 		$scale['divisor']++;
 	}
 	$scale['lines'] = (int)($scale['range']/$scale['divisor']);
-	return( $scale );
+	return $scale;
 }
 
-function getYScale( $range, $minLines, $maxLines ) {
+function getYScale($range, $minLines, $maxLines) {
 	$scale['range'] = $range;
 	$scale['divisor'] = 1;
 	while ( $scale['range']/$scale['divisor'] > $maxLines ) {
@@ -29,298 +29,18 @@ function getYScale( $range, $minLines, $maxLines ) {
 	}
 	$scale['lines'] = (int)(($scale['range']-1)/$scale['divisor'])+1;
 
-	return( $scale );
+	return $scale;
 }
 
-function getSlotFrame( $slot ) {
+function getSlotFrame($slot) {
 	$slotFrame = isset($slot['frame'])?$slot['frame']['FrameId']:1;
+  # FIXME what's with this false?
 	if ( false && $slotFrame ) {
 		$slotFrame -= $monitor['PreEventCount'];
 		if ( $slotFrame < 1 )
 			$slotFrame = 1;
 	}
-	return( $slotFrame );
-}
-
-function parseFilterToTree( $filter ) {
-	if ( count($filter['terms']) <= 0 ) {
-		return false;
-	}
-	$terms = $filter['terms'];
-
-	$StorageArea = NULL;
-
-	$postfixExpr = array();
-	$postfixStack = array();
-
-	$priorities = array(
-			'<' => 1,
-			'<=' => 1,
-			'>' => 1,
-			'>=' => 1,
-			'=' => 2,
-			'!=' => 2,
-			'=~' => 2,
-			'!~' => 2,
-			'=[]' => 2,
-			'![]' => 2,
-			'and' => 3,
-			'or' => 4,
-			);
-
-	for ( $i = 0; $i <= count($terms); $i++ ) {
-		if ( !empty($terms[$i]['cnj']) ) {
-			while( true ) {
-				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$terms[$i]['cnj'], 'sqlValue'=>$terms[$i]['cnj']);
-					break;
-				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$terms[$i]['cnj'], 'sqlValue'=>$terms[$i]['cnj']);
-					break;
-				} elseif ( $priorities[$terms[$i]['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$terms[$i]['cnj'], 'sqlValue'=>$terms[$i]['cnj']);
-					break;
-				} else {
-					$postfixExpr[] = array_pop($postfixStack);
-				}
-			}
-		}
-		if ( !empty($terms[$i]['obr']) ) {
-			for ( $j = 0; $j < $terms[$i]['obr']; $j++ ) {
-				$postfixStack[] = array('type'=>'obr', 'value'=>$terms[$i]['obr']);
-			}
-		}
-		if ( !empty($terms[$i]['attr']) ) {
-			$dtAttr = false;
-			switch ( $terms[$i]['attr']) {
-				case 'MonitorName':
-					$sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $terms[$i]['attr']);
-					break;
-				case 'ServerId':
-					$sqlValue .= 'M.ServerId';
-					break;
-				case 'DateTime':
-				case 'StartDateTime':
-					$sqlValue = "E.StartTime";
-					$dtAttr = true;
-					break;
-				case 'Date':
-				case 'StartDate':
-					$sqlValue = "to_days( E.StartTime )";
-					$dtAttr = true;
-					break;
-				case 'Time':
-				case 'StartTime':
-					$sqlValue = "extract( hour_second from E.StartTime )";
-					break;
-				case 'Weekday':
-				case 'StartWeekday':
-					$sqlValue = "weekday( E.StartTime )";
-					break;
-				case 'EndDateTime':
-					$sqlValue = "E.EndTime";
-					$dtAttr = true;
-					break;
-				case 'EndDate':
-					$sqlValue = "to_days( E.EndTime )";
-					$dtAttr = true;
-					break;
-				case 'EndTime':
-					$sqlValue = "extract( hour_second from E.EndTime )";
-					break;
-				case 'EndWeekday':
-					$sqlValue = "weekday( E.EndTime )";
-					break;
-				case 'Id':
-				case 'Name':
-				case 'MonitorId':
-				case 'StorageId':
-				case 'Length':
-				case 'Frames':
-				case 'AlarmFrames':
-				case 'TotScore':
-				case 'AvgScore':
-				case 'MaxScore':
-				case 'Cause':
-				case 'Notes':
-				case 'StateId':
-				case 'Archived':
-					$sqlValue = "E.".$terms[$i]['attr'];
-					break;
-				case 'DiskPercent':
-					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-					if ( ! $StorageArea ) {
-						for ( $j = 0; $j < count($terms); $j++ ) {
-							if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-								$StorageArea = new Storage($terms[$j]['val']);
-								break;
-							}
-						} // end foreach remaining term
-						if ( ! $StorageArea ) $StorageArea = new Storage();
-					} // end no StorageArea found yet
-					$sqlValue = getDiskPercent($StorageArea);
-					break;
-				case 'DiskBlocks':
-					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-					if ( ! $StorageArea ) {
-						for ( $j = 0; $j < count($terms); $j++ ) {
-							if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-								$StorageArea = new Storage($terms[$j]['val']);
-								break;
-							}
-						} // end foreach remaining term
-						if ( ! $StorageArea ) $StorageArea = new Storage();
-					} // end no StorageArea found yet
-					$sqlValue = getDiskBlocks($StorageArea);
-					break;
-				default :
-					$sqlValue = $terms[$i]['attr'];
-					break;
-			}
-			if ( $dtAttr ) {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$terms[$i]['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
-			} else {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$terms[$i]['attr'], 'sqlValue'=>$sqlValue);
-			}
-		} # end if attr
-
-		if ( isset($terms[$i]['op']) ) {
-			if ( empty($terms[$i]['op']) ) {
-				$terms[$i]['op'] = '=';
-			}
-			switch ( $terms[$i]['op']) {
-				case '=' :
-				case '!=' :
-				case '>=' :
-				case '>' :
-				case '<' :
-				case '<=' :
-					$sqlValue = $terms[$i]['op'];
-					break;
-				case '=~' :
-					$sqlValue = 'regexp';
-					break;
-				case '!~' :
-					$sqlValue = 'not regexp';
-					break;
-				case '=[]' :
-					$sqlValue = 'in (';
-					break;
-				case '![]' :
-					$sqlValue = 'not in (';
-					break;
-				default :
-					Error('Unknown operator in filter '. $terms[$i]['op']);
-			}
-			while( true ) {
-				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$terms[$i]['op'], 'sqlValue'=>$sqlValue);
-					break;
-				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$terms[$i]['op'], 'sqlValue'=>$sqlValue);
-					break;
-				} elseif ( $priorities[$terms[$i]['op']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$terms[$i]['op'], 'sqlValue'=>$sqlValue );
-					break;
-				} else {
-					$postfixExpr[] = array_pop($postfixStack);
-				}
-			} // end while
-		} // end if operator
-
-		if ( isset($terms[$i]['val']) ) {
-			$valueList = array();
-			foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $terms[$i]['val'])) as $value ) {
-				switch ( $terms[$i]['attr'] ) {
-					case 'MonitorName':
-					case 'Name':
-					case 'Cause':
-					case 'Notes':
-						$value = "'$value'";
-						break;
-					case 'ServerId':
-						if ( $value == 'ZM_SERVER_ID' ) {
-							$value = ZM_SERVER_ID;
-						} else if ( $value == 'NULL' ) {
-
-						} else {
-							$value = dbEscape($value);
-						}
-						break;
-					case 'StorageId':
-						$StorageArea = new Storage($value);
-						if ( $value != 'NULL' )
-							$value = dbEscape($value);
-						break;
-					case 'DateTime':
-					case 'EndDateTime':
-					case 'StartDateTime':
-						$value = "'".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."'";
-						break;
-					case 'Date':
-					case 'EndDate':
-					case 'StartDate':
-						$value = "to_days('".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."' )";
-						break;
-					case 'Time':
-					case 'EndTime':
-					case 'StartTime':
-						$value = "extract( hour_second from '".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."' )";
-						break;
-					case 'Weekday':
-					case 'EndWeekday':
-					case 'StartWeekday':
-						$value = "weekday( '".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."' )";
-						break;
-					default :
-						if ( $value != 'NULL' )
-							$value = dbEscape($value);
-				} // end switch attribute
-				$valueList[] = $value;
-			} // end foreach value
-			$postfixExpr[] = array('type'=>'val', 'value'=>$terms[$i]['val'], 'sqlValue'=>join(',', $valueList));
-		} // end if has val
-
-		if ( !empty($terms[$i]['cbr']) ) {
-			for ( $j = 0; $j < $terms[$i]['cbr']; $j++ ) {
-				while ( count($postfixStack) ) {
-					$element = array_pop($postfixStack);
-					if ( $element['type'] == 'obr' ) {
-						$postfixExpr[count($postfixExpr)-1]['bracket'] = true;
-						break;
-					}
-					$postfixExpr[] = $element;
-				}
-			}
-		}
-	}
-	while ( count($postfixStack) ) {
-		$postfixExpr[] = array_pop($postfixStack);
-	}
-
-	$exprStack = array();
-	//foreach ( $postfixExpr as $element )
-	//{
-	//echo $element['value'].' '; 
-	//}
-	//echo "<br>";
-	foreach ( $postfixExpr as $element ) {
-		if ( $element['type'] == 'attr' || $element['type'] == 'val' ) {
-			$node = array('data'=>$element, 'count'=>0);
-			$exprStack[] = $node;
-		} elseif ( $element['type'] == 'op' || $element['type'] == 'cnj' ) {
-			$right = array_pop($exprStack);
-			$left = array_pop($exprStack);
-			$node = array('data'=>$element, 'count'=>2+$left['count']+$right['count'], 'right'=>$right, 'left'=>$left);
-			$exprStack[] = $node;
-		} else {
-			Fatal("Unexpected element type '".$element['type']."', value '".$element['value']."'");
-		}
-	}
-	if ( count($exprStack) != 1 ) {
-		Fatal('Expression stack has '.count($exprStack).' elements');
-	}
-	return array_pop($exprStack);
+	return $slotFrame;
 }
 
 function _parseTreeToInfix($node) {
@@ -345,188 +65,153 @@ function parseTreeToInfix($tree) {
 	return _parseTreeToInfix($tree);
 }
 
-function _parseTreeToSQL( $node, $cbr=false )
-{
+function _parseTreeToSQL($node, $cbr=false) {
 	$expression = '';
-	if ( $node )
-	{
-		if ( isset($node['left']) )
-		{
-			if ( !empty($node['data']['bracket']) )
-				$expression .= '( ';
-						$expression .= _parseTreeToSQL( $node['left'] );
-						}
-						$inExpr = $node['data']['type'] == 'op' && ($node['data']['value'] == '=[]' || $node['data']['value'] == '![]');
-						$expression .= $node['data']['sqlValue'];
-						if ( !$inExpr )
-						$expression .= ' ';
-						if ( $cbr )
-						$expression .= ') ';
-			if ( isset($node['right']) )
-			{
-				$expression .= _parseTreeToSQL( $node['right'], $inExpr );
-				if ( !empty($node['data']['bracket']) )
-					$expression .= ') ';
-			}
-	}
-	return( $expression );
+	if ( !$node )
+    return $expression;
+
+  if ( isset($node['left']) ) {
+    if ( !empty($node['data']['bracket']) )
+      $expression .= '( ';
+    $expression .= _parseTreeToSQL($node['left']);
+  }
+  $inExpr = $node['data']['type'] == 'op' && (
+    $node['data']['value'] == '=[]'
+    or
+    $node['data']['value'] == '![]'
+    or 
+    $node['data']['value'] == 'IN'
+    or 
+    $node['data']['value'] == 'NOT IN'
+  );
+  $expression .= $node['data']['sqlValue'];
+  if ( !$inExpr )
+    $expression .= ' ';
+  if ( $cbr )
+    $expression .= ') ';
+  if ( isset($node['right']) ) {
+    $expression .= _parseTreeToSQL($node['right'], $inExpr);
+    if ( !empty($node['data']['bracket']) )
+      $expression .= ') ';
+  } # end if right
+  return $expression;
 }
 
-function parseTreeToSQL( $tree )
-{
-	return( _parseTreeToSQL( $tree ) );
+function parseTreeToSQL($tree) {
+	return _parseTreeToSQL($tree);
 }
 
-function _parseTreeToFilter( $node, &$terms, &$level )
-{
+function _parseTreeToFilter($node, &$terms, &$level) {
 	$elements = array();
-	if ( $node )
-	{
-		if ( isset($node['left']) )
-		{
+	if ( $node ) {
+		if ( isset($node['left']) ) {
 			if ( !empty($node['data']['bracket']) )
 				$terms[$level]['obr'] = 1;
 			_parseTreeToFilter( $node['left'], $terms, $level );
 		}
-		if ( $node['data']['type'] == 'cnj' )
-		{
+		if ( $node['data']['type'] == 'cnj' ) {
 			$level++;
 		}
 		$terms[$level][$node['data']['type']] = $node['data']['value'];
-		if ( isset($node['right']) )
-		{
-			_parseTreeToFilter( $node['right'], $terms, $level );
+		if ( isset($node['right']) ) {
+			_parseTreeToFilter($node['right'], $terms, $level);
 			if ( !empty($node['data']['bracket']) )
 				$terms[$level]['cbr'] = 1;
 		}
 	}
 }
 
-function parseTreeToFilter( $tree )
-{
+function parseTreeToFilter($tree) {
 	$terms = array();
-	if ( isset($tree) )
-	{
+	if ( isset($tree) ) {
 		$level = 0;
-		_parseTreeToFilter( $tree, $terms, $level );
+		_parseTreeToFilter($tree, $terms, $level);
 	}
-	return( array( 'Query' => array( 'terms' => $terms ) ) );
+	return array('Query' => array('terms' => $terms));
 }
 
-function parseTreeToQuery( $tree )
-{
-	$filter = parseTreeToFilter( $tree );
-	parseFilter( $filter, false, '&' );
-	return( $filter['query'] );
+function parseTreeToQuery($tree) {
+	$filter = parseTreeToFilter($tree);
+	parseFilter($filter, false, '&');
+	return $filter['querystring'];
 }
 
-function _drawTree( $node, $level )
-{
-	if ( isset($node['left']) )
-	{
-		_drawTree( $node['left'], $level+1 );
+function _drawTree($node, $level) {
+	if ( isset($node['left']) ) {
+		_drawTree($node['left'], $level+1);
 	}
-	echo str_repeat( ".", $level*2 ).$node['data']['value']."<br>";
-	if ( isset($node['right']) )
-	{
-		_drawTree( $node['right'], $level+1 );
+	echo str_repeat('.', $level*2).$node['data']['value'].'<br/>';
+	if ( isset($node['right']) ) {
+		_drawTree($node['right'], $level+1);
 	}
 }
 
-function drawTree( $tree )
-{
-	_drawTree( $tree, 0 );
+function drawTree($tree) {
+	_drawTree($tree, 0);
 }
 
-function _extractDatetimeRange( &$node, &$minTime, &$maxTime, &$expandable, $subOr )
-{
+function _extractDatetimeRange(&$node, &$minTime, &$maxTime, &$expandable, $subOr) {
 	$pruned = $leftPruned = $rightPruned = false;
-	if ( $node )
-	{
-		if ( isset($node['left']) && isset($node['right']) )
-		{
-			if ( $node['data']['type'] == 'cnj' && $node['data']['value'] == 'or' )
-			{
-				$subOr = true;
-			}
-			elseif ( !empty($node['left']['data']['dtAttr']) )
-			{
-				if ( $subOr )
-				{
-					$expandable = false;
-				}
-				elseif ( $node['data']['type'] == 'op' )
-				{
-					if ( $node['data']['value'] == '>' || $node['data']['value'] == '>=' )
-					{
-						if ( !$minTime || $minTime > $node['right']['data']['sqlValue'] )
-						{
-							$minTime = $node['right']['data']['value'];
-							return( true );
-						}
-					}
-					if ( $node['data']['value'] == '<' || $node['data']['value'] == '<=' )
-					{
-						if ( !$maxTime || $maxTime < $node['right']['data']['sqlValue'] )
-						{
-							$maxTime = $node['right']['data']['value'];
-							return( true );
-						}
-					}
-				}
-				else
-				{
-					Fatal( "Unexpected node type '".$node['data']['type']."'" );
-				}
-				return( false );
-			}
+	if ( !($node and isset($node['left']) and isset($node['right']) ) ) {
+    return $pruned;
+  }
 
-			$leftPruned = _extractDatetimeRange( $node['left'], $minTime, $maxTime, $expandable, $subOr );
-			$rightPruned = _extractDatetimeRange( $node['right'], $minTime, $maxTime, $expandable, $subOr );
+  if ( $node['data']['type'] == 'cnj' && $node['data']['value'] == 'or' ) {
+    $subOr = true;
+  } else if ( !empty($node['left']['data']['dtAttr']) ) {
+    if ( $subOr ) {
+      $expandable = false;
+    } elseif ( $node['data']['type'] == 'op' ) {
+      if ( $node['data']['value'] == '>' || $node['data']['value'] == '>=' ) {
+        if ( !$minTime || $minTime > $node['right']['data']['sqlValue'] ) {
+          $minTime = $node['right']['data']['value'];
+          return true;
+        }
+      } else if ( $node['data']['value'] == '<' || $node['data']['value'] == '<=' ) {
+        if ( !$maxTime || $maxTime < $node['right']['data']['sqlValue'] ) {
+          $maxTime = $node['right']['data']['value'];
+          return true;
+        }
+      }
+    } else {
+      ZM\Fatal("Unexpected node type '".$node['data']['type']."'");
+    }
+    return false;
+  }
 
-			if ( $leftPruned && $rightPruned )
-			{
-				$pruned = true;
-			}
-			elseif ( $leftPruned )
-			{
-				$node = $node['right'];
-			}
-			elseif ( $rightPruned )
-			{
-				$node = $node['left'];
-			}
-		}
-	}
-	return( $pruned );
+  $leftPruned = _extractDatetimeRange( $node['left'], $minTime, $maxTime, $expandable, $subOr );
+  $rightPruned = _extractDatetimeRange( $node['right'], $minTime, $maxTime, $expandable, $subOr );
+
+  if ( $leftPruned && $rightPruned ) {
+    $pruned = true;
+  } else if ( $leftPruned ) {
+    $node = $node['right'];
+  } else if ( $rightPruned ) {
+    $node = $node['left'];
+  }
+	return $pruned;
 }
 
-function extractDatetimeRange( &$tree, &$minTime, &$maxTime, &$expandable )
-{
-	$minTime = "";
-	$maxTime = "";
+function extractDatetimeRange( &$tree, &$minTime, &$maxTime, &$expandable ) {
+	$minTime = '';
+	$maxTime = '';
 	$expandable = true;
 
 	_extractDateTimeRange( $tree, $minTime, $maxTime, $expandable, false );
 }
 
-function appendDatetimeRange( &$tree, $minTime, $maxTime=false )
-{
+function appendDatetimeRange( &$tree, $minTime, $maxTime=false ) {
 	$attrNode = array( 'data'=>array( 'type'=>'attr', 'value'=>'StartDateTime', 'sqlValue'=>'E.StartTime', 'dtAttr'=>true ), 'count'=>0 );
 	$valNode = array( 'data'=>array( 'type'=>'val', 'value'=>$minTime, 'sqlValue'=>$minTime ), 'count'=>0 );
 	$opNode = array( 'data'=>array( 'type'=>'op', 'value'=>'>=', 'sqlValue'=>'>=' ), 'count'=>2, 'left'=>$attrNode, 'right'=>$valNode );
-	if ( isset($tree) )
-	{
+	if ( isset($tree) ) {
 		$cnjNode = array( 'data'=>array( 'type'=>'cnj', 'value'=>'and', 'sqlValue'=>'and' ), 'count'=>2+$tree['count']+$opNode['count'], 'left'=>$tree, 'right'=>$opNode );
 		$tree = $cnjNode;
-	}
-	else
-	{
+	} else {
 		$tree = $opNode;
 	}
 
-	if ( $maxTime )
-	{
+	if ( $maxTime ) {
 		$attrNode = array( 'data'=>array( 'type'=>'attr', 'value'=>'StartDateTime', 'sqlValue'=>'E.StartTime', 'dtAttr'=>true ), 'count'=>0 );
 		$valNode = array( 'data'=>array( 'type'=>'val', 'value'=>$maxTime, 'sqlValue'=>$maxTime ), 'count'=>0 );
 		$opNode = array( 'data'=>array( 'type'=>'op', 'value'=>'<=', 'sqlValue'=>'<=' ), 'count'=>2, 'left'=>$attrNode, 'right'=>$valNode );
diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js
index 20ca27002..a3a99f773 100644
--- a/web/skins/classic/js/base.js
+++ b/web/skins/classic/js/base.js
@@ -29,7 +29,7 @@ var popupSizes = {
   'console':      {'width': 750, 'height': 312},
   'control':      {'width': 480, 'height': 480},
   'controlcaps':  {'width': 780, 'height': 320},
-  'controlcap':   {'width': 400, 'height': 400},
+  'controlcap':   {'width': 600, 'height': 500},
   'cycle':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 62},
   'device':       {'width': 260, 'height': 150},
   'devices':      {'width': 400, 'height': 240},
@@ -38,15 +38,15 @@ var popupSizes = {
   'event':        {'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540},
   'eventdetail':  {'width': 600, 'height': 420},
   'events':       {'width': 1220, 'height': 780},
-  'export':       {'width': 400, 'height': 340},
+  'export':       {'width': 500, 'height': 640},
   'filter':       {'width': 900, 'height': 700},
   'frame':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 200},
-  'frames':       {'addWidth': 600, 'addHeight': 600},
+  'frames':       {'addWidth': 800, 'addHeight': 600},
   'function':     {'width': 350, 'height': 260},
   'group':        {'width': 760, 'height': 600},
   'groups':       {'width': 540, 'height': 420},
   'image':        {'addWidth': 48, 'addHeight': 80},
-  'log':          {'width': 1080, 'height': 720},
+  'log':          {'width': 1180, 'height': 720},
   'login':        {'width': 720, 'height': 480},
   'logout':       {'width': 260, 'height': 150},
   'monitor':      {'width': 800, 'height': 780},
@@ -59,11 +59,11 @@ var popupSizes = {
   'options':      {'width': 1000, 'height': 660},
   'preset':       {'width': 300, 'height': 220},
   'server':       {'width': 600, 'height': 405},
-  'settings':     {'width': 220, 'height': 235},
+  'settings':     {'width': 250, 'height': 335},
   'shutdown':     {'width': 400, 'height': 400},
   'state':        {'width': 400, 'height': 170},
   'stats':        {'width': 840, 'height': 200},
-  'storage':      {'width': 600, 'height': 405},
+  'storage':      {'width': 600, 'height': 425},
   'timeline':     {'width': 760, 'height': 540},
   'user':         {'width': 460, 'height': 720},
   'version':      {'width': 360, 'height': 210},
diff --git a/web/skins/classic/js/bootstrap-table-auto-refresh.min.js b/web/skins/classic/js/bootstrap-table-auto-refresh.min.js
new file mode 100644
index 000000000..4eba327a1
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-auto-refresh.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(t){var e=a(this,t);return!!e&&e.enumerable}:c},s=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},l={}.toString,p=function(t){return l.call(t).slice(8,-1)},h="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?h.call(t,""):Object(t)}:Object,b=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return y(b(t))},d=function(t){return"object"==typeof t?null!==t:"function"==typeof t},g=function(t,e){if(!d(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!d(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!d(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!d(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,O=function(t,e){return m.call(t,e)},w=o.document,j=d(w)&&d(w.createElement),S=function(t){return j?w.createElement(t):{}},R=!u&&!i((function(){return 7!=Object.defineProperty(S("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,P={f:u?T:function(t,e){if(t=v(t),e=g(e,!0),R)try{return T(t,e)}catch(t){}if(O(t,e))return s(!f.f.call(t,e),t[e])}},A=function(t){if(!d(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,x={f:u?E:function(t,e,n){if(A(t),e=g(e,!0),A(n),R)try{return E(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},_=u?function(t,e,n){return x.f(t,e,s(1,n))}:function(t,e,n){return t[e]=n,t},I=function(t,e){try{_(o,t,e)}catch(n){o[t]=e}return e},k="__core-js_shared__",F=o[k]||I(k,{}),M=Function.toString;"function"!=typeof F.inspectSource&&(F.inspectSource=function(t){return M.call(t)});var C,q,B,L=F.inspectSource,N=o.WeakMap,z="function"==typeof N&&/native code/.test(L(N)),D=n((function(t){(t.exports=function(t,e){return F[t]||(F[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),W=0,G=Math.random(),$=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++W+G).toString(36)},K=D("keys"),Q=function(t){return K[t]||(K[t]=$(t))},V={},X=o.WeakMap;if(z){var Y=new X,H=Y.get,J=Y.has,U=Y.set;C=function(t,e){return U.call(Y,t,e),e},q=function(t){return H.call(Y,t)||{}},B=function(t){return J.call(Y,t)}}else{var Z=Q("state");V[Z]=!0,C=function(t,e){return _(t,Z,e),e},q=function(t){return O(t,Z)?t[Z]:{}},B=function(t){return O(t,Z)}}var tt,et,nt={set:C,get:q,has:B,enforce:function(t){return B(t)?q(t):C(t,{})},getterFor:function(t){return function(e){var n;if(!d(e)||(n=q(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},rt=n((function(t){var e=nt.get,n=nt.enforce,r=String(String).split("String");(t.exports=function(t,e,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof e||O(i,"name")||_(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!f&&t[e]&&(a=!0):delete t[e],a?t[e]=i:_(t,e,i)):a?t[e]=i:I(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||L(this)}))})),ot=o,it=function(t){return"function"==typeof t?t:void 0},ut=function(t,e){return arguments.length<2?it(ot[t])||it(o[t]):ot[t]&&ot[t][e]||o[t]&&o[t][e]},ct=Math.ceil,at=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?at:ct)(t)},st=Math.min,lt=function(t){return t>0?st(ft(t),9007199254740991):0},pt=Math.max,ht=Math.min,yt=function(t){return function(e,n,r){var o,i=v(e),u=lt(i.length),c=function(t,e){var n=ft(t);return n<0?pt(n+e,0):ht(n,e)}(r,u);if(t&&n!=n){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},bt={includes:yt(!0),indexOf:yt(!1)}.indexOf,vt=function(t,e){var n,r=v(t),o=0,i=[];for(n in r)!O(V,n)&&O(r,n)&&i.push(n);for(;e.length>o;)O(r,n=e[o++])&&(~bt(i,n)||i.push(n));return i},dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],gt=dt.concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return vt(t,gt)}},Ot={f:Object.getOwnPropertySymbols},wt=ut("Reflect","ownKeys")||function(t){var e=mt.f(A(t)),n=Ot.f;return n?e.concat(n(t)):e},jt=function(t,e){for(var n=wt(e),r=x.f,o=P.f,i=0;i<n.length;i++){var u=n[i];O(t,u)||r(t,u,o(e,u))}},St=/#|\.prototype\./,Rt=function(t,e){var n=Pt[Tt(t)];return n==Et||n!=At&&("function"==typeof e?i(e):!!e)},Tt=Rt.normalize=function(t){return String(t).replace(St,".").toLowerCase()},Pt=Rt.data={},At=Rt.NATIVE="N",Et=Rt.POLYFILL="P",xt=Rt,_t=P.f,It=function(t,e){var n,r,i,u,c,a=t.target,f=t.global,s=t.stat;if(n=f?o:s?o[a]||I(a,{}):(o[a]||{}).prototype)for(r in e){if(u=e[r],i=t.noTargetGet?(c=_t(n,r))&&c.value:n[r],!xt(f?r:a+(s?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;jt(u,i)}(t.sham||i&&i.sham)&&_(u,"sham",!0),rt(n,r,u,t)}},kt=Array.isArray||function(t){return"Array"==p(t)},Ft=function(t){return Object(b(t))},Mt=function(t,e,n){var r=g(e);r in t?x.f(t,r,s(0,n)):t[r]=n},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),qt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Bt=D("wks"),Lt=o.Symbol,Nt=qt?Lt:$,zt=function(t){return O(Bt,t)||(Ct&&O(Lt,t)?Bt[t]=Lt[t]:Bt[t]=Nt("Symbol."+t)),Bt[t]},Dt=zt("species"),Wt=function(t,e){var n;return kt(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!kt(n.prototype)?d(n)&&null===(n=n[Dt])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},Gt=ut("navigator","userAgent")||"",$t=o.process,Kt=$t&&$t.versions,Qt=Kt&&Kt.v8;Qt?et=(tt=Qt.split("."))[0]+tt[1]:Gt&&(!(tt=Gt.match(/Edge\/(\d+)/))||tt[1]>=74)&&(tt=Gt.match(/Chrome\/(\d+)/))&&(et=tt[1]);var Vt,Xt=et&&+et,Yt=zt("species"),Ht=zt("isConcatSpreadable"),Jt=9007199254740991,Ut="Maximum allowed index exceeded",Zt=Xt>=51||!i((function(){var t=[];return t[Ht]=!1,t.concat()[0]!==t})),te=(Vt="concat",Xt>=51||!i((function(){var t=[];return(t.constructor={})[Yt]=function(){return{foo:1}},1!==t[Vt](Boolean).foo}))),ee=function(t){if(!d(t))return!1;var e=t[Ht];return void 0!==e?!!e:kt(t)};It({target:"Array",proto:!0,forced:!Zt||!te},{concat:function(t){var e,n,r,o,i,u=Ft(this),c=Wt(u,0),a=0;for(e=-1,r=arguments.length;e<r;e++)if(ee(i=-1===e?u:arguments[e])){if(a+(o=lt(i.length))>Jt)throw TypeError(Ut);for(n=0;n<o;n++,a++)n in i&&Mt(c,a,i[n])}else{if(a>=Jt)throw TypeError(Ut);Mt(c,a++,i)}return c.length=a,c}});var ne,re=function(t,e,n){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}},oe=[].push,ie=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,a,f,s){for(var l,p,h=Ft(c),b=y(h),v=re(a,f,3),d=lt(b.length),g=0,m=s||Wt,O=e?m(c,d):n?m(c,0):void 0;d>g;g++)if((u||g in b)&&(p=v(l=b[g],g,h),t))if(e)O[g]=p;else if(p)switch(t){case 3:return!0;case 5:return l;case 6:return g;case 2:oe.call(O,l)}else if(o)return!1;return i?-1:r||o?o:O}},ue={forEach:ie(0),map:ie(1),filter:ie(2),some:ie(3),every:ie(4),find:ie(5),findIndex:ie(6)},ce=Object.keys||function(t){return vt(t,dt)},ae=u?Object.defineProperties:function(t,e){A(t);for(var n,r=ce(e),o=r.length,i=0;o>i;)x.f(t,n=r[i++],e[n]);return t},fe=ut("document","documentElement"),se=Q("IE_PROTO"),le=function(){},pe=function(t){return"<script>"+t+"</"+"script>"},he=function(){try{ne=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;he=ne?function(t){t.write(pe("")),t.close();var e=t.parentWindow.Object;return t=null,e}(ne):((e=S("iframe")).style.display="none",fe.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(pe("document.F=Object")),t.close(),t.F);for(var n=dt.length;n--;)delete he.prototype[dt[n]];return he()};V[se]=!0;var ye=Object.create||function(t,e){var n;return null!==t?(le.prototype=A(t),n=new le,le.prototype=null,n[se]=t):n=he(),void 0===e?n:ae(n,e)},be=zt("unscopables"),ve=Array.prototype;null==ve[be]&&x.f(ve,be,{configurable:!0,value:ye(null)});var de,ge=ue.find,me="find",Oe=!0;me in[]&&Array(1).find((function(){Oe=!1})),It({target:"Array",proto:!0,forced:Oe},{find:function(t){return ge(this,t,arguments.length>1?arguments[1]:void 0)}}),de=me,ve[be][de]=!0;var we=Object.assign,je=Object.defineProperty,Se=!we||i((function(){if(u&&1!==we({b:1},we(je({},"a",{enumerable:!0,get:function(){je(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=we({},t)[n]||ce(we({},e)).join("")!=r}))?function(t,e){for(var n=Ft(t),r=arguments.length,o=1,i=Ot.f,c=f.f;r>o;)for(var a,s=y(arguments[o++]),l=i?ce(s).concat(i(s)):ce(s),p=l.length,h=0;p>h;)a=l[h++],u&&!c.call(s,a)||(n[a]=s[a]);return n}:we;function Re(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Te(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Pe(t){return(Pe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Ae(t,e){return(Ae=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ee(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function xe(t,e,n){return(xe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Pe(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}It({target:"Object",stat:!0,forced:Object.assign!==Se},{assign:Se});var _e=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{autoRefresh:!1,autoRefreshInterval:60,autoRefreshSilent:!0,autoRefreshStatus:!0,autoRefreshFunction:null}),t.extend(t.fn.bootstrapTable.defaults.icons,{autoRefresh:{bootstrap3:"glyphicon-time icon-time",materialize:"access_time","bootstrap-table":"icon-clock"}[t.fn.bootstrapTable.theme]||"fa-clock"}),t.extend(t.fn.bootstrapTable.locales,{formatAutoRefresh:function(){return"Auto Refresh"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(t){function e(){return Re(this,e),Ee(this,Pe(e).apply(this,arguments))}var n,r,o;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ae(t,e)}(e,t),n=e,(r=[{key:"init",value:function(){for(var t,n=this,r=arguments.length,o=new Array(r),i=0;i<r;i++)o[i]=arguments[i];(t=xe(Pe(e.prototype),"init",this)).call.apply(t,[this].concat(o)),this.options.autoRefresh&&this.options.autoRefreshStatus&&(this.options.autoRefreshFunction=setInterval((function(){n.refresh({silent:n.options.autoRefreshSilent})}),1e3*this.options.autoRefreshInterval))}},{key:"initToolbar",value:function(){var t;this.options.autoRefresh&&(this.buttons=Object.assign(this.buttons,{autoRefresh:{html:'\n            <button class="auto-refresh '.concat(this.constants.buttonsClass,"\n              ").concat(this.options.autoRefreshStatus?" ".concat(this.constants.classes.buttonActive):"",'"\n              type="button" name="autoRefresh" title="').concat(this.options.formatAutoRefresh(),'">\n              ').concat(this.options.showButtonIcons?_e.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.autoRefresh):"","\n              ").concat(this.options.showButtonText?this.options.formatAutoRefresh():"","\n            </button>\n           "),event:this.toggleAutoRefresh}}));for(var n=arguments.length,r=new Array(n),o=0;o<n;o++)r[o]=arguments[o];(t=xe(Pe(e.prototype),"initToolbar",this)).call.apply(t,[this].concat(r))}},{key:"toggleAutoRefresh",value:function(){var t=this;this.options.autoRefresh&&(this.options.autoRefreshStatus?(clearInterval(this.options.autoRefreshFunction),this.$toolbar.find(">.columns .auto-refresh").removeClass(this.constants.classes.buttonActive)):(this.options.autoRefreshFunction=setInterval((function(){t.refresh({silent:t.options.autoRefreshSilent})}),1e3*this.options.autoRefreshInterval),this.$toolbar.find(">.columns .auto-refresh").addClass(this.constants.classes.buttonActive)),this.options.autoRefreshStatus=!this.options.autoRefreshStatus)}}])&&Te(n.prototype,r),o&&Te(n,o),e}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-cookie.min.js b/web/skins/classic/js/bootstrap-table-cookie.min.js
new file mode 100644
index 000000000..f3a4a70c4
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-cookie.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},n=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,s=Object.getOwnPropertyDescriptor,l={f:s&&!c.call({1:2},1)?function(t){var e=s(this,t);return!!e&&e.enumerable}:c},u=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},h="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?h.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return g(d(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!v(t))return t;var o,r;if(e&&"function"==typeof(o=t.toString)&&!v(r=o.call(t)))return r;if("function"==typeof(o=t.valueOf)&&!v(r=o.call(t)))return r;if(!e&&"function"==typeof(o=t.toString)&&!v(r=o.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,k=function(t,e){return m.call(t,e)},S=n.document,C=v(S)&&v(S.createElement),w=function(t){return C?S.createElement(t):{}},x=!a&&!i((function(){return 7!=Object.defineProperty(w("div"),"a",{get:function(){return 7}}).a})),O=Object.getOwnPropertyDescriptor,E={f:a?O:function(t,e){if(t=y(t),e=b(e,!0),x)try{return O(t,e)}catch(t){}if(k(t,e))return u(!l.f.call(t,e),t[e])}},I=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},T=Object.defineProperty,j={f:a?T:function(t,e,o){if(I(t),e=b(e,!0),I(o),x)try{return T(t,e,o)}catch(t){}if("get"in o||"set"in o)throw TypeError("Accessors not supported");return"value"in o&&(t[e]=o.value),t}},P=a?function(t,e,o){return j.f(t,e,u(1,o))}:function(t,e,o){return t[e]=o,t},A=function(t,e){try{P(n,t,e)}catch(o){n[t]=e}return e},N="__core-js_shared__",L=n[N]||A(N,{}),R=Function.toString;"function"!=typeof L.inspectSource&&(L.inspectSource=function(t){return R.call(t)});var _,D,M,G=L.inspectSource,B=n.WeakMap,V="function"==typeof B&&/native code/.test(G(B)),$=o((function(t){(t.exports=function(t,e){return L[t]||(L[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),F=0,J=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++F+J).toString(36)},z=$("keys"),H=function(t){return z[t]||(z[t]=U(t))},q={},K=n.WeakMap;if(V){var W=new K,Y=W.get,Q=W.has,X=W.set;_=function(t,e){return X.call(W,t,e),e},D=function(t){return Y.call(W,t)||{}},M=function(t){return Q.call(W,t)}}else{var Z=H("state");q[Z]=!0,_=function(t,e){return P(t,Z,e),e},D=function(t){return k(t,Z)?t[Z]:{}},M=function(t){return k(t,Z)}}var tt,et={set:_,get:D,has:M,enforce:function(t){return M(t)?D(t):_(t,{})},getterFor:function(t){return function(e){var o;if(!v(e)||(o=D(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return o}}},ot=o((function(t){var e=et.get,o=et.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,s=!!a&&!!a.enumerable,l=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||k(i,"name")||P(i,"name",e),o(i).source=r.join("string"==typeof e?e:"")),t!==n?(c?!l&&t[e]&&(s=!0):delete t[e],s?t[e]=i:P(t,e,i)):s?t[e]=i:A(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||G(this)}))})),rt=n,nt=function(t){return"function"==typeof t?t:void 0},it=function(t,e){return arguments.length<2?nt(rt[t])||nt(n[t]):rt[t]&&rt[t][e]||n[t]&&n[t][e]},at=Math.ceil,ct=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?ct:at)(t)},lt=Math.min,ut=function(t){return t>0?lt(st(t),9007199254740991):0},ft=Math.max,pt=Math.min,ht=function(t){return function(e,o,r){var n,i=y(e),a=ut(i.length),c=function(t,e){var o=st(t);return o<0?ft(o+e,0):pt(o,e)}(r,a);if(t&&o!=o){for(;a>c;)if((n=i[c++])!=n)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===o)return t||c||0;return!t&&-1}},gt={includes:ht(!0),indexOf:ht(!1)}.indexOf,dt=function(t,e){var o,r=y(t),n=0,i=[];for(o in r)!k(q,o)&&k(r,o)&&i.push(o);for(;e.length>n;)k(r,o=e[n++])&&(~gt(i,o)||i.push(o));return i},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],vt=yt.concat("length","prototype"),bt={f:Object.getOwnPropertyNames||function(t){return dt(t,vt)}},mt={f:Object.getOwnPropertySymbols},kt=it("Reflect","ownKeys")||function(t){var e=bt.f(I(t)),o=mt.f;return o?e.concat(o(t)):e},St=function(t,e){for(var o=kt(e),r=j.f,n=E.f,i=0;i<o.length;i++){var a=o[i];k(t,a)||r(t,a,n(e,a))}},Ct=/#|\.prototype\./,wt=function(t,e){var o=Ot[xt(t)];return o==It||o!=Et&&("function"==typeof e?i(e):!!e)},xt=wt.normalize=function(t){return String(t).replace(Ct,".").toLowerCase()},Ot=wt.data={},Et=wt.NATIVE="N",It=wt.POLYFILL="P",Tt=wt,jt=E.f,Pt=function(t,e){var o,r,i,a,c,s=t.target,l=t.global,u=t.stat;if(o=l?n:u?n[s]||A(s,{}):(n[s]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=jt(o,r))&&c.value:o[r],!Tt(l?r:s+(u?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;St(a,i)}(t.sham||i&&i.sham)&&P(a,"sham",!0),ot(o,r,a,t)}},At=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Nt=At&&!Symbol.sham&&"symbol"==typeof Symbol(),Lt=Array.isArray||function(t){return"Array"==p(t)},Rt=function(t){return Object(d(t))},_t=Object.keys||function(t){return dt(t,yt)},Dt=a?Object.defineProperties:function(t,e){I(t);for(var o,r=_t(e),n=r.length,i=0;n>i;)j.f(t,o=r[i++],e[o]);return t},Mt=it("document","documentElement"),Gt=H("IE_PROTO"),Bt=function(){},Vt=function(t){return"<script>"+t+"</"+"script>"},$t=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;$t=tt?function(t){t.write(Vt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(tt):((e=w("iframe")).style.display="none",Mt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Vt("document.F=Object")),t.close(),t.F);for(var o=yt.length;o--;)delete $t.prototype[yt[o]];return $t()};q[Gt]=!0;var Ft=Object.create||function(t,e){var o;return null!==t?(Bt.prototype=I(t),o=new Bt,Bt.prototype=null,o[Gt]=t):o=$t(),void 0===e?o:Dt(o,e)},Jt=bt.f,Ut={}.toString,zt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Ht={f:function(t){return zt&&"[object Window]"==Ut.call(t)?function(t){try{return Jt(t)}catch(t){return zt.slice()}}(t):Jt(y(t))}},qt=$("wks"),Kt=n.Symbol,Wt=Nt?Kt:U,Yt=function(t){return k(qt,t)||(At&&k(Kt,t)?qt[t]=Kt[t]:qt[t]=Wt("Symbol."+t)),qt[t]},Qt={f:Yt},Xt=j.f,Zt=function(t){var e=rt.Symbol||(rt.Symbol={});k(e,t)||Xt(e,t,{value:Qt.f(t)})},te=j.f,ee=Yt("toStringTag"),oe=function(t,e,o){t&&!k(t=o?t:t.prototype,ee)&&te(t,ee,{configurable:!0,value:e})},re=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ne=Yt("species"),ie=function(t,e){var o;return Lt(t)&&("function"!=typeof(o=t.constructor)||o!==Array&&!Lt(o.prototype)?v(o)&&null===(o=o[ne])&&(o=void 0):o=void 0),new(void 0===o?Array:o)(0===e?0:e)},ae=[].push,ce=function(t){var e=1==t,o=2==t,r=3==t,n=4==t,i=6==t,a=5==t||i;return function(c,s,l,u){for(var f,p,h=Rt(c),d=g(h),y=function(t,e,o){if(re(t),void 0===e)return t;switch(o){case 0:return function(){return t.call(e)};case 1:return function(o){return t.call(e,o)};case 2:return function(o,r){return t.call(e,o,r)};case 3:return function(o,r,n){return t.call(e,o,r,n)}}return function(){return t.apply(e,arguments)}}(s,l,3),v=ut(d.length),b=0,m=u||ie,k=e?m(c,v):o?m(c,0):void 0;v>b;b++)if((a||b in d)&&(p=y(f=d[b],b,h),t))if(e)k[b]=p;else if(p)switch(t){case 3:return!0;case 5:return f;case 6:return b;case 2:ae.call(k,f)}else if(n)return!1;return i?-1:r||n?n:k}},se={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},le=se.forEach,ue=H("hidden"),fe="Symbol",pe=Yt("toPrimitive"),he=et.set,ge=et.getterFor(fe),de=Object.prototype,ye=n.Symbol,ve=it("JSON","stringify"),be=E.f,me=j.f,ke=Ht.f,Se=l.f,Ce=$("symbols"),we=$("op-symbols"),xe=$("string-to-symbol-registry"),Oe=$("symbol-to-string-registry"),Ee=$("wks"),Ie=n.QObject,Te=!Ie||!Ie.prototype||!Ie.prototype.findChild,je=a&&i((function(){return 7!=Ft(me({},"a",{get:function(){return me(this,"a",{value:7}).a}})).a}))?function(t,e,o){var r=be(de,e);r&&delete de[e],me(t,e,o),r&&t!==de&&me(de,e,r)}:me,Pe=function(t,e){var o=Ce[t]=Ft(ye.prototype);return he(o,{type:fe,tag:t,description:e}),a||(o.description=e),o},Ae=At&&"symbol"==typeof ye.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ye},Ne=function(t,e,o){t===de&&Ne(we,e,o),I(t);var r=b(e,!0);return I(o),k(Ce,r)?(o.enumerable?(k(t,ue)&&t[ue][r]&&(t[ue][r]=!1),o=Ft(o,{enumerable:u(0,!1)})):(k(t,ue)||me(t,ue,u(1,{})),t[ue][r]=!0),je(t,r,o)):me(t,r,o)},Le=function(t,e){I(t);var o=y(e),r=_t(o).concat(Me(o));return le(r,(function(e){a&&!Re.call(o,e)||Ne(t,e,o[e])})),t},Re=function(t){var e=b(t,!0),o=Se.call(this,e);return!(this===de&&k(Ce,e)&&!k(we,e))&&(!(o||!k(this,e)||!k(Ce,e)||k(this,ue)&&this[ue][e])||o)},_e=function(t,e){var o=y(t),r=b(e,!0);if(o!==de||!k(Ce,r)||k(we,r)){var n=be(o,r);return!n||!k(Ce,r)||k(o,ue)&&o[ue][r]||(n.enumerable=!0),n}},De=function(t){var e=ke(y(t)),o=[];return le(e,(function(t){k(Ce,t)||k(q,t)||o.push(t)})),o},Me=function(t){var e=t===de,o=ke(e?we:y(t)),r=[];return le(o,(function(t){!k(Ce,t)||e&&!k(de,t)||r.push(Ce[t])})),r};if(At||(ot((ye=function(){if(this instanceof ye)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=U(t),o=function(t){this===de&&o.call(we,t),k(this,ue)&&k(this[ue],e)&&(this[ue][e]=!1),je(this,e,u(1,t))};return a&&Te&&je(de,e,{configurable:!0,set:o}),Pe(e,t)}).prototype,"toString",(function(){return ge(this).tag})),l.f=Re,j.f=Ne,E.f=_e,bt.f=Ht.f=De,mt.f=Me,a&&(me(ye.prototype,"description",{configurable:!0,get:function(){return ge(this).description}}),ot(de,"propertyIsEnumerable",Re,{unsafe:!0}))),Nt||(Qt.f=function(t){return Pe(Yt(t),t)}),Pt({global:!0,wrap:!0,forced:!At,sham:!At},{Symbol:ye}),le(_t(Ee),(function(t){Zt(t)})),Pt({target:fe,stat:!0,forced:!At},{for:function(t){var e=String(t);if(k(xe,e))return xe[e];var o=ye(e);return xe[e]=o,Oe[o]=e,o},keyFor:function(t){if(!Ae(t))throw TypeError(t+" is not a symbol");if(k(Oe,t))return Oe[t]},useSetter:function(){Te=!0},useSimple:function(){Te=!1}}),Pt({target:"Object",stat:!0,forced:!At,sham:!a},{create:function(t,e){return void 0===e?Ft(t):Le(Ft(t),e)},defineProperty:Ne,defineProperties:Le,getOwnPropertyDescriptor:_e}),Pt({target:"Object",stat:!0,forced:!At},{getOwnPropertyNames:De,getOwnPropertySymbols:Me}),Pt({target:"Object",stat:!0,forced:i((function(){mt.f(1)}))},{getOwnPropertySymbols:function(t){return mt.f(Rt(t))}}),ve){var Ge=!At||i((function(){var t=ye();return"[null]"!=ve([t])||"{}"!=ve({a:t})||"{}"!=ve(Object(t))}));Pt({target:"JSON",stat:!0,forced:Ge},{stringify:function(t,e,o){for(var r,n=[t],i=1;arguments.length>i;)n.push(arguments[i++]);if(r=e,(v(e)||void 0!==t)&&!Ae(t))return Lt(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!Ae(e))return e}),n[1]=e,ve.apply(null,n)}})}ye.prototype[pe]||P(ye.prototype,pe,ye.prototype.valueOf),oe(ye,fe),q[ue]=!0;var Be=j.f,Ve=n.Symbol;if(a&&"function"==typeof Ve&&(!("description"in Ve.prototype)||void 0!==Ve().description)){var $e={},Fe=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Fe?new Ve(t):void 0===t?Ve():Ve(t);return""===t&&($e[e]=!0),e};St(Fe,Ve);var Je=Fe.prototype=Ve.prototype;Je.constructor=Fe;var Ue=Je.toString,ze="Symbol(test)"==String(Ve("test")),He=/^Symbol\((.*)\)[^)]+$/;Be(Je,"description",{configurable:!0,get:function(){var t=v(this)?this.valueOf():this,e=Ue.call(t);if(k($e,t))return"";var o=ze?e.slice(7,-1):e.replace(He,"$1");return""===o?void 0:o}}),Pt({global:!0,forced:!0},{Symbol:Fe})}Zt("iterator");var qe,Ke,We=function(t,e,o){var r=b(e);r in t?j.f(t,r,u(0,o)):t[r]=o},Ye=it("navigator","userAgent")||"",Qe=n.process,Xe=Qe&&Qe.versions,Ze=Xe&&Xe.v8;Ze?Ke=(qe=Ze.split("."))[0]+qe[1]:Ye&&(!(qe=Ye.match(/Edge\/(\d+)/))||qe[1]>=74)&&(qe=Ye.match(/Chrome\/(\d+)/))&&(Ke=qe[1]);var to=Ke&&+Ke,eo=Yt("species"),oo=function(t){return to>=51||!i((function(){var e=[];return(e.constructor={})[eo]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ro=Yt("isConcatSpreadable"),no=9007199254740991,io="Maximum allowed index exceeded",ao=to>=51||!i((function(){var t=[];return t[ro]=!1,t.concat()[0]!==t})),co=oo("concat"),so=function(t){if(!v(t))return!1;var e=t[ro];return void 0!==e?!!e:Lt(t)};Pt({target:"Array",proto:!0,forced:!ao||!co},{concat:function(t){var e,o,r,n,i,a=Rt(this),c=ie(a,0),s=0;for(e=-1,r=arguments.length;e<r;e++)if(so(i=-1===e?a:arguments[e])){if(s+(n=ut(i.length))>no)throw TypeError(io);for(o=0;o<n;o++,s++)o in i&&We(c,s,i[o])}else{if(s>=no)throw TypeError(io);We(c,s++,i)}return c.length=s,c}});var lo=se.filter,uo=oo("filter"),fo=uo&&!i((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Pt({target:"Array",proto:!0,forced:!uo||!fo},{filter:function(t){return lo(this,t,arguments.length>1?arguments[1]:void 0)}});var po=Yt("unscopables"),ho=Array.prototype;null==ho[po]&&j.f(ho,po,{configurable:!0,value:Ft(null)});var go=function(t){ho[po][t]=!0},yo=se.find,vo="find",bo=!0;vo in[]&&Array(1).find((function(){bo=!1})),Pt({target:"Array",proto:!0,forced:bo},{find:function(t){return yo(this,t,arguments.length>1?arguments[1]:void 0)}}),go(vo);var mo,ko,So,Co=!i((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),wo=H("IE_PROTO"),xo=Object.prototype,Oo=Co?Object.getPrototypeOf:function(t){return t=Rt(t),k(t,wo)?t[wo]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?xo:null},Eo=Yt("iterator"),Io=!1;[].keys&&("next"in(So=[].keys())?(ko=Oo(Oo(So)))!==Object.prototype&&(mo=ko):Io=!0),null==mo&&(mo={}),k(mo,Eo)||P(mo,Eo,(function(){return this}));var To={IteratorPrototype:mo,BUGGY_SAFARI_ITERATORS:Io},jo=To.IteratorPrototype,Po=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,o={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(o,[]),e=o instanceof Array}catch(t){}return function(o,r){return I(o),function(t){if(!v(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),e?t.call(o,r):o.__proto__=r,o}}():void 0),Ao=To.IteratorPrototype,No=To.BUGGY_SAFARI_ITERATORS,Lo=Yt("iterator"),Ro="keys",_o="values",Do="entries",Mo=function(){return this},Go=function(t,e,o,r,n,i,a){!function(t,e,o){var r=e+" Iterator";t.prototype=Ft(jo,{next:u(1,o)}),oe(t,r,!1)}(o,e,r);var c,s,l,f=function(t){if(t===n&&y)return y;if(!No&&t in g)return g[t];switch(t){case Ro:case _o:case Do:return function(){return new o(this,t)}}return function(){return new o(this)}},p=e+" Iterator",h=!1,g=t.prototype,d=g[Lo]||g["@@iterator"]||n&&g[n],y=!No&&d||f(n),v="Array"==e&&g.entries||d;if(v&&(c=Oo(v.call(new t)),Ao!==Object.prototype&&c.next&&(Oo(c)!==Ao&&(Po?Po(c,Ao):"function"!=typeof c[Lo]&&P(c,Lo,Mo)),oe(c,p,!0))),n==_o&&d&&d.name!==_o&&(h=!0,y=function(){return d.call(this)}),g[Lo]!==y&&P(g,Lo,y),n)if(s={values:f(_o),keys:i?y:f(Ro),entries:f(Do)},a)for(l in s)(No||h||!(l in g))&&ot(g,l,s[l]);else Pt({target:e,proto:!0,forced:No||h},s);return s},Bo="Array Iterator",Vo=et.set,$o=et.getterFor(Bo),Fo=Go(Array,"Array",(function(t,e){Vo(this,{type:Bo,target:y(t),index:0,kind:e})}),(function(){var t=$o(this),e=t.target,o=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==o?{value:r,done:!1}:"values"==o?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values");go("keys"),go("values"),go("entries");var Jo=function(t,e){var o=[][t];return!o||!i((function(){o.call(null,e||function(){throw 1},1)}))},Uo=[].join,zo=g!=Object,Ho=Jo("join",",");Pt({target:"Array",proto:!0,forced:zo||Ho},{join:function(t){return Uo.call(y(this),void 0===t?",":t)}});var qo=se.map,Ko=oo("map"),Wo=Ko&&!i((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Pt({target:"Array",proto:!0,forced:!Ko||!Wo},{map:function(t){return qo(this,t,arguments.length>1?arguments[1]:void 0)}});var Yo={};Yo[Yt("toStringTag")]="z";var Qo="[object z]"===String(Yo),Xo=Yt("toStringTag"),Zo="Arguments"==p(function(){return arguments}()),tr=Qo?p:function(t){var e,o,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(o=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Xo))?o:Zo?p(e):"Object"==(r=p(e))&&"function"==typeof e.callee?"Arguments":r},er=Qo?{}.toString:function(){return"[object "+tr(this)+"]"};Qo||ot(Object.prototype,"toString",er,{unsafe:!0});var or=function(){var t=I(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function rr(t,e){return RegExp(t,e)}var nr,ir,ar={UNSUPPORTED_Y:i((function(){var t=rr("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=rr("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},cr=RegExp.prototype.exec,sr=String.prototype.replace,lr=cr,ur=(nr=/a/,ir=/b*/g,cr.call(nr,"a"),cr.call(ir,"a"),0!==nr.lastIndex||0!==ir.lastIndex),fr=ar.UNSUPPORTED_Y||ar.BROKEN_CARET,pr=void 0!==/()??/.exec("")[1];(ur||pr||fr)&&(lr=function(t){var e,o,r,n,i=this,a=fr&&i.sticky,c=or.call(i),s=i.source,l=0,u=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),u=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(s="(?: "+s+")",u=" "+u,l++),o=new RegExp("^(?:"+s+")",c)),pr&&(o=new RegExp("^"+s+"$(?!\\s)",c)),ur&&(e=i.lastIndex),r=cr.call(a?o:i,u),a?r?(r.input=r.input.slice(l),r[0]=r[0].slice(l),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:ur&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),pr&&r&&r.length>1&&sr.call(r[0],o,(function(){for(n=1;n<arguments.length-2;n++)void 0===arguments[n]&&(r[n]=void 0)})),r});var hr=lr;Pt({target:"RegExp",proto:!0,forced:/./.exec!==hr},{exec:hr});var gr="toString",dr=RegExp.prototype,yr=dr.toString,vr=i((function(){return"/a/b"!=yr.call({source:"a",flags:"b"})})),br=yr.name!=gr;(vr||br)&&ot(RegExp.prototype,gr,(function(){var t=I(this),e=String(t.source),o=t.flags;return"/"+e+"/"+String(void 0===o&&t instanceof RegExp&&!("flags"in dr)?or.call(t):o)}),{unsafe:!0});var mr=function(t){return function(e,o){var r,n,i=String(d(e)),a=st(o),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(n=i.charCodeAt(a+1))<56320||n>57343?t?i.charAt(a):r:t?i.slice(a,a+2):n-56320+(r-55296<<10)+65536}},kr={codeAt:mr(!1),charAt:mr(!0)},Sr=kr.charAt,Cr="String Iterator",wr=et.set,xr=et.getterFor(Cr);Go(String,"String",(function(t){wr(this,{type:Cr,string:String(t),index:0})}),(function(){var t,e=xr(this),o=e.string,r=e.index;return r>=o.length?{value:void 0,done:!0}:(t=Sr(o,r),e.index+=t.length,{value:t,done:!1})}));var Or=Yt("species"),Er=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),Ir="$0"==="a".replace(/./,"$0"),Tr=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var o="ab".split(t);return 2!==o.length||"a"!==o[0]||"b"!==o[1]})),jr=function(t,e,o,r){var n=Yt(t),a=!i((function(){var e={};return e[n]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,o=/a/;return"split"===t&&((o={}).constructor={},o.constructor[Or]=function(){return o},o.flags="",o[n]=/./[n]),o.exec=function(){return e=!0,null},o[n](""),!e}));if(!a||!c||"replace"===t&&(!Er||!Ir)||"split"===t&&!Tr){var s=/./[n],l=o(n,""[t],(function(t,e,o,r,n){return e.exec===hr?a&&!n?{done:!0,value:s.call(e,o,r)}:{done:!0,value:t.call(o,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:Ir}),u=l[0],f=l[1];ot(String.prototype,t,u),ot(RegExp.prototype,n,2==e?function(t,e){return f.call(t,this,e)}:function(t){return f.call(t,this)})}r&&P(RegExp.prototype[n],"sham",!0)},Pr=kr.charAt,Ar=function(t,e,o){return e+(o?Pr(t,e).length:1)},Nr=function(t,e){var o=t.exec;if("function"==typeof o){var r=o.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return hr.call(t,e)},Lr=Math.max,Rr=Math.min,_r=Math.floor,Dr=/\$([$&'`]|\d\d?|<[^>]*>)/g,Mr=/\$([$&'`]|\d\d?)/g;jr("replace",2,(function(t,e,o,r){return[function(o,r){var n=d(this),i=null==o?void 0:o[t];return void 0!==i?i.call(o,n,r):e.call(String(n),o,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=o(e,t,this,i);if(a.done)return a.value}var c=I(t),s=String(this),l="function"==typeof i;l||(i=String(i));var u=c.global;if(u){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var h=Nr(c,s);if(null===h)break;if(p.push(h),!u)break;""===String(h[0])&&(c.lastIndex=Ar(s,ut(c.lastIndex),f))}for(var g,d="",y=0,v=0;v<p.length;v++){h=p[v];for(var b=String(h[0]),m=Lr(Rr(st(h.index),s.length),0),k=[],S=1;S<h.length;S++)k.push(void 0===(g=h[S])?g:String(g));var C=h.groups;if(l){var w=[b].concat(k,m,s);void 0!==C&&w.push(C);var x=String(i.apply(void 0,w))}else x=n(b,s,m,k,C,i);m>=y&&(d+=s.slice(y,m)+x,y=m+b.length)}return d+s.slice(y)}];function n(t,o,r,n,i,a){var c=r+t.length,s=n.length,l=Mr;return void 0!==i&&(i=Rt(i),l=Dr),e.call(a,l,(function(e,a){var l;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return o.slice(0,r);case"'":return o.slice(c);case"<":l=i[a.slice(1,-1)];break;default:var u=+a;if(0===u)return e;if(u>s){var f=_r(u/10);return 0===f?e:f<=s?void 0===n[f-1]?a.charAt(1):n[f-1]+a.charAt(1):e}l=n[u-1]}return void 0===l?"":l}))}}));var Gr=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};jr("search",1,(function(t,e,o){return[function(e){var o=d(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o):new RegExp(e)[t](String(o))},function(t){var r=o(e,t,this);if(r.done)return r.value;var n=I(t),i=String(this),a=n.lastIndex;Gr(a,0)||(n.lastIndex=0);var c=Nr(n,i);return Gr(n.lastIndex,a)||(n.lastIndex=a),null===c?-1:c.index}]}));var Br=Yt("match"),Vr=Yt("species"),$r=[].push,Fr=Math.min,Jr=4294967295,Ur=!i((function(){return!RegExp(Jr,"y")}));jr("split",2,(function(t,e,o){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,o){var r,n,i=String(d(this)),a=void 0===o?Jr:o>>>0;if(0===a)return[];if(void 0===t)return[i];if(!v(r=t)||!(void 0!==(n=r[Br])?n:"RegExp"==p(r)))return e.call(i,t,a);for(var c,s,l,u=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,g=new RegExp(t.source,f+"g");(c=hr.call(g,i))&&!((s=g.lastIndex)>h&&(u.push(i.slice(h,c.index)),c.length>1&&c.index<i.length&&$r.apply(u,c.slice(1)),l=c[0].length,h=s,u.length>=a));)g.lastIndex===c.index&&g.lastIndex++;return h===i.length?!l&&g.test("")||u.push(""):u.push(i.slice(h)),u.length>a?u.slice(0,a):u}:"0".split(void 0,0).length?function(t,o){return void 0===t&&0===o?[]:e.call(this,t,o)}:e,[function(e,o){var n=d(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,n,o):r.call(String(n),e,o)},function(t,n){var i=o(r,t,this,n,r!==e);if(i.done)return i.value;var a=I(t),c=String(this),s=function(t,e){var o,r=I(t).constructor;return void 0===r||null==(o=I(r)[Vr])?e:re(o)}(a,RegExp),l=a.unicode,u=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Ur?"y":"g"),f=new s(Ur?a:"^(?:"+a.source+")",u),p=void 0===n?Jr:n>>>0;if(0===p)return[];if(0===c.length)return null===Nr(f,c)?[c]:[];for(var h=0,g=0,d=[];g<c.length;){f.lastIndex=Ur?g:0;var y,v=Nr(f,Ur?c:c.slice(g));if(null===v||(y=Fr(ut(f.lastIndex+(Ur?0:g)),c.length))===h)g=Ar(c,g,l);else{if(d.push(c.slice(h,g)),d.length===p)return d;for(var b=1;b<=v.length-1;b++)if(d.push(v[b]),d.length===p)return d;g=h=y}}return d.push(c.slice(h)),d}]}),!Ur);var zr={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Hr=se.forEach,qr=Jo("forEach")?function(t){return Hr(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Kr in zr){var Wr=n[Kr],Yr=Wr&&Wr.prototype;if(Yr&&Yr.forEach!==qr)try{P(Yr,"forEach",qr)}catch(t){Yr.forEach=qr}}var Qr=Yt("iterator"),Xr=Yt("toStringTag"),Zr=Fo.values;for(var tn in zr){var en=n[tn],on=en&&en.prototype;if(on){if(on[Qr]!==Zr)try{P(on,Qr,Zr)}catch(t){on[Qr]=Zr}if(on[Xr]||P(on,Xr,tn),zr[tn])for(var rn in Fo)if(on[rn]!==Fo[rn])try{P(on,rn,Fo[rn])}catch(t){on[rn]=Fo[rn]}}}function nn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function an(t,e){for(var o=0;o<e.length;o++){var r=e[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function cn(t){return(cn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function sn(t,e){return(sn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ln(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function un(t,e,o){return(un="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,o){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=cn(t)););return t}(t,e);if(r){var n=Object.getOwnPropertyDescriptor(r,e);return n.get?n.get.call(o):n.value}})(t,e,o||t)}var fn=t.fn.bootstrapTable.utils,pn={cookieIds:{sortOrder:"bs.table.sortOrder",sortName:"bs.table.sortName",pageNumber:"bs.table.pageNumber",pageList:"bs.table.pageList",columns:"bs.table.columns",searchText:"bs.table.searchText",reorderColumns:"bs.table.reorderColumns",filterControl:"bs.table.filterControl",filterBy:"bs.table.filterBy"},getCurrentHeader:function(t){var e=t.$header;return t.options.height&&(e=t.$tableHeader),e},getCurrentSearchControls:function(t){var e="select, input";return t.options.height&&(e="table select, table input"),e},cookieEnabled:function(){return!!navigator.cookieEnabled},inArrayCookiesEnabled:function(t,e){for(var o=-1,r=0;r<e.length;r++)if(t.toLowerCase()===e[r].toLowerCase()){o=r;break}return o},setCookie:function(t,e,o){if(t.options.cookie&&pn.cookieEnabled()&&""!==t.options.cookieIdTable&&-1!==pn.inArrayCookiesEnabled(e,t.options.cookiesEnabled)){switch(e="".concat(t.options.cookieIdTable,".").concat(e),t.options.cookieStorage){case"cookieStorage":document.cookie=[e,"=",encodeURIComponent(o),"; expires=".concat(pn.calculateExpiration(t.options.cookieExpire)),t.options.cookiePath?"; path=".concat(t.options.cookiePath):"",t.options.cookieDomain?"; domain=".concat(t.options.cookieDomain):"",t.options.cookieSecure?"; secure":"",";SameSite="+t.options.cookieSameSite].join("");break;case"localStorage":localStorage.setItem(e,o);break;case"sessionStorage":sessionStorage.setItem(e,o);break;case"customStorage":if(!t.options.cookieCustomStorageSet||!t.options.cookieCustomStorageGet||!t.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");fn.calculateObjectValue(t.options,t.options.cookieCustomStorageSet,[e,o],"");break;default:return!1}return!0}},getCookie:function(t,e,o){if(!o)return null;if(-1===pn.inArrayCookiesEnabled(o,t.options.cookiesEnabled))return null;switch(o="".concat(e,".").concat(o),t.options.cookieStorage){case"cookieStorage":var r="; ".concat(document.cookie).split("; ".concat(o,"="));return 2===r.length?decodeURIComponent(r.pop().split(";").shift()):null;case"localStorage":return localStorage.getItem(o);case"sessionStorage":return sessionStorage.getItem(o);case"customStorage":if(!t.options.cookieCustomStorageSet||!t.options.cookieCustomStorageGet||!t.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");return fn.calculateObjectValue(t.options,t.options.cookieCustomStorageGet,[o],"");default:return null}},deleteCookie:function(t,e,o){switch(o="".concat(e,".").concat(o),t.options.cookieStorage){case"cookieStorage":document.cookie=[encodeURIComponent(o),"=","; expires=Thu, 01 Jan 1970 00:00:00 GMT",t.options.cookiePath?"; path=".concat(t.options.cookiePath):"",t.options.cookieDomain?"; domain=".concat(t.options.cookieDomain):""].join("");break;case"localStorage":localStorage.removeItem(o);break;case"sessionStorage":sessionStorage.removeItem(o);break;case"customStorage":if(!t.options.cookieCustomStorageSet||!t.options.cookieCustomStorageGet||!t.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");fn.calculateObjectValue(t.options,t.options.cookieCustomStorageDelete,[o],"");break;default:return!1}return!0},calculateExpiration:function(t){var e=t.replace(/[0-9]*/,"");switch(t=t.replace(/[A-Za-z]{1,2}/,""),e.toLowerCase()){case"s":t=+t;break;case"mi":t*=60;break;case"h":t=60*t*60;break;case"d":t=24*t*60*60;break;case"m":t=30*t*24*60*60;break;case"y":t=365*t*24*60*60;break;default:t=void 0}if(!t)return"";var o=new Date;return o.setTime(o.getTime()+1e3*t),o.toGMTString()},initCookieFilters:function(e){setTimeout((function(){var o=JSON.parse(pn.getCookie(e,e.options.cookieIdTable,pn.cookieIds.filterControl));if(!e.options.filterControlValuesLoaded&&o){var r={},n=pn.getCurrentHeader(e),i=pn.getCurrentSearchControls(e),a=n;e.options.filterControlContainer&&(a=t("".concat(e.options.filterControlContainer))),a.find(i).each((function(){var n=t(this).closest("[data-field]").data("field");!function(t,o){o.forEach((function(o){if(""!==o.text&&("radio"!==t.type||t.value.toString()===o.text.toString()))if("INPUT"===t.tagName&&"radio"===t.type&&t.value.toString()===o.text.toString())t.checked=!0,r[o.field]=o.text;else if("INPUT"===t.tagName)t.value=o.text,r[o.field]=o.text;else if("SELECT"===t.tagName&&e.options.filterControlContainer)t.value=o.text,r[o.field]=o.text;else if(""!==o.text&&"SELECT"===t.tagName){for(var n=0;n<t.length;n++){var i=t[n];if(i.value===o.text)return void(i.selected=!0)}var a=document.createElement("option");a.value=o.text,a.text=o.text,t.add(a,t[1]),t.selectedIndex=1,r[o.field]=o.text}}))}(this,o.filter((function(t){return t.field===n})))})),e.initColumnSearch(r),e.options.filterControlValuesLoaded=!0,e.initServer()}}),250)}};t.extend(t.fn.bootstrapTable.defaults,{cookie:!1,cookieExpire:"2h",cookiePath:null,cookieDomain:null,cookieSecure:null,cookieSameSite:"Lax",cookieIdTable:"",cookiesEnabled:["bs.table.sortOrder","bs.table.sortName","bs.table.pageNumber","bs.table.pageList","bs.table.columns","bs.table.searchText","bs.table.filterControl","bs.table.filterBy","bs.table.reorderColumns"],cookieStorage:"cookieStorage",cookieCustomStorageGet:null,cookieCustomStorageSet:null,cookieCustomStorageDelete:null,filterControls:[],filterControlValuesLoaded:!1}),t.fn.bootstrapTable.methods.push("getCookies"),t.fn.bootstrapTable.methods.push("deleteCookie"),t.extend(t.fn.bootstrapTable.utils,{setCookie:pn.setCookie,getCookie:pn.getCookie}),t.BootstrapTable=function(e){function o(){return nn(this,o),ln(this,cn(o).apply(this,arguments))}var r,n,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&sn(t,e)}(o,e),r=o,(n=[{key:"init",value:function(){if(this.options.cookie){var t=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.filterBy);if("boolean"==typeof t&&!t)throw new Error("The cookie value of filterBy must be a json!");var e={};try{e=JSON.parse(t)}catch(t){throw new Error("Could not parse the json of the filterBy cookie!")}if(this.filterColumns=e||{},this.options.filterControls=[],this.options.filterControlValuesLoaded=!1,this.options.cookiesEnabled="string"==typeof this.options.cookiesEnabled?this.options.cookiesEnabled.replace("[","").replace("]","").replace(/'/g,"").replace(/ /g,"").toLowerCase().split(","):this.options.cookiesEnabled,this.options.filterControl){var r=this;this.$el.on("column-search.bs.table",(function(t,e,o){for(var n=!0,i=0;i<r.options.filterControls.length;i++)if(r.options.filterControls[i].field===e){r.options.filterControls[i].text=o,n=!1;break}n&&r.options.filterControls.push({field:e,text:o}),pn.setCookie(r,pn.cookieIds.filterControl,JSON.stringify(r.options.filterControls))})).on("created-controls.bs.table",pn.initCookieFilters(r))}}un(cn(o.prototype),"init",this).call(this)}},{key:"initServer",value:function(){var t;if(this.options.cookie&&this.options.filterControl&&!this.options.filterControlValuesLoaded){var e=JSON.parse(pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.filterControl));if(e)return}for(var r=arguments.length,n=new Array(r),i=0;i<r;i++)n[i]=arguments[i];(t=un(cn(o.prototype),"initServer",this)).call.apply(t,[this].concat(n))}},{key:"initTable",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"initTable",this)).call.apply(t,[this].concat(r)),this.initCookie()}},{key:"onSort",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onSort",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.sortOrder,this.options.sortOrder),pn.setCookie(this,pn.cookieIds.sortName,this.options.sortName)}},{key:"onPageNumber",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPageNumber",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPageListChange",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPageListChange",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageList,this.options.pageSize),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPagePre",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPagePre",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPageNext",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPageNext",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"_toggleColumn",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"_toggleColumn",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map((function(t){return t.field}))))}},{key:"_toggleAllColumns",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"_toggleAllColumns",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map((function(t){return t.field}))))}},{key:"selectPage",value:function(t){un(cn(o.prototype),"selectPage",this).call(this,t),pn.setCookie(this,pn.cookieIds.pageNumber,t)}},{key:"onSearch",value:function(t){un(cn(o.prototype),"onSearch",this).call(this,t),this.options.search&&pn.setCookie(this,pn.cookieIds.searchText,this.searchText),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"initHeader",value:function(){var t;this.options.reorderableColumns&&(this.columnsSortOrder=JSON.parse(pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.reorderColumns)));for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"initHeader",this)).call.apply(t,[this].concat(r))}},{key:"persistReorderColumnsState",value:function(t){pn.setCookie(t,pn.cookieIds.reorderColumns,JSON.stringify(t.columnsSortOrder))}},{key:"filterBy",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"filterBy",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.filterBy,JSON.stringify(this.filterColumns))}},{key:"initCookie",value:function(){var t=this;if(this.options.cookie){if(""===this.options.cookieIdTable||""===this.options.cookieExpire||!pn.cookieEnabled())return console.error("Configuration error. Please review the cookieIdTable and the cookieExpire property. If the properties are correct, then this browser does not support cookies."),void(this.options.cookie=!1);var e=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.sortOrder),o=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.sortName),r=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.pageNumber),n=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.pageList),i=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.searchText),a=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.columns);if("boolean"==typeof a&&!a)throw new Error("The cookie value of filterBy must be a json!");var c={};try{c=JSON.parse(a)}catch(t){throw new Error("Could not parse the json of the columns cookie!",a)}if(this.options.sortOrder=e||this.options.sortOrder,this.options.sortName=o||this.options.sortName,this.options.pageNumber=r?+r:this.options.pageNumber,this.options.pageSize=n?n===this.options.formatAllRows()?n:+n:this.options.pageSize,this.options.searchText=i||"",c){var s=!0,l=!1,u=void 0;try{for(var f,p=function(){var e=f.value;e.visible=c.filter((function(o){return!!t.isSelectionColumn(e)||(o instanceof Object?o.field===e.field:o===e.field)})).length>0||!e.switchable},h=this.columns[Symbol.iterator]();!(s=(f=h.next()).done);s=!0)p()}catch(t){l=!0,u=t}finally{try{s||null==h.return||h.return()}finally{if(l)throw u}}}}}},{key:"getCookies",value:function(){var e=this,o={};return t.each(pn.cookieIds,(function(t,r){o[t]=pn.getCookie(e,e.options.cookieIdTable,r),"columns"===t&&(o[t]=JSON.parse(o[t]))})),o}},{key:"deleteCookie",value:function(t){""!==t&&pn.cookieEnabled()&&pn.deleteCookie(this,this.options.cookieIdTable,pn.cookieIds[t])}}])&&an(r.prototype,n),i&&an(r,i),o}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-export.min.js b/web/skins/classic/js/bootstrap-table-export.min.js
new file mode 100644
index 000000000..cefc8d0a4
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-export.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,u=Object.getOwnPropertyDescriptor,l={f:u&&!c.call({1:2},1)?function(t){var e=u(this,t);return!!e&&e.enumerable}:c},s=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},h="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?h.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return d(g(t))},y=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!y(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!y(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!y(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!y(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},x={}.hasOwnProperty,m=function(t,e){return x.call(t,e)},S=o.document,w=y(S)&&y(S.createElement),O=function(t){return w?S.createElement(t):{}},E=!a&&!i((function(){return 7!=Object.defineProperty(O("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,j={f:a?T:function(t,e){if(t=v(t),e=b(e,!0),E)try{return T(t,e)}catch(t){}if(m(t,e))return s(!l.f.call(t,e),t[e])}},P=function(t){if(!y(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,I={f:a?A:function(t,e,n){if(P(t),e=b(e,!0),P(n),E)try{return A(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},_=a?function(t,e,n){return I.f(t,e,s(1,n))}:function(t,e,n){return t[e]=n,t},R=function(t,e){try{_(o,t,e)}catch(n){o[t]=e}return e},C="__core-js_shared__",L=o[C]||R(C,{}),k=Function.toString;"function"!=typeof L.inspectSource&&(L.inspectSource=function(t){return k.call(t)});var M,$,D,N=L.inspectSource,F=o.WeakMap,B="function"==typeof F&&/native code/.test(N(F)),G=n((function(t){(t.exports=function(t,e){return L[t]||(L[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),V=0,H=Math.random(),q=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++V+H).toString(36)},z=G("keys"),U=function(t){return z[t]||(z[t]=q(t))},W={},K=o.WeakMap;if(B){var Y=new K,X=Y.get,J=Y.has,Q=Y.set;M=function(t,e){return Q.call(Y,t,e),e},$=function(t){return X.call(Y,t)||{}},D=function(t){return J.call(Y,t)}}else{var Z=U("state");W[Z]=!0,M=function(t,e){return _(t,Z,e),e},$=function(t){return m(t,Z)?t[Z]:{}},D=function(t){return m(t,Z)}}var tt,et={set:M,get:$,has:D,enforce:function(t){return D(t)?$(t):M(t,{})},getterFor:function(t){return function(e){var n;if(!y(e)||(n=$(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},nt=n((function(t){var e=et.get,n=et.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,u=!!a&&!!a.enumerable,l=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||m(i,"name")||_(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!l&&t[e]&&(u=!0):delete t[e],u?t[e]=i:_(t,e,i)):u?t[e]=i:R(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||N(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},it=function(t,e){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][e]||o[t]&&o[t][e]},at=Math.ceil,ct=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?ct:at)(t)},lt=Math.min,st=function(t){return t>0?lt(ut(t),9007199254740991):0},ft=Math.max,pt=Math.min,ht=function(t,e){var n=ut(t);return n<0?ft(n+e,0):pt(n,e)},dt=function(t){return function(e,n,r){var o,i=v(e),a=st(i.length),c=ht(r,a);if(t&&n!=n){for(;a>c;)if((o=i[c++])!=o)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},gt={includes:dt(!0),indexOf:dt(!1)}.indexOf,vt=function(t,e){var n,r=v(t),o=0,i=[];for(n in r)!m(W,n)&&m(r,n)&&i.push(n);for(;e.length>o;)m(r,n=e[o++])&&(~gt(i,n)||i.push(n));return i},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],bt=yt.concat("length","prototype"),xt={f:Object.getOwnPropertyNames||function(t){return vt(t,bt)}},mt={f:Object.getOwnPropertySymbols},St=it("Reflect","ownKeys")||function(t){var e=xt.f(P(t)),n=mt.f;return n?e.concat(n(t)):e},wt=function(t,e){for(var n=St(e),r=I.f,o=j.f,i=0;i<n.length;i++){var a=n[i];m(t,a)||r(t,a,o(e,a))}},Ot=/#|\.prototype\./,Et=function(t,e){var n=jt[Tt(t)];return n==At||n!=Pt&&("function"==typeof e?i(e):!!e)},Tt=Et.normalize=function(t){return String(t).replace(Ot,".").toLowerCase()},jt=Et.data={},Pt=Et.NATIVE="N",At=Et.POLYFILL="P",It=Et,_t=j.f,Rt=function(t,e){var n,r,i,a,c,u=t.target,l=t.global,s=t.stat;if(n=l?o:s?o[u]||R(u,{}):(o[u]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=_t(n,r))&&c.value:n[r],!It(l?r:u+(s?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;wt(a,i)}(t.sham||i&&i.sham)&&_(a,"sham",!0),nt(n,r,a,t)}},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Lt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),kt=Array.isArray||function(t){return"Array"==p(t)},Mt=function(t){return Object(g(t))},$t=Object.keys||function(t){return vt(t,yt)},Dt=a?Object.defineProperties:function(t,e){P(t);for(var n,r=$t(e),o=r.length,i=0;o>i;)I.f(t,n=r[i++],e[n]);return t},Nt=it("document","documentElement"),Ft=U("IE_PROTO"),Bt=function(){},Gt=function(t){return"<script>"+t+"</"+"script>"},Vt=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Vt=tt?function(t){t.write(Gt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(tt):((e=O("iframe")).style.display="none",Nt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Gt("document.F=Object")),t.close(),t.F);for(var n=yt.length;n--;)delete Vt.prototype[yt[n]];return Vt()};W[Ft]=!0;var Ht=Object.create||function(t,e){var n;return null!==t?(Bt.prototype=P(t),n=new Bt,Bt.prototype=null,n[Ft]=t):n=Vt(),void 0===e?n:Dt(n,e)},qt=xt.f,zt={}.toString,Ut="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Wt={f:function(t){return Ut&&"[object Window]"==zt.call(t)?function(t){try{return qt(t)}catch(t){return Ut.slice()}}(t):qt(v(t))}},Kt=G("wks"),Yt=o.Symbol,Xt=Lt?Yt:q,Jt=function(t){return m(Kt,t)||(Ct&&m(Yt,t)?Kt[t]=Yt[t]:Kt[t]=Xt("Symbol."+t)),Kt[t]},Qt={f:Jt},Zt=I.f,te=function(t){var e=rt.Symbol||(rt.Symbol={});m(e,t)||Zt(e,t,{value:Qt.f(t)})},ee=I.f,ne=Jt("toStringTag"),re=function(t,e,n){t&&!m(t=n?t:t.prototype,ne)&&ee(t,ne,{configurable:!0,value:e})},oe=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ie=Jt("species"),ae=function(t,e){var n;return kt(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!kt(n.prototype)?y(n)&&null===(n=n[ie])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},ce=[].push,ue=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,a=5==t||i;return function(c,u,l,s){for(var f,p,h=Mt(c),g=d(h),v=function(t,e,n){if(oe(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}(u,l,3),y=st(g.length),b=0,x=s||ae,m=e?x(c,y):n?x(c,0):void 0;y>b;b++)if((a||b in g)&&(p=v(f=g[b],b,h),t))if(e)m[b]=p;else if(p)switch(t){case 3:return!0;case 5:return f;case 6:return b;case 2:ce.call(m,f)}else if(o)return!1;return i?-1:r||o?o:m}},le={forEach:ue(0),map:ue(1),filter:ue(2),some:ue(3),every:ue(4),find:ue(5),findIndex:ue(6)},se=le.forEach,fe=U("hidden"),pe="Symbol",he=Jt("toPrimitive"),de=et.set,ge=et.getterFor(pe),ve=Object.prototype,ye=o.Symbol,be=it("JSON","stringify"),xe=j.f,me=I.f,Se=Wt.f,we=l.f,Oe=G("symbols"),Ee=G("op-symbols"),Te=G("string-to-symbol-registry"),je=G("symbol-to-string-registry"),Pe=G("wks"),Ae=o.QObject,Ie=!Ae||!Ae.prototype||!Ae.prototype.findChild,_e=a&&i((function(){return 7!=Ht(me({},"a",{get:function(){return me(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=xe(ve,e);r&&delete ve[e],me(t,e,n),r&&t!==ve&&me(ve,e,r)}:me,Re=function(t,e){var n=Oe[t]=Ht(ye.prototype);return de(n,{type:pe,tag:t,description:e}),a||(n.description=e),n},Ce=Ct&&"symbol"==typeof ye.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ye},Le=function(t,e,n){t===ve&&Le(Ee,e,n),P(t);var r=b(e,!0);return P(n),m(Oe,r)?(n.enumerable?(m(t,fe)&&t[fe][r]&&(t[fe][r]=!1),n=Ht(n,{enumerable:s(0,!1)})):(m(t,fe)||me(t,fe,s(1,{})),t[fe][r]=!0),_e(t,r,n)):me(t,r,n)},ke=function(t,e){P(t);var n=v(e),r=$t(n).concat(Ne(n));return se(r,(function(e){a&&!Me.call(n,e)||Le(t,e,n[e])})),t},Me=function(t){var e=b(t,!0),n=we.call(this,e);return!(this===ve&&m(Oe,e)&&!m(Ee,e))&&(!(n||!m(this,e)||!m(Oe,e)||m(this,fe)&&this[fe][e])||n)},$e=function(t,e){var n=v(t),r=b(e,!0);if(n!==ve||!m(Oe,r)||m(Ee,r)){var o=xe(n,r);return!o||!m(Oe,r)||m(n,fe)&&n[fe][r]||(o.enumerable=!0),o}},De=function(t){var e=Se(v(t)),n=[];return se(e,(function(t){m(Oe,t)||m(W,t)||n.push(t)})),n},Ne=function(t){var e=t===ve,n=Se(e?Ee:v(t)),r=[];return se(n,(function(t){!m(Oe,t)||e&&!m(ve,t)||r.push(Oe[t])})),r};if(Ct||(nt((ye=function(){if(this instanceof ye)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=q(t),n=function(t){this===ve&&n.call(Ee,t),m(this,fe)&&m(this[fe],e)&&(this[fe][e]=!1),_e(this,e,s(1,t))};return a&&Ie&&_e(ve,e,{configurable:!0,set:n}),Re(e,t)}).prototype,"toString",(function(){return ge(this).tag})),l.f=Me,I.f=Le,j.f=$e,xt.f=Wt.f=De,mt.f=Ne,a&&(me(ye.prototype,"description",{configurable:!0,get:function(){return ge(this).description}}),nt(ve,"propertyIsEnumerable",Me,{unsafe:!0}))),Lt||(Qt.f=function(t){return Re(Jt(t),t)}),Rt({global:!0,wrap:!0,forced:!Ct,sham:!Ct},{Symbol:ye}),se($t(Pe),(function(t){te(t)})),Rt({target:pe,stat:!0,forced:!Ct},{for:function(t){var e=String(t);if(m(Te,e))return Te[e];var n=ye(e);return Te[e]=n,je[n]=e,n},keyFor:function(t){if(!Ce(t))throw TypeError(t+" is not a symbol");if(m(je,t))return je[t]},useSetter:function(){Ie=!0},useSimple:function(){Ie=!1}}),Rt({target:"Object",stat:!0,forced:!Ct,sham:!a},{create:function(t,e){return void 0===e?Ht(t):ke(Ht(t),e)},defineProperty:Le,defineProperties:ke,getOwnPropertyDescriptor:$e}),Rt({target:"Object",stat:!0,forced:!Ct},{getOwnPropertyNames:De,getOwnPropertySymbols:Ne}),Rt({target:"Object",stat:!0,forced:i((function(){mt.f(1)}))},{getOwnPropertySymbols:function(t){return mt.f(Mt(t))}}),be){var Fe=!Ct||i((function(){var t=ye();return"[null]"!=be([t])||"{}"!=be({a:t})||"{}"!=be(Object(t))}));Rt({target:"JSON",stat:!0,forced:Fe},{stringify:function(t,e,n){for(var r,o=[t],i=1;arguments.length>i;)o.push(arguments[i++]);if(r=e,(y(e)||void 0!==t)&&!Ce(t))return kt(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!Ce(e))return e}),o[1]=e,be.apply(null,o)}})}ye.prototype[he]||_(ye.prototype,he,ye.prototype.valueOf),re(ye,pe),W[fe]=!0;var Be=I.f,Ge=o.Symbol;if(a&&"function"==typeof Ge&&(!("description"in Ge.prototype)||void 0!==Ge().description)){var Ve={},He=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof He?new Ge(t):void 0===t?Ge():Ge(t);return""===t&&(Ve[e]=!0),e};wt(He,Ge);var qe=He.prototype=Ge.prototype;qe.constructor=He;var ze=qe.toString,Ue="Symbol(test)"==String(Ge("test")),We=/^Symbol\((.*)\)[^)]+$/;Be(qe,"description",{configurable:!0,get:function(){var t=y(this)?this.valueOf():this,e=ze.call(t);if(m(Ve,t))return"";var n=Ue?e.slice(7,-1):e.replace(We,"$1");return""===n?void 0:n}}),Rt({global:!0,forced:!0},{Symbol:He})}te("iterator");var Ke,Ye,Xe=function(t,e,n){var r=b(e);r in t?I.f(t,r,s(0,n)):t[r]=n},Je=it("navigator","userAgent")||"",Qe=o.process,Ze=Qe&&Qe.versions,tn=Ze&&Ze.v8;tn?Ye=(Ke=tn.split("."))[0]+Ke[1]:Je&&(!(Ke=Je.match(/Edge\/(\d+)/))||Ke[1]>=74)&&(Ke=Je.match(/Chrome\/(\d+)/))&&(Ye=Ke[1]);var en=Ye&&+Ye,nn=Jt("species"),rn=function(t){return en>=51||!i((function(){var e=[];return(e.constructor={})[nn]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},on=Jt("isConcatSpreadable"),an=9007199254740991,cn="Maximum allowed index exceeded",un=en>=51||!i((function(){var t=[];return t[on]=!1,t.concat()[0]!==t})),ln=rn("concat"),sn=function(t){if(!y(t))return!1;var e=t[on];return void 0!==e?!!e:kt(t)};Rt({target:"Array",proto:!0,forced:!un||!ln},{concat:function(t){var e,n,r,o,i,a=Mt(this),c=ae(a,0),u=0;for(e=-1,r=arguments.length;e<r;e++)if(sn(i=-1===e?a:arguments[e])){if(u+(o=st(i.length))>an)throw TypeError(cn);for(n=0;n<o;n++,u++)n in i&&Xe(c,u,i[n])}else{if(u>=an)throw TypeError(cn);Xe(c,u++,i)}return c.length=u,c}});var fn=Jt("unscopables"),pn=Array.prototype;null==pn[fn]&&I.f(pn,fn,{configurable:!0,value:Ht(null)});var hn=function(t){pn[fn][t]=!0},dn=le.find,gn="find",vn=!0;gn in[]&&Array(1).find((function(){vn=!1})),Rt({target:"Array",proto:!0,forced:vn},{find:function(t){return dn(this,t,arguments.length>1?arguments[1]:void 0)}}),hn(gn);var yn,bn,xn,mn=!i((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Sn=U("IE_PROTO"),wn=Object.prototype,On=mn?Object.getPrototypeOf:function(t){return t=Mt(t),m(t,Sn)?t[Sn]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?wn:null},En=Jt("iterator"),Tn=!1;[].keys&&("next"in(xn=[].keys())?(bn=On(On(xn)))!==Object.prototype&&(yn=bn):Tn=!0),null==yn&&(yn={}),m(yn,En)||_(yn,En,(function(){return this}));var jn={IteratorPrototype:yn,BUGGY_SAFARI_ITERATORS:Tn},Pn=jn.IteratorPrototype,An=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,n={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(n,[]),e=n instanceof Array}catch(t){}return function(n,r){return P(n),function(t){if(!y(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),e?t.call(n,r):n.__proto__=r,n}}():void 0),In=jn.IteratorPrototype,_n=jn.BUGGY_SAFARI_ITERATORS,Rn=Jt("iterator"),Cn="keys",Ln="values",kn="entries",Mn=function(){return this},$n=function(t,e,n,r,o,i,a){!function(t,e,n){var r=e+" Iterator";t.prototype=Ht(Pn,{next:s(1,n)}),re(t,r,!1)}(n,e,r);var c,u,l,f=function(t){if(t===o&&v)return v;if(!_n&&t in d)return d[t];switch(t){case Cn:case Ln:case kn:return function(){return new n(this,t)}}return function(){return new n(this)}},p=e+" Iterator",h=!1,d=t.prototype,g=d[Rn]||d["@@iterator"]||o&&d[o],v=!_n&&g||f(o),y="Array"==e&&d.entries||g;if(y&&(c=On(y.call(new t)),In!==Object.prototype&&c.next&&(On(c)!==In&&(An?An(c,In):"function"!=typeof c[Rn]&&_(c,Rn,Mn)),re(c,p,!0))),o==Ln&&g&&g.name!==Ln&&(h=!0,v=function(){return g.call(this)}),d[Rn]!==v&&_(d,Rn,v),o)if(u={values:f(Ln),keys:i?v:f(Cn),entries:f(kn)},a)for(l in u)(_n||h||!(l in d))&&nt(d,l,u[l]);else Rt({target:e,proto:!0,forced:_n||h},u);return u},Dn="Array Iterator",Nn=et.set,Fn=et.getterFor(Dn),Bn=$n(Array,"Array",(function(t,e){Nn(this,{type:Dn,target:v(t),index:0,kind:e})}),(function(){var t=Fn(this),e=t.target,n=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values");hn("keys"),hn("values"),hn("entries");var Gn=function(t,e){var n=[][t];return!n||!i((function(){n.call(null,e||function(){throw 1},1)}))},Vn=[].join,Hn=d!=Object,qn=Gn("join",",");Rt({target:"Array",proto:!0,forced:Hn||qn},{join:function(t){return Vn.call(v(this),void 0===t?",":t)}});var zn=le.map,Un=rn("map"),Wn=Un&&!i((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Rt({target:"Array",proto:!0,forced:!Un||!Wn},{map:function(t){return zn(this,t,arguments.length>1?arguments[1]:void 0)}});var Kn=Jt("species"),Yn=[].slice,Xn=Math.max;Rt({target:"Array",proto:!0,forced:!rn("slice")},{slice:function(t,e){var n,r,o,i=v(this),a=st(i.length),c=ht(t,a),u=ht(void 0===e?a:e,a);if(kt(i)&&("function"!=typeof(n=i.constructor)||n!==Array&&!kt(n.prototype)?y(n)&&null===(n=n[Kn])&&(n=void 0):n=void 0,n===Array||void 0===n))return Yn.call(i,c,u);for(r=new(void 0===n?Array:n)(Xn(u-c,0)),o=0;c<u;c++,o++)c in i&&Xe(r,o,i[c]);return r.length=o,r}});var Jn=Object.assign,Qn=Object.defineProperty,Zn=!Jn||i((function(){if(a&&1!==Jn({b:1},Jn(Qn({},"a",{enumerable:!0,get:function(){Qn(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=Jn({},t)[n]||$t(Jn({},e)).join("")!=r}))?function(t,e){for(var n=Mt(t),r=arguments.length,o=1,i=mt.f,c=l.f;r>o;)for(var u,s=d(arguments[o++]),f=i?$t(s).concat(i(s)):$t(s),p=f.length,h=0;p>h;)u=f[h++],a&&!c.call(s,u)||(n[u]=s[u]);return n}:Jn;Rt({target:"Object",stat:!0,forced:Object.assign!==Zn},{assign:Zn});var tr={};tr[Jt("toStringTag")]="z";var er="[object z]"===String(tr),nr=Jt("toStringTag"),rr="Arguments"==p(function(){return arguments}()),or=er?p:function(t){var e,n,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),nr))?n:rr?p(e):"Object"==(r=p(e))&&"function"==typeof e.callee?"Arguments":r},ir=er?{}.toString:function(){return"[object "+or(this)+"]"};er||nt(Object.prototype,"toString",ir,{unsafe:!0});var ar=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function cr(t,e){return RegExp(t,e)}var ur,lr,sr={UNSUPPORTED_Y:i((function(){var t=cr("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=cr("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},fr=RegExp.prototype.exec,pr=String.prototype.replace,hr=fr,dr=(ur=/a/,lr=/b*/g,fr.call(ur,"a"),fr.call(lr,"a"),0!==ur.lastIndex||0!==lr.lastIndex),gr=sr.UNSUPPORTED_Y||sr.BROKEN_CARET,vr=void 0!==/()??/.exec("")[1];(dr||vr||gr)&&(hr=function(t){var e,n,r,o,i=this,a=gr&&i.sticky,c=ar.call(i),u=i.source,l=0,s=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),s=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(u="(?: "+u+")",s=" "+s,l++),n=new RegExp("^(?:"+u+")",c)),vr&&(n=new RegExp("^"+u+"$(?!\\s)",c)),dr&&(e=i.lastIndex),r=fr.call(a?n:i,s),a?r?(r.input=r.input.slice(l),r[0]=r[0].slice(l),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:dr&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),vr&&r&&r.length>1&&pr.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var yr=hr;Rt({target:"RegExp",proto:!0,forced:/./.exec!==yr},{exec:yr});var br=function(t){return function(e,n){var r,o,i=String(g(e)),a=ut(n),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(o=i.charCodeAt(a+1))<56320||o>57343?t?i.charAt(a):r:t?i.slice(a,a+2):o-56320+(r-55296<<10)+65536}},xr={codeAt:br(!1),charAt:br(!0)},mr=xr.charAt,Sr="String Iterator",wr=et.set,Or=et.getterFor(Sr);$n(String,"String",(function(t){wr(this,{type:Sr,string:String(t),index:0})}),(function(){var t,e=Or(this),n=e.string,r=e.index;return r>=n.length?{value:void 0,done:!0}:(t=mr(n,r),e.index+=t.length,{value:t,done:!1})}));var Er=Jt("species"),Tr=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),jr="$0"==="a".replace(/./,"$0"),Pr=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),Ar=function(t,e,n,r){var o=Jt(t),a=!i((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[Er]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!a||!c||"replace"===t&&(!Tr||!jr)||"split"===t&&!Pr){var u=/./[o],l=n(o,""[t],(function(t,e,n,r,o){return e.exec===yr?a&&!o?{done:!0,value:u.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:jr}),s=l[0],f=l[1];nt(String.prototype,t,s),nt(RegExp.prototype,o,2==e?function(t,e){return f.call(t,this,e)}:function(t){return f.call(t,this)})}r&&_(RegExp.prototype[o],"sham",!0)},Ir=xr.charAt,_r=function(t,e,n){return e+(n?Ir(t,e).length:1)},Rr=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return yr.call(t,e)},Cr=Math.max,Lr=Math.min,kr=Math.floor,Mr=/\$([$&'`]|\d\d?|<[^>]*>)/g,$r=/\$([$&'`]|\d\d?)/g;Ar("replace",2,(function(t,e,n,r){return[function(n,r){var o=g(this),i=null==n?void 0:n[t];return void 0!==i?i.call(n,o,r):e.call(String(o),n,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=n(e,t,this,i);if(a.done)return a.value}var c=P(t),u=String(this),l="function"==typeof i;l||(i=String(i));var s=c.global;if(s){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var h=Rr(c,u);if(null===h)break;if(p.push(h),!s)break;""===String(h[0])&&(c.lastIndex=_r(u,st(c.lastIndex),f))}for(var d,g="",v=0,y=0;y<p.length;y++){h=p[y];for(var b=String(h[0]),x=Cr(Lr(ut(h.index),u.length),0),m=[],S=1;S<h.length;S++)m.push(void 0===(d=h[S])?d:String(d));var w=h.groups;if(l){var O=[b].concat(m,x,u);void 0!==w&&O.push(w);var E=String(i.apply(void 0,O))}else E=o(b,u,x,m,w,i);x>=v&&(g+=u.slice(v,x)+E,v=x+b.length)}return g+u.slice(v)}];function o(t,n,r,o,i,a){var c=r+t.length,u=o.length,l=$r;return void 0!==i&&(i=Mt(i),l=Mr),e.call(a,l,(function(e,a){var l;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":l=i[a.slice(1,-1)];break;default:var s=+a;if(0===s)return e;if(s>u){var f=kr(s/10);return 0===f?e:f<=u?void 0===o[f-1]?a.charAt(1):o[f-1]+a.charAt(1):e}l=o[s-1]}return void 0===l?"":l}))}}));var Dr=Jt("match"),Nr=Jt("species"),Fr=[].push,Br=Math.min,Gr=4294967295,Vr=!i((function(){return!RegExp(Gr,"y")}));Ar("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r,o,i=String(g(this)),a=void 0===n?Gr:n>>>0;if(0===a)return[];if(void 0===t)return[i];if(!y(r=t)||!(void 0!==(o=r[Dr])?o:"RegExp"==p(r)))return e.call(i,t,a);for(var c,u,l,s=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,d=new RegExp(t.source,f+"g");(c=yr.call(d,i))&&!((u=d.lastIndex)>h&&(s.push(i.slice(h,c.index)),c.length>1&&c.index<i.length&&Fr.apply(s,c.slice(1)),l=c[0].length,h=u,s.length>=a));)d.lastIndex===c.index&&d.lastIndex++;return h===i.length?!l&&d.test("")||s.push(""):s.push(i.slice(h)),s.length>a?s.slice(0,a):s}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var o=g(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,o,n):r.call(String(o),e,n)},function(t,o){var i=n(r,t,this,o,r!==e);if(i.done)return i.value;var a=P(t),c=String(this),u=function(t,e){var n,r=P(t).constructor;return void 0===r||null==(n=P(r)[Nr])?e:oe(n)}(a,RegExp),l=a.unicode,s=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Vr?"y":"g"),f=new u(Vr?a:"^(?:"+a.source+")",s),p=void 0===o?Gr:o>>>0;if(0===p)return[];if(0===c.length)return null===Rr(f,c)?[c]:[];for(var h=0,d=0,g=[];d<c.length;){f.lastIndex=Vr?d:0;var v,y=Rr(f,Vr?c:c.slice(d));if(null===y||(v=Br(st(f.lastIndex+(Vr?0:d)),c.length))===h)d=_r(c,d,l);else{if(g.push(c.slice(h,d)),g.length===p)return g;for(var b=1;b<=y.length-1;b++)if(g.push(y[b]),g.length===p)return g;d=h=v}}return g.push(c.slice(h)),g}]}),!Vr);var Hr={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},qr=le.forEach,zr=Gn("forEach")?function(t){return qr(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Ur in Hr){var Wr=o[Ur],Kr=Wr&&Wr.prototype;if(Kr&&Kr.forEach!==zr)try{_(Kr,"forEach",zr)}catch(t){Kr.forEach=zr}}var Yr=Jt("iterator"),Xr=Jt("toStringTag"),Jr=Bn.values;for(var Qr in Hr){var Zr=o[Qr],to=Zr&&Zr.prototype;if(to){if(to[Yr]!==Jr)try{_(to,Yr,Jr)}catch(t){to[Yr]=Jr}if(to[Xr]||_(to,Xr,Qr),Hr[Qr])for(var eo in Bn)if(to[eo]!==Bn[eo])try{_(to,eo,Bn[eo])}catch(t){to[eo]=Bn[eo]}}}function no(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ro(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function oo(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function io(t){return(io=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function ao(t,e){return(ao=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function co(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function uo(t,e,n){return(uo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=io(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}var lo=t.fn.bootstrapTable.utils,so={json:"JSON",xml:"XML",png:"PNG",csv:"CSV",txt:"TXT",sql:"SQL",doc:"MS-Word",excel:"MS-Excel",xlsx:"MS-Excel (OpenXML)",powerpoint:"MS-Powerpoint",pdf:"PDF"};t.extend(t.fn.bootstrapTable.defaults,{showExport:!1,exportDataType:"basic",exportTypes:["json","xml","csv","txt","sql","excel"],exportOptions:{onCellHtmlData:function(t,e,n,r){return t.is("th")?t.find(".th-inner").text():r}},exportFooter:!1}),t.extend(t.fn.bootstrapTable.columnDefaults,{forceExport:!1,forceHide:!1}),t.extend(t.fn.bootstrapTable.defaults.icons,{export:{bootstrap3:"glyphicon-export icon-share",materialize:"file_download","bootstrap-table":"icon-download"}[t.fn.bootstrapTable.theme]||"fa-download"}),t.extend(t.fn.bootstrapTable.locales,{formatExport:function(){return"Export data"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.fn.bootstrapTable.methods.push("exportTable"),t.extend(t.fn.bootstrapTable.defaults,{onExportSaved:function(t){return!1}}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"export-saved.bs.table":"onExportSaved"}),t.BootstrapTable=function(e){function n(){return no(this,n),co(this,io(n).apply(this,arguments))}var r,o,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ao(t,e)}(n,e),r=n,(o=[{key:"initToolbar",value:function(){var e,r=this,o=this.options;if(this.showToolbar=this.showToolbar||o.showExport,this.$toolbar.find(">.columns"),this.options.showExport){var i=o.exportTypes;if("string"==typeof i){var a=i.slice(1,-1).replace(/ /g,"").split(",");i=a.map((function(t){return t.slice(1,-1)}))}if(this.$export=this.$toolbar.find(">.columns div.export"),this.$export.length)return void this.updateExportButton();this.buttons=Object.assign(this.buttons,{export:{html:1===i.length?'\n            <div class="export '.concat(this.constants.classes.buttonsDropdown,'"\n            data-type="').concat(i[0],'">\n            <button class="').concat(this.constants.buttonsClass,'"\n            aria-label="Export"\n            type="button"\n            title="').concat(o.formatExport(),'">\n            ').concat(o.showButtonIcons?lo.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n            ").concat(o.showButtonText?o.formatExport():"","\n            </button>\n            </div>\n          "):'\n            <div class="export '.concat(this.constants.classes.buttonsDropdown,'">\n            <button class="').concat(this.constants.buttonsClass,' dropdown-toggle"\n            aria-label="Export"\n            data-toggle="dropdown"\n            type="button"\n            title="').concat(o.formatExport(),'">\n            ').concat(o.showButtonIcons?lo.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n            ").concat(o.showButtonText?o.formatExport():"","\n            ").concat(this.constants.html.dropdownCaret,"\n            </button>\n            </div>\n          ")}})}for(var c=arguments.length,u=new Array(c),l=0;l<c;l++)u[l]=arguments[l];if((e=uo(io(n.prototype),"initToolbar",this)).call.apply(e,[this].concat(u)),this.$export=this.$toolbar.find(">.columns div.export"),this.options.showExport){var s=t(this.constants.html.toolbarDropdown.join("")),f=this.$export;if(i.length>1){this.$export.append(s),s.children().length&&(s=s.children().eq(0));var p=!0,h=!1,d=void 0;try{for(var g,v=i[Symbol.iterator]();!(p=(g=v.next()).done);p=!0){var y=g.value;if(so.hasOwnProperty(y)){var b=t(lo.sprintf(this.constants.html.pageDropdownItem,"",so[y]));b.attr("data-type",y),s.append(b)}}}catch(t){h=!0,d=t}finally{try{p||null==v.return||v.return()}finally{if(h)throw d}}f=s.children()}this.updateExportButton(),f.click((function(e){e.preventDefault();var n={type:t(e.currentTarget).data("type"),escape:!1};r.exportTable(n)})),this.handleToolbar()}}},{key:"handleToolbar",value:function(){this.$export&&("foundation"===t.fn.bootstrapTable.theme?this.$export.find(".dropdown-pane").attr("id","toolbar-export-id"):"materialize"===t.fn.bootstrapTable.theme&&this.$export.find(".dropdown-content").attr("id","toolbar-export-id"),uo(io(n.prototype),"handleToolbar",this)&&uo(io(n.prototype),"handleToolbar",this).call(this))}},{key:"exportTable",value:function(e){var n=this,r=this.options,o=this.header.stateField,i=r.cardView,a=function(a){o&&n.hideColumn(o),i&&n.toggleView(),n.columns.forEach((function(t){t.forceHide&&n.hideColumn(t.field)}));var c=n.getData();if(r.exportFooter){var u=n.$tableFooter.find("tr").first(),l={},s=[];t.each(u.children(),(function(e,r){var o=t(r).children(".th-inner").first().html();l[n.columns[e].field]="&nbsp;"===o?null:o,s.push(o)})),n.$body.append(n.$body.children().last()[0].outerHTML);var f=n.$body.children().last();t.each(f.children(),(function(e,n){t(n).html(s[e])}))}var p=n.getHiddenColumns();p.forEach((function(t){t.forceExport&&n.showColumn(t.field)})),"function"==typeof r.exportOptions.fileName&&(e.fileName=r.exportOptions.fileName()),n.$el.tableExport(t.extend({onAfterSaveToFile:function(){r.exportFooter&&n.load(c),o&&n.showColumn(o),i&&n.toggleView(),p.forEach((function(t){t.forceExport&&n.hideColumn(t.field)})),n.columns.forEach((function(t){t.forceHide&&n.showColumn(t.field)})),a&&a()}},r.exportOptions,e))};if("all"===r.exportDataType&&r.pagination){var c="server"===r.sidePagination?"post-body.bs.table":"page-change.bs.table",u=this.options.virtualScroll;this.$el.one(c,(function(){setTimeout((function(){a((function(){n.options.virtualScroll=u,n.togglePagination()}))}),0)})),this.options.virtualScroll=!1,this.togglePagination(),this.trigger("export-saved",this.getData())}else if("selected"===r.exportDataType){var l=this.getData(),s=this.getSelections(),f=r.pagination;if(!s.length)return;"server"===r.sidePagination&&(l=oo({total:r.totalRows},this.options.dataField,l),s=oo({total:s.length},this.options.dataField,s)),this.load(s),f&&this.togglePagination(),a((function(){f&&n.togglePagination(),n.load(l)})),this.trigger("export-saved",s)}else a(),this.trigger("export-saved",this.getData(!0))}},{key:"updateSelected",value:function(){uo(io(n.prototype),"updateSelected",this).call(this),this.updateExportButton()}},{key:"updateExportButton",value:function(){"selected"===this.options.exportDataType&&this.$export.find("> button").prop("disabled",!this.getSelections().length)}}])&&ro(r.prototype,o),i&&ro(r,i),n}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-page-jump-to.min.js b/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
new file mode 100644
index 000000000..e2cad7b35
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,h=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return d(h(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},g=function(t,n){if(!v(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!v(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,w=function(t,n){return m.call(t,n)},O=o.document,j=v(O)&&v(O.createElement),S=function(t){return j?O.createElement(t):{}},T=!u&&!i((function(){return 7!=Object.defineProperty(S("div"),"a",{get:function(){return 7}}).a})),P=Object.getOwnPropertyDescriptor,E={f:u?P:function(t,n){if(t=b(t),n=g(n,!0),T)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},_=Object.defineProperty,A={f:u?_:function(t,n,e){if(x(t),n=g(n,!0),x(e),T)try{return _(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},M=u?function(t,n,e){return A.f(t,n,l(1,e))}:function(t,n,e){return t[n]=e,t},k=function(t,n){try{M(o,t,n)}catch(e){o[t]=n}return n},C="__core-js_shared__",I=o[C]||k(C,{}),F=Function.toString;"function"!=typeof I.inspectSource&&(I.inspectSource=function(t){return F.call(t)});var N,R,L,q=I.inspectSource,z=o.WeakMap,D="function"==typeof z&&/native code/.test(q(z)),G=e((function(t){(t.exports=function(t,n){return I[t]||(I[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),J=0,W=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++J+W).toString(36)},K=G("keys"),Q=function(t){return K[t]||(K[t]=B(t))},V={},X=o.WeakMap;if(D){var Y=new X,$=Y.get,H=Y.has,U=Y.set;N=function(t,n){return U.call(Y,t,n),n},R=function(t){return $.call(Y,t)||{}},L=function(t){return H.call(Y,t)}}else{var Z=Q("state");V[Z]=!0,N=function(t,n){return M(t,Z,n),n},R=function(t){return w(t,Z)?t[Z]:{}},L=function(t){return w(t,Z)}}var tt,nt,et={set:N,get:R,has:L,enforce:function(t){return L(t)?R(t):N(t,{})},getterFor:function(t){return function(n){var e;if(!v(n)||(e=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},rt=e((function(t){var n=et.get,e=et.enforce,r=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),e(i).source=r.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||q(this)}))})),ot=o,it=function(t){return"function"==typeof t?t:void 0},ut=function(t,n){return arguments.length<2?it(ot[t])||it(o[t]):ot[t]&&ot[t][n]||o[t]&&o[t][n]},ct=Math.ceil,ft=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ft:ct)(t)},lt=Math.min,st=function(t){return t>0?lt(at(t),9007199254740991):0},pt=Math.max,yt=Math.min,dt=function(t){return function(n,e,r){var o,i=b(n),u=st(i.length),c=function(t,n){var e=at(t);return e<0?pt(e+n,0):yt(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},ht={includes:dt(!0),indexOf:dt(!1)}.indexOf,bt=function(t,n){var e,r=b(t),o=0,i=[];for(e in r)!w(V,e)&&w(r,e)&&i.push(e);for(;n.length>o;)w(r,e=n[o++])&&(~ht(i,e)||i.push(e));return i},vt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],gt=vt.concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return bt(t,gt)}},wt={f:Object.getOwnPropertySymbols},Ot=ut("Reflect","ownKeys")||function(t){var n=mt.f(x(t)),e=wt.f;return e?n.concat(e(t)):n},jt=function(t,n){for(var e=Ot(n),r=A.f,o=E.f,i=0;i<e.length;i++){var u=e[i];w(t,u)||r(t,u,o(n,u))}},St=/#|\.prototype\./,Tt=function(t,n){var e=Et[Pt(t)];return e==_t||e!=xt&&("function"==typeof n?i(n):!!n)},Pt=Tt.normalize=function(t){return String(t).replace(St,".").toLowerCase()},Et=Tt.data={},xt=Tt.NATIVE="N",_t=Tt.POLYFILL="P",At=Tt,Mt=E.f,kt=function(t,n){var e,r,i,u,c,f=t.target,a=t.global,l=t.stat;if(e=a?o:l?o[f]||k(f,{}):(o[f]||{}).prototype)for(r in n){if(u=n[r],i=t.noTargetGet?(c=Mt(e,r))&&c.value:e[r],!At(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;jt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),rt(e,r,u,t)}},Ct=Array.isArray||function(t){return"Array"==p(t)},It=function(t){return Object(h(t))},Ft=function(t,n,e){var r=g(n);r in t?A.f(t,r,l(0,e)):t[r]=e},Nt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Nt&&!Symbol.sham&&"symbol"==typeof Symbol(),Lt=G("wks"),qt=o.Symbol,zt=Rt?qt:B,Dt=function(t){return w(Lt,t)||(Nt&&w(qt,t)?Lt[t]=qt[t]:Lt[t]=zt("Symbol."+t)),Lt[t]},Gt=Dt("species"),Jt=function(t,n){var e;return Ct(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!Ct(e.prototype)?v(e)&&null===(e=e[Gt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},Wt=ut("navigator","userAgent")||"",Bt=o.process,Kt=Bt&&Bt.versions,Qt=Kt&&Kt.v8;Qt?nt=(tt=Qt.split("."))[0]+tt[1]:Wt&&(!(tt=Wt.match(/Edge\/(\d+)/))||tt[1]>=74)&&(tt=Wt.match(/Chrome\/(\d+)/))&&(nt=tt[1]);var Vt,Xt=nt&&+nt,Yt=Dt("species"),$t=Dt("isConcatSpreadable"),Ht=9007199254740991,Ut="Maximum allowed index exceeded",Zt=Xt>=51||!i((function(){var t=[];return t[$t]=!1,t.concat()[0]!==t})),tn=(Vt="concat",Xt>=51||!i((function(){var t=[];return(t.constructor={})[Yt]=function(){return{foo:1}},1!==t[Vt](Boolean).foo}))),nn=function(t){if(!v(t))return!1;var n=t[$t];return void 0!==n?!!n:Ct(t)};kt({target:"Array",proto:!0,forced:!Zt||!tn},{concat:function(t){var n,e,r,o,i,u=It(this),c=Jt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(nn(i=-1===n?u:arguments[n])){if(f+(o=st(i.length))>Ht)throw TypeError(Ut);for(e=0;e<o;e++,f++)e in i&&Ft(c,f,i[e])}else{if(f>=Ht)throw TypeError(Ut);Ft(c,f++,i)}return c.length=f,c}});var en,rn=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},on=[].push,un=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,f,a,l){for(var s,p,y=It(c),h=d(y),b=rn(f,a,3),v=st(h.length),g=0,m=l||Jt,w=n?m(c,v):e?m(c,0):void 0;v>g;g++)if((u||g in h)&&(p=b(s=h[g],g,y),t))if(n)w[g]=p;else if(p)switch(t){case 3:return!0;case 5:return s;case 6:return g;case 2:on.call(w,s)}else if(o)return!1;return i?-1:r||o?o:w}},cn={forEach:un(0),map:un(1),filter:un(2),some:un(3),every:un(4),find:un(5),findIndex:un(6)},fn=Object.keys||function(t){return bt(t,vt)},an=u?Object.defineProperties:function(t,n){x(t);for(var e,r=fn(n),o=r.length,i=0;o>i;)A.f(t,e=r[i++],n[e]);return t},ln=ut("document","documentElement"),sn=Q("IE_PROTO"),pn=function(){},yn=function(t){return"<script>"+t+"</"+"script>"},dn=function(){try{en=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;dn=en?function(t){t.write(yn("")),t.close();var n=t.parentWindow.Object;return t=null,n}(en):((n=S("iframe")).style.display="none",ln.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(yn("document.F=Object")),t.close(),t.F);for(var e=vt.length;e--;)delete dn.prototype[vt[e]];return dn()};V[sn]=!0;var hn=Object.create||function(t,n){var e;return null!==t?(pn.prototype=x(t),e=new pn,pn.prototype=null,e[sn]=t):e=dn(),void 0===n?e:an(e,n)},bn=Dt("unscopables"),vn=Array.prototype;null==vn[bn]&&A.f(vn,bn,{configurable:!0,value:hn(null)});var gn,mn=cn.find,wn="find",On=!0;function jn(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function Sn(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Tn(t){return(Tn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Pn(t,n){return(Pn=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function En(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function xn(t,n,e){return(xn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=Tn(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}wn in[]&&Array(1).find((function(){On=!1})),kt({target:"Array",proto:!0,forced:On},{find:function(t){return mn(this,t,arguments.length>1?arguments[1]:void 0)}}),gn=wn,vn[bn][gn]=!0;var _n=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{showJumpTo:!1}),t.extend(t.fn.bootstrapTable.locales,{formatJumpTo:function(){return"GO"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(n){function e(){return jn(this,e),En(this,Tn(e).apply(this,arguments))}var r,o,i;return function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&Pn(t,n)}(e,n),r=e,(o=[{key:"initPagination",value:function(){for(var n,r=this,o=arguments.length,i=new Array(o),u=0;u<o;u++)i[u]=arguments[u];if((n=xn(Tn(e.prototype),"initPagination",this)).call.apply(n,[this].concat(i)),this.options.showJumpTo){var c=this.$pagination.find("> .pagination"),f=c.find(".page-jump-to");f.length||(f=t('\n          <div class="page-jump-to '.concat(this.constants.classes.inputGroup,'">\n          <input type="number" class="').concat(this.constants.classes.input).concat(_n.sprintf(" input-%s",this.options.iconSize),'" value="').concat(this.options.pageNumber,'">\n          <button class="').concat(this.constants.buttonsClass,'"  type="button">\n          ').concat(this.options.formatJumpTo(),"\n          </button>\n          </div>\n        ")).appendTo(c)).on("click","button",(function(n){r.selectPage(+t(n.target).parent(".page-jump-to").find("input").val())}))}}}])&&Sn(r.prototype,o),i&&Sn(r,i),e}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-toolbar.min.js b/web/skins/classic/js/bootstrap-table-toolbar.min.js
new file mode 100644
index 000000000..2c96323d7
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-toolbar.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),a=function(t){try{return!!t()}catch(t){return!0}},i=!a((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,s={f:l&&!c.call({1:2},1)?function(t){var n=l(this,t);return!!n&&n.enumerable}:c},u=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},d={}.toString,f=function(t){return d.call(t).slice(8,-1)},p="".split,h=a((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==f(t)?p.call(t,""):Object(t)}:Object,v=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return h(v(t))},y=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,n){if(!y(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!y(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!y(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!y(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},g={}.hasOwnProperty,S=function(t,n){return g.call(t,n)},O=o.document,w=y(O)&&y(O.createElement),x=function(t){return w?O.createElement(t):{}},T=!i&&!a((function(){return 7!=Object.defineProperty(x("div"),"a",{get:function(){return 7}}).a})),j=Object.getOwnPropertyDescriptor,A={f:i?j:function(t,n){if(t=b(t),n=m(n,!0),T)try{return j(t,n)}catch(t){}if(S(t,n))return u(!s.f.call(t,n),t[n])}},_=function(t){if(!y(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,P={f:i?E:function(t,n,e){if(_(t),n=m(n,!0),_(e),T)try{return E(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},C=i?function(t,n,e){return P.f(t,n,u(1,e))}:function(t,n,e){return t[n]=e,t},M=function(t,n){try{C(o,t,n)}catch(e){o[t]=n}return n},I="__core-js_shared__",k=o[I]||M(I,{}),R=Function.toString;"function"!=typeof k.inspectSource&&(k.inspectSource=function(t){return R.call(t)});var L,F,N,D=k.inspectSource,G=o.WeakMap,B="function"==typeof G&&/native code/.test(D(G)),V=e((function(t){(t.exports=function(t,n){return k[t]||(k[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,$=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+$).toString(36)},q=V("keys"),W=function(t){return q[t]||(q[t]=U(t))},Y={},H=o.WeakMap;if(B){var K=new H,J=K.get,Q=K.has,X=K.set;L=function(t,n){return X.call(K,t,n),n},F=function(t){return J.call(K,t)||{}},N=function(t){return Q.call(K,t)}}else{var Z=W("state");Y[Z]=!0,L=function(t,n){return C(t,Z,n),n},F=function(t){return S(t,Z)?t[Z]:{}},N=function(t){return S(t,Z)}}var tt,nt={set:L,get:F,has:N,enforce:function(t){return N(t)?F(t):L(t,{})},getterFor:function(t){return function(n){var e;if(!y(n)||(e=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},et=e((function(t){var n=nt.get,e=nt.enforce,r=String(String).split("String");(t.exports=function(t,n,a,i){var c=!!i&&!!i.unsafe,l=!!i&&!!i.enumerable,s=!!i&&!!i.noTargetGet;"function"==typeof a&&("string"!=typeof n||S(a,"name")||C(a,"name",n),e(a).source=r.join("string"==typeof n?n:"")),t!==o?(c?!s&&t[n]&&(l=!0):delete t[n],l?t[n]=a:C(t,n,a)):l?t[n]=a:M(n,a)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||D(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},at=function(t,n){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ct=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?ct:it)(t)},st=Math.min,ut=function(t){return t>0?st(lt(t),9007199254740991):0},dt=Math.max,ft=Math.min,pt=function(t){return function(n,e,r){var o,a=b(n),i=ut(a.length),c=function(t,n){var e=lt(t);return e<0?dt(e+n,0):ft(e,n)}(r,i);if(t&&e!=e){for(;i>c;)if((o=a[c++])!=o)return!0}else for(;i>c;c++)if((t||c in a)&&a[c]===e)return t||c||0;return!t&&-1}},ht={includes:pt(!0),indexOf:pt(!1)},vt=ht.indexOf,bt=function(t,n){var e,r=b(t),o=0,a=[];for(e in r)!S(Y,e)&&S(r,e)&&a.push(e);for(;n.length>o;)S(r,e=n[o++])&&(~vt(a,e)||a.push(e));return a},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=yt.concat("length","prototype"),gt={f:Object.getOwnPropertyNames||function(t){return bt(t,mt)}},St={f:Object.getOwnPropertySymbols},Ot=at("Reflect","ownKeys")||function(t){var n=gt.f(_(t)),e=St.f;return e?n.concat(e(t)):n},wt=function(t,n){for(var e=Ot(n),r=P.f,o=A.f,a=0;a<e.length;a++){var i=e[a];S(t,i)||r(t,i,o(n,i))}},xt=/#|\.prototype\./,Tt=function(t,n){var e=At[jt(t)];return e==Et||e!=_t&&("function"==typeof n?a(n):!!n)},jt=Tt.normalize=function(t){return String(t).replace(xt,".").toLowerCase()},At=Tt.data={},_t=Tt.NATIVE="N",Et=Tt.POLYFILL="P",Pt=Tt,Ct=A.f,Mt=function(t,n){var e,r,a,i,c,l=t.target,s=t.global,u=t.stat;if(e=s?o:u?o[l]||M(l,{}):(o[l]||{}).prototype)for(r in n){if(i=n[r],a=t.noTargetGet?(c=Ct(e,r))&&c.value:e[r],!Pt(s?r:l+(u?".":"#")+r,t.forced)&&void 0!==a){if(typeof i==typeof a)continue;wt(i,a)}(t.sham||a&&a.sham)&&C(i,"sham",!0),et(e,r,i,t)}},It=!!Object.getOwnPropertySymbols&&!a((function(){return!String(Symbol())})),kt=It&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=Array.isArray||function(t){return"Array"==f(t)},Lt=function(t){return Object(v(t))},Ft=Object.keys||function(t){return bt(t,yt)},Nt=i?Object.defineProperties:function(t,n){_(t);for(var e,r=Ft(n),o=r.length,a=0;o>a;)P.f(t,e=r[a++],n[e]);return t},Dt=at("document","documentElement"),Gt=W("IE_PROTO"),Bt=function(){},Vt=function(t){return"<script>"+t+"</"+"script>"},zt=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;zt=tt?function(t){t.write(Vt("")),t.close();var n=t.parentWindow.Object;return t=null,n}(tt):((n=x("iframe")).style.display="none",Dt.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(Vt("document.F=Object")),t.close(),t.F);for(var e=yt.length;e--;)delete zt.prototype[yt[e]];return zt()};Y[Gt]=!0;var $t=Object.create||function(t,n){var e;return null!==t?(Bt.prototype=_(t),e=new Bt,Bt.prototype=null,e[Gt]=t):e=zt(),void 0===n?e:Nt(e,n)},Ut=gt.f,qt={}.toString,Wt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Yt={f:function(t){return Wt&&"[object Window]"==qt.call(t)?function(t){try{return Ut(t)}catch(t){return Wt.slice()}}(t):Ut(b(t))}},Ht=V("wks"),Kt=o.Symbol,Jt=kt?Kt:U,Qt=function(t){return S(Ht,t)||(It&&S(Kt,t)?Ht[t]=Kt[t]:Ht[t]=Jt("Symbol."+t)),Ht[t]},Xt={f:Qt},Zt=P.f,tn=function(t){var n=rt.Symbol||(rt.Symbol={});S(n,t)||Zt(n,t,{value:Xt.f(t)})},nn=P.f,en=Qt("toStringTag"),rn=function(t,n,e){t&&!S(t=e?t:t.prototype,en)&&nn(t,en,{configurable:!0,value:n})},on=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},an=Qt("species"),cn=function(t,n){var e;return Rt(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!Rt(e.prototype)?y(e)&&null===(e=e[an])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},ln=[].push,sn=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,a=6==t,i=5==t||a;return function(c,l,s,u){for(var d,f,p=Lt(c),v=h(p),b=on(l,s,3),y=ut(v.length),m=0,g=u||cn,S=n?g(c,y):e?g(c,0):void 0;y>m;m++)if((i||m in v)&&(f=b(d=v[m],m,p),t))if(n)S[m]=f;else if(f)switch(t){case 3:return!0;case 5:return d;case 6:return m;case 2:ln.call(S,d)}else if(o)return!1;return a?-1:r||o?o:S}},un={forEach:sn(0),map:sn(1),filter:sn(2),some:sn(3),every:sn(4),find:sn(5),findIndex:sn(6)},dn=un.forEach,fn=W("hidden"),pn="Symbol",hn=Qt("toPrimitive"),vn=nt.set,bn=nt.getterFor(pn),yn=Object.prototype,mn=o.Symbol,gn=at("JSON","stringify"),Sn=A.f,On=P.f,wn=Yt.f,xn=s.f,Tn=V("symbols"),jn=V("op-symbols"),An=V("string-to-symbol-registry"),_n=V("symbol-to-string-registry"),En=V("wks"),Pn=o.QObject,Cn=!Pn||!Pn.prototype||!Pn.prototype.findChild,Mn=i&&a((function(){return 7!=$t(On({},"a",{get:function(){return On(this,"a",{value:7}).a}})).a}))?function(t,n,e){var r=Sn(yn,n);r&&delete yn[n],On(t,n,e),r&&t!==yn&&On(yn,n,r)}:On,In=function(t,n){var e=Tn[t]=$t(mn.prototype);return vn(e,{type:pn,tag:t,description:n}),i||(e.description=n),e},kn=It&&"symbol"==typeof mn.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof mn},Rn=function(t,n,e){t===yn&&Rn(jn,n,e),_(t);var r=m(n,!0);return _(e),S(Tn,r)?(e.enumerable?(S(t,fn)&&t[fn][r]&&(t[fn][r]=!1),e=$t(e,{enumerable:u(0,!1)})):(S(t,fn)||On(t,fn,u(1,{})),t[fn][r]=!0),Mn(t,r,e)):On(t,r,e)},Ln=function(t,n){_(t);var e=b(n),r=Ft(e).concat(Gn(e));return dn(r,(function(n){i&&!Fn.call(e,n)||Rn(t,n,e[n])})),t},Fn=function(t){var n=m(t,!0),e=xn.call(this,n);return!(this===yn&&S(Tn,n)&&!S(jn,n))&&(!(e||!S(this,n)||!S(Tn,n)||S(this,fn)&&this[fn][n])||e)},Nn=function(t,n){var e=b(t),r=m(n,!0);if(e!==yn||!S(Tn,r)||S(jn,r)){var o=Sn(e,r);return!o||!S(Tn,r)||S(e,fn)&&e[fn][r]||(o.enumerable=!0),o}},Dn=function(t){var n=wn(b(t)),e=[];return dn(n,(function(t){S(Tn,t)||S(Y,t)||e.push(t)})),e},Gn=function(t){var n=t===yn,e=wn(n?jn:b(t)),r=[];return dn(e,(function(t){!S(Tn,t)||n&&!S(yn,t)||r.push(Tn[t])})),r};if(It||(et((mn=function(){if(this instanceof mn)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,n=U(t),e=function(t){this===yn&&e.call(jn,t),S(this,fn)&&S(this[fn],n)&&(this[fn][n]=!1),Mn(this,n,u(1,t))};return i&&Cn&&Mn(yn,n,{configurable:!0,set:e}),In(n,t)}).prototype,"toString",(function(){return bn(this).tag})),s.f=Fn,P.f=Rn,A.f=Nn,gt.f=Yt.f=Dn,St.f=Gn,i&&(On(mn.prototype,"description",{configurable:!0,get:function(){return bn(this).description}}),et(yn,"propertyIsEnumerable",Fn,{unsafe:!0}))),kt||(Xt.f=function(t){return In(Qt(t),t)}),Mt({global:!0,wrap:!0,forced:!It,sham:!It},{Symbol:mn}),dn(Ft(En),(function(t){tn(t)})),Mt({target:pn,stat:!0,forced:!It},{for:function(t){var n=String(t);if(S(An,n))return An[n];var e=mn(n);return An[n]=e,_n[e]=n,e},keyFor:function(t){if(!kn(t))throw TypeError(t+" is not a symbol");if(S(_n,t))return _n[t]},useSetter:function(){Cn=!0},useSimple:function(){Cn=!1}}),Mt({target:"Object",stat:!0,forced:!It,sham:!i},{create:function(t,n){return void 0===n?$t(t):Ln($t(t),n)},defineProperty:Rn,defineProperties:Ln,getOwnPropertyDescriptor:Nn}),Mt({target:"Object",stat:!0,forced:!It},{getOwnPropertyNames:Dn,getOwnPropertySymbols:Gn}),Mt({target:"Object",stat:!0,forced:a((function(){St.f(1)}))},{getOwnPropertySymbols:function(t){return St.f(Lt(t))}}),gn){var Bn=!It||a((function(){var t=mn();return"[null]"!=gn([t])||"{}"!=gn({a:t})||"{}"!=gn(Object(t))}));Mt({target:"JSON",stat:!0,forced:Bn},{stringify:function(t,n,e){for(var r,o=[t],a=1;arguments.length>a;)o.push(arguments[a++]);if(r=n,(y(n)||void 0!==t)&&!kn(t))return Rt(n)||(n=function(t,n){if("function"==typeof r&&(n=r.call(this,t,n)),!kn(n))return n}),o[1]=n,gn.apply(null,o)}})}mn.prototype[hn]||C(mn.prototype,hn,mn.prototype.valueOf),rn(mn,pn),Y[fn]=!0;var Vn=P.f,zn=o.Symbol;if(i&&"function"==typeof zn&&(!("description"in zn.prototype)||void 0!==zn().description)){var $n={},Un=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),n=this instanceof Un?new zn(t):void 0===t?zn():zn(t);return""===t&&($n[n]=!0),n};wt(Un,zn);var qn=Un.prototype=zn.prototype;qn.constructor=Un;var Wn=qn.toString,Yn="Symbol(test)"==String(zn("test")),Hn=/^Symbol\((.*)\)[^)]+$/;Vn(qn,"description",{configurable:!0,get:function(){var t=y(this)?this.valueOf():this,n=Wn.call(t);if(S($n,t))return"";var e=Yn?n.slice(7,-1):n.replace(Hn,"$1");return""===e?void 0:e}}),Mt({global:!0,forced:!0},{Symbol:Un})}tn("iterator");var Kn,Jn,Qn=function(t,n,e){var r=m(n);r in t?P.f(t,r,u(0,e)):t[r]=e},Xn=at("navigator","userAgent")||"",Zn=o.process,te=Zn&&Zn.versions,ne=te&&te.v8;ne?Jn=(Kn=ne.split("."))[0]+Kn[1]:Xn&&(!(Kn=Xn.match(/Edge\/(\d+)/))||Kn[1]>=74)&&(Kn=Xn.match(/Chrome\/(\d+)/))&&(Jn=Kn[1]);var ee=Jn&&+Jn,re=Qt("species"),oe=function(t){return ee>=51||!a((function(){var n=[];return(n.constructor={})[re]=function(){return{foo:1}},1!==n[t](Boolean).foo}))},ae=Qt("isConcatSpreadable"),ie=9007199254740991,ce="Maximum allowed index exceeded",le=ee>=51||!a((function(){var t=[];return t[ae]=!1,t.concat()[0]!==t})),se=oe("concat"),ue=function(t){if(!y(t))return!1;var n=t[ae];return void 0!==n?!!n:Rt(t)};Mt({target:"Array",proto:!0,forced:!le||!se},{concat:function(t){var n,e,r,o,a,i=Lt(this),c=cn(i,0),l=0;for(n=-1,r=arguments.length;n<r;n++)if(ue(a=-1===n?i:arguments[n])){if(l+(o=ut(a.length))>ie)throw TypeError(ce);for(e=0;e<o;e++,l++)e in a&&Qn(c,l,a[e])}else{if(l>=ie)throw TypeError(ce);Qn(c,l++,a)}return c.length=l,c}});var de=un.filter,fe=oe("filter"),pe=fe&&!a((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Mt({target:"Array",proto:!0,forced:!fe||!pe},{filter:function(t){return de(this,t,arguments.length>1?arguments[1]:void 0)}});var he=Qt("unscopables"),ve=Array.prototype;null==ve[he]&&P.f(ve,he,{configurable:!0,value:$t(null)});var be=function(t){ve[he][t]=!0},ye=un.find,me="find",ge=!0;me in[]&&Array(1).find((function(){ge=!1})),Mt({target:"Array",proto:!0,forced:ge},{find:function(t){return ye(this,t,arguments.length>1?arguments[1]:void 0)}}),be(me);var Se=ht.includes;Mt({target:"Array",proto:!0},{includes:function(t){return Se(this,t,arguments.length>1?arguments[1]:void 0)}}),be("includes");var Oe=function(t,n){var e=[][t];return!e||!a((function(){e.call(null,n||function(){throw 1},1)}))},we=ht.indexOf,xe=[].indexOf,Te=!!xe&&1/[1].indexOf(1,-0)<0,je=Oe("indexOf");Mt({target:"Array",proto:!0,forced:Te||je},{indexOf:function(t){return Te?xe.apply(this,arguments)||0:we(this,t,arguments.length>1?arguments[1]:void 0)}});var Ae,_e,Ee,Pe=!a((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Ce=W("IE_PROTO"),Me=Object.prototype,Ie=Pe?Object.getPrototypeOf:function(t){return t=Lt(t),S(t,Ce)?t[Ce]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?Me:null},ke=Qt("iterator"),Re=!1;[].keys&&("next"in(Ee=[].keys())?(_e=Ie(Ie(Ee)))!==Object.prototype&&(Ae=_e):Re=!0),null==Ae&&(Ae={}),S(Ae,ke)||C(Ae,ke,(function(){return this}));var Le={IteratorPrototype:Ae,BUGGY_SAFARI_ITERATORS:Re},Fe=Le.IteratorPrototype,Ne=Object.setPrototypeOf||("__proto__"in{}?function(){var t,n=!1,e={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(e,[]),n=e instanceof Array}catch(t){}return function(e,r){return _(e),function(t){if(!y(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),n?t.call(e,r):e.__proto__=r,e}}():void 0),De=Le.IteratorPrototype,Ge=Le.BUGGY_SAFARI_ITERATORS,Be=Qt("iterator"),Ve="keys",ze="values",$e="entries",Ue=function(){return this},qe=function(t,n,e,r,o,a,i){!function(t,n,e){var r=n+" Iterator";t.prototype=$t(Fe,{next:u(1,e)}),rn(t,r,!1)}(e,n,r);var c,l,s,d=function(t){if(t===o&&b)return b;if(!Ge&&t in h)return h[t];switch(t){case Ve:case ze:case $e:return function(){return new e(this,t)}}return function(){return new e(this)}},f=n+" Iterator",p=!1,h=t.prototype,v=h[Be]||h["@@iterator"]||o&&h[o],b=!Ge&&v||d(o),y="Array"==n&&h.entries||v;if(y&&(c=Ie(y.call(new t)),De!==Object.prototype&&c.next&&(Ie(c)!==De&&(Ne?Ne(c,De):"function"!=typeof c[Be]&&C(c,Be,Ue)),rn(c,f,!0))),o==ze&&v&&v.name!==ze&&(p=!0,b=function(){return v.call(this)}),h[Be]!==b&&C(h,Be,b),o)if(l={values:d(ze),keys:a?b:d(Ve),entries:d($e)},i)for(s in l)(Ge||p||!(s in h))&&et(h,s,l[s]);else Mt({target:n,proto:!0,forced:Ge||p},l);return l},We="Array Iterator",Ye=nt.set,He=nt.getterFor(We),Ke=qe(Array,"Array",(function(t,n){Ye(this,{type:We,target:b(t),index:0,kind:n})}),(function(){var t=He(this),n=t.target,e=t.kind,r=t.index++;return!n||r>=n.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==e?{value:r,done:!1}:"values"==e?{value:n[r],done:!1}:{value:[r,n[r]],done:!1}}),"values");be("keys"),be("values"),be("entries");var Je=[].join,Qe=h!=Object,Xe=Oe("join",",");Mt({target:"Array",proto:!0,forced:Qe||Xe},{join:function(t){return Je.call(b(this),void 0===t?",":t)}});var Ze=Object.assign,tr=Object.defineProperty,nr=!Ze||a((function(){if(i&&1!==Ze({b:1},Ze(tr({},"a",{enumerable:!0,get:function(){tr(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},n={},e=Symbol(),r="abcdefghijklmnopqrst";return t[e]=7,r.split("").forEach((function(t){n[t]=t})),7!=Ze({},t)[e]||Ft(Ze({},n)).join("")!=r}))?function(t,n){for(var e=Lt(t),r=arguments.length,o=1,a=St.f,c=s.f;r>o;)for(var l,u=h(arguments[o++]),d=a?Ft(u).concat(a(u)):Ft(u),f=d.length,p=0;f>p;)l=d[p++],i&&!c.call(u,l)||(e[l]=u[l]);return e}:Ze;Mt({target:"Object",stat:!0,forced:Object.assign!==nr},{assign:nr});var er=s.f,rr=function(t){return function(n){for(var e,r=b(n),o=Ft(r),a=o.length,c=0,l=[];a>c;)e=o[c++],i&&!er.call(r,e)||l.push(t?[e,r[e]]:r[e]);return l}},or={entries:rr(!0),values:rr(!1)}.entries;Mt({target:"Object",stat:!0},{entries:function(t){return or(t)}});var ar={};ar[Qt("toStringTag")]="z";var ir="[object z]"===String(ar),cr=Qt("toStringTag"),lr="Arguments"==f(function(){return arguments}()),sr=ir?f:function(t){var n,e,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(e=function(t,n){try{return t[n]}catch(t){}}(n=Object(t),cr))?e:lr?f(n):"Object"==(r=f(n))&&"function"==typeof n.callee?"Arguments":r},ur=ir?{}.toString:function(){return"[object "+sr(this)+"]"};ir||et(Object.prototype,"toString",ur,{unsafe:!0});var dr=function(){var t=_(this),n="";return t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.dotAll&&(n+="s"),t.unicode&&(n+="u"),t.sticky&&(n+="y"),n};function fr(t,n){return RegExp(t,n)}var pr,hr,vr={UNSUPPORTED_Y:a((function(){var t=fr("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:a((function(){var t=fr("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},br=RegExp.prototype.exec,yr=String.prototype.replace,mr=br,gr=(pr=/a/,hr=/b*/g,br.call(pr,"a"),br.call(hr,"a"),0!==pr.lastIndex||0!==hr.lastIndex),Sr=vr.UNSUPPORTED_Y||vr.BROKEN_CARET,Or=void 0!==/()??/.exec("")[1];(gr||Or||Sr)&&(mr=function(t){var n,e,r,o,a=this,i=Sr&&a.sticky,c=dr.call(a),l=a.source,s=0,u=t;return i&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),u=String(t).slice(a.lastIndex),a.lastIndex>0&&(!a.multiline||a.multiline&&"\n"!==t[a.lastIndex-1])&&(l="(?: "+l+")",u=" "+u,s++),e=new RegExp("^(?:"+l+")",c)),Or&&(e=new RegExp("^"+l+"$(?!\\s)",c)),gr&&(n=a.lastIndex),r=br.call(i?e:a,u),i?r?(r.input=r.input.slice(s),r[0]=r[0].slice(s),r.index=a.lastIndex,a.lastIndex+=r[0].length):a.lastIndex=0:gr&&r&&(a.lastIndex=a.global?r.index+r[0].length:n),Or&&r&&r.length>1&&yr.call(r[0],e,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var wr=mr;Mt({target:"RegExp",proto:!0,forced:/./.exec!==wr},{exec:wr});var xr=Qt("match"),Tr=function(t){if(function(t){var n;return y(t)&&(void 0!==(n=t[xr])?!!n:"RegExp"==f(t))}(t))throw TypeError("The method doesn't accept regular expressions");return t},jr=Qt("match");Mt({target:"String",proto:!0,forced:!function(t){var n=/./;try{"/./"[t](n)}catch(e){try{return n[jr]=!1,"/./"[t](n)}catch(t){}}return!1}("includes")},{includes:function(t){return!!~String(v(this)).indexOf(Tr(t),arguments.length>1?arguments[1]:void 0)}});var Ar=function(t){return function(n,e){var r,o,a=String(v(n)),i=lt(e),c=a.length;return i<0||i>=c?t?"":void 0:(r=a.charCodeAt(i))<55296||r>56319||i+1===c||(o=a.charCodeAt(i+1))<56320||o>57343?t?a.charAt(i):r:t?a.slice(i,i+2):o-56320+(r-55296<<10)+65536}},_r={codeAt:Ar(!1),charAt:Ar(!0)}.charAt,Er="String Iterator",Pr=nt.set,Cr=nt.getterFor(Er);qe(String,"String",(function(t){Pr(this,{type:Er,string:String(t),index:0})}),(function(){var t,n=Cr(this),e=n.string,r=n.index;return r>=e.length?{value:void 0,done:!0}:(t=_r(e,r),n.index+=t.length,{value:t,done:!1})}));var Mr=Qt("species"),Ir=!a((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),kr="$0"==="a".replace(/./,"$0"),Rr=!a((function(){var t=/(?:)/,n=t.exec;t.exec=function(){return n.apply(this,arguments)};var e="ab".split(t);return 2!==e.length||"a"!==e[0]||"b"!==e[1]})),Lr=Object.is||function(t,n){return t===n?0!==t||1/t==1/n:t!=t&&n!=n};!function(t,n,e,r){var o=Qt(t),i=!a((function(){var n={};return n[o]=function(){return 7},7!=""[t](n)})),c=i&&!a((function(){var n=!1,e=/a/;return"split"===t&&((e={}).constructor={},e.constructor[Mr]=function(){return e},e.flags="",e[o]=/./[o]),e.exec=function(){return n=!0,null},e[o](""),!n}));if(!i||!c||"replace"===t&&(!Ir||!kr)||"split"===t&&!Rr){var l=/./[o],s=e(o,""[t],(function(t,n,e,r,o){return n.exec===wr?i&&!o?{done:!0,value:l.call(n,e,r)}:{done:!0,value:t.call(e,n,r)}:{done:!1}}),{REPLACE_KEEPS_$0:kr}),u=s[0],d=s[1];et(String.prototype,t,u),et(RegExp.prototype,o,2==n?function(t,n){return d.call(t,this,n)}:function(t){return d.call(t,this)})}r&&C(RegExp.prototype[o],"sham",!0)}("search",1,(function(t,n,e){return[function(n){var e=v(this),r=null==n?void 0:n[t];return void 0!==r?r.call(n,e):new RegExp(n)[t](String(e))},function(t){var r=e(n,t,this);if(r.done)return r.value;var o=_(t),a=String(this),i=o.lastIndex;Lr(i,0)||(o.lastIndex=0);var c=function(t,n){var e=t.exec;if("function"==typeof e){var r=e.call(t,n);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==f(t))throw TypeError("RegExp#exec called on incompatible receiver");return wr.call(t,n)}(o,a);return Lr(o.lastIndex,i)||(o.lastIndex=i),null===c?-1:c.index}]}));var Fr="\t\n\v\f\r                　\u2028\u2029\ufeff",Nr="["+Fr+"]",Dr=RegExp("^"+Nr+Nr+"*"),Gr=RegExp(Nr+Nr+"*$"),Br=function(t){return function(n){var e=String(v(n));return 1&t&&(e=e.replace(Dr,"")),2&t&&(e=e.replace(Gr,"")),e}},Vr={start:Br(1),end:Br(2),trim:Br(3)},zr=Vr.trim;Mt({target:"String",proto:!0,forced:function(t){return a((function(){return!!Fr[t]()||"​…᠎"!="​…᠎"[t]()||Fr[t].name!==t}))}("trim")},{trim:function(){return zr(this)}});var $r={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Ur=Qt("iterator"),qr=Qt("toStringTag"),Wr=Ke.values;for(var Yr in $r){var Hr=o[Yr],Kr=Hr&&Hr.prototype;if(Kr){if(Kr[Ur]!==Wr)try{C(Kr,Ur,Wr)}catch(t){Kr[Ur]=Wr}if(Kr[qr]||C(Kr,qr,Yr),$r[Yr])for(var Jr in Ke)if(Kr[Jr]!==Ke[Jr])try{C(Kr,Jr,Ke[Jr])}catch(t){Kr[Jr]=Ke[Jr]}}}function Qr(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function Xr(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Zr(t){return(Zr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function to(t,n){return(to=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function no(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function eo(t,n,e){return(eo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=Zr(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}function ro(t,n){return function(t){if(Array.isArray(t))return t}(t)||function(t,n){if(!(Symbol.iterator in Object(t))&&"[object Arguments]"!==Object.prototype.toString.call(t))return;var e=[],r=!0,o=!1,a=void 0;try{for(var i,c=t[Symbol.iterator]();!(r=(i=c.next()).done)&&(e.push(i.value),!n||e.length!==n);r=!0);}catch(t){o=!0,a=t}finally{try{r||null==c.return||c.return()}finally{if(o)throw a}}return e}(t,n)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function oo(t){return function(t){if(Array.isArray(t)){for(var n=0,e=new Array(t.length);n<t.length;n++)e[n]=t[n];return e}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var ao=t.fn.bootstrapTable.utils,io={bootstrap3:{icons:{advancedSearchIcon:"glyphicon-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0px; padding-left: 0px;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bootstrap4:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0; padding-left: 0;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bootstrap5:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0; padding-left: 0;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bulma:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="modal" id="avdSearchModal_%s">\n          <div class="modal-background"></div>\n          <div class="modal-card">\n            <header class="modal-card-head">\n              <p class="modal-card-title">%s</p>\n              <button class="delete" aria-label="close"></button>\n            </header>\n            <section class="modal-card-body" id="avdSearchModalContent_%s"></section>\n            <footer class="modal-card-foot">\n              <button class="button" id="btnCloseAvd_%s" data-close="btn btn-%s">%s</button>\n            </footer>\n          </div>\n        </div>\n      '}},foundation:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="reveal" id="avdSearchModal_%s" data-reveal>\n          <h1>%s</h1>\n          <div id="avdSearchModalContent_%s">\n\n          </div>\n          <button class="close-button" data-close aria-label="Close modal" type="button">\n            <span aria-hidden="true">&times;</span>\n          </button>\n\n          <button id="btnCloseAvd_%s" class="%s" type="button">%s</button>\n        </div>\n      '}},materialize:{icons:{advancedSearchIcon:"expand_more"},html:{modal:'\n        <div id="avdSearchModal_%s" class="modal">\n          <div class="modal-content">\n            <h4>%s</h4>\n            <div id="avdSearchModalContent_%s">\n\n            </div>\n          </div>\n          <div class="modal-footer">\n            <a href="javascript:void(0)"" id="btnCloseAvd_%s" class="modal-close waves-effect waves-green btn-flat %s">%s</a>\n          </div>\n        </div>\n      '}},semantic:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="ui modal" id="avdSearchModal_%s">\n          <i class="close icon"></i>\n          <div class="header">\n            %s\n          </div>\n          <div class="image content ui form" id="avdSearchModalContent_%s"></div>\n          <div class="actions">\n            <div id="btnCloseAvd_%s" class="ui black deny button %s">%s</div>\n          </div>\n        </div>\n      '}}}[t.fn.bootstrapTable.theme];t.extend(t.fn.bootstrapTable.defaults,{advancedSearch:!1,idForm:"advancedSearch",actionForm:"",idTable:void 0,onColumnAdvancedSearch:function(t,n){return!1}}),t.extend(t.fn.bootstrapTable.defaults.icons,{advancedSearchIcon:io.icons.advancedSearchIcon}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"column-advanced-search.bs.table":"onColumnAdvancedSearch"}),t.extend(t.fn.bootstrapTable.locales,{formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(n){function e(){return Qr(this,e),no(this,Zr(e).apply(this,arguments))}var r,o,a;return function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&to(t,n)}(e,n),r=e,(o=[{key:"initToolbar",value:function(){var t=this.options;this.showToolbar=this.showToolbar||t.search&&t.advancedSearch&&t.idTable,t.search&&t.advancedSearch&&t.idTable&&(this.buttons=Object.assign(this.buttons,{advancedSearch:{text:this.options.formatAdvancedSearch(),icon:this.options.icons.advancedSearchIcon,event:this.showAvdSearch,attributes:{"aria-label":this.options.formatAdvancedSearch(),title:this.options.formatAdvancedSearch()}}})),eo(Zr(e.prototype),"initToolbar",this).call(this)}},{key:"showAvdSearch",value:function(){var n=this,e=this.options,r="#avdSearchModal_"+e.idTable;if(t(r).length<=0){t("body").append(ao.sprintf(io.html.modal,e.idTable,e.formatAdvancedSearch(),e.idTable,e.idTable,e.buttonsClass,e.formatAdvancedCloseButton()));var o=0;t("#avdSearchModalContent_".concat(e.idTable)).append(this.createFormAvd().join("")),t("#".concat(e.idForm)).off("keyup blur","input").on("keyup blur","input",(function(t){"server"===e.sidePagination?n.onColumnAdvancedSearch(t):(clearTimeout(o),o=setTimeout((function(){n.onColumnAdvancedSearch(t)}),e.searchTimeOut))})),t("#btnCloseAvd_".concat(e.idTable)).click((function(){return n.hideModal()})),"bulma"===t.fn.bootstrapTable.theme&&t(r).find(".delete").off("click").on("click",(function(){return n.hideModal()})),this.showModal()}else this.showModal()}},{key:"showModal",value:function(){var n="#avdSearchModal_"+this.options.idTable;-1!==t.inArray(t.fn.bootstrapTable.theme,["bootstrap3","bootstrap4"])?t(n).modal():"bootstrap5"===t.fn.bootstrapTable.theme?(this.toolbarModal||(this.toolbarModal=new bootstrap.Modal(document.getElementById("avdSearchModal_"+this.options.idTable),{})),this.toolbarModal.show()):"bulma"===t.fn.bootstrapTable.theme?t(n).toggleClass("is-active"):"foundation"===t.fn.bootstrapTable.theme?(this.toolbarModal||(this.toolbarModal=new Foundation.Reveal(t(n))),this.toolbarModal.open()):"materialize"===t.fn.bootstrapTable.theme?(t(n).modal(),t(n).modal("open")):"semantic"===t.fn.bootstrapTable.theme&&t(n).modal("show")}},{key:"hideModal",value:function(){var n=t("#avdSearchModal_".concat(this.options.idTable)),e="#avdSearchModal_"+this.options.idTable;-1!==t.inArray(t.fn.bootstrapTable.theme,["bootstrap3","bootstrap4"])?n.modal("hide"):"bootstrap5"===t.fn.bootstrapTable.theme?this.toolbarModal.hide():"bulma"===t.fn.bootstrapTable.theme?(t("html").toggleClass("is-clipped"),t(e).toggleClass("is-active")):"foundation"===t.fn.bootstrapTable.theme?this.toolbarModal.close():"materialize"===t.fn.bootstrapTable.theme?t(e).modal("open"):"semantic"===t.fn.bootstrapTable.theme&&t(e).modal("close"),"server"===this.options.sidePagination&&(this.options.pageNumber=1,this.updatePagination(),this.trigger("column-advanced-search",this.filterColumnsPartial))}},{key:"createFormAvd",value:function(){var t=this.options,n=['<form class="form-horizontal" id="'.concat(t.idForm,'" action="').concat(t.actionForm,'">')],e=!0,r=!1,o=void 0;try{for(var a,i=this.columns[Symbol.iterator]();!(e=(a=i.next()).done);e=!0){var c=a.value;!c.checkbox&&c.visible&&c.searchable&&n.push('\n          <div class="form-group row">\n            <label class="col-sm-4 control-label">'.concat(c.title,'</label>\n            <div class="col-sm-6">\n              <input type="text" class="form-control ').concat(this.constants.classes.input,'" name="').concat(c.field,'" placeholder="').concat(c.title,'" id="').concat(c.field,'">\n            </div>\n          </div>\n        '))}}catch(t){r=!0,o=t}finally{try{e||null==i.return||i.return()}finally{if(r)throw o}}return n.push("</form>"),n}},{key:"initSearch",value:function(){var n=this;if(eo(Zr(e.prototype),"initSearch",this).call(this),this.options.advancedSearch&&"server"!==this.options.sidePagination){var r=t.isEmptyObject(this.filterColumnsPartial)?null:this.filterColumnsPartial;this.data=r?this.data.filter((function(t,e){for(var o=0,a=Object.entries(r);o<a.length;o++){var i=ro(a[o],2),c=i[0],l=i[1].toLowerCase(),s=t[c],u=n.header.fields.indexOf(c);if(s=ao.calculateObjectValue(n.header,n.header.formatters[u],[s,t,e],s),-1===u||"string"!=typeof s&&"number"!=typeof s||!"".concat(s).toLowerCase().includes(l))return!1}return!0})):this.data,this.unsortedData=oo(this.data)}}},{key:"onColumnAdvancedSearch",value:function(n){var e=t.trim(t(n.currentTarget).val()),r=t(n.currentTarget)[0].id;t.isEmptyObject(this.filterColumnsPartial)&&(this.filterColumnsPartial={}),e?this.filterColumnsPartial[r]=e:delete this.filterColumnsPartial[r],"server"!==this.options.sidePagination&&(this.options.pageNumber=1,this.onSearch(n),this.updatePagination(),this.trigger("column-advanced-search",r,e))}}])&&Xr(r.prototype,o),a&&Xr(r,a),e}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table.min.js b/web/skins/classic/js/bootstrap-table.min.js
new file mode 100644
index 000000000..cea3aca2e
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t=t||self).BootstrapTable=e(t.jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function i(t,e){return t(e={exports:{}},e.exports),e.exports}var n=function(t){return t&&t.Math==Math&&t},o=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||Function("return this")(),r=function(t){try{return!!t()}catch(t){return!0}},a=!r((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),s={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,c={f:l&&!s.call({1:2},1)?function(t){var e=l(this,t);return!!e&&e.enumerable}:s},h=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},u={}.toString,d=function(t){return u.call(t).slice(8,-1)},p="".split,f=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?p.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return f(g(t))},b=function(t){return"object"==typeof t?null!==t:"function"==typeof t},y=function(t,e){if(!b(t))return t;var i,n;if(e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;if("function"==typeof(i=t.valueOf)&&!b(n=i.call(t)))return n;if(!e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,w=function(t,e){return m.call(t,e)},S=o.document,x=b(S)&&b(S.createElement),k=function(t){return x?S.createElement(t):{}},O=!a&&!r((function(){return 7!=Object.defineProperty(k("div"),"a",{get:function(){return 7}}).a})),C=Object.getOwnPropertyDescriptor,P={f:a?C:function(t,e){if(t=v(t),e=y(e,!0),O)try{return C(t,e)}catch(t){}if(w(t,e))return h(!c.f.call(t,e),t[e])}},T=function(t){if(!b(t))throw TypeError(String(t)+" is not an object");return t},I=Object.defineProperty,A={f:a?I:function(t,e,i){if(T(t),e=y(e,!0),T(i),O)try{return I(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},$=a?function(t,e,i){return A.f(t,e,h(1,i))}:function(t,e,i){return t[e]=i,t},E=function(t,e){try{$(o,t,e)}catch(i){o[t]=e}return e},R="__core-js_shared__",j=o[R]||E(R,{}),N=Function.toString;"function"!=typeof j.inspectSource&&(j.inspectSource=function(t){return N.call(t)});var _,F,V,D=j.inspectSource,B=o.WeakMap,L="function"==typeof B&&/native code/.test(D(B)),H=i((function(t){(t.exports=function(t,e){return j[t]||(j[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),M=0,U=Math.random(),z=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++M+U).toString(36)},q=H("keys"),W=function(t){return q[t]||(q[t]=z(t))},G={},K=o.WeakMap;if(L){var Y=new K,J=Y.get,X=Y.has,Q=Y.set;_=function(t,e){return Q.call(Y,t,e),e},F=function(t){return J.call(Y,t)||{}},V=function(t){return X.call(Y,t)}}else{var Z=W("state");G[Z]=!0,_=function(t,e){return $(t,Z,e),e},F=function(t){return w(t,Z)?t[Z]:{}},V=function(t){return w(t,Z)}}var tt,et={set:_,get:F,has:V,enforce:function(t){return V(t)?F(t):_(t,{})},getterFor:function(t){return function(e){var i;if(!b(e)||(i=F(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}},it=i((function(t){var e=et.get,i=et.enforce,n=String(String).split("String");(t.exports=function(t,e,r,a){var s=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,c=!!a&&!!a.noTargetGet;"function"==typeof r&&("string"!=typeof e||w(r,"name")||$(r,"name",e),i(r).source=n.join("string"==typeof e?e:"")),t!==o?(s?!c&&t[e]&&(l=!0):delete t[e],l?t[e]=r:$(t,e,r)):l?t[e]=r:E(e,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||D(this)}))})),nt=o,ot=function(t){return"function"==typeof t?t:void 0},rt=function(t,e){return arguments.length<2?ot(nt[t])||ot(o[t]):nt[t]&&nt[t][e]||o[t]&&o[t][e]},at=Math.ceil,st=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?st:at)(t)},ct=Math.min,ht=function(t){return t>0?ct(lt(t),9007199254740991):0},ut=Math.max,dt=Math.min,pt=function(t,e){var i=lt(t);return i<0?ut(i+e,0):dt(i,e)},ft=function(t){return function(e,i,n){var o,r=v(e),a=ht(r.length),s=pt(n,a);if(t&&i!=i){for(;a>s;)if((o=r[s++])!=o)return!0}else for(;a>s;s++)if((t||s in r)&&r[s]===i)return t||s||0;return!t&&-1}},gt={includes:ft(!0),indexOf:ft(!1)},vt=gt.indexOf,bt=function(t,e){var i,n=v(t),o=0,r=[];for(i in n)!w(G,i)&&w(n,i)&&r.push(i);for(;e.length>o;)w(n,i=e[o++])&&(~vt(r,i)||r.push(i));return r},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=yt.concat("length","prototype"),wt={f:Object.getOwnPropertyNames||function(t){return bt(t,mt)}},St={f:Object.getOwnPropertySymbols},xt=rt("Reflect","ownKeys")||function(t){var e=wt.f(T(t)),i=St.f;return i?e.concat(i(t)):e},kt=function(t,e){for(var i=xt(e),n=A.f,o=P.f,r=0;r<i.length;r++){var a=i[r];w(t,a)||n(t,a,o(e,a))}},Ot=/#|\.prototype\./,Ct=function(t,e){var i=Tt[Pt(t)];return i==At||i!=It&&("function"==typeof e?r(e):!!e)},Pt=Ct.normalize=function(t){return String(t).replace(Ot,".").toLowerCase()},Tt=Ct.data={},It=Ct.NATIVE="N",At=Ct.POLYFILL="P",$t=Ct,Et=P.f,Rt=function(t,e){var i,n,r,a,s,l=t.target,c=t.global,h=t.stat;if(i=c?o:h?o[l]||E(l,{}):(o[l]||{}).prototype)for(n in e){if(a=e[n],r=t.noTargetGet?(s=Et(i,n))&&s.value:i[n],!$t(c?n:l+(h?".":"#")+n,t.forced)&&void 0!==r){if(typeof a==typeof r)continue;kt(a,r)}(t.sham||r&&r.sham)&&$(a,"sham",!0),it(i,n,a,t)}},jt=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())})),Nt=jt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=Array.isArray||function(t){return"Array"==d(t)},Ft=function(t){return Object(g(t))},Vt=Object.keys||function(t){return bt(t,yt)},Dt=a?Object.defineProperties:function(t,e){T(t);for(var i,n=Vt(e),o=n.length,r=0;o>r;)A.f(t,i=n[r++],e[i]);return t},Bt=rt("document","documentElement"),Lt=W("IE_PROTO"),Ht=function(){},Mt=function(t){return"<script>"+t+"</"+"script>"},Ut=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Ut=tt?function(t){t.write(Mt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(tt):((e=k("iframe")).style.display="none",Bt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Mt("document.F=Object")),t.close(),t.F);for(var i=yt.length;i--;)delete Ut.prototype[yt[i]];return Ut()};G[Lt]=!0;var zt=Object.create||function(t,e){var i;return null!==t?(Ht.prototype=T(t),i=new Ht,Ht.prototype=null,i[Lt]=t):i=Ut(),void 0===e?i:Dt(i,e)},qt=wt.f,Wt={}.toString,Gt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Kt={f:function(t){return Gt&&"[object Window]"==Wt.call(t)?function(t){try{return qt(t)}catch(t){return Gt.slice()}}(t):qt(v(t))}},Yt=H("wks"),Jt=o.Symbol,Xt=Nt?Jt:z,Qt=function(t){return w(Yt,t)||(jt&&w(Jt,t)?Yt[t]=Jt[t]:Yt[t]=Xt("Symbol."+t)),Yt[t]},Zt={f:Qt},te=A.f,ee=function(t){var e=nt.Symbol||(nt.Symbol={});w(e,t)||te(e,t,{value:Zt.f(t)})},ie=A.f,ne=Qt("toStringTag"),oe=function(t,e,i){t&&!w(t=i?t:t.prototype,ne)&&ie(t,ne,{configurable:!0,value:e})},re=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ae=Qt("species"),se=function(t,e){var i;return _t(t)&&("function"!=typeof(i=t.constructor)||i!==Array&&!_t(i.prototype)?b(i)&&null===(i=i[ae])&&(i=void 0):i=void 0),new(void 0===i?Array:i)(0===e?0:e)},le=[].push,ce=function(t){var e=1==t,i=2==t,n=3==t,o=4==t,r=6==t,a=5==t||r;return function(s,l,c,h){for(var u,d,p=Ft(s),g=f(p),v=function(t,e,i){if(re(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,o){return t.call(e,i,n,o)}}return function(){return t.apply(e,arguments)}}(l,c,3),b=ht(g.length),y=0,m=h||se,w=e?m(s,b):i?m(s,0):void 0;b>y;y++)if((a||y in g)&&(d=v(u=g[y],y,p),t))if(e)w[y]=d;else if(d)switch(t){case 3:return!0;case 5:return u;case 6:return y;case 2:le.call(w,u)}else if(o)return!1;return r?-1:n||o?o:w}},he={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},ue=he.forEach,de=W("hidden"),pe="Symbol",fe=Qt("toPrimitive"),ge=et.set,ve=et.getterFor(pe),be=Object.prototype,ye=o.Symbol,me=rt("JSON","stringify"),we=P.f,Se=A.f,xe=Kt.f,ke=c.f,Oe=H("symbols"),Ce=H("op-symbols"),Pe=H("string-to-symbol-registry"),Te=H("symbol-to-string-registry"),Ie=H("wks"),Ae=o.QObject,$e=!Ae||!Ae.prototype||!Ae.prototype.findChild,Ee=a&&r((function(){return 7!=zt(Se({},"a",{get:function(){return Se(this,"a",{value:7}).a}})).a}))?function(t,e,i){var n=we(be,e);n&&delete be[e],Se(t,e,i),n&&t!==be&&Se(be,e,n)}:Se,Re=function(t,e){var i=Oe[t]=zt(ye.prototype);return ge(i,{type:pe,tag:t,description:e}),a||(i.description=e),i},je=jt&&"symbol"==typeof ye.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ye},Ne=function(t,e,i){t===be&&Ne(Ce,e,i),T(t);var n=y(e,!0);return T(i),w(Oe,n)?(i.enumerable?(w(t,de)&&t[de][n]&&(t[de][n]=!1),i=zt(i,{enumerable:h(0,!1)})):(w(t,de)||Se(t,de,h(1,{})),t[de][n]=!0),Ee(t,n,i)):Se(t,n,i)},_e=function(t,e){T(t);var i=v(e),n=Vt(i).concat(Be(i));return ue(n,(function(e){a&&!Fe.call(i,e)||Ne(t,e,i[e])})),t},Fe=function(t){var e=y(t,!0),i=ke.call(this,e);return!(this===be&&w(Oe,e)&&!w(Ce,e))&&(!(i||!w(this,e)||!w(Oe,e)||w(this,de)&&this[de][e])||i)},Ve=function(t,e){var i=v(t),n=y(e,!0);if(i!==be||!w(Oe,n)||w(Ce,n)){var o=we(i,n);return!o||!w(Oe,n)||w(i,de)&&i[de][n]||(o.enumerable=!0),o}},De=function(t){var e=xe(v(t)),i=[];return ue(e,(function(t){w(Oe,t)||w(G,t)||i.push(t)})),i},Be=function(t){var e=t===be,i=xe(e?Ce:v(t)),n=[];return ue(i,(function(t){!w(Oe,t)||e&&!w(be,t)||n.push(Oe[t])})),n};if(jt||(it((ye=function(){if(this instanceof ye)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=z(t),i=function(t){this===be&&i.call(Ce,t),w(this,de)&&w(this[de],e)&&(this[de][e]=!1),Ee(this,e,h(1,t))};return a&&$e&&Ee(be,e,{configurable:!0,set:i}),Re(e,t)}).prototype,"toString",(function(){return ve(this).tag})),c.f=Fe,A.f=Ne,P.f=Ve,wt.f=Kt.f=De,St.f=Be,a&&(Se(ye.prototype,"description",{configurable:!0,get:function(){return ve(this).description}}),it(be,"propertyIsEnumerable",Fe,{unsafe:!0}))),Nt||(Zt.f=function(t){return Re(Qt(t),t)}),Rt({global:!0,wrap:!0,forced:!jt,sham:!jt},{Symbol:ye}),ue(Vt(Ie),(function(t){ee(t)})),Rt({target:pe,stat:!0,forced:!jt},{for:function(t){var e=String(t);if(w(Pe,e))return Pe[e];var i=ye(e);return Pe[e]=i,Te[i]=e,i},keyFor:function(t){if(!je(t))throw TypeError(t+" is not a symbol");if(w(Te,t))return Te[t]},useSetter:function(){$e=!0},useSimple:function(){$e=!1}}),Rt({target:"Object",stat:!0,forced:!jt,sham:!a},{create:function(t,e){return void 0===e?zt(t):_e(zt(t),e)},defineProperty:Ne,defineProperties:_e,getOwnPropertyDescriptor:Ve}),Rt({target:"Object",stat:!0,forced:!jt},{getOwnPropertyNames:De,getOwnPropertySymbols:Be}),Rt({target:"Object",stat:!0,forced:r((function(){St.f(1)}))},{getOwnPropertySymbols:function(t){return St.f(Ft(t))}}),me){var Le=!jt||r((function(){var t=ye();return"[null]"!=me([t])||"{}"!=me({a:t})||"{}"!=me(Object(t))}));Rt({target:"JSON",stat:!0,forced:Le},{stringify:function(t,e,i){for(var n,o=[t],r=1;arguments.length>r;)o.push(arguments[r++]);if(n=e,(b(e)||void 0!==t)&&!je(t))return _t(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!je(e))return e}),o[1]=e,me.apply(null,o)}})}ye.prototype[fe]||$(ye.prototype,fe,ye.prototype.valueOf),oe(ye,pe),G[de]=!0;var He=A.f,Me=o.Symbol;if(a&&"function"==typeof Me&&(!("description"in Me.prototype)||void 0!==Me().description)){var Ue={},ze=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof ze?new Me(t):void 0===t?Me():Me(t);return""===t&&(Ue[e]=!0),e};kt(ze,Me);var qe=ze.prototype=Me.prototype;qe.constructor=ze;var We=qe.toString,Ge="Symbol(test)"==String(Me("test")),Ke=/^Symbol\((.*)\)[^)]+$/;He(qe,"description",{configurable:!0,get:function(){var t=b(this)?this.valueOf():this,e=We.call(t);if(w(Ue,t))return"";var i=Ge?e.slice(7,-1):e.replace(Ke,"$1");return""===i?void 0:i}}),Rt({global:!0,forced:!0},{Symbol:ze})}ee("iterator");var Ye,Je,Xe=function(t,e,i){var n=y(e);n in t?A.f(t,n,h(0,i)):t[n]=i},Qe=rt("navigator","userAgent")||"",Ze=o.process,ti=Ze&&Ze.versions,ei=ti&&ti.v8;ei?Je=(Ye=ei.split("."))[0]+Ye[1]:Qe&&(!(Ye=Qe.match(/Edge\/(\d+)/))||Ye[1]>=74)&&(Ye=Qe.match(/Chrome\/(\d+)/))&&(Je=Ye[1]);var ii=Je&&+Je,ni=Qt("species"),oi=function(t){return ii>=51||!r((function(){var e=[];return(e.constructor={})[ni]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ri=Qt("isConcatSpreadable"),ai=9007199254740991,si="Maximum allowed index exceeded",li=ii>=51||!r((function(){var t=[];return t[ri]=!1,t.concat()[0]!==t})),ci=oi("concat"),hi=function(t){if(!b(t))return!1;var e=t[ri];return void 0!==e?!!e:_t(t)};Rt({target:"Array",proto:!0,forced:!li||!ci},{concat:function(t){var e,i,n,o,r,a=Ft(this),s=se(a,0),l=0;for(e=-1,n=arguments.length;e<n;e++)if(hi(r=-1===e?a:arguments[e])){if(l+(o=ht(r.length))>ai)throw TypeError(si);for(i=0;i<o;i++,l++)i in r&&Xe(s,l,r[i])}else{if(l>=ai)throw TypeError(si);Xe(s,l++,r)}return s.length=l,s}});var ui=he.filter,di=oi("filter"),pi=di&&!r((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Rt({target:"Array",proto:!0,forced:!di||!pi},{filter:function(t){return ui(this,t,arguments.length>1?arguments[1]:void 0)}});var fi=Qt("unscopables"),gi=Array.prototype;null==gi[fi]&&A.f(gi,fi,{configurable:!0,value:zt(null)});var vi=function(t){gi[fi][t]=!0},bi=he.find,yi="find",mi=!0;yi in[]&&Array(1).find((function(){mi=!1})),Rt({target:"Array",proto:!0,forced:mi},{find:function(t){return bi(this,t,arguments.length>1?arguments[1]:void 0)}}),vi(yi);var wi=he.findIndex,Si="findIndex",xi=!0;Si in[]&&Array(1).findIndex((function(){xi=!1})),Rt({target:"Array",proto:!0,forced:xi},{findIndex:function(t){return wi(this,t,arguments.length>1?arguments[1]:void 0)}}),vi(Si);var ki=gt.includes;Rt({target:"Array",proto:!0},{includes:function(t){return ki(this,t,arguments.length>1?arguments[1]:void 0)}}),vi("includes");var Oi=function(t,e){var i=[][t];return!i||!r((function(){i.call(null,e||function(){throw 1},1)}))},Ci=gt.indexOf,Pi=[].indexOf,Ti=!!Pi&&1/[1].indexOf(1,-0)<0,Ii=Oi("indexOf");Rt({target:"Array",proto:!0,forced:Ti||Ii},{indexOf:function(t){return Ti?Pi.apply(this,arguments)||0:Ci(this,t,arguments.length>1?arguments[1]:void 0)}});var Ai,$i,Ei,Ri=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),ji=W("IE_PROTO"),Ni=Object.prototype,_i=Ri?Object.getPrototypeOf:function(t){return t=Ft(t),w(t,ji)?t[ji]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?Ni:null},Fi=Qt("iterator"),Vi=!1;[].keys&&("next"in(Ei=[].keys())?($i=_i(_i(Ei)))!==Object.prototype&&(Ai=$i):Vi=!0),null==Ai&&(Ai={}),w(Ai,Fi)||$(Ai,Fi,(function(){return this}));var Di={IteratorPrototype:Ai,BUGGY_SAFARI_ITERATORS:Vi},Bi=Di.IteratorPrototype,Li=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,n){return T(i),function(t){if(!b(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(n),e?t.call(i,n):i.__proto__=n,i}}():void 0),Hi=Di.IteratorPrototype,Mi=Di.BUGGY_SAFARI_ITERATORS,Ui=Qt("iterator"),zi="keys",qi="values",Wi="entries",Gi=function(){return this},Ki=function(t,e,i,n,o,r,a){!function(t,e,i){var n=e+" Iterator";t.prototype=zt(Bi,{next:h(1,i)}),oe(t,n,!1)}(i,e,n);var s,l,c,u=function(t){if(t===o&&v)return v;if(!Mi&&t in f)return f[t];switch(t){case zi:case qi:case Wi:return function(){return new i(this,t)}}return function(){return new i(this)}},d=e+" Iterator",p=!1,f=t.prototype,g=f[Ui]||f["@@iterator"]||o&&f[o],v=!Mi&&g||u(o),b="Array"==e&&f.entries||g;if(b&&(s=_i(b.call(new t)),Hi!==Object.prototype&&s.next&&(_i(s)!==Hi&&(Li?Li(s,Hi):"function"!=typeof s[Ui]&&$(s,Ui,Gi)),oe(s,d,!0))),o==qi&&g&&g.name!==qi&&(p=!0,v=function(){return g.call(this)}),f[Ui]!==v&&$(f,Ui,v),o)if(l={values:u(qi),keys:r?v:u(zi),entries:u(Wi)},a)for(c in l)(Mi||p||!(c in f))&&it(f,c,l[c]);else Rt({target:e,proto:!0,forced:Mi||p},l);return l},Yi="Array Iterator",Ji=et.set,Xi=et.getterFor(Yi),Qi=Ki(Array,"Array",(function(t,e){Ji(this,{type:Yi,target:v(t),index:0,kind:e})}),(function(){var t=Xi(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values");vi("keys"),vi("values"),vi("entries");var Zi=[].join,tn=f!=Object,en=Oi("join",",");Rt({target:"Array",proto:!0,forced:tn||en},{join:function(t){return Zi.call(v(this),void 0===t?",":t)}});var nn=he.map,on=oi("map"),rn=on&&!r((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Rt({target:"Array",proto:!0,forced:!on||!rn},{map:function(t){return nn(this,t,arguments.length>1?arguments[1]:void 0)}});var an=[].reverse,sn=[1,2];Rt({target:"Array",proto:!0,forced:String(sn)===String(sn.reverse())},{reverse:function(){return _t(this)&&(this.length=this.length),an.call(this)}});var ln=Qt("species"),cn=[].slice,hn=Math.max;Rt({target:"Array",proto:!0,forced:!oi("slice")},{slice:function(t,e){var i,n,o,r=v(this),a=ht(r.length),s=pt(t,a),l=pt(void 0===e?a:e,a);if(_t(r)&&("function"!=typeof(i=r.constructor)||i!==Array&&!_t(i.prototype)?b(i)&&null===(i=i[ln])&&(i=void 0):i=void 0,i===Array||void 0===i))return cn.call(r,s,l);for(n=new(void 0===i?Array:i)(hn(l-s,0)),o=0;s<l;s++,o++)s in r&&Xe(n,o,r[s]);return n.length=o,n}});var un=[],dn=un.sort,pn=r((function(){un.sort(void 0)})),fn=r((function(){un.sort(null)})),gn=Oi("sort");Rt({target:"Array",proto:!0,forced:pn||!fn||gn},{sort:function(t){return void 0===t?dn.call(Ft(this)):dn.call(Ft(this),re(t))}});var vn=Math.max,bn=Math.min,yn=9007199254740991,mn="Maximum allowed length exceeded";Rt({target:"Array",proto:!0,forced:!oi("splice")},{splice:function(t,e){var i,n,o,r,a,s,l=Ft(this),c=ht(l.length),h=pt(t,c),u=arguments.length;if(0===u?i=n=0:1===u?(i=0,n=c-h):(i=u-2,n=bn(vn(lt(e),0),c-h)),c+i-n>yn)throw TypeError(mn);for(o=se(l,n),r=0;r<n;r++)(a=h+r)in l&&Xe(o,r,l[a]);if(o.length=n,i<n){for(r=h;r<c-n;r++)s=r+i,(a=r+n)in l?l[s]=l[a]:delete l[s];for(r=c;r>c-n+i;r--)delete l[r-1]}else if(i>n)for(r=c-n;r>h;r--)s=r+i-1,(a=r+n-1)in l?l[s]=l[a]:delete l[s];for(r=0;r<i;r++)l[r+h]=arguments[r+2];return l.length=c-n+i,o}});var wn=function(t,e,i){var n,o;return Li&&"function"==typeof(n=e.constructor)&&n!==i&&b(o=n.prototype)&&o!==i.prototype&&Li(t,o),t},Sn="\t\n\v\f\r                　\u2028\u2029\ufeff",xn="["+Sn+"]",kn=RegExp("^"+xn+xn+"*"),On=RegExp(xn+xn+"*$"),Cn=function(t){return function(e){var i=String(g(e));return 1&t&&(i=i.replace(kn,"")),2&t&&(i=i.replace(On,"")),i}},Pn={start:Cn(1),end:Cn(2),trim:Cn(3)},Tn=wt.f,In=P.f,An=A.f,$n=Pn.trim,En="Number",Rn=o.Number,jn=Rn.prototype,Nn=d(zt(jn))==En,_n=function(t){var e,i,n,o,r,a,s,l,c=y(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=$n(c)).charCodeAt(0))||45===e){if(88===(i=c.charCodeAt(2))||120===i)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:n=2,o=49;break;case 79:case 111:n=8,o=55;break;default:return+c}for(a=(r=c.slice(2)).length,s=0;s<a;s++)if((l=r.charCodeAt(s))<48||l>o)return NaN;return parseInt(r,n)}return+c};if($t(En,!Rn(" 0o1")||!Rn("0b1")||Rn("+0x1"))){for(var Fn,Vn=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof Vn&&(Nn?r((function(){jn.valueOf.call(i)})):d(i)!=En)?wn(new Rn(_n(e)),i,Vn):_n(e)},Dn=a?Tn(Rn):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),Bn=0;Dn.length>Bn;Bn++)w(Rn,Fn=Dn[Bn])&&!w(Vn,Fn)&&An(Vn,Fn,In(Rn,Fn));Vn.prototype=jn,jn.constructor=Vn,it(o,En,Vn)}var Ln=Object.assign,Hn=Object.defineProperty,Mn=!Ln||r((function(){if(a&&1!==Ln({b:1},Ln(Hn({},"a",{enumerable:!0,get:function(){Hn(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol(),n="abcdefghijklmnopqrst";return t[i]=7,n.split("").forEach((function(t){e[t]=t})),7!=Ln({},t)[i]||Vt(Ln({},e)).join("")!=n}))?function(t,e){for(var i=Ft(t),n=arguments.length,o=1,r=St.f,s=c.f;n>o;)for(var l,h=f(arguments[o++]),u=r?Vt(h).concat(r(h)):Vt(h),d=u.length,p=0;d>p;)l=u[p++],a&&!s.call(h,l)||(i[l]=h[l]);return i}:Ln;Rt({target:"Object",stat:!0,forced:Object.assign!==Mn},{assign:Mn});var Un=c.f,zn=function(t){return function(e){for(var i,n=v(e),o=Vt(n),r=o.length,s=0,l=[];r>s;)i=o[s++],a&&!Un.call(n,i)||l.push(t?[i,n[i]]:n[i]);return l}},qn={entries:zn(!0),values:zn(!1)}.entries;Rt({target:"Object",stat:!0},{entries:function(t){return qn(t)}});var Wn={};Wn[Qt("toStringTag")]="z";var Gn="[object z]"===String(Wn),Kn=Qt("toStringTag"),Yn="Arguments"==d(function(){return arguments}()),Jn=Gn?d:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Kn))?i:Yn?d(e):"Object"==(n=d(e))&&"function"==typeof e.callee?"Arguments":n},Xn=Gn?{}.toString:function(){return"[object "+Jn(this)+"]"};Gn||it(Object.prototype,"toString",Xn,{unsafe:!0});var Qn=Pn.trim,Zn=o.parseFloat,to=1/Zn(Sn+"-0")!=-1/0?function(t){var e=Qn(String(t)),i=Zn(e);return 0===i&&"-"==e.charAt(0)?-0:i}:Zn;Rt({global:!0,forced:parseFloat!=to},{parseFloat:to});var eo=Pn.trim,io=o.parseInt,no=/^[+-]?0[Xx]/,oo=8!==io(Sn+"08")||22!==io(Sn+"0x16")?function(t,e){var i=eo(String(t));return io(i,e>>>0||(no.test(i)?16:10))}:io;Rt({global:!0,forced:parseInt!=oo},{parseInt:oo});var ro=Qt("match"),ao=function(t){var e;return b(t)&&(void 0!==(e=t[ro])?!!e:"RegExp"==d(t))},so=function(){var t=T(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function lo(t,e){return RegExp(t,e)}var co={UNSUPPORTED_Y:r((function(){var t=lo("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:r((function(){var t=lo("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},ho=Qt("species"),uo=A.f,po=wt.f,fo=et.set,go=Qt("match"),vo=o.RegExp,bo=vo.prototype,yo=/a/g,mo=/a/g,wo=new vo(yo)!==yo,So=co.UNSUPPORTED_Y;if(a&&$t("RegExp",!wo||So||r((function(){return mo[go]=!1,vo(yo)!=yo||vo(mo)==mo||"/a/i"!=vo(yo,"i")})))){for(var xo=function(t,e){var i,n=this instanceof xo,o=ao(t),r=void 0===e;if(!n&&o&&t.constructor===xo&&r)return t;wo?o&&!r&&(t=t.source):t instanceof xo&&(r&&(e=so.call(t)),t=t.source),So&&(i=!!e&&e.indexOf("y")>-1)&&(e=e.replace(/y/g,""));var a=wn(wo?new vo(t,e):vo(t,e),n?this:bo,xo);return So&&i&&fo(a,{sticky:i}),a},ko=function(t){t in xo||uo(xo,t,{configurable:!0,get:function(){return vo[t]},set:function(e){vo[t]=e}})},Oo=po(vo),Co=0;Oo.length>Co;)ko(Oo[Co++]);bo.constructor=xo,xo.prototype=bo,it(o,"RegExp",xo)}!function(t){var e=rt(t),i=A.f;a&&e&&!e[ho]&&i(e,ho,{configurable:!0,get:function(){return this}})}("RegExp");var Po=RegExp.prototype.exec,To=String.prototype.replace,Io=Po,Ao=function(){var t=/a/,e=/b*/g;return Po.call(t,"a"),Po.call(e,"a"),0!==t.lastIndex||0!==e.lastIndex}(),$o=co.UNSUPPORTED_Y||co.BROKEN_CARET,Eo=void 0!==/()??/.exec("")[1];(Ao||Eo||$o)&&(Io=function(t){var e,i,n,o,r=this,a=$o&&r.sticky,s=so.call(r),l=r.source,c=0,h=t;return a&&(-1===(s=s.replace("y","")).indexOf("g")&&(s+="g"),h=String(t).slice(r.lastIndex),r.lastIndex>0&&(!r.multiline||r.multiline&&"\n"!==t[r.lastIndex-1])&&(l="(?: "+l+")",h=" "+h,c++),i=new RegExp("^(?:"+l+")",s)),Eo&&(i=new RegExp("^"+l+"$(?!\\s)",s)),Ao&&(e=r.lastIndex),n=Po.call(a?i:r,h),a?n?(n.input=n.input.slice(c),n[0]=n[0].slice(c),n.index=r.lastIndex,r.lastIndex+=n[0].length):r.lastIndex=0:Ao&&n&&(r.lastIndex=r.global?n.index+n[0].length:e),Eo&&n&&n.length>1&&To.call(n[0],i,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(n[o]=void 0)})),n});var Ro=Io;Rt({target:"RegExp",proto:!0,forced:/./.exec!==Ro},{exec:Ro});var jo="toString",No=RegExp.prototype,_o=No.toString,Fo=r((function(){return"/a/b"!=_o.call({source:"a",flags:"b"})})),Vo=_o.name!=jo;(Fo||Vo)&&it(RegExp.prototype,jo,(function(){var t=T(this),e=String(t.source),i=t.flags;return"/"+e+"/"+String(void 0===i&&t instanceof RegExp&&!("flags"in No)?so.call(t):i)}),{unsafe:!0});var Do=function(t){if(ao(t))throw TypeError("The method doesn't accept regular expressions");return t},Bo=Qt("match"),Lo=function(t){var e=/./;try{"/./"[t](e)}catch(i){try{return e[Bo]=!1,"/./"[t](e)}catch(t){}}return!1};Rt({target:"String",proto:!0,forced:!Lo("includes")},{includes:function(t){return!!~String(g(this)).indexOf(Do(t),arguments.length>1?arguments[1]:void 0)}});var Ho=function(t){return function(e,i){var n,o,r=String(g(e)),a=lt(i),s=r.length;return a<0||a>=s?t?"":void 0:(n=r.charCodeAt(a))<55296||n>56319||a+1===s||(o=r.charCodeAt(a+1))<56320||o>57343?t?r.charAt(a):n:t?r.slice(a,a+2):o-56320+(n-55296<<10)+65536}},Mo={codeAt:Ho(!1),charAt:Ho(!0)},Uo=Mo.charAt,zo="String Iterator",qo=et.set,Wo=et.getterFor(zo);Ki(String,"String",(function(t){qo(this,{type:zo,string:String(t),index:0})}),(function(){var t,e=Wo(this),i=e.string,n=e.index;return n>=i.length?{value:void 0,done:!0}:(t=Uo(i,n),e.index+=t.length,{value:t,done:!1})}));var Go=Qt("species"),Ko=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),Yo="$0"==="a".replace(/./,"$0"),Jo=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]})),Xo=function(t,e,i,n){var o=Qt(t),a=!r((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),s=a&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[Go]=function(){return i},i.flags="",i[o]=/./[o]),i.exec=function(){return e=!0,null},i[o](""),!e}));if(!a||!s||"replace"===t&&(!Ko||!Yo)||"split"===t&&!Jo){var l=/./[o],c=i(o,""[t],(function(t,e,i,n,o){return e.exec===Ro?a&&!o?{done:!0,value:l.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:Yo}),h=c[0],u=c[1];it(String.prototype,t,h),it(RegExp.prototype,o,2==e?function(t,e){return u.call(t,this,e)}:function(t){return u.call(t,this)})}n&&$(RegExp.prototype[o],"sham",!0)},Qo=Mo.charAt,Zo=function(t,e,i){return e+(i?Qo(t,e).length:1)},tr=function(t,e){var i=t.exec;if("function"==typeof i){var n=i.call(t,e);if("object"!=typeof n)throw TypeError("RegExp exec method returned something other than an Object or null");return n}if("RegExp"!==d(t))throw TypeError("RegExp#exec called on incompatible receiver");return Ro.call(t,e)},er=Math.max,ir=Math.min,nr=Math.floor,or=/\$([$&'`]|\d\d?|<[^>]*>)/g,rr=/\$([$&'`]|\d\d?)/g;Xo("replace",2,(function(t,e,i,n){return[function(i,n){var o=g(this),r=null==i?void 0:i[t];return void 0!==r?r.call(i,o,n):e.call(String(o),i,n)},function(t,r){if(n.REPLACE_KEEPS_$0||"string"==typeof r&&-1===r.indexOf("$0")){var a=i(e,t,this,r);if(a.done)return a.value}var s=T(t),l=String(this),c="function"==typeof r;c||(r=String(r));var h=s.global;if(h){var u=s.unicode;s.lastIndex=0}for(var d=[];;){var p=tr(s,l);if(null===p)break;if(d.push(p),!h)break;""===String(p[0])&&(s.lastIndex=Zo(l,ht(s.lastIndex),u))}for(var f,g="",v=0,b=0;b<d.length;b++){p=d[b];for(var y=String(p[0]),m=er(ir(lt(p.index),l.length),0),w=[],S=1;S<p.length;S++)w.push(void 0===(f=p[S])?f:String(f));var x=p.groups;if(c){var k=[y].concat(w,m,l);void 0!==x&&k.push(x);var O=String(r.apply(void 0,k))}else O=o(y,l,m,w,x,r);m>=v&&(g+=l.slice(v,m)+O,v=m+y.length)}return g+l.slice(v)}];function o(t,i,n,o,r,a){var s=n+t.length,l=o.length,c=rr;return void 0!==r&&(r=Ft(r),c=or),e.call(a,c,(function(e,a){var c;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(s);case"<":c=r[a.slice(1,-1)];break;default:var h=+a;if(0===h)return e;if(h>l){var u=nr(h/10);return 0===u?e:u<=l?void 0===o[u-1]?a.charAt(1):o[u-1]+a.charAt(1):e}c=o[h-1]}return void 0===c?"":c}))}}));var ar=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};Xo("search",1,(function(t,e,i){return[function(e){var i=g(this),n=null==e?void 0:e[t];return void 0!==n?n.call(e,i):new RegExp(e)[t](String(i))},function(t){var n=i(e,t,this);if(n.done)return n.value;var o=T(t),r=String(this),a=o.lastIndex;ar(a,0)||(o.lastIndex=0);var s=tr(o,r);return ar(o.lastIndex,a)||(o.lastIndex=a),null===s?-1:s.index}]}));var sr=Qt("species"),lr=[].push,cr=Math.min,hr=4294967295,ur=!r((function(){return!RegExp(hr,"y")}));Xo("split",2,(function(t,e,i){var n;return n="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,i){var n=String(g(this)),o=void 0===i?hr:i>>>0;if(0===o)return[];if(void 0===t)return[n];if(!ao(t))return e.call(n,t,o);for(var r,a,s,l=[],c=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,u=new RegExp(t.source,c+"g");(r=Ro.call(u,n))&&!((a=u.lastIndex)>h&&(l.push(n.slice(h,r.index)),r.length>1&&r.index<n.length&&lr.apply(l,r.slice(1)),s=r[0].length,h=a,l.length>=o));)u.lastIndex===r.index&&u.lastIndex++;return h===n.length?!s&&u.test("")||l.push(""):l.push(n.slice(h)),l.length>o?l.slice(0,o):l}:"0".split(void 0,0).length?function(t,i){return void 0===t&&0===i?[]:e.call(this,t,i)}:e,[function(e,i){var o=g(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o,i):n.call(String(o),e,i)},function(t,o){var r=i(n,t,this,o,n!==e);if(r.done)return r.value;var a=T(t),s=String(this),l=function(t,e){var i,n=T(t).constructor;return void 0===n||null==(i=T(n)[sr])?e:re(i)}(a,RegExp),c=a.unicode,h=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(ur?"y":"g"),u=new l(ur?a:"^(?:"+a.source+")",h),d=void 0===o?hr:o>>>0;if(0===d)return[];if(0===s.length)return null===tr(u,s)?[s]:[];for(var p=0,f=0,g=[];f<s.length;){u.lastIndex=ur?f:0;var v,b=tr(u,ur?s:s.slice(f));if(null===b||(v=cr(ht(u.lastIndex+(ur?0:f)),s.length))===p)f=Zo(s,f,c);else{if(g.push(s.slice(p,f)),g.length===d)return g;for(var y=1;y<=b.length-1;y++)if(g.push(b[y]),g.length===d)return g;f=p=v}}return g.push(s.slice(p)),g}]}),!ur);var dr=Pn.trim;Rt({target:"String",proto:!0,forced:function(t){return r((function(){return!!Sn[t]()||"​…᠎"!="​…᠎"[t]()||Sn[t].name!==t}))}("trim")},{trim:function(){return dr(this)}});var pr={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},fr=he.forEach,gr=Oi("forEach")?function(t){return fr(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var vr in pr){var br=o[vr],yr=br&&br.prototype;if(yr&&yr.forEach!==gr)try{$(yr,"forEach",gr)}catch(t){yr.forEach=gr}}var mr=Qt("iterator"),wr=Qt("toStringTag"),Sr=Qi.values;for(var xr in pr){var kr=o[xr],Or=kr&&kr.prototype;if(Or){if(Or[mr]!==Sr)try{$(Or,mr,Sr)}catch(t){Or[mr]=Sr}if(Or[wr]||$(Or,wr,xr),pr[xr])for(var Cr in Qi)if(Or[Cr]!==Qi[Cr])try{$(Or,Cr,Qi[Cr])}catch(t){Or[Cr]=Qi[Cr]}}}function Pr(t){return(Pr="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)}function Tr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ir(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function Ar(t,e,i){return e&&Ir(t.prototype,e),i&&Ir(t,i),t}function $r(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if(!(Symbol.iterator in Object(t))&&"[object Arguments]"!==Object.prototype.toString.call(t))return;var i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done)&&(i.push(a.value),!e||i.length!==e);n=!0);}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return i}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function Er(t){return function(t){if(Array.isArray(t)){for(var e=0,i=new Array(t.length);e<t.length;e++)i[e]=t[e];return i}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var Rr=4;try{var jr=t.fn.dropdown.Constructor.VERSION;void 0!==jr&&(Rr=parseInt(jr,10))}catch(t){}try{var Nr=bootstrap.Tooltip.VERSION;void 0!==Nr&&(Rr=parseInt(Nr,10))}catch(t){}var _r={3:{iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen",search:"glyphicon-search",clearSearch:"glyphicon-trash"},classes:{buttonsPrefix:"btn",buttons:"default",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"pull",inputGroup:"input-group",inputPrefix:"input-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],toolbarDropdownItem:'<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',toolbarDropdownSeparator:'<li class="divider"></li>',pageDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItem:'<li role="menuitem" class="%s"><a href="#">%s</a></li>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<span class="input-group-btn">%s</span></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},4:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},5:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}}}[Rr],Fr={height:void 0,classes:"table table-bordered table-hover",buttons:{},theadClasses:"",headerStyle:function(t){return{}},rowStyle:function(t,e){return{}},rowAttributes:function(t,e){return{}},undefinedText:"-",locale:void 0,virtualScroll:!1,virtualScrollItemHeight:void 0,sortable:!0,sortClass:void 0,silentSort:!0,sortName:void 0,sortOrder:void 0,sortReset:!1,sortStable:!1,rememberOrder:!1,serverSort:!0,customSort:void 0,columns:[[]],data:[],url:void 0,method:"get",cache:!0,contentType:"application/json",dataType:"json",ajax:void 0,ajaxOptions:{},queryParams:function(t){return t},queryParamsType:"limit",responseHandler:function(t){return t},totalField:"total",totalNotFilteredField:"totalNotFiltered",dataField:"rows",footerField:"footer",pagination:!1,paginationParts:["pageInfo","pageSize","pageList"],showExtendedPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,totalNotFiltered:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",paginationSuccessivelySize:5,paginationPagesBySide:1,paginationUseIntermediate:!1,search:!1,searchHighlight:!1,searchOnEnterKey:!1,strictSearch:!1,searchSelector:!1,visibleSearch:!1,showButtonIcons:!0,showButtonText:!1,showSearchButton:!1,showSearchClearButton:!1,trimOnSearch:!0,searchAlign:"right",searchTimeOut:500,searchText:"",customSearch:void 0,showHeader:!0,showFooter:!1,footerStyle:function(t){return{}},searchAccentNeutralise:!1,showColumns:!1,showColumnsToggleAll:!1,showColumnsSearch:!1,minimumCountColumns:1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,filterOptions:{filterAlgorithm:"and"},idField:void 0,selectItemName:"btSelectItem",clickToSelect:!1,ignoreClickToSelectOn:function(t){var e=t.tagName;return["A","BUTTON"].includes(e)},singleSelect:!1,checkboxHeader:!0,maintainMetaData:!1,multipleSelectRow:!1,uniqueId:void 0,cardView:!1,detailView:!1,detailViewIcon:!0,detailViewByClick:!1,detailViewAlign:"left",detailFormatter:function(t,e){return""},detailFilter:function(t,e){return!0},toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",buttonsOrder:["paginationSwitch","refresh","toggle","fullscreen","columns"],buttonsPrefix:_r.classes.buttonsPrefix,buttonsClass:_r.classes.buttons,icons:_r.icons,iconSize:void 0,iconsPrefix:_r.iconsPrefix,loadingFontSize:"auto",loadingTemplate:function(t){return'<span class="loading-wrap">\n      <span class="loading-text">'.concat(t,'</span>\n      <span class="animation-wrap"><span class="animation-dot"></span></span>\n      </span>\n    ')},onAll:function(t,e){return!1},onClickCell:function(t,e,i,n){return!1},onDblClickCell:function(t,e,i,n){return!1},onClickRow:function(t,e){return!1},onDblClickRow:function(t,e){return!1},onSort:function(t,e){return!1},onCheck:function(t){return!1},onUncheck:function(t){return!1},onCheckAll:function(t){return!1},onUncheckAll:function(t){return!1},onCheckSome:function(t){return!1},onUncheckSome:function(t){return!1},onLoadSuccess:function(t){return!1},onLoadError:function(t){return!1},onColumnSwitch:function(t,e){return!1},onPageChange:function(t,e){return!1},onSearch:function(t){return!1},onToggle:function(t){return!1},onPreBody:function(t){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onPostFooter:function(){return!1},onExpandRow:function(t,e,i){return!1},onCollapseRow:function(t,e){return!1},onRefreshOptions:function(t){return!1},onRefresh:function(t){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},Vr={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,e,i,n){return void 0!==n&&n>0&&n>i?"Showing ".concat(t," to ").concat(e," of ").concat(i," rows (filtered from ").concat(n," total rows)"):"Showing ".concat(t," to ").concat(e," of ").concat(i," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatSearch:function(){return"Search"},formatClearSearch:function(){return"Clear Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"}},Dr={field:void 0,title:void 0,titleTooltip:void 0,class:void 0,width:void 0,widthUnit:"px",rowspan:void 0,colspan:void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,cellStyle:void 0,radio:!1,checkbox:!1,checkboxEnabled:!0,clickToSelect:!0,showSelectTitle:!1,sortable:!1,sortName:void 0,order:"asc",sorter:void 0,visible:!0,switchable:!0,cardVisible:!0,searchable:!0,formatter:void 0,footerFormatter:void 0,detailFormatter:void 0,searchFormatter:!0,searchHighlightFormatter:!1,escape:!1,events:void 0};Object.assign(Fr,Vr);var Br={VERSION:"1.18.0",THEME:"bootstrap".concat(Rr),CONSTANTS:_r,DEFAULTS:Fr,COLUMN_DEFAULTS:Dr,METHODS:["getOptions","refreshOptions","getData","getSelections","load","append","prepend","remove","removeAll","insertRow","updateRow","getRowByUniqueId","updateByUniqueId","removeByUniqueId","updateCell","updateCellByUniqueId","showRow","hideRow","getHiddenRows","showColumn","hideColumn","getVisibleColumns","getHiddenColumns","showAllColumns","hideAllColumns","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","destroy","resetView","showLoading","hideLoading","togglePagination","toggleFullscreen","toggleView","resetSearch","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","toggleDetailView","expandRow","collapseRow","expandRowByUniqueId","collapseRowByUniqueId","expandAllRows","collapseAllRows","updateColumnTitle","updateFormatText"],EVENTS:{"all.bs.table":"onAll","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","post-footer.bs.table":"onPostFooter","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},LOCALES:{en:Vr,"en-US":Vr}},Lr=r((function(){Vt(1)}));Rt({target:"Object",stat:!0,forced:Lr},{keys:function(t){return Vt(Ft(t))}});var Hr,Mr=P.f,Ur="".endsWith,zr=Math.min,qr=Lo("endsWith"),Wr=!(qr||(Hr=Mr(String.prototype,"endsWith"),!Hr||Hr.writable));Rt({target:"String",proto:!0,forced:!Wr&&!qr},{endsWith:function(t){var e=String(g(this));Do(t);var i=arguments.length>1?arguments[1]:void 0,n=ht(e.length),o=void 0===i?n:zr(ht(i),n),r=String(t);return Ur?Ur.call(e,r,o):e.slice(o-r.length,o)===r}});var Gr=P.f,Kr="".startsWith,Yr=Math.min,Jr=Lo("startsWith"),Xr=!Jr&&!!function(){var t=Gr(String.prototype,"startsWith");return t&&!t.writable}();Rt({target:"String",proto:!0,forced:!Xr&&!Jr},{startsWith:function(t){var e=String(g(this));Do(t);var i=ht(Yr(arguments.length>1?arguments[1]:void 0,e.length)),n=String(t);return Kr?Kr.call(e,n,i):e.slice(i,i+n.length)===n}});var Qr={getSearchInput:function(e){return"string"==typeof e.options.searchSelector?t(e.options.searchSelector):e.$toolbar.find(".search input")},sprintf:function(t){for(var e=arguments.length,i=new Array(e>1?e-1:0),n=1;n<e;n++)i[n-1]=arguments[n];var o=!0,r=0,a=t.replace(/%s/g,(function(){var t=i[r++];return void 0===t?(o=!1,""):t}));return o?a:""},isObject:function(t){return t instanceof Object&&!Array.isArray(t)},isEmptyObject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return 0===Object.entries(t).length&&t.constructor===Object},isNumeric:function(t){return!isNaN(parseFloat(t))&&isFinite(t)},getFieldTitle:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(s.field===e)return s.title}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return""},setFieldIndex:function(t){var e=0,i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[0][Symbol.iterator]();!(n=(a=s.next()).done);n=!0){e+=a.value.colspan||1}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}for(var l=0;l<t.length;l++){i[l]=[];for(var c=0;c<e;c++)i[l][c]=!1}for(var h=0;h<t.length;h++){var u=!0,d=!1,p=void 0;try{for(var f,g=t[h][Symbol.iterator]();!(u=(f=g.next()).done);u=!0){var v=f.value,b=v.rowspan||1,y=v.colspan||1,m=i[h].indexOf(!1);v.colspanIndex=m,1===y?(v.fieldIndex=m,void 0===v.field&&(v.field=m)):v.colspanGroup=v.colspan;for(var w=0;w<b;w++)for(var S=0;S<y;S++)i[h+w][m+S]=!0}}catch(t){d=!0,p=t}finally{try{u||null==g.return||g.return()}finally{if(d)throw p}}}},normalizeAccent:function(t){return"string"!=typeof t?t:t.normalize("NFD").replace(/[\u0300-\u036f]/g,"")},updateFieldGroup:function(t){var e,i=(e=[]).concat.apply(e,Er(t)),n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value,c=!0,h=!1,u=void 0;try{for(var d,p=l[Symbol.iterator]();!(c=(d=p.next()).done);c=!0){var f=d.value;if(f.colspanGroup>1){for(var g=0,v=function(t){i.find((function(e){return e.fieldIndex===t})).visible&&g++},b=f.colspanIndex;b<f.colspanIndex+f.colspanGroup;b++)v(b);f.colspan=g,f.visible=g>0}}}catch(t){h=!0,u=t}finally{try{c||null==p.return||p.return()}finally{if(h)throw u}}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}},getScrollBarWidth:function(){if(void 0===this.cachedWidth){var e=t("<div/>").addClass("fixed-table-scroll-inner"),i=t("<div/>").addClass("fixed-table-scroll-outer");i.append(e),t("body").append(i);var n=e[0].offsetWidth;i.css("overflow","scroll");var o=e[0].offsetWidth;n===o&&(o=i[0].clientWidth),i.remove(),this.cachedWidth=n-o}return this.cachedWidth},calculateObjectValue:function(t,e){var i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],n=arguments.length>3?arguments[3]:void 0,o=e;if("string"==typeof e){var r=e.split(".");if(r.length>1){o=window;var a=!0,s=!1,l=void 0;try{for(var c,h=r[Symbol.iterator]();!(a=(c=h.next()).done);a=!0){var u=c.value;o=o[u]}}catch(t){s=!0,l=t}finally{try{a||null==h.return||h.return()}finally{if(s)throw l}}}else o=window[e]}return null!==o&&"object"===Pr(o)?o:"function"==typeof o?o.apply(t,i||[]):!o&&"string"==typeof e&&this.sprintf.apply(this,[e].concat(Er(i)))?this.sprintf.apply(this,[e].concat(Er(i))):n},compareObjects:function(t,e,i){var n=Object.keys(t),o=Object.keys(e);if(i&&n.length!==o.length)return!1;for(var r=0,a=n;r<a.length;r++){var s=a[r];if(o.includes(s)&&t[s]!==e[s])return!1}return!0},escapeHTML:function(t){return"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):t},unescapeHTML:function(t){return"string"==typeof t?t.replace(/&amp;/g,"&").replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&#039;/g,"'").replace(/&#x60;/g,"`"):t},getRealDataAttr:function(t){for(var e=0,i=Object.entries(t);e<i.length;e++){var n=$r(i[e],2),o=n[0],r=n[1],a=o.split(/(?=[A-Z])/).join("-").toLowerCase();a!==o&&(t[a]=r,delete t[o])}return t},getItemField:function(t,e,i){var n=t;if("string"!=typeof e||t.hasOwnProperty(e))return i?this.escapeHTML(t[e]):t[e];var o=e.split("."),r=!0,a=!1,s=void 0;try{for(var l,c=o[Symbol.iterator]();!(r=(l=c.next()).done);r=!0){var h=l.value;n=n&&n[h]}}catch(t){a=!0,s=t}finally{try{r||null==c.return||c.return()}finally{if(a)throw s}}return i?this.escapeHTML(n):n},isIEBrowser:function(){return navigator.userAgent.includes("MSIE ")||/Trident.*rv:11\./.test(navigator.userAgent)},findIndex:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(JSON.stringify(s)===JSON.stringify(e))return t.indexOf(s)}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return-1},trToData:function(e,i){var n=this,o=[],r=[];return i.each((function(i,a){var s=t(a),l={};l._id=s.attr("id"),l._class=s.attr("class"),l._data=n.getRealDataAttr(s.data()),l._style=s.attr("style"),s.find(">td,>th").each((function(o,a){for(var s=t(a),c=+s.attr("colspan")||1,h=+s.attr("rowspan")||1,u=o;r[i]&&r[i][u];u++);for(var d=u;d<u+c;d++)for(var p=i;p<i+h;p++)r[p]||(r[p]=[]),r[p][d]=!0;var f=e[u].field;l[f]=s.html().trim(),l["_".concat(f,"_id")]=s.attr("id"),l["_".concat(f,"_class")]=s.attr("class"),l["_".concat(f,"_rowspan")]=s.attr("rowspan"),l["_".concat(f,"_colspan")]=s.attr("colspan"),l["_".concat(f,"_title")]=s.attr("title"),l["_".concat(f,"_data")]=n.getRealDataAttr(s.data()),l["_".concat(f,"_style")]=s.attr("style")})),o.push(l)})),o},sort:function(t,e,i,n,o,r){return null==t&&(t=""),null==e&&(e=""),n&&t===e&&(t=o,e=r),this.isNumeric(t)&&this.isNumeric(e)?(t=parseFloat(t))<(e=parseFloat(e))?-1*i:t>e?i:0:t===e?0:("string"!=typeof t&&(t=t.toString()),-1===t.localeCompare(e)?-1*i:i)},getEventName:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e=e||"".concat(+new Date).concat(~~(1e6*Math.random())),"".concat(t,"-").concat(e)},hasDetailViewIcon:function(t){return t.detailView&&t.detailViewIcon&&!t.cardView},getDetailViewIndexOffset:function(t){return this.hasDetailViewIcon(t)&&"right"!==t.detailViewAlign?1:0},checkAutoMergeCells:function(t){var e=!0,i=!1,n=void 0;try{for(var o,r=t[Symbol.iterator]();!(e=(o=r.next()).done);e=!0)for(var a=o.value,s=0,l=Object.keys(a);s<l.length;s++){var c=l[s];if(c.startsWith("_")&&(c.endsWith("_rowspan")||c.endsWith("_colspan")))return!0}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return!1},deepCopy:function(e){return void 0===e?e:t.extend(!0,Array.isArray(e)?[]:{},e)}},Zr=function(){function t(e){var i=this;Tr(this,t),this.rows=e.rows,this.scrollEl=e.scrollEl,this.contentEl=e.contentEl,this.callback=e.callback,this.itemHeight=e.itemHeight,this.cache={},this.scrollTop=this.scrollEl.scrollTop,this.initDOM(this.rows,e.fixedScroll),this.scrollEl.scrollTop=this.scrollTop,this.lastCluster=0;var n=function(){i.lastCluster!==(i.lastCluster=i.getNum())&&(i.initDOM(i.rows),i.callback())};this.scrollEl.addEventListener("scroll",n,!1),this.destroy=function(){i.contentEl.innerHtml="",i.scrollEl.removeEventListener("scroll",n,!1)}}return Ar(t,[{key:"initDOM",value:function(t,e){void 0===this.clusterHeight&&(this.cache.scrollTop=this.scrollEl.scrollTop,this.cache.data=this.contentEl.innerHTML=t[0]+t[0]+t[0],this.getRowsHeight(t));var i=this.initData(t,this.getNum(e)),n=i.rows.join(""),o=this.checkChanges("data",n),r=this.checkChanges("top",i.topOffset),a=this.checkChanges("bottom",i.bottomOffset),s=[];o&&r?(i.topOffset&&s.push(this.getExtra("top",i.topOffset)),s.push(n),i.bottomOffset&&s.push(this.getExtra("bottom",i.bottomOffset)),this.contentEl.innerHTML=s.join(""),e&&(this.contentEl.scrollTop=this.cache.scrollTop)):a&&(this.contentEl.lastChild.style.height="".concat(i.bottomOffset,"px"))}},{key:"getRowsHeight",value:function(){if(void 0===this.itemHeight){var t=this.contentEl.children,e=t[Math.floor(t.length/2)];this.itemHeight=e.offsetHeight}this.blockHeight=50*this.itemHeight,this.clusterRows=200,this.clusterHeight=4*this.blockHeight}},{key:"getNum",value:function(t){return this.scrollTop=t?this.cache.scrollTop:this.scrollEl.scrollTop,Math.floor(this.scrollTop/(this.clusterHeight-this.blockHeight))||0}},{key:"initData",value:function(t,e){if(t.length<50)return{topOffset:0,bottomOffset:0,rowsAbove:0,rows:t};var i=Math.max((this.clusterRows-50)*e,0),n=i+this.clusterRows,o=Math.max(i*this.itemHeight,0),r=Math.max((t.length-n)*this.itemHeight,0),a=[],s=i;o<1&&s++;for(var l=i;l<n;l++)t[l]&&a.push(t[l]);return{topOffset:o,bottomOffset:r,rowsAbove:s,rows:a}}},{key:"checkChanges",value:function(t,e){var i=e!==this.cache[t];return this.cache[t]=e,i}},{key:"getExtra",value:function(t,e){var i=document.createElement("tr");return i.className="virtual-scroll-".concat(t),e&&(i.style.height="".concat(e,"px")),i.outerHTML}}]),t}(),ta=function(){function e(i,n){Tr(this,e),this.options=n,this.$el=t(i),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0}return Ar(e,[{key:"init",value:function(){this.initConstants(),this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()}},{key:"initConstants",value:function(){var e=this.options;this.constants=Br.CONSTANTS,this.constants.theme=t.fn.bootstrapTable.theme;var i=e.buttonsPrefix?"".concat(e.buttonsPrefix,"-"):"";this.constants.buttonsClass=[e.buttonsPrefix,i+e.buttonsClass,Qr.sprintf("".concat(i,"%s"),e.iconSize)].join(" ").trim(),this.buttons=Qr.calculateObjectValue(this,e.buttons,[],[])}},{key:"initLocale",value:function(){if(this.options.locale){var e=t.fn.bootstrapTable.locales,i=this.options.locale.split(/-|_/);i[0]=i[0].toLowerCase(),i[1]&&(i[1]=i[1].toUpperCase()),e[this.options.locale]?t.extend(this.options,e[this.options.locale]):e[i.join("-")]?t.extend(this.options,e[i.join("-")]):e[i[0]]&&t.extend(this.options,e[i[0]])}}},{key:"initContainer",value:function(){var e=["top","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination clearfix"></div>':"",i=["bottom","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination"></div>':"",n=Qr.calculateObjectValue(this.options,this.options.loadingTemplate,[this.options.formatLoadingMessage()]);this.$container=t('\n      <div class="bootstrap-table '.concat(this.constants.theme,'">\n      <div class="fixed-table-toolbar"></div>\n      ').concat(e,'\n      <div class="fixed-table-container">\n      <div class="fixed-table-header"><table></table></div>\n      <div class="fixed-table-body">\n      <div class="fixed-table-loading">\n      ').concat(n,'\n      </div>\n      </div>\n      <div class="fixed-table-footer"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ').concat(i,"\n      </div>\n    ")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$el.find("tfoot"),this.options.buttonsToolbar?this.$toolbar=t("body").find(this.options.buttonsToolbar):this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.$tableLoading.addClass(this.options.classes),this.options.height&&(this.$tableContainer.addClass("fixed-height"),this.options.showFooter&&this.$tableContainer.addClass("has-footer"),this.options.classes.split(" ").includes("table-bordered")&&(this.$tableBody.append('<div class="fixed-table-border"></div>'),this.$tableBorder=this.$tableBody.find(".fixed-table-border"),this.$tableLoading.addClass("fixed-table-border")),this.$tableFooter=this.$container.find(".fixed-table-footer"))}},{key:"initTable",value:function(){var i=this,n=[];if(this.$header=this.$el.find(">thead"),this.$header.length?this.options.theadClasses&&this.$header.addClass(this.options.theadClasses):this.$header=t('<thead class="'.concat(this.options.theadClasses,'"></thead>')).appendTo(this.$el),this._headerTrClasses=[],this._headerTrStyles=[],this.$header.find("tr").each((function(e,o){var r=t(o),a=[];r.find("th").each((function(e,i){var n=t(i);void 0!==n.data("field")&&n.data("field","".concat(n.data("field"))),a.push(t.extend({},{title:n.html(),class:n.attr("class"),titleTooltip:n.attr("title"),rowspan:n.attr("rowspan")?+n.attr("rowspan"):void 0,colspan:n.attr("colspan")?+n.attr("colspan"):void 0},n.data()))})),n.push(a),r.attr("class")&&i._headerTrClasses.push(r.attr("class")),r.attr("style")&&i._headerTrStyles.push(r.attr("style"))})),Array.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=t.extend(!0,[],n,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],Qr.setFieldIndex(this.options.columns),this.options.columns.forEach((function(n,o){n.forEach((function(n,r){var a=t.extend({},e.COLUMN_DEFAULTS,n);void 0!==a.fieldIndex&&(i.columns[a.fieldIndex]=a,i.fieldsColumnsIndex[a.field]=a.fieldIndex),i.options.columns[o][r]=a}))})),!this.options.data.length){var o=Qr.trToData(this.columns,this.$el.find(">tbody>tr"));o.length&&(this.options.data=o,this.fromHtml=!0)}this.options.pagination&&"server"!==this.options.sidePagination||(this.footerData=Qr.trToData(this.columns,this.$el.find(">tfoot>tr"))),this.footerData&&this.$el.find("tfoot").html("<tr></tr>"),!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()}},{key:"initHeader",value:function(){var e=this,i={},n=[];this.header={fields:[],styles:[],classes:[],formatters:[],detailFormatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},Qr.updateFieldGroup(this.options.columns),this.options.columns.forEach((function(t,o){n.push("<tr".concat(Qr.sprintf(' class="%s"',e._headerTrClasses[o])," ").concat(Qr.sprintf(' style="%s"',e._headerTrStyles[o]),">"));var r="";0===o&&Qr.hasDetailViewIcon(e.options)&&(r='<th class="detail" rowspan="'.concat(e.options.columns.length,'">\n          <div class="fht-cell"></div>\n          </th>')),r&&"right"!==e.options.detailViewAlign&&n.push(r),t.forEach((function(t,r){var a=Qr.sprintf(' class="%s"',t.class),s=t.widthUnit,l=parseFloat(t.width),c=Qr.sprintf("text-align: %s; ",t.halign?t.halign:t.align),h=Qr.sprintf("text-align: %s; ",t.align),u=Qr.sprintf("vertical-align: %s; ",t.valign);if(u+=Qr.sprintf("width: %s; ",!t.checkbox&&!t.radio||l?l?l+s:void 0:t.showSelectTitle?void 0:"36px"),void 0!==t.fieldIndex||t.visible){var d=Qr.calculateObjectValue(null,e.options.headerStyle,[t]),p=[],f="";if(d&&d.css)for(var g=0,v=Object.entries(d.css);g<v.length;g++){var b=$r(v[g],2),y=b[0],m=b[1];p.push("".concat(y,": ").concat(m))}if(d&&d.classes&&(f=Qr.sprintf(' class="%s"',t.class?[t.class,d.classes].join(" "):d.classes)),void 0!==t.fieldIndex){if(e.header.fields[t.fieldIndex]=t.field,e.header.styles[t.fieldIndex]=h+u,e.header.classes[t.fieldIndex]=a,e.header.formatters[t.fieldIndex]=t.formatter,e.header.detailFormatters[t.fieldIndex]=t.detailFormatter,e.header.events[t.fieldIndex]=t.events,e.header.sorters[t.fieldIndex]=t.sorter,e.header.sortNames[t.fieldIndex]=t.sortName,e.header.cellStyles[t.fieldIndex]=t.cellStyle,e.header.searchables[t.fieldIndex]=t.searchable,!t.visible)return;if(e.options.cardView&&!t.cardVisible)return;i[t.field]=t}n.push("<th".concat(Qr.sprintf(' title="%s"',t.titleTooltip)),t.checkbox||t.radio?Qr.sprintf(' class="bs-checkbox %s"',t.class||""):f||a,Qr.sprintf(' style="%s"',c+u+p.join("; ")),Qr.sprintf(' rowspan="%s"',t.rowspan),Qr.sprintf(' colspan="%s"',t.colspan),Qr.sprintf(' data-field="%s"',t.field),0===r&&o>0?" data-not-first-th":"",">"),n.push(Qr.sprintf('<div class="th-inner %s">',e.options.sortable&&t.sortable?"sortable both":""));var w=e.options.escape?Qr.escapeHTML(t.title):t.title,S=w;t.checkbox&&(w="",!e.options.singleSelect&&e.options.checkboxHeader&&(w='<label><input name="btSelectAll" type="checkbox" /><span></span></label>'),e.header.stateField=t.field),t.radio&&(w="",e.header.stateField=t.field),!w&&t.showSelectTitle&&(w+=S),n.push(w),n.push("</div>"),n.push('<div class="fht-cell"></div>'),n.push("</div>"),n.push("</th>")}})),r&&"right"===e.options.detailViewAlign&&n.push(r),n.push("</tr>")})),this.$header.html(n.join("")),this.$header.find("th[data-field]").each((function(e,n){t(n).data(i[t(n).data("field")])})),this.$container.off("click",".th-inner").on("click",".th-inner",(function(i){var n=t(i.currentTarget);if(e.options.detailView&&!n.parent().hasClass("bs-checkbox")&&n.closest(".bootstrap-table")[0]!==e.$container[0])return!1;e.options.sortable&&n.parent().data().sortable&&e.onSort(i)})),this.$header.children().children().off("keypress").on("keypress",(function(i){e.options.sortable&&t(i.currentTarget).data().sortable&&(13===(i.keyCode||i.which)&&e.onSort(i))}));var o=Qr.getEventName("resize.bootstrap-table",this.$el.attr("id"));t(window).off(o),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),t(window).on(o,(function(){return e.resetView()}))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",(function(i){i.stopPropagation();var n=t(i.currentTarget).prop("checked");e[n?"checkAll":"uncheckAll"](),e.updateSelected()}))}},{key:"initData",value:function(t,e){"append"===e?this.options.data=this.options.data.concat(t):"prepend"===e?this.options.data=[].concat(t).concat(this.options.data):(t=t||Qr.deepCopy(this.options.data),this.options.data=Array.isArray(t)?t:t[this.options.dataField]),this.data=Er(this.options.data),this.options.sortReset&&(this.unsortedData=Er(this.data)),"server"!==this.options.sidePagination&&this.initSort()}},{key:"initSort",value:function(){var t=this,e=this.options.sortName,i="desc"===this.options.sortOrder?-1:1,n=this.header.fields.indexOf(this.options.sortName),o=0;-1!==n?(this.options.sortStable&&this.data.forEach((function(t,e){t.hasOwnProperty("_position")||(t._position=e)})),this.options.customSort?Qr.calculateObjectValue(this.options,this.options.customSort,[this.options.sortName,this.options.sortOrder,this.data]):this.data.sort((function(o,r){t.header.sortNames[n]&&(e=t.header.sortNames[n]);var a=Qr.getItemField(o,e,t.options.escape),s=Qr.getItemField(r,e,t.options.escape),l=Qr.calculateObjectValue(t.header,t.header.sorters[n],[a,s,o,r]);return void 0!==l?t.options.sortStable&&0===l?i*(o._position-r._position):i*l:Qr.sort(a,s,i,t.options.sortStable,o._position,r._position)})),void 0!==this.options.sortClass&&(clearTimeout(o),o=setTimeout((function(){t.$el.removeClass(t.options.sortClass);var e=t.$header.find('[data-field="'.concat(t.options.sortName,'"]')).index();t.$el.find("tr td:nth-child(".concat(e+1,")")).addClass(t.options.sortClass)}),250))):this.options.sortReset&&(this.data=Er(this.unsortedData))}},{key:"onSort",value:function(e){var i=e.type,n=e.currentTarget,o="keypress"===i?t(n):t(n).parent(),r=this.$header.find("th").eq(o.index());if(this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===o.data("field")){var a=this.options.sortOrder;void 0===a?this.options.sortOrder="asc":"asc"===a?this.options.sortOrder="desc":"desc"===this.options.sortOrder&&(this.options.sortOrder=this.options.sortReset?void 0:"asc"),void 0===this.options.sortOrder&&(this.options.sortName=void 0)}else this.options.sortName=o.data("field"),this.options.rememberOrder?this.options.sortOrder="asc"===o.data("order")?"desc":"asc":this.options.sortOrder=this.columns[this.fieldsColumnsIndex[o.data("field")]].sortOrder||this.columns[this.fieldsColumnsIndex[o.data("field")]].order;if(this.trigger("sort",this.options.sortName,this.options.sortOrder),o.add(r).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination&&this.options.serverSort)return this.options.pageNumber=1,void this.initServer(this.options.silentSort);this.initSort(),this.initBody()}},{key:"initToolbar",value:function(){var e,i=this,n=this.options,o=[],r=0,a=0;this.$toolbar.find(".bs-bars").children().length&&t("body").append(t(n.toolbar)),this.$toolbar.html(""),"string"!=typeof n.toolbar&&"object"!==Pr(n.toolbar)||t(Qr.sprintf('<div class="bs-bars %s-%s"></div>',this.constants.classes.pull,n.toolbarAlign)).appendTo(this.$toolbar).append(t(n.toolbar)),o=['<div class="'.concat(["columns","columns-".concat(n.buttonsAlign),this.constants.classes.buttonsGroup,"".concat(this.constants.classes.pull,"-").concat(n.buttonsAlign)].join(" "),'">')],"string"==typeof n.icons&&(n.icons=Qr.calculateObjectValue(null,n.icons)),"string"==typeof n.buttonsOrder&&(n.buttonsOrder=n.buttonsOrder.replace(/\[|\]| |'/g,"").toLowerCase().split(",")),this.buttons=Object.assign(this.buttons,{paginationSwitch:{text:n.pagination?n.formatPaginationSwitchUp():n.formatPaginationSwitchDown(),icon:n.pagination?n.icons.paginationSwitchDown:n.icons.paginationSwitchUp,render:!1,event:this.togglePagination,attributes:{"aria-label":n.formatPaginationSwitch(),title:n.formatPaginationSwitch()}},refresh:{text:n.formatRefresh(),icon:n.icons.refresh,render:!1,event:this.refresh,attributes:{"aria-label":n.formatRefresh(),title:n.formatRefresh()}},toggle:{text:n.formatToggle(),icon:n.icons.toggleOff,render:!1,event:this.toggleView,attributes:{"aria-label":n.formatToggleOn(),title:n.formatToggleOn()}},fullscreen:{text:n.formatFullscreen(),icon:n.icons.fullscreen,render:!1,event:this.toggleFullscreen,attributes:{"aria-label":n.formatFullscreen(),title:n.formatFullscreen()}},columns:{render:!1,html:function(){var t=[];if(t.push('<div class="keep-open '.concat(i.constants.classes.buttonsDropdown,'" title="').concat(n.formatColumns(),'">\n            <button class="').concat(i.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown"\n            aria-label="Columns" title="').concat(n.formatColumns(),'">\n            ').concat(n.showButtonIcons?Qr.sprintf(i.constants.html.icon,n.iconsPrefix,n.icons.columns):"","\n            ").concat(n.showButtonText?n.formatColumns():"","\n            ").concat(i.constants.html.dropdownCaret,"\n            </button>\n            ").concat(i.constants.html.toolbarDropdown[0])),n.showColumnsSearch&&(t.push(Qr.sprintf(i.constants.html.toolbarDropdownItem,Qr.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">',i.constants.classes.input,n.formatSearch()))),t.push(i.constants.html.toolbarDropdownSeparator)),n.showColumnsToggleAll){var e=i.getVisibleColumns().length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length;t.push(Qr.sprintf(i.constants.html.toolbarDropdownItem,Qr.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',e?'checked="checked"':"",n.formatColumnsToggleAll()))),t.push(i.constants.html.toolbarDropdownSeparator)}var o=0;return i.columns.forEach((function(t,e){t.visible&&o++})),i.columns.forEach((function(e,r){if(!i.isSelectionColumn(e)&&(!n.cardView||e.cardVisible)){var s=e.visible?' checked="checked"':"",l=o<=n.minimumCountColumns&&s?' disabled="disabled"':"";e.switchable&&(t.push(Qr.sprintf(i.constants.html.toolbarDropdownItem,Qr.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',e.field,r,s,l,e.title))),a++)}})),t.push(i.constants.html.toolbarDropdown[1],"</div>"),t.join("")}}});for(var s={},l=0,c=Object.entries(this.buttons);l<c.length;l++){var h=$r(c[l],2),u=h[0],d=h[1],p=void 0;if(d.hasOwnProperty("html"))p=Qr.calculateObjectValue(n,d.html);else{if(p='<button class="'.concat(this.constants.buttonsClass,'" type="button" name="').concat(u,'"'),d.hasOwnProperty("attributes"))for(var f=0,g=Object.entries(d.attributes);f<g.length;f++){var v=$r(g[f],2),b=v[0],y=v[1];p+=" ".concat(b,'="').concat(Qr.calculateObjectValue(n,y),'"')}if(p+=">",n.showButtonIcons&&d.hasOwnProperty("icon")){var m=Qr.calculateObjectValue(n,d.icon);p+=Qr.sprintf(this.constants.html.icon,n.iconsPrefix,m)+" "}n.showButtonText&&d.hasOwnProperty("text")&&(p+=Qr.calculateObjectValue(n,d.text)),p+="</button>"}s[u]=p;var w="show".concat(u.charAt(0).toUpperCase()).concat(u.substring(1)),S=n[w];!(!d.hasOwnProperty("render")||d.hasOwnProperty("render")&&d.render)||void 0!==S&&!0!==S||(n[w]=!0),n.buttonsOrder.includes(u)||n.buttonsOrder.push(u)}var x=!0,k=!1,O=void 0;try{for(var C,P=n.buttonsOrder[Symbol.iterator]();!(x=(C=P.next()).done);x=!0){var T=C.value;n["show".concat(T.charAt(0).toUpperCase()).concat(T.substring(1))]&&o.push(s[T])}}catch(t){k=!0,O=t}finally{try{x||null==P.return||P.return()}finally{if(k)throw O}}o.push("</div>"),(this.showToolbar||o.length>2)&&this.$toolbar.append(o.join(""));for(var I=0,A=Object.entries(this.buttons);I<A.length;I++){var $=$r(A[I],2),E=$[0],R=$[1];if(R.hasOwnProperty("event")){if("function"==typeof R.event||"string"==typeof R.event)if("continue"===function(){var t="string"==typeof R.event?window[R.event]:R.event;return i.$toolbar.find('button[name="'.concat(E,'"]')).off("click").on("click",(function(){return t.call(i)})),"continue"}())continue;for(var j=function(){var t=$r(_[N],2),e=t[0],n=t[1],o="string"==typeof n?window[n]:n;i.$toolbar.find('button[name="'.concat(E,'"]')).off(e).on(e,(function(){return o.call(i)}))},N=0,_=Object.entries(R.event);N<_.length;N++)j()}}if(n.showColumns){var F=(e=this.$toolbar.find(".keep-open")).find('input[type="checkbox"]:not(".toggle-all")'),V=e.find('input[type="checkbox"].toggle-all');if(a<=n.minimumCountColumns&&e.find("input").prop("disabled",!0),e.find("li, label").off("click").on("click",(function(t){t.stopImmediatePropagation()})),F.off("click").on("click",(function(e){var n=e.currentTarget,o=t(n);i._toggleColumn(o.val(),o.prop("checked"),!1),i.trigger("column-switch",o.data("field"),o.prop("checked")),V.prop("checked",F.filter(":checked").length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length)})),V.off("click").on("click",(function(e){var n=e.currentTarget;i._toggleAllColumns(t(n).prop("checked"))})),n.showColumnsSearch){var D=e.find('[name="columnsSearch"]'),B=e.find(".dropdown-item-marker");D.on("keyup paste change",(function(e){var i=e.currentTarget,n=t(i).val().toLowerCase();B.show(),F.each((function(e,i){var o=t(i).parents(".dropdown-item-marker");o.text().toLowerCase().includes(n)||o.hide()}))}))}}var L=function(t){var e="keyup drop blur mouseup";t.off(e).on(e,(function(t){n.searchOnEnterKey&&13!==t.keyCode||[37,38,39,40].includes(t.keyCode)||(clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:t.currentTarget})}),n.searchTimeOut))}))};if((n.search||this.showSearchClearButton)&&"string"!=typeof n.searchSelector){o=[];var H=Qr.sprintf(this.constants.html.searchButton,this.constants.buttonsClass,n.formatSearch(),n.showButtonIcons?Qr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.search):"",n.showButtonText?n.formatSearch():""),M=Qr.sprintf(this.constants.html.searchClearButton,this.constants.buttonsClass,n.formatClearSearch(),n.showButtonIcons?Qr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.clearSearch):"",n.showButtonText?n.formatClearSearch():""),U='<input class="'.concat(this.constants.classes.input,"\n        ").concat(Qr.sprintf(" %s%s",this.constants.classes.inputPrefix,n.iconSize),'\n        search-input" type="search" placeholder="').concat(n.formatSearch(),'" autocomplete="off">'),z=U;if(n.showSearchButton||n.showSearchClearButton){var q=(n.showSearchButton?H:"")+(n.showSearchClearButton?M:"");z=n.search?Qr.sprintf(this.constants.html.inputGroup,U,q):q}o.push(Qr.sprintf('\n        <div class="'.concat(this.constants.classes.pull,"-").concat(n.searchAlign," search ").concat(this.constants.classes.inputGroup,'">\n          %s\n        </div>\n      '),z)),this.$toolbar.append(o.join(""));var W=Qr.getSearchInput(this);n.showSearchButton?(this.$toolbar.find(".search button[name=search]").off("click").on("click",(function(t){clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:W})}),n.searchTimeOut)})),n.searchOnEnterKey&&L(W)):L(W),n.showSearchClearButton&&this.$toolbar.find(".search button[name=clearSearch]").click((function(){i.resetSearch()}))}else if("string"==typeof n.searchSelector){L(Qr.getSearchInput(this))}}},{key:"onSearch",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=e.currentTarget,n=e.firedByInitSearchText,o=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(void 0!==i&&t(i).length&&o){var r=t(i).val().trim();if(this.options.trimOnSearch&&t(i).val()!==r&&t(i).val(r),this.searchText===r)return;(i===Qr.getSearchInput(this)[0]||t(i).hasClass("search-input"))&&(this.searchText=r,this.options.searchText=r)}n||(this.options.pageNumber=1),this.initSearch(),n?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",this.searchText)}},{key:"initSearch",value:function(){var t=this;if(this.filterOptions=this.filterOptions||this.options.filterOptions,"server"!==this.options.sidePagination){if(this.options.customSearch)return this.data=Qr.calculateObjectValue(this.options,this.options.customSearch,[this.options.data,this.searchText,this.filterColumns]),void(this.options.sortReset&&(this.unsortedData=Er(this.data)));var e=this.searchText&&(this.fromHtml?Qr.escapeHTML(this.searchText):this.searchText).toLowerCase(),i=Qr.isEmptyObject(this.filterColumns)?null:this.filterColumns;"function"==typeof this.filterOptions.filterAlgorithm?this.data=this.options.data.filter((function(e,n){return t.filterOptions.filterAlgorithm.apply(null,[e,i])})):"string"==typeof this.filterOptions.filterAlgorithm&&(this.data=i?this.options.data.filter((function(e,n){var o=t.filterOptions.filterAlgorithm;if("and"===o){for(var r in i)if(Array.isArray(i[r])&&!i[r].includes(e[r])||!Array.isArray(i[r])&&e[r]!==i[r])return!1}else if("or"===o){var a=!1;for(var s in i)(Array.isArray(i[s])&&i[s].includes(e[s])||!Array.isArray(i[s])&&e[s]===i[s])&&(a=!0);return a}return!0})):Er(this.options.data));var n=this.getVisibleFields();this.data=e?this.data.filter((function(i,o){for(var r=0;r<t.header.fields.length;r++)if(t.header.searchables[r]&&(!t.options.visibleSearch||-1!==n.indexOf(t.header.fields[r]))){var a=Qr.isNumeric(t.header.fields[r])?parseInt(t.header.fields[r],10):t.header.fields[r],s=t.columns[t.fieldsColumnsIndex[a]],l=void 0;if("string"==typeof a){l=i;for(var c=a.split("."),h=0;h<c.length;h++)null!==l[c[h]]&&(l=l[c[h]])}else l=i[a];if(t.options.searchAccentNeutralise&&(l=Qr.normalizeAccent(l)),s&&s.searchFormatter&&(l=Qr.calculateObjectValue(s,t.header.formatters[r],[l,i,o,s.field],l)),"string"==typeof l||"number"==typeof l)if(t.options.strictSearch){if("".concat(l).toLowerCase()===e)return!0}else{var u=/(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm.exec(e),d=!1;if(u){var p=u[1]||"".concat(u[5],"l"),f=u[2]||u[3],g=parseInt(l,10),v=parseInt(f,10);switch(p){case">":case"<l":d=g>v;break;case"<":case">l":d=g<v;break;case"<=":case"=<":case">=l":case"=>l":d=g<=v;break;case">=":case"=>":case"<=l":case"=<l":d=g>=v}}if(d||"".concat(l).toLowerCase().includes(e))return!0}}return!1})):this.data,this.options.sortReset&&(this.unsortedData=Er(this.data)),this.initSort()}}},{key:"initPagination",value:function(){var t=this,e=this.options;if(e.pagination){this.$pagination.show();var i,n,o,r,a,s,l,c=[],h=!1,u=this.getData({includeHiddenRows:!1}),d=e.pageList;if("string"==typeof d&&(d=d.replace(/\[|\]| /g,"").toLowerCase().split(",")),d=d.map((function(t){return"string"==typeof t?t.toLowerCase()===e.formatAllRows().toLowerCase()||["all","unlimited"].includes(t.toLowerCase())?e.formatAllRows():+t:t})),this.paginationParts=e.paginationParts,"string"==typeof this.paginationParts&&(this.paginationParts=this.paginationParts.replace(/\[|\]| |'/g,"").split(",")),"server"!==e.sidePagination&&(e.totalRows=u.length),this.totalPages=0,e.totalRows&&(e.pageSize===e.formatAllRows()&&(e.pageSize=e.totalRows,h=!0),this.totalPages=1+~~((e.totalRows-1)/e.pageSize),e.totalPages=this.totalPages),this.totalPages>0&&e.pageNumber>this.totalPages&&(e.pageNumber=this.totalPages),this.pageFrom=(e.pageNumber-1)*e.pageSize+1,this.pageTo=e.pageNumber*e.pageSize,this.pageTo>e.totalRows&&(this.pageTo=e.totalRows),this.options.pagination&&"server"!==this.options.sidePagination&&(this.options.totalNotFiltered=this.options.data.length),this.options.showExtendedPagination||(this.options.totalNotFiltered=void 0),(this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationDetailHAlign,' pagination-detail">')),this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")){var p=this.paginationParts.includes("pageInfoShort")?e.formatDetailPagination(e.totalRows):e.formatShowingRows(this.pageFrom,this.pageTo,e.totalRows,e.totalNotFiltered);c.push('<span class="pagination-info">\n      '.concat(p,"\n      </span>"))}if(this.paginationParts.includes("pageSize")){c.push('<span class="page-list">');var f=['<span class="'.concat(this.constants.classes.paginationDropdown,'">\n        <button class="').concat(this.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown">\n        <span class="page-size">\n        ').concat(h?e.formatAllRows():e.pageSize,"\n        </span>\n        ").concat(this.constants.html.dropdownCaret,"\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];d.forEach((function(i,n){var o;(!e.smartDisplay||0===n||d[n-1]<e.totalRows)&&(o=h?i===e.formatAllRows()?t.constants.classes.dropdownActive:"":i===e.pageSize?t.constants.classes.dropdownActive:"",f.push(Qr.sprintf(t.constants.html.pageDropdownItem,o,i)))})),f.push("".concat(this.constants.html.pageDropdown[1],"</span>")),c.push(e.formatRecordsPerPage(f.join("")))}if((this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push("</span></div>"),this.paginationParts.includes("pageList")){c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationHAlign,' pagination">'),Qr.sprintf(this.constants.html.pagination[0],Qr.sprintf(" pagination-%s",e.iconSize)),Qr.sprintf(this.constants.html.paginationItem," page-pre",e.formatSRPaginationPreText(),e.paginationPreText)),this.totalPages<e.paginationSuccessivelySize?(n=1,o=this.totalPages):o=(n=e.pageNumber-e.paginationPagesBySide)+2*e.paginationPagesBySide,e.pageNumber<e.paginationSuccessivelySize-1&&(o=e.paginationSuccessivelySize),e.paginationSuccessivelySize>this.totalPages-n&&(n=n-(e.paginationSuccessivelySize-(this.totalPages-n))+1),n<1&&(n=1),o>this.totalPages&&(o=this.totalPages);var g=Math.round(e.paginationPagesBySide/2),v=function(i){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return Qr.sprintf(t.constants.html.paginationItem,n+(i===e.pageNumber?" ".concat(t.constants.classes.paginationActive):""),e.formatSRPaginationPageText(i),i)};if(n>1){var b=e.paginationPagesBySide;for(b>=n&&(b=n-1),i=1;i<=b;i++)c.push(v(i));n-1===b+1?(i=n-1,c.push(v(i))):n-1>b&&(n-2*e.paginationPagesBySide>e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((n-g)/2+g),c.push(v(i," page-intermediate"))):c.push(Qr.sprintf(this.constants.html.paginationItem," page-first-separator disabled","","...")))}for(i=n;i<=o;i++)c.push(v(i));if(this.totalPages>o){var y=this.totalPages-(e.paginationPagesBySide-1);for(o>=y&&(y=o+1),o+1===y-1?(i=o+1,c.push(v(i))):y>o+1&&(this.totalPages-o>2*e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((this.totalPages-g-o)/2+o),c.push(v(i," page-intermediate"))):c.push(Qr.sprintf(this.constants.html.paginationItem," page-last-separator disabled","","..."))),i=y;i<=this.totalPages;i++)c.push(v(i))}c.push(Qr.sprintf(this.constants.html.paginationItem," page-next",e.formatSRPaginationNextText(),e.paginationNextText)),c.push(this.constants.html.pagination[1],"</div>")}this.$pagination.html(c.join(""));var m=["bottom","both"].includes(e.paginationVAlign)?" ".concat(this.constants.classes.dropup):"";this.$pagination.last().find(".page-list > span").addClass(m),e.onlyInfoPagination||(r=this.$pagination.find(".page-list a"),a=this.$pagination.find(".page-pre"),s=this.$pagination.find(".page-next"),l=this.$pagination.find(".page-item").not(".page-next, .page-pre, .page-last-separator, .page-first-separator"),this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),e.smartDisplay&&(d.length<2||e.totalRows<=d[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"](),e.paginationLoop||(1===e.pageNumber&&a.addClass("disabled"),e.pageNumber===this.totalPages&&s.addClass("disabled")),h&&(e.pageSize=e.formatAllRows()),r.off("click").on("click",(function(e){return t.onPageListChange(e)})),a.off("click").on("click",(function(e){return t.onPagePre(e)})),s.off("click").on("click",(function(e){return t.onPageNext(e)})),l.off("click").on("click",(function(e){return t.onPageNumber(e)})))}else this.$pagination.hide()}},{key:"updatePagination",value:function(e){e&&t(e.currentTarget).hasClass("disabled")||(this.options.maintainMetaData||this.resetRows(),this.initPagination(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize),"server"===this.options.sidePagination?this.initServer():this.initBody())}},{key:"onPageListChange",value:function(e){e.preventDefault();var i=t(e.currentTarget);return i.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive),this.options.pageSize=i.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+i.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(e),!1}},{key:"onPagePre",value:function(t){return t.preventDefault(),this.options.pageNumber-1==0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(t),!1}},{key:"onPageNext",value:function(t){return t.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(t),!1}},{key:"onPageNumber",value:function(e){if(e.preventDefault(),this.options.pageNumber!==+t(e.currentTarget).text())return this.options.pageNumber=+t(e.currentTarget).text(),this.updatePagination(e),!1}},{key:"initRow",value:function(t,e,i,n){var o=this,r=[],a={},s=[],l="",c={},h=[];if(!(Qr.findIndex(this.hiddenRows,t)>-1)){if((a=Qr.calculateObjectValue(this.options,this.options.rowStyle,[t,e],a))&&a.css)for(var u=0,d=Object.entries(a.css);u<d.length;u++){var p=$r(d[u],2),f=p[0],g=p[1];s.push("".concat(f,": ").concat(g))}if(c=Qr.calculateObjectValue(this.options,this.options.rowAttributes,[t,e],c))for(var v=0,b=Object.entries(c);v<b.length;v++){var y=$r(b[v],2),m=y[0],w=y[1];h.push("".concat(m,'="').concat(Qr.escapeHTML(w),'"'))}if(t._data&&!Qr.isEmptyObject(t._data))for(var S=0,x=Object.entries(t._data);S<x.length;S++){var k=$r(x[S],2),O=k[0],C=k[1];if("index"===O)return;l+=" data-".concat(O,"='").concat("object"===Pr(C)?JSON.stringify(C):C,"'")}r.push("<tr",Qr.sprintf(" %s",h.length?h.join(" "):void 0),Qr.sprintf(' id="%s"',Array.isArray(t)?void 0:t._id),Qr.sprintf(' class="%s"',a.classes||(Array.isArray(t)?void 0:t._class)),Qr.sprintf(' style="%s"',Array.isArray(t)?void 0:t._style),' data-index="'.concat(e,'"'),Qr.sprintf(' data-uniqueid="%s"',Qr.getItemField(t,this.options.uniqueId,!1)),Qr.sprintf(' data-has-detail-view="%s"',this.options.detailView&&Qr.calculateObjectValue(null,this.options.detailFilter,[e,t])?"true":void 0),Qr.sprintf("%s",l),">"),this.options.cardView&&r.push('<td colspan="'.concat(this.header.fields.length,'"><div class="card-views">'));var P="";return Qr.hasDetailViewIcon(this.options)&&(P="<td>",Qr.calculateObjectValue(null,this.options.detailFilter,[e,t])&&(P+='\n          <a class="detail-icon" href="#">\n          '.concat(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen),"\n          </a>\n        ")),P+="</td>"),P&&"right"!==this.options.detailViewAlign&&r.push(P),this.header.fields.forEach((function(i,n){var a="",l=Qr.getItemField(t,i,o.options.escape),c="",h="",u={},d="",p=o.header.classes[n],f="",g="",v="",b="",y="",m="",w=o.columns[n];if((!o.fromHtml&&!o.autoMergeCells||void 0!==l||w.checkbox||w.radio)&&w.visible&&(!o.options.cardView||w.cardVisible)){if(w.escape&&(l=Qr.escapeHTML(l)),s.concat([o.header.styles[n]]).length&&(g+="".concat(s.concat([o.header.styles[n]]).join("; "))),t["_".concat(i,"_style")]&&(g+="".concat(t["_".concat(i,"_style")])),g&&(f=' style="'.concat(g,'"')),t["_".concat(i,"_id")]&&(d=Qr.sprintf(' id="%s"',t["_".concat(i,"_id")])),t["_".concat(i,"_class")]&&(p=Qr.sprintf(' class="%s"',t["_".concat(i,"_class")])),t["_".concat(i,"_rowspan")]&&(b=Qr.sprintf(' rowspan="%s"',t["_".concat(i,"_rowspan")])),t["_".concat(i,"_colspan")]&&(y=Qr.sprintf(' colspan="%s"',t["_".concat(i,"_colspan")])),t["_".concat(i,"_title")]&&(m=Qr.sprintf(' title="%s"',t["_".concat(i,"_title")])),(u=Qr.calculateObjectValue(o.header,o.header.cellStyles[n],[l,t,e,i],u)).classes&&(p=' class="'.concat(u.classes,'"')),u.css){for(var S=[],x=0,k=Object.entries(u.css);x<k.length;x++){var O=$r(k[x],2),C=O[0],P=O[1];S.push("".concat(C,": ").concat(P))}f=' style="'.concat(S.concat(o.header.styles[n]).join("; "),'"')}if(c=Qr.calculateObjectValue(w,o.header.formatters[n],[l,t,e,i],l),""!==o.searchText&&o.options.searchHighlight&&(c=Qr.calculateObjectValue(w,w.searchHighlightFormatter,[c,o.searchText],c.replace(new RegExp("("+o.searchText+")","gim"),"<mark>$1</mark>"))),t["_".concat(i,"_data")]&&!Qr.isEmptyObject(t["_".concat(i,"_data")]))for(var T=0,I=Object.entries(t["_".concat(i,"_data")]);T<I.length;T++){var A=$r(I[T],2),$=A[0],E=A[1];if("index"===$)return;v+=" data-".concat($,'="').concat(E,'"')}if(w.checkbox||w.radio){h=w.checkbox?"checkbox":h,h=w.radio?"radio":h;var R=w.class||"",j=Qr.isObject(c)&&c.hasOwnProperty("checked")?c.checked:(!0===c||l)&&!1!==c,N=!w.checkboxEnabled||c&&c.disabled;a=[o.options.cardView?'<div class="card-view '.concat(R,'">'):'<td class="bs-checkbox '.concat(R,'"').concat(p).concat(f,">"),'<label>\n            <input\n            data-index="'.concat(e,'"\n            name="').concat(o.options.selectItemName,'"\n            type="').concat(h,'"\n            ').concat(Qr.sprintf('value="%s"',t[o.options.idField]),"\n            ").concat(Qr.sprintf('checked="%s"',j?"checked":void 0),"\n            ").concat(Qr.sprintf('disabled="%s"',N?"disabled":void 0)," />\n            <span></span>\n            </label>"),o.header.formatters[n]&&"string"==typeof c?c:"",o.options.cardView?"</div>":"</td>"].join(""),t[o.header.stateField]=!0===c||!!l||c&&c.checked}else if(c=null==c?o.options.undefinedText:c,o.options.cardView){var _=o.options.showHeader?'<span class="card-view-title"'.concat(f,">").concat(Qr.getFieldTitle(o.columns,i),"</span>"):"";a='<div class="card-view">'.concat(_,'<span class="card-view-value">').concat(c,"</span></div>"),o.options.smartDisplay&&""===c&&(a='<div class="card-view"></div>')}else a="<td".concat(d).concat(p).concat(f).concat(v).concat(b).concat(y).concat(m,">").concat(c,"</td>");r.push(a)}})),P&&"right"===this.options.detailViewAlign&&r.push(P),this.options.cardView&&r.push("</div></td>"),r.push("</tr>"),r.join("")}}},{key:"initBody",value:function(e){var i=this,n=this.getData();this.trigger("pre-body",n),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=t("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=n.length);var o=[],r=t(document.createDocumentFragment()),a=!1;this.autoMergeCells=Qr.checkAutoMergeCells(n.slice(this.pageFrom-1,this.pageTo));for(var s=this.pageFrom-1;s<this.pageTo;s++){var l=n[s],c=this.initRow(l,s,n,r);a=a||!!c,c&&"string"==typeof c&&(this.options.virtualScroll?o.push(c):r.append(c))}a?this.options.virtualScroll?(this.virtualScroll&&this.virtualScroll.destroy(),this.virtualScroll=new Zr({rows:o,fixedScroll:e,scrollEl:this.$tableBody[0],contentEl:this.$body[0],itemHeight:this.options.virtualScrollItemHeight,callback:function(){i.fitHeader(),i.initBodyEvent()}})):this.$body.html(r):this.$body.html('<tr class="no-records-found">'.concat(Qr.sprintf('<td colspan="%s">%s</td>',this.getVisibleFields().length+Qr.getDetailViewIndexOffset(this.options),this.options.formatNoMatches()),"</tr>")),e||this.scrollTo(0),this.initBodyEvent(),this.updateSelected(),this.initFooter(),this.resetView(),"server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.trigger("post-body",n)}},{key:"initBodyEvent",value:function(){var e=this;this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",(function(i){var n=t(i.currentTarget),o=n.parent(),r=t(i.target).parents(".card-views").children(),a=t(i.target).parents(".card-view"),s=o.data("index"),l=e.data[s],c=e.options.cardView?r.index(a):n[0].cellIndex,h=e.getVisibleFields()[c-Qr.getDetailViewIndexOffset(e.options)],u=e.columns[e.fieldsColumnsIndex[h]],d=Qr.getItemField(l,h,e.options.escape);if(!n.find(".detail-icon").length){if(e.trigger("click"===i.type?"click-cell":"dbl-click-cell",h,d,l,n),e.trigger("click"===i.type?"click-row":"dbl-click-row",l,o,h),"click"===i.type&&e.options.clickToSelect&&u.clickToSelect&&!Qr.calculateObjectValue(e.options,e.options.ignoreClickToSelectOn,[i.target])){var p=o.find(Qr.sprintf('[name="%s"]',e.options.selectItemName));p.length&&p[0].click()}"click"===i.type&&e.options.detailViewByClick&&e.toggleDetailView(s,e.header.detailFormatters[e.fieldsColumnsIndex[h]])}})).off("mousedown").on("mousedown",(function(t){e.multipleSelectRowCtrlKey=t.ctrlKey||t.metaKey,e.multipleSelectRowShiftKey=t.shiftKey})),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",(function(i){return i.preventDefault(),e.toggleDetailView(t(i.currentTarget).parent().parent().data("index")),!1})),this.$selectItem=this.$body.find(Qr.sprintf('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",(function(i){i.stopImmediatePropagation();var n=t(i.currentTarget);e._toggleCheck(n.prop("checked"),n.data("index"))})),this.header.events.forEach((function(i,n){var o=i;if(o){"string"==typeof o&&(o=Qr.calculateObjectValue(null,o));var r=e.header.fields[n],a=e.getVisibleFields().indexOf(r);if(-1!==a){a+=Qr.getDetailViewIndexOffset(e.options);var s=function(i){if(!o.hasOwnProperty(i))return"continue";var n=o[i];e.$body.find(">tr:not(.no-records-found)").each((function(o,s){var l=t(s),c=l.find(e.options.cardView?".card-views>.card-view":">td").eq(a),h=i.indexOf(" "),u=i.substring(0,h),d=i.substring(h+1);c.find(d).off(u).on(u,(function(t){var i=l.data("index"),o=e.data[i],a=o[r];n.apply(e,[t,a,o,i])}))}))};for(var l in o)s(l)}}}))}},{key:"initServer",value:function(e,i,n){var o=this,r={},a=this.header.fields.indexOf(this.options.sortName),s={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};if(this.header.sortNames[a]&&(s.sortName=this.header.sortNames[a]),this.options.pagination&&"server"===this.options.sidePagination&&(s.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,s.pageNumber=this.options.pageNumber),n||this.options.url||this.options.ajax){if("limit"===this.options.queryParamsType&&(s={search:s.searchText,sort:s.sortName,order:s.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(s.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),s.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===s.limit&&delete s.limit)),this.options.search&&"server"===this.options.sidePagination&&this.columns.filter((function(t){return!t.searchable})).length){s.searchable=[];var l=!0,c=!1,h=void 0;try{for(var u,d=this.columns[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var p=u.value;!p.checkbox&&p.searchable&&(this.options.visibleSearch&&p.visible||!this.options.visibleSearch)&&s.searchable.push(p.field)}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}}if(Qr.isEmptyObject(this.filterColumnsPartial)||(s.filter=JSON.stringify(this.filterColumnsPartial,null)),t.extend(s,i||{}),!1!==(r=Qr.calculateObjectValue(this.options,this.options.queryParams,[s],r))){e||this.showLoading();var f=t.extend({},Qr.calculateObjectValue(null,this.options.ajaxOptions),{type:this.options.method,url:n||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(r):r,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(t,i,n){var r=Qr.calculateObjectValue(o.options,o.options.responseHandler,[t,n],t);o.load(r),o.trigger("load-success",r,n&&n.status,n),e||o.hideLoading(),"server"===o.options.sidePagination&&r[o.options.totalField]>0&&!r[o.options.dataField].length&&o.updatePagination()},error:function(t){var i=[];"server"===o.options.sidePagination&&((i={})[o.options.totalField]=0,i[o.options.dataField]=[]),o.load(i),o.trigger("load-error",t&&t.status,t),e||o.$tableLoading.hide()}});return this.options.ajax?Qr.calculateObjectValue(this,this.options.ajax,[f],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=t.ajax(f)),r}}}},{key:"initSearchText",value:function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var t=Qr.getSearchInput(this);t.val(this.options.searchText),this.onSearch({currentTarget:t,firedByInitSearchText:!0})}}},{key:"getCaret",value:function(){var e=this;this.$header.find("th").each((function(i,n){t(n).find(".sortable").removeClass("desc asc").addClass(t(n).data("field")===e.options.sortName?e.options.sortOrder:"both")}))}},{key:"updateSelected",value:function(){var e=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",e),this.$selectItem.each((function(e,i){t(i).closest("tr")[t(i).prop("checked")?"addClass":"removeClass"]("selected")}))}},{key:"updateRows",value:function(){var e=this;this.$selectItem.each((function(i,n){e.data[t(n).data("index")][e.header.stateField]=t(n).prop("checked")}))}},{key:"resetRows",value:function(){var t=!0,e=!1,i=void 0;try{for(var n,o=this.data[Symbol.iterator]();!(t=(n=o.next()).done);t=!0){var r=n.value;this.$selectAll.prop("checked",!1),this.$selectItem.prop("checked",!1),this.header.stateField&&(r[this.header.stateField]=!1)}}catch(t){e=!0,i=t}finally{try{t||null==o.return||o.return()}finally{if(e)throw i}}this.initHiddenRows()}},{key:"trigger",value:function(i){for(var n,o,r="".concat(i,".bs.table"),a=arguments.length,s=new Array(a>1?a-1:0),l=1;l<a;l++)s[l-1]=arguments[l];(n=this.options)[e.EVENTS[r]].apply(n,[].concat(s,[this])),this.$el.trigger(t.Event(r,{sender:this}),s),(o=this.options).onAll.apply(o,[r].concat([].concat(s,[this]))),this.$el.trigger(t.Event("all.bs.table",{sender:this}),[r,s])}},{key:"resetHeader",value:function(){var t=this;clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout((function(){return t.fitHeader()}),this.$el.is(":hidden")?100:0)}},{key:"fitHeader",value:function(){var e=this;if(this.$el.is(":hidden"))this.timeoutId_=setTimeout((function(){return e.fitHeader()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?Qr.getScrollBarWidth():0;this.$el.css("margin-top",-this.$header.outerHeight());var o=t(":focus");if(o.length>0){var r=o.parents("th");if(r.length>0){var a=r.attr("data-field");if(void 0!==a){var s=this.$header.find("[data-field='".concat(a,"']"));s.length>0&&s.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),this.$tableLoading.css("width",this.$el.outerWidth());var l=t(".focus-temp:visible:eq(0)");l.length>0&&(l.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each((function(i,n){e.$header_.find(Qr.sprintf('th[data-field="%s"]',t(n).data("field"))).data(t(n).data())}));for(var c=this.getVisibleFields(),h=this.$header_.find("th"),u=this.$body.find(">tr:not(.no-records-found,.virtual-scroll-top)").eq(0);u.length&&u.find('>td[colspan]:not([colspan="1"])').length;)u=u.next();var d=u.find("> *").length;u.find("> *").each((function(i,n){var o=t(n);if(Qr.hasDetailViewIcon(e.options)&&(0===i&&"right"!==e.options.detailViewAlign||i===d-1&&"right"===e.options.detailViewAlign)){var r=h.filter(".detail"),a=r.innerWidth()-r.find(".fht-cell").width();r.find(".fht-cell").width(o.innerWidth()-a)}else{var s=i-Qr.getDetailViewIndexOffset(e.options),l=e.$header_.find(Qr.sprintf('th[data-field="%s"]',c[s]));l.length>1&&(l=t(h[o[0].cellIndex]));var u=l.innerWidth()-l.find(".fht-cell").width();l.find(".fht-cell").width(o.innerWidth()-u)}})),this.horizontalScroll(),this.trigger("post-header")}}},{key:"initFooter",value:function(){if(this.options.showFooter&&!this.options.cardView){var t=this.getData(),e=[],i="";Qr.hasDetailViewIcon(this.options)&&(i='<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>'),i&&"right"!==this.options.detailViewAlign&&e.push(i);var n=!0,o=!1,r=void 0;try{for(var a,s=this.columns[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l,c,h=a.value,u=[],d={},p=Qr.sprintf(' class="%s"',h.class);if(!(!h.visible||this.footerData&&this.footerData.length>0&&!(h.field in this.footerData[0]))){if(this.options.cardView&&!h.cardVisible)return;if(l=Qr.sprintf("text-align: %s; ",h.falign?h.falign:h.align),c=Qr.sprintf("vertical-align: %s; ",h.valign),(d=Qr.calculateObjectValue(null,this.options.footerStyle,[h]))&&d.css)for(var f=0,g=Object.entries(d.css);f<g.length;f++){var v=$r(g[f],2),b=v[0],y=v[1];u.push("".concat(b,": ").concat(y))}d&&d.classes&&(p=Qr.sprintf(' class="%s"',h.class?[h.class,d.classes].join(" "):d.classes)),e.push("<th",p,Qr.sprintf(' style="%s"',l+c+u.concat().join("; ")));var m=0;this.footerData&&this.footerData.length>0&&(m=this.footerData[0]["_"+h.field+"_colspan"]||0),m&&e.push(' colspan="'.concat(m,'" ')),e.push(">"),e.push('<div class="th-inner">');var w="";this.footerData&&this.footerData.length>0&&(w=this.footerData[0][h.field]||""),e.push(Qr.calculateObjectValue(h,h.footerFormatter,[t,w],w)),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}i&&"right"===this.options.detailViewAlign&&e.push(i),this.options.height||this.$tableFooter.length||(this.$el.append("<tfoot><tr></tr></tfoot>"),this.$tableFooter=this.$el.find("tfoot")),this.$tableFooter.find("tr").html(e.join("")),this.trigger("post-footer",this.$tableFooter)}}},{key:"fitFooter",value:function(){var e=this;if(this.$el.is(":hidden"))setTimeout((function(){return e.fitFooter()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?Qr.getScrollBarWidth():0;this.$tableFooter.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).attr("class",this.$el.attr("class"));this.getVisibleFields();var o=this.$tableFooter.find("th"),r=this.$body.find(">tr:first-child:not(.no-records-found)");for(o.find(".fht-cell").width("auto");r.length&&r.find('>td[colspan]:not([colspan="1"])').length;)r=r.next();var a=r.find("> *").length;r.find("> *").each((function(i,n){var r=t(n);if(Qr.hasDetailViewIcon(e.options)&&(0===i&&"left"===e.options.detailViewAlign||i===a-1&&"right"===e.options.detailViewAlign)){var s=o.filter(".detail"),l=s.innerWidth()-s.find(".fht-cell").width();s.find(".fht-cell").width(r.innerWidth()-l)}else{var c=o.eq(i),h=c.innerWidth()-c.find(".fht-cell").width();c.find(".fht-cell").width(r.innerWidth()-h)}})),this.horizontalScroll()}}},{key:"horizontalScroll",value:function(){var t=this;this.$tableBody.off("scroll").on("scroll",(function(){var e=t.$tableBody.scrollLeft();t.options.showHeader&&t.options.height&&t.$tableHeader.scrollLeft(e),t.options.showFooter&&!t.options.cardView&&t.$tableFooter.scrollLeft(e),t.trigger("scroll-body",t.$tableBody)}))}},{key:"getVisibleFields",value:function(){var t=[],e=!0,i=!1,n=void 0;try{for(var o,r=this.header.fields[Symbol.iterator]();!(e=(o=r.next()).done);e=!0){var a=o.value,s=this.columns[this.fieldsColumnsIndex[a]];s&&s.visible&&t.push(a)}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return t}},{key:"initHiddenRows",value:function(){this.hiddenRows=[]}},{key:"getOptions",value:function(){var e=t.extend({},this.options);return delete e.data,t.extend(!0,{},e)}},{key:"refreshOptions",value:function(e){Qr.compareObjects(this.options,e,!0)||(this.options=t.extend(this.options,e),this.trigger("refresh-options",this.options),this.destroy(),this.init())}},{key:"getData",value:function(t){var e=this,i=this.options.data;if(!this.searchText&&!this.options.customSearch&&void 0===this.options.sortName&&Qr.isEmptyObject(this.filterColumns)&&Qr.isEmptyObject(this.filterColumnsPartial)||t&&t.unfiltered||(i=this.data),t&&t.useCurrentPage&&(i=i.slice(this.pageFrom-1,this.pageTo)),t&&!t.includeHiddenRows){var n=this.getHiddenRows();i=i.filter((function(t){return-1===Qr.findIndex(n,t)}))}return t&&t.formatted&&i.forEach((function(t){for(var i=0,n=Object.entries(t);i<n.length;i++){var o=$r(n[i],2),r=o[0],a=o[1],s=e.columns[e.fieldsColumnsIndex[r]];if(!s)return;t[r]=Qr.calculateObjectValue(s,e.header.formatters[s.fieldIndex],[a,t,t.index,s.field],a)}})),i}},{key:"getSelections",value:function(){var t=this;return this.options.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"load",value:function(t){var e,i=t;this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalRows=i[this.options.totalField],this.options.totalNotFiltered=i[this.options.totalNotFilteredField],this.footerData=i[this.options.footerField]?[i[this.options.footerField]]:void 0),e=i.fixedScroll,i=Array.isArray(i)?i:i[this.options.dataField],this.initData(i),this.initSearch(),this.initPagination(),this.initBody(e)}},{key:"append",value:function(t){this.initData(t,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"prepend",value:function(t){this.initData(t,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"remove",value:function(t){var e,i,n=this.options.data.length;if(t.hasOwnProperty("field")&&t.hasOwnProperty("values")){for(e=n-1;e>=0;e--){((i=this.options.data[e]).hasOwnProperty(t.field)||"$index"===t.field)&&((i.hasOwnProperty(t.field)||"$index"!==t.field?t.values.includes(i[t.field]):t.values.includes(e))&&(this.options.data.splice(e,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1)))}n!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}}},{key:"removeAll",value:function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"insertRow",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("row")&&(this.options.data.splice(t.index,0,t.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"updateRow",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;l.hasOwnProperty("index")&&l.hasOwnProperty("row")&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[l.index]=l.row:t.extend(this.options.data[l.index],l.row))}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"getRowByUniqueId",value:function(t){var e,i,n,o=this.options.uniqueId,r=t,a=null;for(e=this.options.data.length-1;e>=0;e--){if((i=this.options.data[e]).hasOwnProperty(o))n=i[o];else{if(!i._data||!i._data.hasOwnProperty(o))continue;n=i._data[o]}if("string"==typeof n?r=r.toString():"number"==typeof n&&(Number(n)===n&&n%1==0?r=parseInt(r):n===Number(n)&&0!==n&&(r=parseFloat(r))),n===r){a=i;break}}return a}},{key:"updateByUniqueId",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.hasOwnProperty("id")&&l.hasOwnProperty("row")){var c=this.options.data.indexOf(this.getRowByUniqueId(l.id));-1!==c&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[c]=l.row:t.extend(this.options.data[c],l.row))}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"removeByUniqueId",value:function(t){var e=this.options.data.length,i=this.getRowByUniqueId(t);i&&this.options.data.splice(this.options.data.indexOf(i),1),e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"updateCell",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&(this.data[t.index][t.field]=t.value,!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"updateCellByUniqueId",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){var i=t.id,n=t.field,o=t.value,r=e.options.data.indexOf(e.getRowByUniqueId(i));-1!==r&&(e.options.data[r][n]=o)})),!1!==t.reinit&&(this.initSort(),this.initBody(!0))}},{key:"showRow",value:function(t){this._toggleRow(t,!0)}},{key:"hideRow",value:function(t){this._toggleRow(t,!1)}},{key:"_toggleRow",value:function(t,e){var i;if(t.hasOwnProperty("index")?i=this.getData()[t.index]:t.hasOwnProperty("uniqueId")&&(i=this.getRowByUniqueId(t.uniqueId)),i){var n=Qr.findIndex(this.hiddenRows,i);e||-1!==n?e&&n>-1&&this.hiddenRows.splice(n,1):this.hiddenRows.push(i),this.initBody(!0),this.initPagination()}}},{key:"getHiddenRows",value:function(t){if(t)return this.initHiddenRows(),this.initBody(!0),void this.initPagination();var e=this.getData(),i=[],n=!0,o=!1,r=void 0;try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;this.hiddenRows.includes(l)&&i.push(l)}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return this.hiddenRows=i,i}},{key:"showColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!0,!0)}))}},{key:"hideColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!1,!0)}))}},{key:"_toggleColumn",value:function(t,e,i){if(-1!==t&&this.columns[t].visible!==e&&(this.columns[t].visible=e,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var n=this.$toolbar.find('.keep-open input:not(".toggle-all")').prop("disabled",!1);i&&n.filter(Qr.sprintf('[value="%s"]',t)).prop("checked",e),n.filter(":checked").length<=this.options.minimumCountColumns&&n.filter(":checked").prop("disabled",!0)}}},{key:"getVisibleColumns",value:function(){var t=this;return this.columns.filter((function(e){return e.visible&&!t.isSelectionColumn(e)}))}},{key:"getHiddenColumns",value:function(){return this.columns.filter((function(t){return!t.visible}))}},{key:"isSelectionColumn",value:function(t){return t.radio||t.checkbox}},{key:"showAllColumns",value:function(){this._toggleAllColumns(!0)}},{key:"hideAllColumns",value:function(){this._toggleAllColumns(!1)}},{key:"_toggleAllColumns",value:function(e){var i=this,n=!0,o=!1,r=void 0;try{for(var a,s=this.columns.slice().reverse()[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.switchable){if(!e&&this.options.showColumns&&this.getVisibleColumns().length===this.options.minimumCountColumns)continue;l.visible=e}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}if(this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var c=this.$toolbar.find('.keep-open input[type="checkbox"]:not(".toggle-all")').prop("disabled",!1);e?c.prop("checked",e):c.get().reverse().forEach((function(n){c.filter(":checked").length>i.options.minimumCountColumns&&t(n).prop("checked",e)})),c.filter(":checked").length<=this.options.minimumCountColumns&&c.filter(":checked").prop("disabled",!0)}}},{key:"mergeCells",value:function(t){var e,i,n=t.index,o=this.getVisibleFields().indexOf(t.field),r=t.rowspan||1,a=t.colspan||1,s=this.$body.find(">tr");o+=Qr.getDetailViewIndexOffset(this.options);var l=s.eq(n).find(">td").eq(o);if(!(n<0||o<0||n>=this.data.length)){for(e=n;e<n+r;e++)for(i=o;i<o+a;i++)s.eq(e).find(">td").eq(i).hide();l.attr("rowspan",r).attr("colspan",a).show()}}},{key:"checkAll",value:function(){this._toggleCheckAll(!0)}},{key:"uncheckAll",value:function(){this._toggleCheckAll(!1)}},{key:"_toggleCheckAll",value:function(t){var e=this.getSelections();this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.filter(":enabled").prop("checked",t),this.updateRows(),this.updateSelected();var i=this.getSelections();t?this.trigger("check-all",i,e):this.trigger("uncheck-all",i,e)}},{key:"checkInvert",value:function(){var e=this.$selectItem.filter(":enabled"),i=e.filter(":checked");e.each((function(e,i){t(i).prop("checked",!t(i).prop("checked"))})),this.updateRows(),this.updateSelected(),this.trigger("uncheck-some",i),i=this.getSelections(),this.trigger("check-some",i)}},{key:"check",value:function(t){this._toggleCheck(!0,t)}},{key:"uncheck",value:function(t){this._toggleCheck(!1,t)}},{key:"_toggleCheck",value:function(t,e){var i=this.$selectItem.filter('[data-index="'.concat(e,'"]')),n=this.options.data[e];if(i.is(":radio")||this.options.singleSelect||this.options.multipleSelectRow&&!this.multipleSelectRowCtrlKey&&!this.multipleSelectRowShiftKey){var o=!0,r=!1,a=void 0;try{for(var s,l=this.options.data[Symbol.iterator]();!(o=(s=l.next()).done);o=!0){s.value[this.header.stateField]=!1}}catch(t){r=!0,a=t}finally{try{o||null==l.return||l.return()}finally{if(r)throw a}}this.$selectItem.filter(":checked").not(i).prop("checked",!1)}if(n[this.header.stateField]=t,this.options.multipleSelectRow){if(this.multipleSelectRowShiftKey&&this.multipleSelectRowLastSelectedIndex>=0)for(var c=[this.multipleSelectRowLastSelectedIndex,e].sort(),h=c[0]+1;h<c[1];h++)this.data[h][this.header.stateField]=!0,this.$selectItem.filter('[data-index="'.concat(h,'"]')).prop("checked",!0);this.multipleSelectRowCtrlKey=!1,this.multipleSelectRowShiftKey=!1,this.multipleSelectRowLastSelectedIndex=t?e:-1}i.prop("checked",t),this.updateSelected(),this.trigger(t?"check":"uncheck",this.data[e],i)}},{key:"checkBy",value:function(t){this._toggleCheckBy(!0,t)}},{key:"uncheckBy",value:function(t){this._toggleCheckBy(!1,t)}},{key:"_toggleCheckBy",value:function(t,e){var i=this;if(e.hasOwnProperty("field")&&e.hasOwnProperty("values")){var n=[];this.data.forEach((function(o,r){if(!o.hasOwnProperty(e.field))return!1;if(e.values.includes(o[e.field])){var a=i.$selectItem.filter(":enabled").filter(Qr.sprintf('[data-index="%s"]',r));if(!(a=t?a.not(":checked"):a.filter(":checked")).length)return;a.prop("checked",t),o[i.header.stateField]=t,n.push(o),i.trigger(t?"check":"uncheck",o,a)}})),this.updateSelected(),this.trigger(t?"check-some":"uncheck-some",n)}}},{key:"refresh",value:function(t){t&&t.url&&(this.options.url=t.url),t&&t.pageNumber&&(this.options.pageNumber=t.pageNumber),t&&t.pageSize&&(this.options.pageSize=t.pageSize),this.trigger("refresh",this.initServer(t&&t.silent,t&&t.query,t&&t.url))}},{key:"destroy",value:function(){this.$el.insertBefore(this.$container),t(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")}},{key:"resetView",value:function(t){var e=0;if(t&&t.height&&(this.options.height=t.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.$tableContainer.toggleClass("has-card-view",this.options.cardView),!this.options.cardView&&this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),e+=this.$header.outerHeight(!0)+1):(this.$tableHeader.hide(),this.trigger("post-header")),!this.options.cardView&&this.options.showFooter&&(this.$tableFooter.show(),this.fitFooter(),this.options.height&&(e+=this.$tableFooter.outerHeight(!0))),this.$container.hasClass("fullscreen"))this.$tableContainer.css("height",""),this.$tableContainer.css("width","");else if(this.options.height){this.$tableBorder&&(this.$tableBorder.css("width",""),this.$tableBorder.css("height",""));var i=this.$toolbar.outerHeight(!0),n=this.$pagination.outerHeight(!0),o=this.options.height-i-n,r=this.$tableBody.find(">table"),a=r.outerHeight();if(this.$tableContainer.css("height","".concat(o,"px")),this.$tableBorder&&r.is(":visible")){var s=o-a-2;this.$tableBody[0].scrollWidth-this.$tableBody.innerWidth()&&(s-=Qr.getScrollBarWidth()),this.$tableBorder.css("width","".concat(r.outerWidth(),"px")),this.$tableBorder.css("height","".concat(s,"px"))}}this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),this.$tableFooter.hide()):(this.getCaret(),this.$tableContainer.css("padding-bottom","".concat(e,"px"))),this.trigger("reset-view")}},{key:"showLoading",value:function(){this.$tableLoading.toggleClass("open",!0);var t=this.options.loadingFontSize;"auto"===this.options.loadingFontSize&&(t=.04*this.$tableLoading.width(),t=Math.max(12,t),t=Math.min(32,t),t="".concat(t,"px")),this.$tableLoading.find(".loading-text").css("font-size",t)}},{key:"hideLoading",value:function(){this.$tableLoading.toggleClass("open",!1)}},{key:"togglePagination",value:function(){this.options.pagination=!this.options.pagination;var t=this.options.showButtonIcons?this.options.pagination?this.options.icons.paginationSwitchDown:this.options.icons.paginationSwitchUp:"",e=this.options.showButtonText?this.options.pagination?this.options.formatPaginationSwitchUp():this.options.formatPaginationSwitchDown():"";this.$toolbar.find('button[name="paginationSwitch"]').html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.updatePagination()}},{key:"toggleFullscreen",value:function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen"),this.resetView()}},{key:"toggleView",value:function(){this.options.cardView=!this.options.cardView,this.initHeader();var t=this.options.showButtonIcons?this.options.cardView?this.options.icons.toggleOn:this.options.icons.toggleOff:"",e=this.options.showButtonText?this.options.cardView?this.options.formatToggleOff():this.options.formatToggleOn():"";this.$toolbar.find('button[name="toggle"]').html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.initBody(),this.trigger("toggle",this.options.cardView)}},{key:"resetSearch",value:function(t){var e=Qr.getSearchInput(this);e.val(t||""),this.onSearch({currentTarget:e})}},{key:"filterBy",value:function(e,i){this.filterOptions=Qr.isEmptyObject(i)?this.options.filterOptions:t.extend(this.options.filterOptions,i),this.filterColumns=Qr.isEmptyObject(e)?{}:e,this.options.pageNumber=1,this.initSearch(),this.updatePagination()}},{key:"scrollTo",value:function(e){var i={unit:"px",value:0};"object"===Pr(e)?i=Object.assign(i,e):"string"==typeof e&&"bottom"===e?i.value=this.$tableBody[0].scrollHeight:"string"!=typeof e&&"number"!=typeof e||(i.value=e);var n=i.value;"rows"===i.unit&&(n=0,this.$body.find("> tr:lt(".concat(i.value,")")).each((function(e,i){n+=t(i).outerHeight(!0)}))),this.$tableBody.scrollTop(n)}},{key:"getScrollPosition",value:function(){return this.$tableBody.scrollTop()}},{key:"selectPage",value:function(t){t>0&&t<=this.options.totalPages&&(this.options.pageNumber=t,this.updatePagination())}},{key:"prevPage",value:function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())}},{key:"nextPage",value:function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())}},{key:"toggleDetailView",value:function(t,e){this.$body.find(Qr.sprintf('> tr[data-index="%s"]',t)).next().is("tr.detail-view")?this.collapseRow(t):this.expandRow(t,e),this.resetView()}},{key:"expandRow",value:function(t,e){var i=this.data[t],n=this.$body.find(Qr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));if(!n.next().is("tr.detail-view")){this.options.detailViewIcon&&n.find("a.detail-icon").html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailClose)),n.after(Qr.sprintf('<tr class="detail-view"><td colspan="%s"></td></tr>',n.children("td").length));var o=n.next().find("td"),r=e||this.options.detailFormatter,a=Qr.calculateObjectValue(this.options,r,[t,i,o],"");1===o.length&&o.append(a),this.trigger("expand-row",t,i,o)}}},{key:"expandRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.expandRow(this.data.indexOf(e))}},{key:"collapseRow",value:function(t){var e=this.data[t],i=this.$body.find(Qr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));i.next().is("tr.detail-view")&&(this.options.detailViewIcon&&i.find("a.detail-icon").html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen)),this.trigger("collapse-row",t,e,i.next()),i.next().remove())}},{key:"collapseRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.collapseRow(this.data.indexOf(e))}},{key:"expandAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.expandRow(t(e[i]).data("index"))}},{key:"collapseAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.collapseRow(t(e[i]).data("index"))}},{key:"updateColumnTitle",value:function(e){e.hasOwnProperty("field")&&e.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[e.field]].title=this.options.escape?Qr.escapeHTML(e.title):e.title,this.columns[this.fieldsColumnsIndex[e.field]].visible&&(void 0!==this.options.height?this.$tableHeader:this.$header).find("th[data-field]").each((function(i,n){if(t(n).data("field")===e.field)return t(t(n).find(".th-inner")[0]).text(e.title),!1})))}},{key:"updateFormatText",value:function(t,e){/^format/.test(t)&&this.options[t]&&("string"==typeof e?this.options[t]=function(){return e}:"function"==typeof e&&(this.options[t]=e),this.initToolbar(),this.initPagination(),this.initBody())}}]),e}();return ta.VERSION=Br.VERSION,ta.DEFAULTS=Br.DEFAULTS,ta.LOCALES=Br.LOCALES,ta.COLUMN_DEFAULTS=Br.COLUMN_DEFAULTS,ta.METHODS=Br.METHODS,ta.EVENTS=Br.EVENTS,t.BootstrapTable=ta,t.fn.bootstrapTable=function(e){for(var i=arguments.length,n=new Array(i>1?i-1:0),o=1;o<i;o++)n[o-1]=arguments[o];var r;return this.each((function(i,o){var a=t(o).data("bootstrap.table"),s=t.extend({},ta.DEFAULTS,t(o).data(),"object"===Pr(e)&&e);if("string"==typeof e){var l;if(!Br.METHODS.includes(e))throw new Error("Unknown method: ".concat(e));if(!a)return;r=(l=a)[e].apply(l,n),"destroy"===e&&t(o).removeData("bootstrap.table")}a||(a=new t.BootstrapTable(o,s),t(o).data("bootstrap.table",a),a.init())})),void 0===r?this:r},t.fn.bootstrapTable.Constructor=ta,t.fn.bootstrapTable.theme=Br.THEME,t.fn.bootstrapTable.VERSION=Br.VERSION,t.fn.bootstrapTable.defaults=ta.DEFAULTS,t.fn.bootstrapTable.columnDefaults=ta.COLUMN_DEFAULTS,t.fn.bootstrapTable.events=ta.EVENTS,t.fn.bootstrapTable.locales=ta.LOCALES,t.fn.bootstrapTable.methods=ta.METHODS,t.fn.bootstrapTable.utils=Qr,t((function(){t('[data-toggle="table"]').bootstrapTable()})),ta}));
diff --git a/web/skins/classic/js/bootstrap.bundle.js.map b/web/skins/classic/js/bootstrap.bundle.js.map
new file mode 100644
index 000000000..299cb1b6d
--- /dev/null
+++ b/web/skins/classic/js/bootstrap.bundle.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"bootstrap.bundle.js","sources":["../../js/src/util.js","../../js/src/alert.js","../../js/src/button.js","../../js/src/carousel.js","../../js/src/collapse.js","../../node_modules/popper.js/dist/esm/popper.js","../../js/src/dropdown.js","../../js/src/modal.js","../../js/src/tools/sanitizer.js","../../js/src/tooltip.js","../../js/src/popover.js","../../js/src/scrollspy.js","../../js/src/tab.js","../../js/src/toast.js"],"sourcesContent":["/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): util.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\n\n/**\n * ------------------------------------------------------------------------\n * Private TransitionEnd Helpers\n * ------------------------------------------------------------------------\n */\n\nconst TRANSITION_END = 'transitionend'\nconst MAX_UID = 1000000\nconst MILLISECONDS_MULTIPLIER = 1000\n\n// Shoutout AngusCroll (https://goo.gl/pxwQGp)\nfunction toType(obj) {\n  if (obj === null || typeof obj === 'undefined') {\n    return `${obj}`\n  }\n\n  return {}.toString.call(obj).match(/\\s([a-z]+)/i)[1].toLowerCase()\n}\n\nfunction getSpecialTransitionEndEvent() {\n  return {\n    bindType: TRANSITION_END,\n    delegateType: TRANSITION_END,\n    handle(event) {\n      if ($(event.target).is(this)) {\n        return event.handleObj.handler.apply(this, arguments) // eslint-disable-line prefer-rest-params\n      }\n      return undefined\n    }\n  }\n}\n\nfunction transitionEndEmulator(duration) {\n  let called = false\n\n  $(this).one(Util.TRANSITION_END, () => {\n    called = true\n  })\n\n  setTimeout(() => {\n    if (!called) {\n      Util.triggerTransitionEnd(this)\n    }\n  }, duration)\n\n  return this\n}\n\nfunction setTransitionEndSupport() {\n  $.fn.emulateTransitionEnd = transitionEndEmulator\n  $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent()\n}\n\n/**\n * --------------------------------------------------------------------------\n * Public Util Api\n * --------------------------------------------------------------------------\n */\n\nconst Util = {\n  TRANSITION_END: 'bsTransitionEnd',\n\n  getUID(prefix) {\n    do {\n      // eslint-disable-next-line no-bitwise\n      prefix += ~~(Math.random() * MAX_UID) // \"~~\" acts like a faster Math.floor() here\n    } while (document.getElementById(prefix))\n    return prefix\n  },\n\n  getSelectorFromElement(element) {\n    let selector = element.getAttribute('data-target')\n\n    if (!selector || selector === '#') {\n      const hrefAttr = element.getAttribute('href')\n      selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : ''\n    }\n\n    try {\n      return document.querySelector(selector) ? selector : null\n    } catch (err) {\n      return null\n    }\n  },\n\n  getTransitionDurationFromElement(element) {\n    if (!element) {\n      return 0\n    }\n\n    // Get transition-duration of the element\n    let transitionDuration = $(element).css('transition-duration')\n    let transitionDelay = $(element).css('transition-delay')\n\n    const floatTransitionDuration = parseFloat(transitionDuration)\n    const floatTransitionDelay = parseFloat(transitionDelay)\n\n    // Return 0 if element or transition duration is not found\n    if (!floatTransitionDuration && !floatTransitionDelay) {\n      return 0\n    }\n\n    // If multiple durations are defined, take the first\n    transitionDuration = transitionDuration.split(',')[0]\n    transitionDelay = transitionDelay.split(',')[0]\n\n    return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER\n  },\n\n  reflow(element) {\n    return element.offsetHeight\n  },\n\n  triggerTransitionEnd(element) {\n    $(element).trigger(TRANSITION_END)\n  },\n\n  // TODO: Remove in v5\n  supportsTransitionEnd() {\n    return Boolean(TRANSITION_END)\n  },\n\n  isElement(obj) {\n    return (obj[0] || obj).nodeType\n  },\n\n  typeCheckConfig(componentName, config, configTypes) {\n    for (const property in configTypes) {\n      if (Object.prototype.hasOwnProperty.call(configTypes, property)) {\n        const expectedTypes = configTypes[property]\n        const value         = config[property]\n        const valueType     = value && Util.isElement(value)\n          ? 'element' : toType(value)\n\n        if (!new RegExp(expectedTypes).test(valueType)) {\n          throw new Error(\n            `${componentName.toUpperCase()}: ` +\n            `Option \"${property}\" provided type \"${valueType}\" ` +\n            `but expected type \"${expectedTypes}\".`)\n        }\n      }\n    }\n  },\n\n  findShadowRoot(element) {\n    if (!document.documentElement.attachShadow) {\n      return null\n    }\n\n    // Can find the shadow root otherwise it'll return the document\n    if (typeof element.getRootNode === 'function') {\n      const root = element.getRootNode()\n      return root instanceof ShadowRoot ? root : null\n    }\n\n    if (element instanceof ShadowRoot) {\n      return element\n    }\n\n    // when we don't find a shadow root\n    if (!element.parentNode) {\n      return null\n    }\n\n    return Util.findShadowRoot(element.parentNode)\n  },\n\n  jQueryDetection() {\n    if (typeof $ === 'undefined') {\n      throw new TypeError('Bootstrap\\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\\'s JavaScript.')\n    }\n\n    const version = $.fn.jquery.split(' ')[0].split('.')\n    const minMajor = 1\n    const ltMajor = 2\n    const minMinor = 9\n    const minPatch = 1\n    const maxMajor = 4\n\n    if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {\n      throw new Error('Bootstrap\\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')\n    }\n  }\n}\n\nUtil.jQueryDetection()\nsetTransitionEndSupport()\n\nexport default Util\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): alert.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'alert'\nconst VERSION             = '4.5.0'\nconst DATA_KEY            = 'bs.alert'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst DATA_API_KEY        = '.data-api'\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\n\nconst SELECTOR_DISMISS = '[data-dismiss=\"alert\"]'\n\nconst EVENT_CLOSE          = `close${EVENT_KEY}`\nconst EVENT_CLOSED         = `closed${EVENT_KEY}`\nconst EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_ALERT = 'alert'\nconst CLASS_NAME_FADE  = 'fade'\nconst CLASS_NAME_SHOW  = 'show'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Alert {\n  constructor(element) {\n    this._element = element\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  // Public\n\n  close(element) {\n    let rootElement = this._element\n    if (element) {\n      rootElement = this._getRootElement(element)\n    }\n\n    const customEvent = this._triggerCloseEvent(rootElement)\n\n    if (customEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._removeElement(rootElement)\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n  }\n\n  // Private\n\n  _getRootElement(element) {\n    const selector = Util.getSelectorFromElement(element)\n    let parent     = false\n\n    if (selector) {\n      parent = document.querySelector(selector)\n    }\n\n    if (!parent) {\n      parent = $(element).closest(`.${CLASS_NAME_ALERT}`)[0]\n    }\n\n    return parent\n  }\n\n  _triggerCloseEvent(element) {\n    const closeEvent = $.Event(EVENT_CLOSE)\n\n    $(element).trigger(closeEvent)\n    return closeEvent\n  }\n\n  _removeElement(element) {\n    $(element).removeClass(CLASS_NAME_SHOW)\n\n    if (!$(element).hasClass(CLASS_NAME_FADE)) {\n      this._destroyElement(element)\n      return\n    }\n\n    const transitionDuration = Util.getTransitionDurationFromElement(element)\n\n    $(element)\n      .one(Util.TRANSITION_END, (event) => this._destroyElement(element, event))\n      .emulateTransitionEnd(transitionDuration)\n  }\n\n  _destroyElement(element) {\n    $(element)\n      .detach()\n      .trigger(EVENT_CLOSED)\n      .remove()\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $element = $(this)\n      let data       = $element.data(DATA_KEY)\n\n      if (!data) {\n        data = new Alert(this)\n        $element.data(DATA_KEY, data)\n      }\n\n      if (config === 'close') {\n        data[config](this)\n      }\n    })\n  }\n\n  static _handleDismiss(alertInstance) {\n    return function (event) {\n      if (event) {\n        event.preventDefault()\n      }\n\n      alertInstance.close(this)\n    }\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(\n  EVENT_CLICK_DATA_API,\n  SELECTOR_DISMISS,\n  Alert._handleDismiss(new Alert())\n)\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME]             = Alert._jQueryInterface\n$.fn[NAME].Constructor = Alert\n$.fn[NAME].noConflict  = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Alert._jQueryInterface\n}\n\nexport default Alert\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): button.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'button'\nconst VERSION             = '4.5.0'\nconst DATA_KEY            = 'bs.button'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst DATA_API_KEY        = '.data-api'\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\n\nconst CLASS_NAME_ACTIVE = 'active'\nconst CLASS_NAME_BUTTON = 'btn'\nconst CLASS_NAME_FOCUS  = 'focus'\n\nconst SELECTOR_DATA_TOGGLE_CARROT   = '[data-toggle^=\"button\"]'\nconst SELECTOR_DATA_TOGGLES         = '[data-toggle=\"buttons\"]'\nconst SELECTOR_DATA_TOGGLE          = '[data-toggle=\"button\"]'\nconst SELECTOR_DATA_TOGGLES_BUTTONS = '[data-toggle=\"buttons\"] .btn'\nconst SELECTOR_INPUT                = 'input:not([type=\"hidden\"])'\nconst SELECTOR_ACTIVE               = '.active'\nconst SELECTOR_BUTTON               = '.btn'\n\nconst EVENT_CLICK_DATA_API      = `click${EVENT_KEY}${DATA_API_KEY}`\nconst EVENT_FOCUS_BLUR_DATA_API = `focus${EVENT_KEY}${DATA_API_KEY} ` +\n                          `blur${EVENT_KEY}${DATA_API_KEY}`\nconst EVENT_LOAD_DATA_API       = `load${EVENT_KEY}${DATA_API_KEY}`\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Button {\n  constructor(element) {\n    this._element = element\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  // Public\n\n  toggle() {\n    let triggerChangeEvent = true\n    let addAriaPressed = true\n    const rootElement = $(this._element).closest(\n      SELECTOR_DATA_TOGGLES\n    )[0]\n\n    if (rootElement) {\n      const input = this._element.querySelector(SELECTOR_INPUT)\n\n      if (input) {\n        if (input.type === 'radio') {\n          if (input.checked &&\n            this._element.classList.contains(CLASS_NAME_ACTIVE)) {\n            triggerChangeEvent = false\n          } else {\n            const activeElement = rootElement.querySelector(SELECTOR_ACTIVE)\n\n            if (activeElement) {\n              $(activeElement).removeClass(CLASS_NAME_ACTIVE)\n            }\n          }\n        }\n\n        if (triggerChangeEvent) {\n          // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input\n          if (input.type === 'checkbox' || input.type === 'radio') {\n            input.checked = !this._element.classList.contains(CLASS_NAME_ACTIVE)\n          }\n          $(input).trigger('change')\n        }\n\n        input.focus()\n        addAriaPressed = false\n      }\n    }\n\n    if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {\n      if (addAriaPressed) {\n        this._element.setAttribute('aria-pressed',\n          !this._element.classList.contains(CLASS_NAME_ACTIVE))\n      }\n\n      if (triggerChangeEvent) {\n        $(this._element).toggleClass(CLASS_NAME_ACTIVE)\n      }\n    }\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n\n      if (!data) {\n        data = new Button(this)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (config === 'toggle') {\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, (event) => {\n    let button = event.target\n    const initialButton = button\n\n    if (!$(button).hasClass(CLASS_NAME_BUTTON)) {\n      button = $(button).closest(SELECTOR_BUTTON)[0]\n    }\n\n    if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {\n      event.preventDefault() // work around Firefox bug #1540995\n    } else {\n      const inputBtn = button.querySelector(SELECTOR_INPUT)\n\n      if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {\n        event.preventDefault() // work around Firefox bug #1540995\n        return\n      }\n\n      if (initialButton.tagName === 'LABEL' && inputBtn && inputBtn.type === 'checkbox') {\n        event.preventDefault() // work around event sent to label and input\n      }\n      Button._jQueryInterface.call($(button), 'toggle')\n    }\n  })\n  .on(EVENT_FOCUS_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, (event) => {\n    const button = $(event.target).closest(SELECTOR_BUTTON)[0]\n    $(button).toggleClass(CLASS_NAME_FOCUS, /^focus(in)?$/.test(event.type))\n  })\n\n$(window).on(EVENT_LOAD_DATA_API, () => {\n  // ensure correct active class is set to match the controls' actual values/states\n\n  // find all checkboxes/readio buttons inside data-toggle groups\n  let buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLES_BUTTONS))\n  for (let i = 0, len = buttons.length; i < len; i++) {\n    const button = buttons[i]\n    const input = button.querySelector(SELECTOR_INPUT)\n    if (input.checked || input.hasAttribute('checked')) {\n      button.classList.add(CLASS_NAME_ACTIVE)\n    } else {\n      button.classList.remove(CLASS_NAME_ACTIVE)\n    }\n  }\n\n  // find all button toggles\n  buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE))\n  for (let i = 0, len = buttons.length; i < len; i++) {\n    const button = buttons[i]\n    if (button.getAttribute('aria-pressed') === 'true') {\n      button.classList.add(CLASS_NAME_ACTIVE)\n    } else {\n      button.classList.remove(CLASS_NAME_ACTIVE)\n    }\n  }\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Button._jQueryInterface\n$.fn[NAME].Constructor = Button\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Button._jQueryInterface\n}\n\nexport default Button\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): carousel.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                   = 'carousel'\nconst VERSION                = '4.5.0'\nconst DATA_KEY               = 'bs.carousel'\nconst EVENT_KEY              = `.${DATA_KEY}`\nconst DATA_API_KEY           = '.data-api'\nconst JQUERY_NO_CONFLICT     = $.fn[NAME]\nconst ARROW_LEFT_KEYCODE     = 37 // KeyboardEvent.which value for left arrow key\nconst ARROW_RIGHT_KEYCODE    = 39 // KeyboardEvent.which value for right arrow key\nconst TOUCHEVENT_COMPAT_WAIT = 500 // Time for mouse compat events to fire after touch\nconst SWIPE_THRESHOLD        = 40\n\nconst Default = {\n  interval : 5000,\n  keyboard : true,\n  slide    : false,\n  pause    : 'hover',\n  wrap     : true,\n  touch    : true\n}\n\nconst DefaultType = {\n  interval : '(number|boolean)',\n  keyboard : 'boolean',\n  slide    : '(boolean|string)',\n  pause    : '(string|boolean)',\n  wrap     : 'boolean',\n  touch    : 'boolean'\n}\n\nconst DIRECTION_NEXT     = 'next'\nconst DIRECTION_PREV     = 'prev'\nconst DIRECTION_LEFT     = 'left'\nconst DIRECTION_RIGHT    = 'right'\n\nconst EVENT_SLIDE          = `slide${EVENT_KEY}`\nconst EVENT_SLID           = `slid${EVENT_KEY}`\nconst EVENT_KEYDOWN        = `keydown${EVENT_KEY}`\nconst EVENT_MOUSEENTER     = `mouseenter${EVENT_KEY}`\nconst EVENT_MOUSELEAVE     = `mouseleave${EVENT_KEY}`\nconst EVENT_TOUCHSTART     = `touchstart${EVENT_KEY}`\nconst EVENT_TOUCHMOVE      = `touchmove${EVENT_KEY}`\nconst EVENT_TOUCHEND       = `touchend${EVENT_KEY}`\nconst EVENT_POINTERDOWN    = `pointerdown${EVENT_KEY}`\nconst EVENT_POINTERUP      = `pointerup${EVENT_KEY}`\nconst EVENT_DRAG_START     = `dragstart${EVENT_KEY}`\nconst EVENT_LOAD_DATA_API  = `load${EVENT_KEY}${DATA_API_KEY}`\nconst EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_CAROUSEL      = 'carousel'\nconst CLASS_NAME_ACTIVE        = 'active'\nconst CLASS_NAME_SLIDE         = 'slide'\nconst CLASS_NAME_RIGHT         = 'carousel-item-right'\nconst CLASS_NAME_LEFT          = 'carousel-item-left'\nconst CLASS_NAME_NEXT          = 'carousel-item-next'\nconst CLASS_NAME_PREV          = 'carousel-item-prev'\nconst CLASS_NAME_POINTER_EVENT = 'pointer-event'\n\nconst SELECTOR_ACTIVE      = '.active'\nconst SELECTOR_ACTIVE_ITEM = '.active.carousel-item'\nconst SELECTOR_ITEM        = '.carousel-item'\nconst SELECTOR_ITEM_IMG    = '.carousel-item img'\nconst SELECTOR_NEXT_PREV   = '.carousel-item-next, .carousel-item-prev'\nconst SELECTOR_INDICATORS  = '.carousel-indicators'\nconst SELECTOR_DATA_SLIDE  = '[data-slide], [data-slide-to]'\nconst SELECTOR_DATA_RIDE   = '[data-ride=\"carousel\"]'\n\nconst PointerType = {\n  TOUCH : 'touch',\n  PEN   : 'pen'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\nclass Carousel {\n  constructor(element, config) {\n    this._items         = null\n    this._interval      = null\n    this._activeElement = null\n    this._isPaused      = false\n    this._isSliding     = false\n    this.touchTimeout   = null\n    this.touchStartX    = 0\n    this.touchDeltaX    = 0\n\n    this._config            = this._getConfig(config)\n    this._element           = element\n    this._indicatorsElement = this._element.querySelector(SELECTOR_INDICATORS)\n    this._touchSupported    = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0\n    this._pointerEvent      = Boolean(window.PointerEvent || window.MSPointerEvent)\n\n    this._addEventListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  next() {\n    if (!this._isSliding) {\n      this._slide(DIRECTION_NEXT)\n    }\n  }\n\n  nextWhenVisible() {\n    // Don't call next when the page isn't visible\n    // or the carousel or its parent isn't visible\n    if (!document.hidden &&\n      ($(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden')) {\n      this.next()\n    }\n  }\n\n  prev() {\n    if (!this._isSliding) {\n      this._slide(DIRECTION_PREV)\n    }\n  }\n\n  pause(event) {\n    if (!event) {\n      this._isPaused = true\n    }\n\n    if (this._element.querySelector(SELECTOR_NEXT_PREV)) {\n      Util.triggerTransitionEnd(this._element)\n      this.cycle(true)\n    }\n\n    clearInterval(this._interval)\n    this._interval = null\n  }\n\n  cycle(event) {\n    if (!event) {\n      this._isPaused = false\n    }\n\n    if (this._interval) {\n      clearInterval(this._interval)\n      this._interval = null\n    }\n\n    if (this._config.interval && !this._isPaused) {\n      this._interval = setInterval(\n        (document.visibilityState ? this.nextWhenVisible : this.next).bind(this),\n        this._config.interval\n      )\n    }\n  }\n\n  to(index) {\n    this._activeElement = this._element.querySelector(SELECTOR_ACTIVE_ITEM)\n\n    const activeIndex = this._getItemIndex(this._activeElement)\n\n    if (index > this._items.length - 1 || index < 0) {\n      return\n    }\n\n    if (this._isSliding) {\n      $(this._element).one(EVENT_SLID, () => this.to(index))\n      return\n    }\n\n    if (activeIndex === index) {\n      this.pause()\n      this.cycle()\n      return\n    }\n\n    const direction = index > activeIndex\n      ? DIRECTION_NEXT\n      : DIRECTION_PREV\n\n    this._slide(direction, this._items[index])\n  }\n\n  dispose() {\n    $(this._element).off(EVENT_KEY)\n    $.removeData(this._element, DATA_KEY)\n\n    this._items             = null\n    this._config            = null\n    this._element           = null\n    this._interval          = null\n    this._isPaused          = null\n    this._isSliding         = null\n    this._activeElement     = null\n    this._indicatorsElement = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...config\n    }\n    Util.typeCheckConfig(NAME, config, DefaultType)\n    return config\n  }\n\n  _handleSwipe() {\n    const absDeltax = Math.abs(this.touchDeltaX)\n\n    if (absDeltax <= SWIPE_THRESHOLD) {\n      return\n    }\n\n    const direction = absDeltax / this.touchDeltaX\n\n    this.touchDeltaX = 0\n\n    // swipe left\n    if (direction > 0) {\n      this.prev()\n    }\n\n    // swipe right\n    if (direction < 0) {\n      this.next()\n    }\n  }\n\n  _addEventListeners() {\n    if (this._config.keyboard) {\n      $(this._element).on(EVENT_KEYDOWN, (event) => this._keydown(event))\n    }\n\n    if (this._config.pause === 'hover') {\n      $(this._element)\n        .on(EVENT_MOUSEENTER, (event) => this.pause(event))\n        .on(EVENT_MOUSELEAVE, (event) => this.cycle(event))\n    }\n\n    if (this._config.touch) {\n      this._addTouchEventListeners()\n    }\n  }\n\n  _addTouchEventListeners() {\n    if (!this._touchSupported) {\n      return\n    }\n\n    const start = (event) => {\n      if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {\n        this.touchStartX = event.originalEvent.clientX\n      } else if (!this._pointerEvent) {\n        this.touchStartX = event.originalEvent.touches[0].clientX\n      }\n    }\n\n    const move = (event) => {\n      // ensure swiping with one touch and not pinching\n      if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {\n        this.touchDeltaX = 0\n      } else {\n        this.touchDeltaX = event.originalEvent.touches[0].clientX - this.touchStartX\n      }\n    }\n\n    const end = (event) => {\n      if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {\n        this.touchDeltaX = event.originalEvent.clientX - this.touchStartX\n      }\n\n      this._handleSwipe()\n      if (this._config.pause === 'hover') {\n        // If it's a touch-enabled device, mouseenter/leave are fired as\n        // part of the mouse compatibility events on first tap - the carousel\n        // would stop cycling until user tapped out of it;\n        // here, we listen for touchend, explicitly pause the carousel\n        // (as if it's the second time we tap on it, mouseenter compat event\n        // is NOT fired) and after a timeout (to allow for mouse compatibility\n        // events to fire) we explicitly restart cycling\n\n        this.pause()\n        if (this.touchTimeout) {\n          clearTimeout(this.touchTimeout)\n        }\n        this.touchTimeout = setTimeout((event) => this.cycle(event), TOUCHEVENT_COMPAT_WAIT + this._config.interval)\n      }\n    }\n\n    $(this._element.querySelectorAll(SELECTOR_ITEM_IMG))\n      .on(EVENT_DRAG_START, (e) => e.preventDefault())\n\n    if (this._pointerEvent) {\n      $(this._element).on(EVENT_POINTERDOWN, (event) => start(event))\n      $(this._element).on(EVENT_POINTERUP, (event) => end(event))\n\n      this._element.classList.add(CLASS_NAME_POINTER_EVENT)\n    } else {\n      $(this._element).on(EVENT_TOUCHSTART, (event) => start(event))\n      $(this._element).on(EVENT_TOUCHMOVE, (event) => move(event))\n      $(this._element).on(EVENT_TOUCHEND, (event) => end(event))\n    }\n  }\n\n  _keydown(event) {\n    if (/input|textarea/i.test(event.target.tagName)) {\n      return\n    }\n\n    switch (event.which) {\n      case ARROW_LEFT_KEYCODE:\n        event.preventDefault()\n        this.prev()\n        break\n      case ARROW_RIGHT_KEYCODE:\n        event.preventDefault()\n        this.next()\n        break\n      default:\n    }\n  }\n\n  _getItemIndex(element) {\n    this._items = element && element.parentNode\n      ? [].slice.call(element.parentNode.querySelectorAll(SELECTOR_ITEM))\n      : []\n    return this._items.indexOf(element)\n  }\n\n  _getItemByDirection(direction, activeElement) {\n    const isNextDirection = direction === DIRECTION_NEXT\n    const isPrevDirection = direction === DIRECTION_PREV\n    const activeIndex     = this._getItemIndex(activeElement)\n    const lastItemIndex   = this._items.length - 1\n    const isGoingToWrap   = isPrevDirection && activeIndex === 0 ||\n                            isNextDirection && activeIndex === lastItemIndex\n\n    if (isGoingToWrap && !this._config.wrap) {\n      return activeElement\n    }\n\n    const delta     = direction === DIRECTION_PREV ? -1 : 1\n    const itemIndex = (activeIndex + delta) % this._items.length\n\n    return itemIndex === -1\n      ? this._items[this._items.length - 1] : this._items[itemIndex]\n  }\n\n  _triggerSlideEvent(relatedTarget, eventDirectionName) {\n    const targetIndex = this._getItemIndex(relatedTarget)\n    const fromIndex = this._getItemIndex(this._element.querySelector(SELECTOR_ACTIVE_ITEM))\n    const slideEvent = $.Event(EVENT_SLIDE, {\n      relatedTarget,\n      direction: eventDirectionName,\n      from: fromIndex,\n      to: targetIndex\n    })\n\n    $(this._element).trigger(slideEvent)\n\n    return slideEvent\n  }\n\n  _setActiveIndicatorElement(element) {\n    if (this._indicatorsElement) {\n      const indicators = [].slice.call(this._indicatorsElement.querySelectorAll(SELECTOR_ACTIVE))\n      $(indicators).removeClass(CLASS_NAME_ACTIVE)\n\n      const nextIndicator = this._indicatorsElement.children[\n        this._getItemIndex(element)\n      ]\n\n      if (nextIndicator) {\n        $(nextIndicator).addClass(CLASS_NAME_ACTIVE)\n      }\n    }\n  }\n\n  _slide(direction, element) {\n    const activeElement = this._element.querySelector(SELECTOR_ACTIVE_ITEM)\n    const activeElementIndex = this._getItemIndex(activeElement)\n    const nextElement   = element || activeElement &&\n      this._getItemByDirection(direction, activeElement)\n    const nextElementIndex = this._getItemIndex(nextElement)\n    const isCycling = Boolean(this._interval)\n\n    let directionalClassName\n    let orderClassName\n    let eventDirectionName\n\n    if (direction === DIRECTION_NEXT) {\n      directionalClassName = CLASS_NAME_LEFT\n      orderClassName = CLASS_NAME_NEXT\n      eventDirectionName = DIRECTION_LEFT\n    } else {\n      directionalClassName = CLASS_NAME_RIGHT\n      orderClassName = CLASS_NAME_PREV\n      eventDirectionName = DIRECTION_RIGHT\n    }\n\n    if (nextElement && $(nextElement).hasClass(CLASS_NAME_ACTIVE)) {\n      this._isSliding = false\n      return\n    }\n\n    const slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName)\n    if (slideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (!activeElement || !nextElement) {\n      // Some weirdness is happening, so we bail\n      return\n    }\n\n    this._isSliding = true\n\n    if (isCycling) {\n      this.pause()\n    }\n\n    this._setActiveIndicatorElement(nextElement)\n\n    const slidEvent = $.Event(EVENT_SLID, {\n      relatedTarget: nextElement,\n      direction: eventDirectionName,\n      from: activeElementIndex,\n      to: nextElementIndex\n    })\n\n    if ($(this._element).hasClass(CLASS_NAME_SLIDE)) {\n      $(nextElement).addClass(orderClassName)\n\n      Util.reflow(nextElement)\n\n      $(activeElement).addClass(directionalClassName)\n      $(nextElement).addClass(directionalClassName)\n\n      const nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10)\n      if (nextElementInterval) {\n        this._config.defaultInterval = this._config.defaultInterval || this._config.interval\n        this._config.interval = nextElementInterval\n      } else {\n        this._config.interval = this._config.defaultInterval || this._config.interval\n      }\n\n      const transitionDuration = Util.getTransitionDurationFromElement(activeElement)\n\n      $(activeElement)\n        .one(Util.TRANSITION_END, () => {\n          $(nextElement)\n            .removeClass(`${directionalClassName} ${orderClassName}`)\n            .addClass(CLASS_NAME_ACTIVE)\n\n          $(activeElement).removeClass(`${CLASS_NAME_ACTIVE} ${orderClassName} ${directionalClassName}`)\n\n          this._isSliding = false\n\n          setTimeout(() => $(this._element).trigger(slidEvent), 0)\n        })\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      $(activeElement).removeClass(CLASS_NAME_ACTIVE)\n      $(nextElement).addClass(CLASS_NAME_ACTIVE)\n\n      this._isSliding = false\n      $(this._element).trigger(slidEvent)\n    }\n\n    if (isCycling) {\n      this.cycle()\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      let _config = {\n        ...Default,\n        ...$(this).data()\n      }\n\n      if (typeof config === 'object') {\n        _config = {\n          ..._config,\n          ...config\n        }\n      }\n\n      const action = typeof config === 'string' ? config : _config.slide\n\n      if (!data) {\n        data = new Carousel(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'number') {\n        data.to(config)\n      } else if (typeof action === 'string') {\n        if (typeof data[action] === 'undefined') {\n          throw new TypeError(`No method named \"${action}\"`)\n        }\n        data[action]()\n      } else if (_config.interval && _config.ride) {\n        data.pause()\n        data.cycle()\n      }\n    })\n  }\n\n  static _dataApiClickHandler(event) {\n    const selector = Util.getSelectorFromElement(this)\n\n    if (!selector) {\n      return\n    }\n\n    const target = $(selector)[0]\n\n    if (!target || !$(target).hasClass(CLASS_NAME_CAROUSEL)) {\n      return\n    }\n\n    const config = {\n      ...$(target).data(),\n      ...$(this).data()\n    }\n    const slideIndex = this.getAttribute('data-slide-to')\n\n    if (slideIndex) {\n      config.interval = false\n    }\n\n    Carousel._jQueryInterface.call($(target), config)\n\n    if (slideIndex) {\n      $(target).data(DATA_KEY).to(slideIndex)\n    }\n\n    event.preventDefault()\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(EVENT_CLICK_DATA_API, SELECTOR_DATA_SLIDE, Carousel._dataApiClickHandler)\n\n$(window).on(EVENT_LOAD_DATA_API, () => {\n  const carousels = [].slice.call(document.querySelectorAll(SELECTOR_DATA_RIDE))\n  for (let i = 0, len = carousels.length; i < len; i++) {\n    const $carousel = $(carousels[i])\n    Carousel._jQueryInterface.call($carousel, $carousel.data())\n  }\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Carousel._jQueryInterface\n$.fn[NAME].Constructor = Carousel\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Carousel._jQueryInterface\n}\n\nexport default Carousel\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): collapse.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'collapse'\nconst VERSION             = '4.5.0'\nconst DATA_KEY            = 'bs.collapse'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst DATA_API_KEY        = '.data-api'\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\n\nconst Default = {\n  toggle : true,\n  parent : ''\n}\n\nconst DefaultType = {\n  toggle : 'boolean',\n  parent : '(string|element)'\n}\n\nconst EVENT_SHOW           = `show${EVENT_KEY}`\nconst EVENT_SHOWN          = `shown${EVENT_KEY}`\nconst EVENT_HIDE           = `hide${EVENT_KEY}`\nconst EVENT_HIDDEN         = `hidden${EVENT_KEY}`\nconst EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_SHOW       = 'show'\nconst CLASS_NAME_COLLAPSE   = 'collapse'\nconst CLASS_NAME_COLLAPSING = 'collapsing'\nconst CLASS_NAME_COLLAPSED  = 'collapsed'\n\nconst DIMENSION_WIDTH  = 'width'\nconst DIMENSION_HEIGHT = 'height'\n\nconst SELECTOR_ACTIVES     = '.show, .collapsing'\nconst SELECTOR_DATA_TOGGLE = '[data-toggle=\"collapse\"]'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Collapse {\n  constructor(element, config) {\n    this._isTransitioning = false\n    this._element         = element\n    this._config          = this._getConfig(config)\n    this._triggerArray    = [].slice.call(document.querySelectorAll(\n      `[data-toggle=\"collapse\"][href=\"#${element.id}\"],` +\n      `[data-toggle=\"collapse\"][data-target=\"#${element.id}\"]`\n    ))\n\n    const toggleList = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE))\n    for (let i = 0, len = toggleList.length; i < len; i++) {\n      const elem = toggleList[i]\n      const selector = Util.getSelectorFromElement(elem)\n      const filterElement = [].slice.call(document.querySelectorAll(selector))\n        .filter((foundElem) => foundElem === element)\n\n      if (selector !== null && filterElement.length > 0) {\n        this._selector = selector\n        this._triggerArray.push(elem)\n      }\n    }\n\n    this._parent = this._config.parent ? this._getParent() : null\n\n    if (!this._config.parent) {\n      this._addAriaAndCollapsedClass(this._element, this._triggerArray)\n    }\n\n    if (this._config.toggle) {\n      this.toggle()\n    }\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  toggle() {\n    if ($(this._element).hasClass(CLASS_NAME_SHOW)) {\n      this.hide()\n    } else {\n      this.show()\n    }\n  }\n\n  show() {\n    if (this._isTransitioning ||\n      $(this._element).hasClass(CLASS_NAME_SHOW)) {\n      return\n    }\n\n    let actives\n    let activesData\n\n    if (this._parent) {\n      actives = [].slice.call(this._parent.querySelectorAll(SELECTOR_ACTIVES))\n        .filter((elem) => {\n          if (typeof this._config.parent === 'string') {\n            return elem.getAttribute('data-parent') === this._config.parent\n          }\n\n          return elem.classList.contains(CLASS_NAME_COLLAPSE)\n        })\n\n      if (actives.length === 0) {\n        actives = null\n      }\n    }\n\n    if (actives) {\n      activesData = $(actives).not(this._selector).data(DATA_KEY)\n      if (activesData && activesData._isTransitioning) {\n        return\n      }\n    }\n\n    const startEvent = $.Event(EVENT_SHOW)\n    $(this._element).trigger(startEvent)\n    if (startEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (actives) {\n      Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide')\n      if (!activesData) {\n        $(actives).data(DATA_KEY, null)\n      }\n    }\n\n    const dimension = this._getDimension()\n\n    $(this._element)\n      .removeClass(CLASS_NAME_COLLAPSE)\n      .addClass(CLASS_NAME_COLLAPSING)\n\n    this._element.style[dimension] = 0\n\n    if (this._triggerArray.length) {\n      $(this._triggerArray)\n        .removeClass(CLASS_NAME_COLLAPSED)\n        .attr('aria-expanded', true)\n    }\n\n    this.setTransitioning(true)\n\n    const complete = () => {\n      $(this._element)\n        .removeClass(CLASS_NAME_COLLAPSING)\n        .addClass(`${CLASS_NAME_COLLAPSE} ${CLASS_NAME_SHOW}`)\n\n      this._element.style[dimension] = ''\n\n      this.setTransitioning(false)\n\n      $(this._element).trigger(EVENT_SHOWN)\n    }\n\n    const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1)\n    const scrollSize = `scroll${capitalizedDimension}`\n    const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n    $(this._element)\n      .one(Util.TRANSITION_END, complete)\n      .emulateTransitionEnd(transitionDuration)\n\n    this._element.style[dimension] = `${this._element[scrollSize]}px`\n  }\n\n  hide() {\n    if (this._isTransitioning ||\n      !$(this._element).hasClass(CLASS_NAME_SHOW)) {\n      return\n    }\n\n    const startEvent = $.Event(EVENT_HIDE)\n    $(this._element).trigger(startEvent)\n    if (startEvent.isDefaultPrevented()) {\n      return\n    }\n\n    const dimension = this._getDimension()\n\n    this._element.style[dimension] = `${this._element.getBoundingClientRect()[dimension]}px`\n\n    Util.reflow(this._element)\n\n    $(this._element)\n      .addClass(CLASS_NAME_COLLAPSING)\n      .removeClass(`${CLASS_NAME_COLLAPSE} ${CLASS_NAME_SHOW}`)\n\n    const triggerArrayLength = this._triggerArray.length\n    if (triggerArrayLength > 0) {\n      for (let i = 0; i < triggerArrayLength; i++) {\n        const trigger = this._triggerArray[i]\n        const selector = Util.getSelectorFromElement(trigger)\n\n        if (selector !== null) {\n          const $elem = $([].slice.call(document.querySelectorAll(selector)))\n          if (!$elem.hasClass(CLASS_NAME_SHOW)) {\n            $(trigger).addClass(CLASS_NAME_COLLAPSED)\n              .attr('aria-expanded', false)\n          }\n        }\n      }\n    }\n\n    this.setTransitioning(true)\n\n    const complete = () => {\n      this.setTransitioning(false)\n      $(this._element)\n        .removeClass(CLASS_NAME_COLLAPSING)\n        .addClass(CLASS_NAME_COLLAPSE)\n        .trigger(EVENT_HIDDEN)\n    }\n\n    this._element.style[dimension] = ''\n    const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n    $(this._element)\n      .one(Util.TRANSITION_END, complete)\n      .emulateTransitionEnd(transitionDuration)\n  }\n\n  setTransitioning(isTransitioning) {\n    this._isTransitioning = isTransitioning\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n\n    this._config          = null\n    this._parent          = null\n    this._element         = null\n    this._triggerArray    = null\n    this._isTransitioning = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...config\n    }\n    config.toggle = Boolean(config.toggle) // Coerce string values\n    Util.typeCheckConfig(NAME, config, DefaultType)\n    return config\n  }\n\n  _getDimension() {\n    const hasWidth = $(this._element).hasClass(DIMENSION_WIDTH)\n    return hasWidth ? DIMENSION_WIDTH : DIMENSION_HEIGHT\n  }\n\n  _getParent() {\n    let parent\n\n    if (Util.isElement(this._config.parent)) {\n      parent = this._config.parent\n\n      // It's a jQuery object\n      if (typeof this._config.parent.jquery !== 'undefined') {\n        parent = this._config.parent[0]\n      }\n    } else {\n      parent = document.querySelector(this._config.parent)\n    }\n\n    const selector = `[data-toggle=\"collapse\"][data-parent=\"${this._config.parent}\"]`\n    const children = [].slice.call(parent.querySelectorAll(selector))\n\n    $(children).each((i, element) => {\n      this._addAriaAndCollapsedClass(\n        Collapse._getTargetFromElement(element),\n        [element]\n      )\n    })\n\n    return parent\n  }\n\n  _addAriaAndCollapsedClass(element, triggerArray) {\n    const isOpen = $(element).hasClass(CLASS_NAME_SHOW)\n\n    if (triggerArray.length) {\n      $(triggerArray)\n        .toggleClass(CLASS_NAME_COLLAPSED, !isOpen)\n        .attr('aria-expanded', isOpen)\n    }\n  }\n\n  // Static\n\n  static _getTargetFromElement(element) {\n    const selector = Util.getSelectorFromElement(element)\n    return selector ? document.querySelector(selector) : null\n  }\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $this   = $(this)\n      let data      = $this.data(DATA_KEY)\n      const _config = {\n        ...Default,\n        ...$this.data(),\n        ...typeof config === 'object' && config ? config : {}\n      }\n\n      if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {\n        _config.toggle = false\n      }\n\n      if (!data) {\n        data = new Collapse(this, _config)\n        $this.data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {\n  // preventDefault only for <a> elements (which change the URL) not inside the collapsible element\n  if (event.currentTarget.tagName === 'A') {\n    event.preventDefault()\n  }\n\n  const $trigger = $(this)\n  const selector = Util.getSelectorFromElement(this)\n  const selectors = [].slice.call(document.querySelectorAll(selector))\n\n  $(selectors).each(function () {\n    const $target = $(this)\n    const data    = $target.data(DATA_KEY)\n    const config  = data ? 'toggle' : $trigger.data()\n    Collapse._jQueryInterface.call($target, config)\n  })\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Collapse._jQueryInterface\n$.fn[NAME].Constructor = Collapse\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Collapse._jQueryInterface\n}\n\nexport default Collapse\n","/**!\n * @fileOverview Kickass library to create and place poppers near their reference elements.\n * @version 1.16.0\n * @license\n * Copyright (c) 2016 Federico Zivolo and contributors\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n */\nvar isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && typeof navigator !== 'undefined';\n\nvar timeoutDuration = function () {\n  var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];\n  for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) {\n    if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) {\n      return 1;\n    }\n  }\n  return 0;\n}();\n\nfunction microtaskDebounce(fn) {\n  var called = false;\n  return function () {\n    if (called) {\n      return;\n    }\n    called = true;\n    window.Promise.resolve().then(function () {\n      called = false;\n      fn();\n    });\n  };\n}\n\nfunction taskDebounce(fn) {\n  var scheduled = false;\n  return function () {\n    if (!scheduled) {\n      scheduled = true;\n      setTimeout(function () {\n        scheduled = false;\n        fn();\n      }, timeoutDuration);\n    }\n  };\n}\n\nvar supportsMicroTasks = isBrowser && window.Promise;\n\n/**\n* Create a debounced version of a method, that's asynchronously deferred\n* but called in the minimum time possible.\n*\n* @method\n* @memberof Popper.Utils\n* @argument {Function} fn\n* @returns {Function}\n*/\nvar debounce = supportsMicroTasks ? microtaskDebounce : taskDebounce;\n\n/**\n * Check if the given variable is a function\n * @method\n * @memberof Popper.Utils\n * @argument {Any} functionToCheck - variable to check\n * @returns {Boolean} answer to: is a function?\n */\nfunction isFunction(functionToCheck) {\n  var getType = {};\n  return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';\n}\n\n/**\n * Get CSS computed property of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Eement} element\n * @argument {String} property\n */\nfunction getStyleComputedProperty(element, property) {\n  if (element.nodeType !== 1) {\n    return [];\n  }\n  // NOTE: 1 DOM access here\n  var window = element.ownerDocument.defaultView;\n  var css = window.getComputedStyle(element, null);\n  return property ? css[property] : css;\n}\n\n/**\n * Returns the parentNode or the host of the element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} parent\n */\nfunction getParentNode(element) {\n  if (element.nodeName === 'HTML') {\n    return element;\n  }\n  return element.parentNode || element.host;\n}\n\n/**\n * Returns the scrolling parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} scroll parent\n */\nfunction getScrollParent(element) {\n  // Return body, `getScroll` will take care to get the correct `scrollTop` from it\n  if (!element) {\n    return document.body;\n  }\n\n  switch (element.nodeName) {\n    case 'HTML':\n    case 'BODY':\n      return element.ownerDocument.body;\n    case '#document':\n      return element.body;\n  }\n\n  // Firefox want us to check `-x` and `-y` variations as well\n\n  var _getStyleComputedProp = getStyleComputedProperty(element),\n      overflow = _getStyleComputedProp.overflow,\n      overflowX = _getStyleComputedProp.overflowX,\n      overflowY = _getStyleComputedProp.overflowY;\n\n  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {\n    return element;\n  }\n\n  return getScrollParent(getParentNode(element));\n}\n\n/**\n * Returns the reference node of the reference object, or the reference object itself.\n * @method\n * @memberof Popper.Utils\n * @param {Element|Object} reference - the reference element (the popper will be relative to this)\n * @returns {Element} parent\n */\nfunction getReferenceNode(reference) {\n  return reference && reference.referenceNode ? reference.referenceNode : reference;\n}\n\nvar isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);\nvar isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);\n\n/**\n * Determines if the browser is Internet Explorer\n * @method\n * @memberof Popper.Utils\n * @param {Number} version to check\n * @returns {Boolean} isIE\n */\nfunction isIE(version) {\n  if (version === 11) {\n    return isIE11;\n  }\n  if (version === 10) {\n    return isIE10;\n  }\n  return isIE11 || isIE10;\n}\n\n/**\n * Returns the offset parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} offset parent\n */\nfunction getOffsetParent(element) {\n  if (!element) {\n    return document.documentElement;\n  }\n\n  var noOffsetParent = isIE(10) ? document.body : null;\n\n  // NOTE: 1 DOM access here\n  var offsetParent = element.offsetParent || null;\n  // Skip hidden elements which don't have an offsetParent\n  while (offsetParent === noOffsetParent && element.nextElementSibling) {\n    offsetParent = (element = element.nextElementSibling).offsetParent;\n  }\n\n  var nodeName = offsetParent && offsetParent.nodeName;\n\n  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {\n    return element ? element.ownerDocument.documentElement : document.documentElement;\n  }\n\n  // .offsetParent will return the closest TH, TD or TABLE in case\n  // no offsetParent is present, I hate this job...\n  if (['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') {\n    return getOffsetParent(offsetParent);\n  }\n\n  return offsetParent;\n}\n\nfunction isOffsetContainer(element) {\n  var nodeName = element.nodeName;\n\n  if (nodeName === 'BODY') {\n    return false;\n  }\n  return nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element;\n}\n\n/**\n * Finds the root node (document, shadowDOM root) of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} node\n * @returns {Element} root node\n */\nfunction getRoot(node) {\n  if (node.parentNode !== null) {\n    return getRoot(node.parentNode);\n  }\n\n  return node;\n}\n\n/**\n * Finds the offset parent common to the two provided nodes\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element1\n * @argument {Element} element2\n * @returns {Element} common offset parent\n */\nfunction findCommonOffsetParent(element1, element2) {\n  // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n  if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) {\n    return document.documentElement;\n  }\n\n  // Here we make sure to give as \"start\" the element that comes first in the DOM\n  var order = element1.compareDocumentPosition(element2) & Node.DOCUMENT_POSITION_FOLLOWING;\n  var start = order ? element1 : element2;\n  var end = order ? element2 : element1;\n\n  // Get common ancestor container\n  var range = document.createRange();\n  range.setStart(start, 0);\n  range.setEnd(end, 0);\n  var commonAncestorContainer = range.commonAncestorContainer;\n\n  // Both nodes are inside #document\n\n  if (element1 !== commonAncestorContainer && element2 !== commonAncestorContainer || start.contains(end)) {\n    if (isOffsetContainer(commonAncestorContainer)) {\n      return commonAncestorContainer;\n    }\n\n    return getOffsetParent(commonAncestorContainer);\n  }\n\n  // one of the nodes is inside shadowDOM, find which one\n  var element1root = getRoot(element1);\n  if (element1root.host) {\n    return findCommonOffsetParent(element1root.host, element2);\n  } else {\n    return findCommonOffsetParent(element1, getRoot(element2).host);\n  }\n}\n\n/**\n * Gets the scroll value of the given element in the given side (top and left)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {String} side `top` or `left`\n * @returns {number} amount of scrolled pixels\n */\nfunction getScroll(element) {\n  var side = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'top';\n\n  var upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft';\n  var nodeName = element.nodeName;\n\n  if (nodeName === 'BODY' || nodeName === 'HTML') {\n    var html = element.ownerDocument.documentElement;\n    var scrollingElement = element.ownerDocument.scrollingElement || html;\n    return scrollingElement[upperSide];\n  }\n\n  return element[upperSide];\n}\n\n/*\n * Sum or subtract the element scroll values (left and top) from a given rect object\n * @method\n * @memberof Popper.Utils\n * @param {Object} rect - Rect object you want to change\n * @param {HTMLElement} element - The element from the function reads the scroll values\n * @param {Boolean} subtract - set to true if you want to subtract the scroll values\n * @return {Object} rect - The modifier rect object\n */\nfunction includeScroll(rect, element) {\n  var subtract = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;\n\n  var scrollTop = getScroll(element, 'top');\n  var scrollLeft = getScroll(element, 'left');\n  var modifier = subtract ? -1 : 1;\n  rect.top += scrollTop * modifier;\n  rect.bottom += scrollTop * modifier;\n  rect.left += scrollLeft * modifier;\n  rect.right += scrollLeft * modifier;\n  return rect;\n}\n\n/*\n * Helper to detect borders of a given element\n * @method\n * @memberof Popper.Utils\n * @param {CSSStyleDeclaration} styles\n * Result of `getStyleComputedProperty` on the given element\n * @param {String} axis - `x` or `y`\n * @return {number} borders - The borders size of the given axis\n */\n\nfunction getBordersSize(styles, axis) {\n  var sideA = axis === 'x' ? 'Left' : 'Top';\n  var sideB = sideA === 'Left' ? 'Right' : 'Bottom';\n\n  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);\n}\n\nfunction getSize(axis, body, html, computedStyle) {\n  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? parseInt(html['offset' + axis]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')]) : 0);\n}\n\nfunction getWindowSizes(document) {\n  var body = document.body;\n  var html = document.documentElement;\n  var computedStyle = isIE(10) && getComputedStyle(html);\n\n  return {\n    height: getSize('Height', body, html, computedStyle),\n    width: getSize('Width', body, html, computedStyle)\n  };\n}\n\nvar classCallCheck = function (instance, Constructor) {\n  if (!(instance instanceof Constructor)) {\n    throw new TypeError(\"Cannot call a class as a function\");\n  }\n};\n\nvar createClass = function () {\n  function defineProperties(target, props) {\n    for (var i = 0; i < props.length; i++) {\n      var descriptor = props[i];\n      descriptor.enumerable = descriptor.enumerable || false;\n      descriptor.configurable = true;\n      if (\"value\" in descriptor) descriptor.writable = true;\n      Object.defineProperty(target, descriptor.key, descriptor);\n    }\n  }\n\n  return function (Constructor, protoProps, staticProps) {\n    if (protoProps) defineProperties(Constructor.prototype, protoProps);\n    if (staticProps) defineProperties(Constructor, staticProps);\n    return Constructor;\n  };\n}();\n\n\n\n\n\nvar defineProperty = function (obj, key, value) {\n  if (key in obj) {\n    Object.defineProperty(obj, key, {\n      value: value,\n      enumerable: true,\n      configurable: true,\n      writable: true\n    });\n  } else {\n    obj[key] = value;\n  }\n\n  return obj;\n};\n\nvar _extends = Object.assign || function (target) {\n  for (var i = 1; i < arguments.length; i++) {\n    var source = arguments[i];\n\n    for (var key in source) {\n      if (Object.prototype.hasOwnProperty.call(source, key)) {\n        target[key] = source[key];\n      }\n    }\n  }\n\n  return target;\n};\n\n/**\n * Given element offsets, generate an output similar to getBoundingClientRect\n * @method\n * @memberof Popper.Utils\n * @argument {Object} offsets\n * @returns {Object} ClientRect like output\n */\nfunction getClientRect(offsets) {\n  return _extends({}, offsets, {\n    right: offsets.left + offsets.width,\n    bottom: offsets.top + offsets.height\n  });\n}\n\n/**\n * Get bounding client rect of given element\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} element\n * @return {Object} client rect\n */\nfunction getBoundingClientRect(element) {\n  var rect = {};\n\n  // IE10 10 FIX: Please, don't ask, the element isn't\n  // considered in DOM in some circumstances...\n  // This isn't reproducible in IE10 compatibility mode of IE11\n  try {\n    if (isIE(10)) {\n      rect = element.getBoundingClientRect();\n      var scrollTop = getScroll(element, 'top');\n      var scrollLeft = getScroll(element, 'left');\n      rect.top += scrollTop;\n      rect.left += scrollLeft;\n      rect.bottom += scrollTop;\n      rect.right += scrollLeft;\n    } else {\n      rect = element.getBoundingClientRect();\n    }\n  } catch (e) {}\n\n  var result = {\n    left: rect.left,\n    top: rect.top,\n    width: rect.right - rect.left,\n    height: rect.bottom - rect.top\n  };\n\n  // subtract scrollbar size from sizes\n  var sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};\n  var width = sizes.width || element.clientWidth || result.width;\n  var height = sizes.height || element.clientHeight || result.height;\n\n  var horizScrollbar = element.offsetWidth - width;\n  var vertScrollbar = element.offsetHeight - height;\n\n  // if an hypothetical scrollbar is detected, we must be sure it's not a `border`\n  // we make this check conditional for performance reasons\n  if (horizScrollbar || vertScrollbar) {\n    var styles = getStyleComputedProperty(element);\n    horizScrollbar -= getBordersSize(styles, 'x');\n    vertScrollbar -= getBordersSize(styles, 'y');\n\n    result.width -= horizScrollbar;\n    result.height -= vertScrollbar;\n  }\n\n  return getClientRect(result);\n}\n\nfunction getOffsetRectRelativeToArbitraryNode(children, parent) {\n  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;\n\n  var isIE10 = isIE(10);\n  var isHTML = parent.nodeName === 'HTML';\n  var childrenRect = getBoundingClientRect(children);\n  var parentRect = getBoundingClientRect(parent);\n  var scrollParent = getScrollParent(children);\n\n  var styles = getStyleComputedProperty(parent);\n  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);\n  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);\n\n  // In cases where the parent is fixed, we must ignore negative scroll in offset calc\n  if (fixedPosition && isHTML) {\n    parentRect.top = Math.max(parentRect.top, 0);\n    parentRect.left = Math.max(parentRect.left, 0);\n  }\n  var offsets = getClientRect({\n    top: childrenRect.top - parentRect.top - borderTopWidth,\n    left: childrenRect.left - parentRect.left - borderLeftWidth,\n    width: childrenRect.width,\n    height: childrenRect.height\n  });\n  offsets.marginTop = 0;\n  offsets.marginLeft = 0;\n\n  // Subtract margins of documentElement in case it's being used as parent\n  // we do this only on HTML because it's the only element that behaves\n  // differently when margins are applied to it. The margins are included in\n  // the box of the documentElement, in the other cases not.\n  if (!isIE10 && isHTML) {\n    var marginTop = parseFloat(styles.marginTop, 10);\n    var marginLeft = parseFloat(styles.marginLeft, 10);\n\n    offsets.top -= borderTopWidth - marginTop;\n    offsets.bottom -= borderTopWidth - marginTop;\n    offsets.left -= borderLeftWidth - marginLeft;\n    offsets.right -= borderLeftWidth - marginLeft;\n\n    // Attach marginTop and marginLeft because in some circumstances we may need them\n    offsets.marginTop = marginTop;\n    offsets.marginLeft = marginLeft;\n  }\n\n  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {\n    offsets = includeScroll(offsets, parent);\n  }\n\n  return offsets;\n}\n\nfunction getViewportOffsetRectRelativeToArtbitraryNode(element) {\n  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;\n\n  var html = element.ownerDocument.documentElement;\n  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);\n  var width = Math.max(html.clientWidth, window.innerWidth || 0);\n  var height = Math.max(html.clientHeight, window.innerHeight || 0);\n\n  var scrollTop = !excludeScroll ? getScroll(html) : 0;\n  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;\n\n  var offset = {\n    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,\n    left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft,\n    width: width,\n    height: height\n  };\n\n  return getClientRect(offset);\n}\n\n/**\n * Check if the given element is fixed or is inside a fixed parent\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {Element} customContainer\n * @returns {Boolean} answer to \"isFixed?\"\n */\nfunction isFixed(element) {\n  var nodeName = element.nodeName;\n  if (nodeName === 'BODY' || nodeName === 'HTML') {\n    return false;\n  }\n  if (getStyleComputedProperty(element, 'position') === 'fixed') {\n    return true;\n  }\n  var parentNode = getParentNode(element);\n  if (!parentNode) {\n    return false;\n  }\n  return isFixed(parentNode);\n}\n\n/**\n * Finds the first parent of an element that has a transformed property defined\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} first transformed parent or documentElement\n */\n\nfunction getFixedPositionOffsetParent(element) {\n  // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n  if (!element || !element.parentElement || isIE()) {\n    return document.documentElement;\n  }\n  var el = element.parentElement;\n  while (el && getStyleComputedProperty(el, 'transform') === 'none') {\n    el = el.parentElement;\n  }\n  return el || document.documentElement;\n}\n\n/**\n * Computed the boundaries limits and return them\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} popper\n * @param {HTMLElement} reference\n * @param {number} padding\n * @param {HTMLElement} boundariesElement - Element used to define the boundaries\n * @param {Boolean} fixedPosition - Is in fixed position mode\n * @returns {Object} Coordinates of the boundaries\n */\nfunction getBoundaries(popper, reference, padding, boundariesElement) {\n  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;\n\n  // NOTE: 1 DOM access here\n\n  var boundaries = { top: 0, left: 0 };\n  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));\n\n  // Handle viewport case\n  if (boundariesElement === 'viewport') {\n    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);\n  } else {\n    // Handle other cases based on DOM element used as boundaries\n    var boundariesNode = void 0;\n    if (boundariesElement === 'scrollParent') {\n      boundariesNode = getScrollParent(getParentNode(reference));\n      if (boundariesNode.nodeName === 'BODY') {\n        boundariesNode = popper.ownerDocument.documentElement;\n      }\n    } else if (boundariesElement === 'window') {\n      boundariesNode = popper.ownerDocument.documentElement;\n    } else {\n      boundariesNode = boundariesElement;\n    }\n\n    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);\n\n    // In case of HTML, we need a different computation\n    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {\n      var _getWindowSizes = getWindowSizes(popper.ownerDocument),\n          height = _getWindowSizes.height,\n          width = _getWindowSizes.width;\n\n      boundaries.top += offsets.top - offsets.marginTop;\n      boundaries.bottom = height + offsets.top;\n      boundaries.left += offsets.left - offsets.marginLeft;\n      boundaries.right = width + offsets.left;\n    } else {\n      // for all the other DOM elements, this one is good\n      boundaries = offsets;\n    }\n  }\n\n  // Add paddings\n  padding = padding || 0;\n  var isPaddingNumber = typeof padding === 'number';\n  boundaries.left += isPaddingNumber ? padding : padding.left || 0;\n  boundaries.top += isPaddingNumber ? padding : padding.top || 0;\n  boundaries.right -= isPaddingNumber ? padding : padding.right || 0;\n  boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0;\n\n  return boundaries;\n}\n\nfunction getArea(_ref) {\n  var width = _ref.width,\n      height = _ref.height;\n\n  return width * height;\n}\n\n/**\n * Utility used to transform the `auto` placement to the placement with more\n * available space.\n * @method\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction computeAutoPlacement(placement, refRect, popper, reference, boundariesElement) {\n  var padding = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;\n\n  if (placement.indexOf('auto') === -1) {\n    return placement;\n  }\n\n  var boundaries = getBoundaries(popper, reference, padding, boundariesElement);\n\n  var rects = {\n    top: {\n      width: boundaries.width,\n      height: refRect.top - boundaries.top\n    },\n    right: {\n      width: boundaries.right - refRect.right,\n      height: boundaries.height\n    },\n    bottom: {\n      width: boundaries.width,\n      height: boundaries.bottom - refRect.bottom\n    },\n    left: {\n      width: refRect.left - boundaries.left,\n      height: boundaries.height\n    }\n  };\n\n  var sortedAreas = Object.keys(rects).map(function (key) {\n    return _extends({\n      key: key\n    }, rects[key], {\n      area: getArea(rects[key])\n    });\n  }).sort(function (a, b) {\n    return b.area - a.area;\n  });\n\n  var filteredAreas = sortedAreas.filter(function (_ref2) {\n    var width = _ref2.width,\n        height = _ref2.height;\n    return width >= popper.clientWidth && height >= popper.clientHeight;\n  });\n\n  var computedPlacement = filteredAreas.length > 0 ? filteredAreas[0].key : sortedAreas[0].key;\n\n  var variation = placement.split('-')[1];\n\n  return computedPlacement + (variation ? '-' + variation : '');\n}\n\n/**\n * Get offsets to the reference element\n * @method\n * @memberof Popper.Utils\n * @param {Object} state\n * @param {Element} popper - the popper element\n * @param {Element} reference - the reference element (the popper will be relative to this)\n * @param {Element} fixedPosition - is in fixed position mode\n * @returns {Object} An object containing the offsets which will be applied to the popper\n */\nfunction getReferenceOffsets(state, popper, reference) {\n  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;\n\n  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));\n  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);\n}\n\n/**\n * Get the outer sizes of the given element (offset size + margins)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Object} object containing width and height properties\n */\nfunction getOuterSizes(element) {\n  var window = element.ownerDocument.defaultView;\n  var styles = window.getComputedStyle(element);\n  var x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);\n  var y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);\n  var result = {\n    width: element.offsetWidth + y,\n    height: element.offsetHeight + x\n  };\n  return result;\n}\n\n/**\n * Get the opposite placement of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement\n * @returns {String} flipped placement\n */\nfunction getOppositePlacement(placement) {\n  var hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };\n  return placement.replace(/left|right|bottom|top/g, function (matched) {\n    return hash[matched];\n  });\n}\n\n/**\n * Get offsets to the popper\n * @method\n * @memberof Popper.Utils\n * @param {Object} position - CSS position the Popper will get applied\n * @param {HTMLElement} popper - the popper element\n * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this)\n * @param {String} placement - one of the valid placement options\n * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper\n */\nfunction getPopperOffsets(popper, referenceOffsets, placement) {\n  placement = placement.split('-')[0];\n\n  // Get popper node sizes\n  var popperRect = getOuterSizes(popper);\n\n  // Add position, width and height to our offsets object\n  var popperOffsets = {\n    width: popperRect.width,\n    height: popperRect.height\n  };\n\n  // depending by the popper placement we have to compute its offsets slightly differently\n  var isHoriz = ['right', 'left'].indexOf(placement) !== -1;\n  var mainSide = isHoriz ? 'top' : 'left';\n  var secondarySide = isHoriz ? 'left' : 'top';\n  var measurement = isHoriz ? 'height' : 'width';\n  var secondaryMeasurement = !isHoriz ? 'height' : 'width';\n\n  popperOffsets[mainSide] = referenceOffsets[mainSide] + referenceOffsets[measurement] / 2 - popperRect[measurement] / 2;\n  if (placement === secondarySide) {\n    popperOffsets[secondarySide] = referenceOffsets[secondarySide] - popperRect[secondaryMeasurement];\n  } else {\n    popperOffsets[secondarySide] = referenceOffsets[getOppositePlacement(secondarySide)];\n  }\n\n  return popperOffsets;\n}\n\n/**\n * Mimics the `find` method of Array\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nfunction find(arr, check) {\n  // use native find if supported\n  if (Array.prototype.find) {\n    return arr.find(check);\n  }\n\n  // use `filter` to obtain the same behavior of `find`\n  return arr.filter(check)[0];\n}\n\n/**\n * Return the index of the matching object\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nfunction findIndex(arr, prop, value) {\n  // use native findIndex if supported\n  if (Array.prototype.findIndex) {\n    return arr.findIndex(function (cur) {\n      return cur[prop] === value;\n    });\n  }\n\n  // use `find` + `indexOf` if `findIndex` isn't supported\n  var match = find(arr, function (obj) {\n    return obj[prop] === value;\n  });\n  return arr.indexOf(match);\n}\n\n/**\n * Loop trough the list of modifiers and run them in order,\n * each of them will then edit the data object.\n * @method\n * @memberof Popper.Utils\n * @param {dataObject} data\n * @param {Array} modifiers\n * @param {String} ends - Optional modifier name used as stopper\n * @returns {dataObject}\n */\nfunction runModifiers(modifiers, data, ends) {\n  var modifiersToRun = ends === undefined ? modifiers : modifiers.slice(0, findIndex(modifiers, 'name', ends));\n\n  modifiersToRun.forEach(function (modifier) {\n    if (modifier['function']) {\n      // eslint-disable-line dot-notation\n      console.warn('`modifier.function` is deprecated, use `modifier.fn`!');\n    }\n    var fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation\n    if (modifier.enabled && isFunction(fn)) {\n      // Add properties to offsets to make them a complete clientRect object\n      // we do this before each modifier to make sure the previous one doesn't\n      // mess with these values\n      data.offsets.popper = getClientRect(data.offsets.popper);\n      data.offsets.reference = getClientRect(data.offsets.reference);\n\n      data = fn(data, modifier);\n    }\n  });\n\n  return data;\n}\n\n/**\n * Updates the position of the popper, computing the new offsets and applying\n * the new style.<br />\n * Prefer `scheduleUpdate` over `update` because of performance reasons.\n * @method\n * @memberof Popper\n */\nfunction update() {\n  // if popper is destroyed, don't perform any further update\n  if (this.state.isDestroyed) {\n    return;\n  }\n\n  var data = {\n    instance: this,\n    styles: {},\n    arrowStyles: {},\n    attributes: {},\n    flipped: false,\n    offsets: {}\n  };\n\n  // compute reference element offsets\n  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);\n\n  // compute auto placement, store placement inside the data object,\n  // modifiers will be able to edit `placement` if needed\n  // and refer to originalPlacement to know the original value\n  data.placement = computeAutoPlacement(this.options.placement, data.offsets.reference, this.popper, this.reference, this.options.modifiers.flip.boundariesElement, this.options.modifiers.flip.padding);\n\n  // store the computed placement inside `originalPlacement`\n  data.originalPlacement = data.placement;\n\n  data.positionFixed = this.options.positionFixed;\n\n  // compute the popper offsets\n  data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);\n\n  data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';\n\n  // run the modifiers\n  data = runModifiers(this.modifiers, data);\n\n  // the first `update` will call `onCreate` callback\n  // the other ones will call `onUpdate` callback\n  if (!this.state.isCreated) {\n    this.state.isCreated = true;\n    this.options.onCreate(data);\n  } else {\n    this.options.onUpdate(data);\n  }\n}\n\n/**\n * Helper used to know if the given modifier is enabled.\n * @method\n * @memberof Popper.Utils\n * @returns {Boolean}\n */\nfunction isModifierEnabled(modifiers, modifierName) {\n  return modifiers.some(function (_ref) {\n    var name = _ref.name,\n        enabled = _ref.enabled;\n    return enabled && name === modifierName;\n  });\n}\n\n/**\n * Get the prefixed supported property name\n * @method\n * @memberof Popper.Utils\n * @argument {String} property (camelCase)\n * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix)\n */\nfunction getSupportedPropertyName(property) {\n  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];\n  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);\n\n  for (var i = 0; i < prefixes.length; i++) {\n    var prefix = prefixes[i];\n    var toCheck = prefix ? '' + prefix + upperProp : property;\n    if (typeof document.body.style[toCheck] !== 'undefined') {\n      return toCheck;\n    }\n  }\n  return null;\n}\n\n/**\n * Destroys the popper.\n * @method\n * @memberof Popper\n */\nfunction destroy() {\n  this.state.isDestroyed = true;\n\n  // touch DOM only if `applyStyle` modifier is enabled\n  if (isModifierEnabled(this.modifiers, 'applyStyle')) {\n    this.popper.removeAttribute('x-placement');\n    this.popper.style.position = '';\n    this.popper.style.top = '';\n    this.popper.style.left = '';\n    this.popper.style.right = '';\n    this.popper.style.bottom = '';\n    this.popper.style.willChange = '';\n    this.popper.style[getSupportedPropertyName('transform')] = '';\n  }\n\n  this.disableEventListeners();\n\n  // remove the popper if user explicitly asked for the deletion on destroy\n  // do not use `remove` because IE11 doesn't support it\n  if (this.options.removeOnDestroy) {\n    this.popper.parentNode.removeChild(this.popper);\n  }\n  return this;\n}\n\n/**\n * Get the window associated with the element\n * @argument {Element} element\n * @returns {Window}\n */\nfunction getWindow(element) {\n  var ownerDocument = element.ownerDocument;\n  return ownerDocument ? ownerDocument.defaultView : window;\n}\n\nfunction attachToScrollParents(scrollParent, event, callback, scrollParents) {\n  var isBody = scrollParent.nodeName === 'BODY';\n  var target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent;\n  target.addEventListener(event, callback, { passive: true });\n\n  if (!isBody) {\n    attachToScrollParents(getScrollParent(target.parentNode), event, callback, scrollParents);\n  }\n  scrollParents.push(target);\n}\n\n/**\n * Setup needed event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nfunction setupEventListeners(reference, options, state, updateBound) {\n  // Resize event listener on window\n  state.updateBound = updateBound;\n  getWindow(reference).addEventListener('resize', state.updateBound, { passive: true });\n\n  // Scroll event listener on scroll parents\n  var scrollElement = getScrollParent(reference);\n  attachToScrollParents(scrollElement, 'scroll', state.updateBound, state.scrollParents);\n  state.scrollElement = scrollElement;\n  state.eventsEnabled = true;\n\n  return state;\n}\n\n/**\n * It will add resize/scroll events and start recalculating\n * position of the popper element when they are triggered.\n * @method\n * @memberof Popper\n */\nfunction enableEventListeners() {\n  if (!this.state.eventsEnabled) {\n    this.state = setupEventListeners(this.reference, this.options, this.state, this.scheduleUpdate);\n  }\n}\n\n/**\n * Remove event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nfunction removeEventListeners(reference, state) {\n  // Remove resize event listener on window\n  getWindow(reference).removeEventListener('resize', state.updateBound);\n\n  // Remove scroll event listener on scroll parents\n  state.scrollParents.forEach(function (target) {\n    target.removeEventListener('scroll', state.updateBound);\n  });\n\n  // Reset state\n  state.updateBound = null;\n  state.scrollParents = [];\n  state.scrollElement = null;\n  state.eventsEnabled = false;\n  return state;\n}\n\n/**\n * It will remove resize/scroll events and won't recalculate popper position\n * when they are triggered. It also won't trigger `onUpdate` callback anymore,\n * unless you call `update` method manually.\n * @method\n * @memberof Popper\n */\nfunction disableEventListeners() {\n  if (this.state.eventsEnabled) {\n    cancelAnimationFrame(this.scheduleUpdate);\n    this.state = removeEventListeners(this.reference, this.state);\n  }\n}\n\n/**\n * Tells if a given input is a number\n * @method\n * @memberof Popper.Utils\n * @param {*} input to check\n * @return {Boolean}\n */\nfunction isNumeric(n) {\n  return n !== '' && !isNaN(parseFloat(n)) && isFinite(n);\n}\n\n/**\n * Set the style to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the style to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nfunction setStyles(element, styles) {\n  Object.keys(styles).forEach(function (prop) {\n    var unit = '';\n    // add unit if the value is numeric and is one of the following\n    if (['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !== -1 && isNumeric(styles[prop])) {\n      unit = 'px';\n    }\n    element.style[prop] = styles[prop] + unit;\n  });\n}\n\n/**\n * Set the attributes to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the attributes to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nfunction setAttributes(element, attributes) {\n  Object.keys(attributes).forEach(function (prop) {\n    var value = attributes[prop];\n    if (value !== false) {\n      element.setAttribute(prop, attributes[prop]);\n    } else {\n      element.removeAttribute(prop);\n    }\n  });\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} data.styles - List of style properties - values to apply to popper element\n * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The same data object\n */\nfunction applyStyle(data) {\n  // any property present in `data.styles` will be applied to the popper,\n  // in this way we can make the 3rd party modifiers add custom styles to it\n  // Be aware, modifiers could override the properties defined in the previous\n  // lines of this modifier!\n  setStyles(data.instance.popper, data.styles);\n\n  // any property present in `data.attributes` will be applied to the popper,\n  // they will be set as HTML attributes of the element\n  setAttributes(data.instance.popper, data.attributes);\n\n  // if arrowElement is defined and arrowStyles has some properties\n  if (data.arrowElement && Object.keys(data.arrowStyles).length) {\n    setStyles(data.arrowElement, data.arrowStyles);\n  }\n\n  return data;\n}\n\n/**\n * Set the x-placement attribute before everything else because it could be used\n * to add margins to the popper margins needs to be calculated to get the\n * correct popper offsets.\n * @method\n * @memberof Popper.modifiers\n * @param {HTMLElement} reference - The reference element used to position the popper\n * @param {HTMLElement} popper - The HTML element used as popper\n * @param {Object} options - Popper.js options\n */\nfunction applyStyleOnLoad(reference, popper, options, modifierOptions, state) {\n  // compute reference element offsets\n  var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);\n\n  // compute auto placement, store placement inside the data object,\n  // modifiers will be able to edit `placement` if needed\n  // and refer to originalPlacement to know the original value\n  var placement = computeAutoPlacement(options.placement, referenceOffsets, popper, reference, options.modifiers.flip.boundariesElement, options.modifiers.flip.padding);\n\n  popper.setAttribute('x-placement', placement);\n\n  // Apply `position` to popper before anything else because\n  // without the position applied we can't guarantee correct computations\n  setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });\n\n  return options;\n}\n\n/**\n * @function\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Boolean} shouldRound - If the offsets should be rounded at all\n * @returns {Object} The popper's position offsets rounded\n *\n * The tale of pixel-perfect positioning. It's still not 100% perfect, but as\n * good as it can be within reason.\n * Discussion here: https://github.com/FezVrasta/popper.js/pull/715\n *\n * Low DPI screens cause a popper to be blurry if not using full pixels (Safari\n * as well on High DPI screens).\n *\n * Firefox prefers no rounding for positioning and does not have blurriness on\n * high DPI screens.\n *\n * Only horizontal placement and left/right values need to be considered.\n */\nfunction getRoundedOffsets(data, shouldRound) {\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n  var round = Math.round,\n      floor = Math.floor;\n\n  var noRound = function noRound(v) {\n    return v;\n  };\n\n  var referenceWidth = round(reference.width);\n  var popperWidth = round(popper.width);\n\n  var isVertical = ['left', 'right'].indexOf(data.placement) !== -1;\n  var isVariation = data.placement.indexOf('-') !== -1;\n  var sameWidthParity = referenceWidth % 2 === popperWidth % 2;\n  var bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;\n\n  var horizontalToInteger = !shouldRound ? noRound : isVertical || isVariation || sameWidthParity ? round : floor;\n  var verticalToInteger = !shouldRound ? noRound : round;\n\n  return {\n    left: horizontalToInteger(bothOddWidth && !isVariation && shouldRound ? popper.left - 1 : popper.left),\n    top: verticalToInteger(popper.top),\n    bottom: verticalToInteger(popper.bottom),\n    right: horizontalToInteger(popper.right)\n  };\n}\n\nvar isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction computeStyle(data, options) {\n  var x = options.x,\n      y = options.y;\n  var popper = data.offsets.popper;\n\n  // Remove this legacy support in Popper.js v2\n\n  var legacyGpuAccelerationOption = find(data.instance.modifiers, function (modifier) {\n    return modifier.name === 'applyStyle';\n  }).gpuAcceleration;\n  if (legacyGpuAccelerationOption !== undefined) {\n    console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');\n  }\n  var gpuAcceleration = legacyGpuAccelerationOption !== undefined ? legacyGpuAccelerationOption : options.gpuAcceleration;\n\n  var offsetParent = getOffsetParent(data.instance.popper);\n  var offsetParentRect = getBoundingClientRect(offsetParent);\n\n  // Styles\n  var styles = {\n    position: popper.position\n  };\n\n  var offsets = getRoundedOffsets(data, window.devicePixelRatio < 2 || !isFirefox);\n\n  var sideA = x === 'bottom' ? 'top' : 'bottom';\n  var sideB = y === 'right' ? 'left' : 'right';\n\n  // if gpuAcceleration is set to `true` and transform is supported,\n  //  we use `translate3d` to apply the position to the popper we\n  // automatically use the supported prefixed version if needed\n  var prefixedProperty = getSupportedPropertyName('transform');\n\n  // now, let's make a step back and look at this code closely (wtf?)\n  // If the content of the popper grows once it's been positioned, it\n  // may happen that the popper gets misplaced because of the new content\n  // overflowing its reference element\n  // To avoid this problem, we provide two options (x and y), which allow\n  // the consumer to define the offset origin.\n  // If we position a popper on top of a reference element, we can set\n  // `x` to `top` to make the popper grow towards its top instead of\n  // its bottom.\n  var left = void 0,\n      top = void 0;\n  if (sideA === 'bottom') {\n    // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)\n    // and not the bottom of the html element\n    if (offsetParent.nodeName === 'HTML') {\n      top = -offsetParent.clientHeight + offsets.bottom;\n    } else {\n      top = -offsetParentRect.height + offsets.bottom;\n    }\n  } else {\n    top = offsets.top;\n  }\n  if (sideB === 'right') {\n    if (offsetParent.nodeName === 'HTML') {\n      left = -offsetParent.clientWidth + offsets.right;\n    } else {\n      left = -offsetParentRect.width + offsets.right;\n    }\n  } else {\n    left = offsets.left;\n  }\n  if (gpuAcceleration && prefixedProperty) {\n    styles[prefixedProperty] = 'translate3d(' + left + 'px, ' + top + 'px, 0)';\n    styles[sideA] = 0;\n    styles[sideB] = 0;\n    styles.willChange = 'transform';\n  } else {\n    // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties\n    var invertTop = sideA === 'bottom' ? -1 : 1;\n    var invertLeft = sideB === 'right' ? -1 : 1;\n    styles[sideA] = top * invertTop;\n    styles[sideB] = left * invertLeft;\n    styles.willChange = sideA + ', ' + sideB;\n  }\n\n  // Attributes\n  var attributes = {\n    'x-placement': data.placement\n  };\n\n  // Update `data` attributes, styles and arrowStyles\n  data.attributes = _extends({}, attributes, data.attributes);\n  data.styles = _extends({}, styles, data.styles);\n  data.arrowStyles = _extends({}, data.offsets.arrow, data.arrowStyles);\n\n  return data;\n}\n\n/**\n * Helper used to know if the given modifier depends from another one.<br />\n * It checks if the needed modifier is listed and enabled.\n * @method\n * @memberof Popper.Utils\n * @param {Array} modifiers - list of modifiers\n * @param {String} requestingName - name of requesting modifier\n * @param {String} requestedName - name of requested modifier\n * @returns {Boolean}\n */\nfunction isModifierRequired(modifiers, requestingName, requestedName) {\n  var requesting = find(modifiers, function (_ref) {\n    var name = _ref.name;\n    return name === requestingName;\n  });\n\n  var isRequired = !!requesting && modifiers.some(function (modifier) {\n    return modifier.name === requestedName && modifier.enabled && modifier.order < requesting.order;\n  });\n\n  if (!isRequired) {\n    var _requesting = '`' + requestingName + '`';\n    var requested = '`' + requestedName + '`';\n    console.warn(requested + ' modifier is required by ' + _requesting + ' modifier in order to work, be sure to include it before ' + _requesting + '!');\n  }\n  return isRequired;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction arrow(data, options) {\n  var _data$offsets$arrow;\n\n  // arrow depends on keepTogether in order to work\n  if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) {\n    return data;\n  }\n\n  var arrowElement = options.element;\n\n  // if arrowElement is a string, suppose it's a CSS selector\n  if (typeof arrowElement === 'string') {\n    arrowElement = data.instance.popper.querySelector(arrowElement);\n\n    // if arrowElement is not found, don't run the modifier\n    if (!arrowElement) {\n      return data;\n    }\n  } else {\n    // if the arrowElement isn't a query selector we must check that the\n    // provided DOM node is child of its popper node\n    if (!data.instance.popper.contains(arrowElement)) {\n      console.warn('WARNING: `arrow.element` must be child of its popper element!');\n      return data;\n    }\n  }\n\n  var placement = data.placement.split('-')[0];\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var isVertical = ['left', 'right'].indexOf(placement) !== -1;\n\n  var len = isVertical ? 'height' : 'width';\n  var sideCapitalized = isVertical ? 'Top' : 'Left';\n  var side = sideCapitalized.toLowerCase();\n  var altSide = isVertical ? 'left' : 'top';\n  var opSide = isVertical ? 'bottom' : 'right';\n  var arrowElementSize = getOuterSizes(arrowElement)[len];\n\n  //\n  // extends keepTogether behavior making sure the popper and its\n  // reference have enough pixels in conjunction\n  //\n\n  // top/left side\n  if (reference[opSide] - arrowElementSize < popper[side]) {\n    data.offsets.popper[side] -= popper[side] - (reference[opSide] - arrowElementSize);\n  }\n  // bottom/right side\n  if (reference[side] + arrowElementSize > popper[opSide]) {\n    data.offsets.popper[side] += reference[side] + arrowElementSize - popper[opSide];\n  }\n  data.offsets.popper = getClientRect(data.offsets.popper);\n\n  // compute center of the popper\n  var center = reference[side] + reference[len] / 2 - arrowElementSize / 2;\n\n  // Compute the sideValue using the updated popper offsets\n  // take popper margin in account because we don't have this info available\n  var css = getStyleComputedProperty(data.instance.popper);\n  var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10);\n  var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10);\n  var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;\n\n  // prevent arrowElement from being placed not contiguously to its popper\n  sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0);\n\n  data.arrowElement = arrowElement;\n  data.offsets.arrow = (_data$offsets$arrow = {}, defineProperty(_data$offsets$arrow, side, Math.round(sideValue)), defineProperty(_data$offsets$arrow, altSide, ''), _data$offsets$arrow);\n\n  return data;\n}\n\n/**\n * Get the opposite placement variation of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement variation\n * @returns {String} flipped placement variation\n */\nfunction getOppositeVariation(variation) {\n  if (variation === 'end') {\n    return 'start';\n  } else if (variation === 'start') {\n    return 'end';\n  }\n  return variation;\n}\n\n/**\n * List of accepted placements to use as values of the `placement` option.<br />\n * Valid placements are:\n * - `auto`\n * - `top`\n * - `right`\n * - `bottom`\n * - `left`\n *\n * Each placement can have a variation from this list:\n * - `-start`\n * - `-end`\n *\n * Variations are interpreted easily if you think of them as the left to right\n * written languages. Horizontally (`top` and `bottom`), `start` is left and `end`\n * is right.<br />\n * Vertically (`left` and `right`), `start` is top and `end` is bottom.\n *\n * Some valid examples are:\n * - `top-end` (on top of reference, right aligned)\n * - `right-start` (on right of reference, top aligned)\n * - `bottom` (on bottom, centered)\n * - `auto-end` (on the side with more space available, alignment depends by placement)\n *\n * @static\n * @type {Array}\n * @enum {String}\n * @readonly\n * @method placements\n * @memberof Popper\n */\nvar placements = ['auto-start', 'auto', 'auto-end', 'top-start', 'top', 'top-end', 'right-start', 'right', 'right-end', 'bottom-end', 'bottom', 'bottom-start', 'left-end', 'left', 'left-start'];\n\n// Get rid of `auto` `auto-start` and `auto-end`\nvar validPlacements = placements.slice(3);\n\n/**\n * Given an initial placement, returns all the subsequent placements\n * clockwise (or counter-clockwise).\n *\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement - A valid placement (it accepts variations)\n * @argument {Boolean} counter - Set to true to walk the placements counterclockwise\n * @returns {Array} placements including their variations\n */\nfunction clockwise(placement) {\n  var counter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;\n\n  var index = validPlacements.indexOf(placement);\n  var arr = validPlacements.slice(index + 1).concat(validPlacements.slice(0, index));\n  return counter ? arr.reverse() : arr;\n}\n\nvar BEHAVIORS = {\n  FLIP: 'flip',\n  CLOCKWISE: 'clockwise',\n  COUNTERCLOCKWISE: 'counterclockwise'\n};\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction flip(data, options) {\n  // if `inner` modifier is enabled, we can't use the `flip` modifier\n  if (isModifierEnabled(data.instance.modifiers, 'inner')) {\n    return data;\n  }\n\n  if (data.flipped && data.placement === data.originalPlacement) {\n    // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides\n    return data;\n  }\n\n  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);\n\n  var placement = data.placement.split('-')[0];\n  var placementOpposite = getOppositePlacement(placement);\n  var variation = data.placement.split('-')[1] || '';\n\n  var flipOrder = [];\n\n  switch (options.behavior) {\n    case BEHAVIORS.FLIP:\n      flipOrder = [placement, placementOpposite];\n      break;\n    case BEHAVIORS.CLOCKWISE:\n      flipOrder = clockwise(placement);\n      break;\n    case BEHAVIORS.COUNTERCLOCKWISE:\n      flipOrder = clockwise(placement, true);\n      break;\n    default:\n      flipOrder = options.behavior;\n  }\n\n  flipOrder.forEach(function (step, index) {\n    if (placement !== step || flipOrder.length === index + 1) {\n      return data;\n    }\n\n    placement = data.placement.split('-')[0];\n    placementOpposite = getOppositePlacement(placement);\n\n    var popperOffsets = data.offsets.popper;\n    var refOffsets = data.offsets.reference;\n\n    // using floor because the reference offsets may contain decimals we are not going to consider here\n    var floor = Math.floor;\n    var overlapsRef = placement === 'left' && floor(popperOffsets.right) > floor(refOffsets.left) || placement === 'right' && floor(popperOffsets.left) < floor(refOffsets.right) || placement === 'top' && floor(popperOffsets.bottom) > floor(refOffsets.top) || placement === 'bottom' && floor(popperOffsets.top) < floor(refOffsets.bottom);\n\n    var overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left);\n    var overflowsRight = floor(popperOffsets.right) > floor(boundaries.right);\n    var overflowsTop = floor(popperOffsets.top) < floor(boundaries.top);\n    var overflowsBottom = floor(popperOffsets.bottom) > floor(boundaries.bottom);\n\n    var overflowsBoundaries = placement === 'left' && overflowsLeft || placement === 'right' && overflowsRight || placement === 'top' && overflowsTop || placement === 'bottom' && overflowsBottom;\n\n    // flip the variation if required\n    var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n\n    // flips variation if reference element overflows boundaries\n    var flippedVariationByRef = !!options.flipVariations && (isVertical && variation === 'start' && overflowsLeft || isVertical && variation === 'end' && overflowsRight || !isVertical && variation === 'start' && overflowsTop || !isVertical && variation === 'end' && overflowsBottom);\n\n    // flips variation if popper content overflows boundaries\n    var flippedVariationByContent = !!options.flipVariationsByContent && (isVertical && variation === 'start' && overflowsRight || isVertical && variation === 'end' && overflowsLeft || !isVertical && variation === 'start' && overflowsBottom || !isVertical && variation === 'end' && overflowsTop);\n\n    var flippedVariation = flippedVariationByRef || flippedVariationByContent;\n\n    if (overlapsRef || overflowsBoundaries || flippedVariation) {\n      // this boolean to detect any flip loop\n      data.flipped = true;\n\n      if (overlapsRef || overflowsBoundaries) {\n        placement = flipOrder[index + 1];\n      }\n\n      if (flippedVariation) {\n        variation = getOppositeVariation(variation);\n      }\n\n      data.placement = placement + (variation ? '-' + variation : '');\n\n      // this object contains `position`, we want to preserve it along with\n      // any additional property we may add in the future\n      data.offsets.popper = _extends({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement));\n\n      data = runModifiers(data.instance.modifiers, data, 'flip');\n    }\n  });\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction keepTogether(data) {\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var placement = data.placement.split('-')[0];\n  var floor = Math.floor;\n  var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n  var side = isVertical ? 'right' : 'bottom';\n  var opSide = isVertical ? 'left' : 'top';\n  var measurement = isVertical ? 'width' : 'height';\n\n  if (popper[side] < floor(reference[opSide])) {\n    data.offsets.popper[opSide] = floor(reference[opSide]) - popper[measurement];\n  }\n  if (popper[opSide] > floor(reference[side])) {\n    data.offsets.popper[opSide] = floor(reference[side]);\n  }\n\n  return data;\n}\n\n/**\n * Converts a string containing value + unit into a px value number\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} str - Value + unit string\n * @argument {String} measurement - `height` or `width`\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @returns {Number|String}\n * Value in pixels, or original string if no values were extracted\n */\nfunction toValue(str, measurement, popperOffsets, referenceOffsets) {\n  // separate value from unit\n  var split = str.match(/((?:\\-|\\+)?\\d*\\.?\\d*)(.*)/);\n  var value = +split[1];\n  var unit = split[2];\n\n  // If it's not a number it's an operator, I guess\n  if (!value) {\n    return str;\n  }\n\n  if (unit.indexOf('%') === 0) {\n    var element = void 0;\n    switch (unit) {\n      case '%p':\n        element = popperOffsets;\n        break;\n      case '%':\n      case '%r':\n      default:\n        element = referenceOffsets;\n    }\n\n    var rect = getClientRect(element);\n    return rect[measurement] / 100 * value;\n  } else if (unit === 'vh' || unit === 'vw') {\n    // if is a vh or vw, we calculate the size based on the viewport\n    var size = void 0;\n    if (unit === 'vh') {\n      size = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\n    } else {\n      size = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\n    }\n    return size / 100 * value;\n  } else {\n    // if is an explicit pixel unit, we get rid of the unit and keep the value\n    // if is an implicit unit, it's px, and we return just the value\n    return value;\n  }\n}\n\n/**\n * Parse an `offset` string to extrapolate `x` and `y` numeric offsets.\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} offset\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @argument {String} basePlacement\n * @returns {Array} a two cells array with x and y offsets in numbers\n */\nfunction parseOffset(offset, popperOffsets, referenceOffsets, basePlacement) {\n  var offsets = [0, 0];\n\n  // Use height if placement is left or right and index is 0 otherwise use width\n  // in this way the first offset will use an axis and the second one\n  // will use the other one\n  var useHeight = ['right', 'left'].indexOf(basePlacement) !== -1;\n\n  // Split the offset string to obtain a list of values and operands\n  // The regex addresses values with the plus or minus sign in front (+10, -20, etc)\n  var fragments = offset.split(/(\\+|\\-)/).map(function (frag) {\n    return frag.trim();\n  });\n\n  // Detect if the offset string contains a pair of values or a single one\n  // they could be separated by comma or space\n  var divider = fragments.indexOf(find(fragments, function (frag) {\n    return frag.search(/,|\\s/) !== -1;\n  }));\n\n  if (fragments[divider] && fragments[divider].indexOf(',') === -1) {\n    console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');\n  }\n\n  // If divider is found, we divide the list of values and operands to divide\n  // them by ofset X and Y.\n  var splitRegex = /\\s*,\\s*|\\s+/;\n  var ops = divider !== -1 ? [fragments.slice(0, divider).concat([fragments[divider].split(splitRegex)[0]]), [fragments[divider].split(splitRegex)[1]].concat(fragments.slice(divider + 1))] : [fragments];\n\n  // Convert the values with units to absolute pixels to allow our computations\n  ops = ops.map(function (op, index) {\n    // Most of the units rely on the orientation of the popper\n    var measurement = (index === 1 ? !useHeight : useHeight) ? 'height' : 'width';\n    var mergeWithPrevious = false;\n    return op\n    // This aggregates any `+` or `-` sign that aren't considered operators\n    // e.g.: 10 + +5 => [10, +, +5]\n    .reduce(function (a, b) {\n      if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) {\n        a[a.length - 1] = b;\n        mergeWithPrevious = true;\n        return a;\n      } else if (mergeWithPrevious) {\n        a[a.length - 1] += b;\n        mergeWithPrevious = false;\n        return a;\n      } else {\n        return a.concat(b);\n      }\n    }, [])\n    // Here we convert the string values into number values (in px)\n    .map(function (str) {\n      return toValue(str, measurement, popperOffsets, referenceOffsets);\n    });\n  });\n\n  // Loop trough the offsets arrays and execute the operations\n  ops.forEach(function (op, index) {\n    op.forEach(function (frag, index2) {\n      if (isNumeric(frag)) {\n        offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1);\n      }\n    });\n  });\n  return offsets;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @argument {Number|String} options.offset=0\n * The offset value as described in the modifier description\n * @returns {Object} The data object, properly modified\n */\nfunction offset(data, _ref) {\n  var offset = _ref.offset;\n  var placement = data.placement,\n      _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var basePlacement = placement.split('-')[0];\n\n  var offsets = void 0;\n  if (isNumeric(+offset)) {\n    offsets = [+offset, 0];\n  } else {\n    offsets = parseOffset(offset, popper, reference, basePlacement);\n  }\n\n  if (basePlacement === 'left') {\n    popper.top += offsets[0];\n    popper.left -= offsets[1];\n  } else if (basePlacement === 'right') {\n    popper.top += offsets[0];\n    popper.left += offsets[1];\n  } else if (basePlacement === 'top') {\n    popper.left += offsets[0];\n    popper.top -= offsets[1];\n  } else if (basePlacement === 'bottom') {\n    popper.left += offsets[0];\n    popper.top += offsets[1];\n  }\n\n  data.popper = popper;\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction preventOverflow(data, options) {\n  var boundariesElement = options.boundariesElement || getOffsetParent(data.instance.popper);\n\n  // If offsetParent is the reference element, we really want to\n  // go one step up and use the next offsetParent as reference to\n  // avoid to make this modifier completely useless and look like broken\n  if (data.instance.reference === boundariesElement) {\n    boundariesElement = getOffsetParent(boundariesElement);\n  }\n\n  // NOTE: DOM access here\n  // resets the popper's position so that the document size can be calculated excluding\n  // the size of the popper element itself\n  var transformProp = getSupportedPropertyName('transform');\n  var popperStyles = data.instance.popper.style; // assignment to help minification\n  var top = popperStyles.top,\n      left = popperStyles.left,\n      transform = popperStyles[transformProp];\n\n  popperStyles.top = '';\n  popperStyles.left = '';\n  popperStyles[transformProp] = '';\n\n  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);\n\n  // NOTE: DOM access here\n  // restores the original style properties after the offsets have been computed\n  popperStyles.top = top;\n  popperStyles.left = left;\n  popperStyles[transformProp] = transform;\n\n  options.boundaries = boundaries;\n\n  var order = options.priority;\n  var popper = data.offsets.popper;\n\n  var check = {\n    primary: function primary(placement) {\n      var value = popper[placement];\n      if (popper[placement] < boundaries[placement] && !options.escapeWithReference) {\n        value = Math.max(popper[placement], boundaries[placement]);\n      }\n      return defineProperty({}, placement, value);\n    },\n    secondary: function secondary(placement) {\n      var mainSide = placement === 'right' ? 'left' : 'top';\n      var value = popper[mainSide];\n      if (popper[placement] > boundaries[placement] && !options.escapeWithReference) {\n        value = Math.min(popper[mainSide], boundaries[placement] - (placement === 'right' ? popper.width : popper.height));\n      }\n      return defineProperty({}, mainSide, value);\n    }\n  };\n\n  order.forEach(function (placement) {\n    var side = ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary';\n    popper = _extends({}, popper, check[side](placement));\n  });\n\n  data.offsets.popper = popper;\n\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction shift(data) {\n  var placement = data.placement;\n  var basePlacement = placement.split('-')[0];\n  var shiftvariation = placement.split('-')[1];\n\n  // if shift shiftvariation is specified, run the modifier\n  if (shiftvariation) {\n    var _data$offsets = data.offsets,\n        reference = _data$offsets.reference,\n        popper = _data$offsets.popper;\n\n    var isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1;\n    var side = isVertical ? 'left' : 'top';\n    var measurement = isVertical ? 'width' : 'height';\n\n    var shiftOffsets = {\n      start: defineProperty({}, side, reference[side]),\n      end: defineProperty({}, side, reference[side] + reference[measurement] - popper[measurement])\n    };\n\n    data.offsets.popper = _extends({}, popper, shiftOffsets[shiftvariation]);\n  }\n\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction hide(data) {\n  if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) {\n    return data;\n  }\n\n  var refRect = data.offsets.reference;\n  var bound = find(data.instance.modifiers, function (modifier) {\n    return modifier.name === 'preventOverflow';\n  }).boundaries;\n\n  if (refRect.bottom < bound.top || refRect.left > bound.right || refRect.top > bound.bottom || refRect.right < bound.left) {\n    // Avoid unnecessary DOM access if visibility hasn't changed\n    if (data.hide === true) {\n      return data;\n    }\n\n    data.hide = true;\n    data.attributes['x-out-of-boundaries'] = '';\n  } else {\n    // Avoid unnecessary DOM access if visibility hasn't changed\n    if (data.hide === false) {\n      return data;\n    }\n\n    data.hide = false;\n    data.attributes['x-out-of-boundaries'] = false;\n  }\n\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction inner(data) {\n  var placement = data.placement;\n  var basePlacement = placement.split('-')[0];\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1;\n\n  var subtractLength = ['top', 'left'].indexOf(basePlacement) === -1;\n\n  popper[isHoriz ? 'left' : 'top'] = reference[basePlacement] - (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0);\n\n  data.placement = getOppositePlacement(placement);\n  data.offsets.popper = getClientRect(popper);\n\n  return data;\n}\n\n/**\n * Modifier function, each modifier can have a function of this type assigned\n * to its `fn` property.<br />\n * These functions will be called on each update, this means that you must\n * make sure they are performant enough to avoid performance bottlenecks.\n *\n * @function ModifierFn\n * @argument {dataObject} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {dataObject} The data object, properly modified\n */\n\n/**\n * Modifiers are plugins used to alter the behavior of your poppers.<br />\n * Popper.js uses a set of 9 modifiers to provide all the basic functionalities\n * needed by the library.\n *\n * Usually you don't want to override the `order`, `fn` and `onLoad` props.\n * All the other properties are configurations that could be tweaked.\n * @namespace modifiers\n */\nvar modifiers = {\n  /**\n   * Modifier used to shift the popper on the start or end of its reference\n   * element.<br />\n   * It will read the variation of the `placement` property.<br />\n   * It can be one either `-end` or `-start`.\n   * @memberof modifiers\n   * @inner\n   */\n  shift: {\n    /** @prop {number} order=100 - Index used to define the order of execution */\n    order: 100,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: shift\n  },\n\n  /**\n   * The `offset` modifier can shift your popper on both its axis.\n   *\n   * It accepts the following units:\n   * - `px` or unit-less, interpreted as pixels\n   * - `%` or `%r`, percentage relative to the length of the reference element\n   * - `%p`, percentage relative to the length of the popper element\n   * - `vw`, CSS viewport width unit\n   * - `vh`, CSS viewport height unit\n   *\n   * For length is intended the main axis relative to the placement of the popper.<br />\n   * This means that if the placement is `top` or `bottom`, the length will be the\n   * `width`. In case of `left` or `right`, it will be the `height`.\n   *\n   * You can provide a single value (as `Number` or `String`), or a pair of values\n   * as `String` divided by a comma or one (or more) white spaces.<br />\n   * The latter is a deprecated method because it leads to confusion and will be\n   * removed in v2.<br />\n   * Additionally, it accepts additions and subtractions between different units.\n   * Note that multiplications and divisions aren't supported.\n   *\n   * Valid examples are:\n   * ```\n   * 10\n   * '10%'\n   * '10, 10'\n   * '10%, 10'\n   * '10 + 10%'\n   * '10 - 5vh + 3%'\n   * '-10px + 5vh, 5px - 6%'\n   * ```\n   * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap\n   * > with their reference element, unfortunately, you will have to disable the `flip` modifier.\n   * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  offset: {\n    /** @prop {number} order=200 - Index used to define the order of execution */\n    order: 200,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: offset,\n    /** @prop {Number|String} offset=0\n     * The offset value as described in the modifier description\n     */\n    offset: 0\n  },\n\n  /**\n   * Modifier used to prevent the popper from being positioned outside the boundary.\n   *\n   * A scenario exists where the reference itself is not within the boundaries.<br />\n   * We can say it has \"escaped the boundaries\" — or just \"escaped\".<br />\n   * In this case we need to decide whether the popper should either:\n   *\n   * - detach from the reference and remain \"trapped\" in the boundaries, or\n   * - if it should ignore the boundary and \"escape with its reference\"\n   *\n   * When `escapeWithReference` is set to`true` and reference is completely\n   * outside its boundaries, the popper will overflow (or completely leave)\n   * the boundaries in order to remain attached to the edge of the reference.\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  preventOverflow: {\n    /** @prop {number} order=300 - Index used to define the order of execution */\n    order: 300,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: preventOverflow,\n    /**\n     * @prop {Array} [priority=['left','right','top','bottom']]\n     * Popper will try to prevent overflow following these priorities by default,\n     * then, it could overflow on the left and on top of the `boundariesElement`\n     */\n    priority: ['left', 'right', 'top', 'bottom'],\n    /**\n     * @prop {number} padding=5\n     * Amount of pixel used to define a minimum distance between the boundaries\n     * and the popper. This makes sure the popper always has a little padding\n     * between the edges of its container\n     */\n    padding: 5,\n    /**\n     * @prop {String|HTMLElement} boundariesElement='scrollParent'\n     * Boundaries used by the modifier. Can be `scrollParent`, `window`,\n     * `viewport` or any DOM element.\n     */\n    boundariesElement: 'scrollParent'\n  },\n\n  /**\n   * Modifier used to make sure the reference and its popper stay near each other\n   * without leaving any gap between the two. Especially useful when the arrow is\n   * enabled and you want to ensure that it points to its reference element.\n   * It cares only about the first axis. You can still have poppers with margin\n   * between the popper and its reference element.\n   * @memberof modifiers\n   * @inner\n   */\n  keepTogether: {\n    /** @prop {number} order=400 - Index used to define the order of execution */\n    order: 400,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: keepTogether\n  },\n\n  /**\n   * This modifier is used to move the `arrowElement` of the popper to make\n   * sure it is positioned between the reference element and its popper element.\n   * It will read the outer size of the `arrowElement` node to detect how many\n   * pixels of conjunction are needed.\n   *\n   * It has no effect if no `arrowElement` is provided.\n   * @memberof modifiers\n   * @inner\n   */\n  arrow: {\n    /** @prop {number} order=500 - Index used to define the order of execution */\n    order: 500,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: arrow,\n    /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */\n    element: '[x-arrow]'\n  },\n\n  /**\n   * Modifier used to flip the popper's placement when it starts to overlap its\n   * reference element.\n   *\n   * Requires the `preventOverflow` modifier before it in order to work.\n   *\n   * **NOTE:** this modifier will interrupt the current update cycle and will\n   * restart it if it detects the need to flip the placement.\n   * @memberof modifiers\n   * @inner\n   */\n  flip: {\n    /** @prop {number} order=600 - Index used to define the order of execution */\n    order: 600,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: flip,\n    /**\n     * @prop {String|Array} behavior='flip'\n     * The behavior used to change the popper's placement. It can be one of\n     * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid\n     * placements (with optional variations)\n     */\n    behavior: 'flip',\n    /**\n     * @prop {number} padding=5\n     * The popper will flip if it hits the edges of the `boundariesElement`\n     */\n    padding: 5,\n    /**\n     * @prop {String|HTMLElement} boundariesElement='viewport'\n     * The element which will define the boundaries of the popper position.\n     * The popper will never be placed outside of the defined boundaries\n     * (except if `keepTogether` is enabled)\n     */\n    boundariesElement: 'viewport',\n    /**\n     * @prop {Boolean} flipVariations=false\n     * The popper will switch placement variation between `-start` and `-end` when\n     * the reference element overlaps its boundaries.\n     *\n     * The original placement should have a set variation.\n     */\n    flipVariations: false,\n    /**\n     * @prop {Boolean} flipVariationsByContent=false\n     * The popper will switch placement variation between `-start` and `-end` when\n     * the popper element overlaps its reference boundaries.\n     *\n     * The original placement should have a set variation.\n     */\n    flipVariationsByContent: false\n  },\n\n  /**\n   * Modifier used to make the popper flow toward the inner of the reference element.\n   * By default, when this modifier is disabled, the popper will be placed outside\n   * the reference element.\n   * @memberof modifiers\n   * @inner\n   */\n  inner: {\n    /** @prop {number} order=700 - Index used to define the order of execution */\n    order: 700,\n    /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */\n    enabled: false,\n    /** @prop {ModifierFn} */\n    fn: inner\n  },\n\n  /**\n   * Modifier used to hide the popper when its reference element is outside of the\n   * popper boundaries. It will set a `x-out-of-boundaries` attribute which can\n   * be used to hide with a CSS selector the popper when its reference is\n   * out of boundaries.\n   *\n   * Requires the `preventOverflow` modifier before it in order to work.\n   * @memberof modifiers\n   * @inner\n   */\n  hide: {\n    /** @prop {number} order=800 - Index used to define the order of execution */\n    order: 800,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: hide\n  },\n\n  /**\n   * Computes the style that will be applied to the popper element to gets\n   * properly positioned.\n   *\n   * Note that this modifier will not touch the DOM, it just prepares the styles\n   * so that `applyStyle` modifier can apply it. This separation is useful\n   * in case you need to replace `applyStyle` with a custom implementation.\n   *\n   * This modifier has `850` as `order` value to maintain backward compatibility\n   * with previous versions of Popper.js. Expect the modifiers ordering method\n   * to change in future major versions of the library.\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  computeStyle: {\n    /** @prop {number} order=850 - Index used to define the order of execution */\n    order: 850,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: computeStyle,\n    /**\n     * @prop {Boolean} gpuAcceleration=true\n     * If true, it uses the CSS 3D transformation to position the popper.\n     * Otherwise, it will use the `top` and `left` properties\n     */\n    gpuAcceleration: true,\n    /**\n     * @prop {string} [x='bottom']\n     * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin.\n     * Change this if your popper should grow in a direction different from `bottom`\n     */\n    x: 'bottom',\n    /**\n     * @prop {string} [x='left']\n     * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin.\n     * Change this if your popper should grow in a direction different from `right`\n     */\n    y: 'right'\n  },\n\n  /**\n   * Applies the computed styles to the popper element.\n   *\n   * All the DOM manipulations are limited to this modifier. This is useful in case\n   * you want to integrate Popper.js inside a framework or view library and you\n   * want to delegate all the DOM manipulations to it.\n   *\n   * Note that if you disable this modifier, you must make sure the popper element\n   * has its position set to `absolute` before Popper.js can do its work!\n   *\n   * Just disable this modifier and define your own to achieve the desired effect.\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  applyStyle: {\n    /** @prop {number} order=900 - Index used to define the order of execution */\n    order: 900,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: applyStyle,\n    /** @prop {Function} */\n    onLoad: applyStyleOnLoad,\n    /**\n     * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier\n     * @prop {Boolean} gpuAcceleration=true\n     * If true, it uses the CSS 3D transformation to position the popper.\n     * Otherwise, it will use the `top` and `left` properties\n     */\n    gpuAcceleration: undefined\n  }\n};\n\n/**\n * The `dataObject` is an object containing all the information used by Popper.js.\n * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.\n * @name dataObject\n * @property {Object} data.instance The Popper.js instance\n * @property {String} data.placement Placement applied to popper\n * @property {String} data.originalPlacement Placement originally defined on init\n * @property {Boolean} data.flipped True if popper has been flipped by flip modifier\n * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper\n * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier\n * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.boundaries Offsets of the popper boundaries\n * @property {Object} data.offsets The measurements of popper, reference and arrow elements\n * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0\n */\n\n/**\n * Default options provided to Popper.js constructor.<br />\n * These can be overridden using the `options` argument of Popper.js.<br />\n * To override an option, simply pass an object with the same\n * structure of the `options` object, as the 3rd argument. For example:\n * ```\n * new Popper(ref, pop, {\n *   modifiers: {\n *     preventOverflow: { enabled: false }\n *   }\n * })\n * ```\n * @type {Object}\n * @static\n * @memberof Popper\n */\nvar Defaults = {\n  /**\n   * Popper's placement.\n   * @prop {Popper.placements} placement='bottom'\n   */\n  placement: 'bottom',\n\n  /**\n   * Set this to true if you want popper to position it self in 'fixed' mode\n   * @prop {Boolean} positionFixed=false\n   */\n  positionFixed: false,\n\n  /**\n   * Whether events (resize, scroll) are initially enabled.\n   * @prop {Boolean} eventsEnabled=true\n   */\n  eventsEnabled: true,\n\n  /**\n   * Set to true if you want to automatically remove the popper when\n   * you call the `destroy` method.\n   * @prop {Boolean} removeOnDestroy=false\n   */\n  removeOnDestroy: false,\n\n  /**\n   * Callback called when the popper is created.<br />\n   * By default, it is set to no-op.<br />\n   * Access Popper.js instance with `data.instance`.\n   * @prop {onCreate}\n   */\n  onCreate: function onCreate() {},\n\n  /**\n   * Callback called when the popper is updated. This callback is not called\n   * on the initialization/creation of the popper, but only on subsequent\n   * updates.<br />\n   * By default, it is set to no-op.<br />\n   * Access Popper.js instance with `data.instance`.\n   * @prop {onUpdate}\n   */\n  onUpdate: function onUpdate() {},\n\n  /**\n   * List of modifiers used to modify the offsets before they are applied to the popper.\n   * They provide most of the functionalities of Popper.js.\n   * @prop {modifiers}\n   */\n  modifiers: modifiers\n};\n\n/**\n * @callback onCreate\n * @param {dataObject} data\n */\n\n/**\n * @callback onUpdate\n * @param {dataObject} data\n */\n\n// Utils\n// Methods\nvar Popper = function () {\n  /**\n   * Creates a new Popper.js instance.\n   * @class Popper\n   * @param {Element|referenceObject} reference - The reference element used to position the popper\n   * @param {Element} popper - The HTML / XML element used as the popper\n   * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)\n   * @return {Object} instance - The generated Popper.js instance\n   */\n  function Popper(reference, popper) {\n    var _this = this;\n\n    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};\n    classCallCheck(this, Popper);\n\n    this.scheduleUpdate = function () {\n      return requestAnimationFrame(_this.update);\n    };\n\n    // make update() debounced, so that it only runs at most once-per-tick\n    this.update = debounce(this.update.bind(this));\n\n    // with {} we create a new object with the options inside it\n    this.options = _extends({}, Popper.Defaults, options);\n\n    // init state\n    this.state = {\n      isDestroyed: false,\n      isCreated: false,\n      scrollParents: []\n    };\n\n    // get reference and popper elements (allow jQuery wrappers)\n    this.reference = reference && reference.jquery ? reference[0] : reference;\n    this.popper = popper && popper.jquery ? popper[0] : popper;\n\n    // Deep merge modifiers options\n    this.options.modifiers = {};\n    Object.keys(_extends({}, Popper.Defaults.modifiers, options.modifiers)).forEach(function (name) {\n      _this.options.modifiers[name] = _extends({}, Popper.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {});\n    });\n\n    // Refactoring modifiers' list (Object => Array)\n    this.modifiers = Object.keys(this.options.modifiers).map(function (name) {\n      return _extends({\n        name: name\n      }, _this.options.modifiers[name]);\n    })\n    // sort the modifiers by order\n    .sort(function (a, b) {\n      return a.order - b.order;\n    });\n\n    // modifiers have the ability to execute arbitrary code when Popper.js get inited\n    // such code is executed in the same order of its modifier\n    // they could add new properties to their options configuration\n    // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`!\n    this.modifiers.forEach(function (modifierOptions) {\n      if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) {\n        modifierOptions.onLoad(_this.reference, _this.popper, _this.options, modifierOptions, _this.state);\n      }\n    });\n\n    // fire the first update to position the popper in the right place\n    this.update();\n\n    var eventsEnabled = this.options.eventsEnabled;\n    if (eventsEnabled) {\n      // setup event listeners, they will take care of update the position in specific situations\n      this.enableEventListeners();\n    }\n\n    this.state.eventsEnabled = eventsEnabled;\n  }\n\n  // We can't use class properties because they don't get listed in the\n  // class prototype and break stuff like Sinon stubs\n\n\n  createClass(Popper, [{\n    key: 'update',\n    value: function update$$1() {\n      return update.call(this);\n    }\n  }, {\n    key: 'destroy',\n    value: function destroy$$1() {\n      return destroy.call(this);\n    }\n  }, {\n    key: 'enableEventListeners',\n    value: function enableEventListeners$$1() {\n      return enableEventListeners.call(this);\n    }\n  }, {\n    key: 'disableEventListeners',\n    value: function disableEventListeners$$1() {\n      return disableEventListeners.call(this);\n    }\n\n    /**\n     * Schedules an update. It will run on the next UI update available.\n     * @method scheduleUpdate\n     * @memberof Popper\n     */\n\n\n    /**\n     * Collection of utilities useful when writing custom modifiers.\n     * Starting from version 1.7, this method is available only if you\n     * include `popper-utils.js` before `popper.js`.\n     *\n     * **DEPRECATION**: This way to access PopperUtils is deprecated\n     * and will be removed in v2! Use the PopperUtils module directly instead.\n     * Due to the high instability of the methods contained in Utils, we can't\n     * guarantee them to follow semver. Use them at your own risk!\n     * @static\n     * @private\n     * @type {Object}\n     * @deprecated since version 1.8\n     * @member Utils\n     * @memberof Popper\n     */\n\n  }]);\n  return Popper;\n}();\n\n/**\n * The `referenceObject` is an object that provides an interface compatible with Popper.js\n * and lets you use it as replacement of a real DOM node.<br />\n * You can use this method to position a popper relatively to a set of coordinates\n * in case you don't have a DOM node to use as reference.\n *\n * ```\n * new Popper(referenceObject, popperNode);\n * ```\n *\n * NB: This feature isn't supported in Internet Explorer 10.\n * @name referenceObject\n * @property {Function} data.getBoundingClientRect\n * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.\n * @property {number} data.clientWidth\n * An ES6 getter that will return the width of the virtual reference element.\n * @property {number} data.clientHeight\n * An ES6 getter that will return the height of the virtual reference element.\n */\n\n\nPopper.Utils = (typeof window !== 'undefined' ? window : global).PopperUtils;\nPopper.placements = placements;\nPopper.Defaults = Defaults;\n\nexport default Popper;\n//# sourceMappingURL=popper.js.map\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): dropdown.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Popper from 'popper.js'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                     = 'dropdown'\nconst VERSION                  = '4.5.0'\nconst DATA_KEY                 = 'bs.dropdown'\nconst EVENT_KEY                = `.${DATA_KEY}`\nconst DATA_API_KEY             = '.data-api'\nconst JQUERY_NO_CONFLICT       = $.fn[NAME]\nconst ESCAPE_KEYCODE           = 27 // KeyboardEvent.which value for Escape (Esc) key\nconst SPACE_KEYCODE            = 32 // KeyboardEvent.which value for space key\nconst TAB_KEYCODE              = 9 // KeyboardEvent.which value for tab key\nconst ARROW_UP_KEYCODE         = 38 // KeyboardEvent.which value for up arrow key\nconst ARROW_DOWN_KEYCODE       = 40 // KeyboardEvent.which value for down arrow key\nconst RIGHT_MOUSE_BUTTON_WHICH = 3 // MouseEvent.which value for the right button (assuming a right-handed mouse)\nconst REGEXP_KEYDOWN           = new RegExp(`${ARROW_UP_KEYCODE}|${ARROW_DOWN_KEYCODE}|${ESCAPE_KEYCODE}`)\n\nconst EVENT_HIDE             = `hide${EVENT_KEY}`\nconst EVENT_HIDDEN           = `hidden${EVENT_KEY}`\nconst EVENT_SHOW             = `show${EVENT_KEY}`\nconst EVENT_SHOWN            = `shown${EVENT_KEY}`\nconst EVENT_CLICK            = `click${EVENT_KEY}`\nconst EVENT_CLICK_DATA_API   = `click${EVENT_KEY}${DATA_API_KEY}`\nconst EVENT_KEYDOWN_DATA_API = `keydown${EVENT_KEY}${DATA_API_KEY}`\nconst EVENT_KEYUP_DATA_API   = `keyup${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_DISABLED        = 'disabled'\nconst CLASS_NAME_SHOW            = 'show'\nconst CLASS_NAME_DROPUP          = 'dropup'\nconst CLASS_NAME_DROPRIGHT       = 'dropright'\nconst CLASS_NAME_DROPLEFT        = 'dropleft'\nconst CLASS_NAME_MENURIGHT       = 'dropdown-menu-right'\nconst CLASS_NAME_POSITION_STATIC = 'position-static'\n\nconst SELECTOR_DATA_TOGGLE   = '[data-toggle=\"dropdown\"]'\nconst SELECTOR_FORM_CHILD    = '.dropdown form'\nconst SELECTOR_MENU          = '.dropdown-menu'\nconst SELECTOR_NAVBAR_NAV    = '.navbar-nav'\nconst SELECTOR_VISIBLE_ITEMS = '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)'\n\nconst PLACEMENT_TOP       = 'top-start'\nconst PLACEMENT_TOPEND    = 'top-end'\nconst PLACEMENT_BOTTOM    = 'bottom-start'\nconst PLACEMENT_BOTTOMEND = 'bottom-end'\nconst PLACEMENT_RIGHT     = 'right-start'\nconst PLACEMENT_LEFT      = 'left-start'\n\nconst Default = {\n  offset       : 0,\n  flip         : true,\n  boundary     : 'scrollParent',\n  reference    : 'toggle',\n  display      : 'dynamic',\n  popperConfig : null\n}\n\nconst DefaultType = {\n  offset       : '(number|string|function)',\n  flip         : 'boolean',\n  boundary     : '(string|element)',\n  reference    : '(string|element)',\n  display      : 'string',\n  popperConfig : '(null|object)'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Dropdown {\n  constructor(element, config) {\n    this._element  = element\n    this._popper   = null\n    this._config   = this._getConfig(config)\n    this._menu     = this._getMenuElement()\n    this._inNavbar = this._detectNavbar()\n\n    this._addEventListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  // Public\n\n  toggle() {\n    if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED)) {\n      return\n    }\n\n    const isActive = $(this._menu).hasClass(CLASS_NAME_SHOW)\n\n    Dropdown._clearMenus()\n\n    if (isActive) {\n      return\n    }\n\n    this.show(true)\n  }\n\n  show(usePopper = false) {\n    if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED) || $(this._menu).hasClass(CLASS_NAME_SHOW)) {\n      return\n    }\n\n    const relatedTarget = {\n      relatedTarget: this._element\n    }\n    const showEvent = $.Event(EVENT_SHOW, relatedTarget)\n    const parent = Dropdown._getParentFromElement(this._element)\n\n    $(parent).trigger(showEvent)\n\n    if (showEvent.isDefaultPrevented()) {\n      return\n    }\n\n    // Disable totally Popper.js for Dropdown in Navbar\n    if (!this._inNavbar && usePopper) {\n      /**\n       * Check for Popper dependency\n       * Popper - https://popper.js.org\n       */\n      if (typeof Popper === 'undefined') {\n        throw new TypeError('Bootstrap\\'s dropdowns require Popper.js (https://popper.js.org/)')\n      }\n\n      let referenceElement = this._element\n\n      if (this._config.reference === 'parent') {\n        referenceElement = parent\n      } else if (Util.isElement(this._config.reference)) {\n        referenceElement = this._config.reference\n\n        // Check if it's jQuery element\n        if (typeof this._config.reference.jquery !== 'undefined') {\n          referenceElement = this._config.reference[0]\n        }\n      }\n\n      // If boundary is not `scrollParent`, then set position to `static`\n      // to allow the menu to \"escape\" the scroll parent's boundaries\n      // https://github.com/twbs/bootstrap/issues/24251\n      if (this._config.boundary !== 'scrollParent') {\n        $(parent).addClass(CLASS_NAME_POSITION_STATIC)\n      }\n      this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig())\n    }\n\n    // If this is a touch-enabled device we add extra\n    // empty mouseover listeners to the body's immediate children;\n    // only needed because of broken event delegation on iOS\n    // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html\n    if ('ontouchstart' in document.documentElement &&\n        $(parent).closest(SELECTOR_NAVBAR_NAV).length === 0) {\n      $(document.body).children().on('mouseover', null, $.noop)\n    }\n\n    this._element.focus()\n    this._element.setAttribute('aria-expanded', true)\n\n    $(this._menu).toggleClass(CLASS_NAME_SHOW)\n    $(parent)\n      .toggleClass(CLASS_NAME_SHOW)\n      .trigger($.Event(EVENT_SHOWN, relatedTarget))\n  }\n\n  hide() {\n    if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED) || !$(this._menu).hasClass(CLASS_NAME_SHOW)) {\n      return\n    }\n\n    const relatedTarget = {\n      relatedTarget: this._element\n    }\n    const hideEvent = $.Event(EVENT_HIDE, relatedTarget)\n    const parent = Dropdown._getParentFromElement(this._element)\n\n    $(parent).trigger(hideEvent)\n\n    if (hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (this._popper) {\n      this._popper.destroy()\n    }\n\n    $(this._menu).toggleClass(CLASS_NAME_SHOW)\n    $(parent)\n      .toggleClass(CLASS_NAME_SHOW)\n      .trigger($.Event(EVENT_HIDDEN, relatedTarget))\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    $(this._element).off(EVENT_KEY)\n    this._element = null\n    this._menu = null\n    if (this._popper !== null) {\n      this._popper.destroy()\n      this._popper = null\n    }\n  }\n\n  update() {\n    this._inNavbar = this._detectNavbar()\n    if (this._popper !== null) {\n      this._popper.scheduleUpdate()\n    }\n  }\n\n  // Private\n\n  _addEventListeners() {\n    $(this._element).on(EVENT_CLICK, (event) => {\n      event.preventDefault()\n      event.stopPropagation()\n      this.toggle()\n    })\n  }\n\n  _getConfig(config) {\n    config = {\n      ...this.constructor.Default,\n      ...$(this._element).data(),\n      ...config\n    }\n\n    Util.typeCheckConfig(\n      NAME,\n      config,\n      this.constructor.DefaultType\n    )\n\n    return config\n  }\n\n  _getMenuElement() {\n    if (!this._menu) {\n      const parent = Dropdown._getParentFromElement(this._element)\n\n      if (parent) {\n        this._menu = parent.querySelector(SELECTOR_MENU)\n      }\n    }\n    return this._menu\n  }\n\n  _getPlacement() {\n    const $parentDropdown = $(this._element.parentNode)\n    let placement = PLACEMENT_BOTTOM\n\n    // Handle dropup\n    if ($parentDropdown.hasClass(CLASS_NAME_DROPUP)) {\n      placement = $(this._menu).hasClass(CLASS_NAME_MENURIGHT)\n        ? PLACEMENT_TOPEND\n        : PLACEMENT_TOP\n    } else if ($parentDropdown.hasClass(CLASS_NAME_DROPRIGHT)) {\n      placement = PLACEMENT_RIGHT\n    } else if ($parentDropdown.hasClass(CLASS_NAME_DROPLEFT)) {\n      placement = PLACEMENT_LEFT\n    } else if ($(this._menu).hasClass(CLASS_NAME_MENURIGHT)) {\n      placement = PLACEMENT_BOTTOMEND\n    }\n    return placement\n  }\n\n  _detectNavbar() {\n    return $(this._element).closest('.navbar').length > 0\n  }\n\n  _getOffset() {\n    const offset = {}\n\n    if (typeof this._config.offset === 'function') {\n      offset.fn = (data) => {\n        data.offsets = {\n          ...data.offsets,\n          ...this._config.offset(data.offsets, this._element) || {}\n        }\n\n        return data\n      }\n    } else {\n      offset.offset = this._config.offset\n    }\n\n    return offset\n  }\n\n  _getPopperConfig() {\n    const popperConfig = {\n      placement: this._getPlacement(),\n      modifiers: {\n        offset: this._getOffset(),\n        flip: {\n          enabled: this._config.flip\n        },\n        preventOverflow: {\n          boundariesElement: this._config.boundary\n        }\n      }\n    }\n\n    // Disable Popper.js if we have a static display\n    if (this._config.display === 'static') {\n      popperConfig.modifiers.applyStyle = {\n        enabled: false\n      }\n    }\n\n    return {\n      ...popperConfig,\n      ...this._config.popperConfig\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' ? config : null\n\n      if (!data) {\n        data = new Dropdown(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n\n  static _clearMenus(event) {\n    if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH ||\n      event.type === 'keyup' && event.which !== TAB_KEYCODE)) {\n      return\n    }\n\n    const toggles = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE))\n\n    for (let i = 0, len = toggles.length; i < len; i++) {\n      const parent = Dropdown._getParentFromElement(toggles[i])\n      const context = $(toggles[i]).data(DATA_KEY)\n      const relatedTarget = {\n        relatedTarget: toggles[i]\n      }\n\n      if (event && event.type === 'click') {\n        relatedTarget.clickEvent = event\n      }\n\n      if (!context) {\n        continue\n      }\n\n      const dropdownMenu = context._menu\n      if (!$(parent).hasClass(CLASS_NAME_SHOW)) {\n        continue\n      }\n\n      if (event && (event.type === 'click' &&\n          /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) &&\n          $.contains(parent, event.target)) {\n        continue\n      }\n\n      const hideEvent = $.Event(EVENT_HIDE, relatedTarget)\n      $(parent).trigger(hideEvent)\n      if (hideEvent.isDefaultPrevented()) {\n        continue\n      }\n\n      // If this is a touch-enabled device we remove the extra\n      // empty mouseover listeners we added for iOS support\n      if ('ontouchstart' in document.documentElement) {\n        $(document.body).children().off('mouseover', null, $.noop)\n      }\n\n      toggles[i].setAttribute('aria-expanded', 'false')\n\n      if (context._popper) {\n        context._popper.destroy()\n      }\n\n      $(dropdownMenu).removeClass(CLASS_NAME_SHOW)\n      $(parent)\n        .removeClass(CLASS_NAME_SHOW)\n        .trigger($.Event(EVENT_HIDDEN, relatedTarget))\n    }\n  }\n\n  static _getParentFromElement(element) {\n    let parent\n    const selector = Util.getSelectorFromElement(element)\n\n    if (selector) {\n      parent = document.querySelector(selector)\n    }\n\n    return parent || element.parentNode\n  }\n\n  // eslint-disable-next-line complexity\n  static _dataApiKeydownHandler(event) {\n    // If not input/textarea:\n    //  - And not a key in REGEXP_KEYDOWN => not a dropdown command\n    // If input/textarea:\n    //  - If space key => not a dropdown command\n    //  - If key is other than escape\n    //    - If key is not up or down => not a dropdown command\n    //    - If trigger inside the menu => not a dropdown command\n    if (/input|textarea/i.test(event.target.tagName)\n      ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE &&\n      (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE ||\n        $(event.target).closest(SELECTOR_MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {\n      return\n    }\n\n    if (this.disabled || $(this).hasClass(CLASS_NAME_DISABLED)) {\n      return\n    }\n\n    const parent   = Dropdown._getParentFromElement(this)\n    const isActive = $(parent).hasClass(CLASS_NAME_SHOW)\n\n    if (!isActive && event.which === ESCAPE_KEYCODE) {\n      return\n    }\n\n    event.preventDefault()\n    event.stopPropagation()\n\n    if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {\n      if (event.which === ESCAPE_KEYCODE) {\n        $(parent.querySelector(SELECTOR_DATA_TOGGLE)).trigger('focus')\n      }\n\n      $(this).trigger('click')\n      return\n    }\n\n    const items = [].slice.call(parent.querySelectorAll(SELECTOR_VISIBLE_ITEMS))\n      .filter((item) => $(item).is(':visible'))\n\n    if (items.length === 0) {\n      return\n    }\n\n    let index = items.indexOf(event.target)\n\n    if (event.which === ARROW_UP_KEYCODE && index > 0) { // Up\n      index--\n    }\n\n    if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // Down\n      index++\n    }\n\n    if (index < 0) {\n      index = 0\n    }\n\n    items[index].focus()\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(EVENT_KEYDOWN_DATA_API, SELECTOR_DATA_TOGGLE, Dropdown._dataApiKeydownHandler)\n  .on(EVENT_KEYDOWN_DATA_API, SELECTOR_MENU, Dropdown._dataApiKeydownHandler)\n  .on(`${EVENT_CLICK_DATA_API} ${EVENT_KEYUP_DATA_API}`, Dropdown._clearMenus)\n  .on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {\n    event.preventDefault()\n    event.stopPropagation()\n    Dropdown._jQueryInterface.call($(this), 'toggle')\n  })\n  .on(EVENT_CLICK_DATA_API, SELECTOR_FORM_CHILD, (e) => {\n    e.stopPropagation()\n  })\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Dropdown._jQueryInterface\n$.fn[NAME].Constructor = Dropdown\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Dropdown._jQueryInterface\n}\n\nexport default Dropdown\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): modal.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'modal'\nconst VERSION            = '4.5.0'\nconst DATA_KEY           = 'bs.modal'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst DATA_API_KEY       = '.data-api'\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\nconst ESCAPE_KEYCODE     = 27 // KeyboardEvent.which value for Escape (Esc) key\n\nconst Default = {\n  backdrop : true,\n  keyboard : true,\n  focus    : true,\n  show     : true\n}\n\nconst DefaultType = {\n  backdrop : '(boolean|string)',\n  keyboard : 'boolean',\n  focus    : 'boolean',\n  show     : 'boolean'\n}\n\nconst EVENT_HIDE              = `hide${EVENT_KEY}`\nconst EVENT_HIDE_PREVENTED    = `hidePrevented${EVENT_KEY}`\nconst EVENT_HIDDEN            = `hidden${EVENT_KEY}`\nconst EVENT_SHOW              = `show${EVENT_KEY}`\nconst EVENT_SHOWN             = `shown${EVENT_KEY}`\nconst EVENT_FOCUSIN           = `focusin${EVENT_KEY}`\nconst EVENT_RESIZE            = `resize${EVENT_KEY}`\nconst EVENT_CLICK_DISMISS     = `click.dismiss${EVENT_KEY}`\nconst EVENT_KEYDOWN_DISMISS   = `keydown.dismiss${EVENT_KEY}`\nconst EVENT_MOUSEUP_DISMISS   = `mouseup.dismiss${EVENT_KEY}`\nconst EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY}`\nconst EVENT_CLICK_DATA_API    = `click${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_SCROLLABLE         = 'modal-dialog-scrollable'\nconst CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure'\nconst CLASS_NAME_BACKDROP           = 'modal-backdrop'\nconst CLASS_NAME_OPEN               = 'modal-open'\nconst CLASS_NAME_FADE               = 'fade'\nconst CLASS_NAME_SHOW               = 'show'\nconst CLASS_NAME_STATIC             = 'modal-static'\n\nconst SELECTOR_DIALOG         = '.modal-dialog'\nconst SELECTOR_MODAL_BODY     = '.modal-body'\nconst SELECTOR_DATA_TOGGLE    = '[data-toggle=\"modal\"]'\nconst SELECTOR_DATA_DISMISS   = '[data-dismiss=\"modal\"]'\nconst SELECTOR_FIXED_CONTENT  = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top'\nconst SELECTOR_STICKY_CONTENT = '.sticky-top'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Modal {\n  constructor(element, config) {\n    this._config              = this._getConfig(config)\n    this._element             = element\n    this._dialog              = element.querySelector(SELECTOR_DIALOG)\n    this._backdrop            = null\n    this._isShown             = false\n    this._isBodyOverflowing   = false\n    this._ignoreBackdropClick = false\n    this._isTransitioning     = false\n    this._scrollbarWidth      = 0\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  toggle(relatedTarget) {\n    return this._isShown ? this.hide() : this.show(relatedTarget)\n  }\n\n  show(relatedTarget) {\n    if (this._isShown || this._isTransitioning) {\n      return\n    }\n\n    if ($(this._element).hasClass(CLASS_NAME_FADE)) {\n      this._isTransitioning = true\n    }\n\n    const showEvent = $.Event(EVENT_SHOW, {\n      relatedTarget\n    })\n\n    $(this._element).trigger(showEvent)\n\n    if (this._isShown || showEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._isShown = true\n\n    this._checkScrollbar()\n    this._setScrollbar()\n\n    this._adjustDialog()\n\n    this._setEscapeEvent()\n    this._setResizeEvent()\n\n    $(this._element).on(\n      EVENT_CLICK_DISMISS,\n      SELECTOR_DATA_DISMISS,\n      (event) => this.hide(event)\n    )\n\n    $(this._dialog).on(EVENT_MOUSEDOWN_DISMISS, () => {\n      $(this._element).one(EVENT_MOUSEUP_DISMISS, (event) => {\n        if ($(event.target).is(this._element)) {\n          this._ignoreBackdropClick = true\n        }\n      })\n    })\n\n    this._showBackdrop(() => this._showElement(relatedTarget))\n  }\n\n  hide(event) {\n    if (event) {\n      event.preventDefault()\n    }\n\n    if (!this._isShown || this._isTransitioning) {\n      return\n    }\n\n    const hideEvent = $.Event(EVENT_HIDE)\n\n    $(this._element).trigger(hideEvent)\n\n    if (!this._isShown || hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._isShown = false\n    const transition = $(this._element).hasClass(CLASS_NAME_FADE)\n\n    if (transition) {\n      this._isTransitioning = true\n    }\n\n    this._setEscapeEvent()\n    this._setResizeEvent()\n\n    $(document).off(EVENT_FOCUSIN)\n\n    $(this._element).removeClass(CLASS_NAME_SHOW)\n\n    $(this._element).off(EVENT_CLICK_DISMISS)\n    $(this._dialog).off(EVENT_MOUSEDOWN_DISMISS)\n\n    if (transition) {\n      const transitionDuration  = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element)\n        .one(Util.TRANSITION_END, (event) => this._hideModal(event))\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      this._hideModal()\n    }\n  }\n\n  dispose() {\n    [window, this._element, this._dialog]\n      .forEach((htmlElement) => $(htmlElement).off(EVENT_KEY))\n\n    /**\n     * `document` has 2 events `EVENT_FOCUSIN` and `EVENT_CLICK_DATA_API`\n     * Do not move `document` in `htmlElements` array\n     * It will remove `EVENT_CLICK_DATA_API` event that should remain\n     */\n    $(document).off(EVENT_FOCUSIN)\n\n    $.removeData(this._element, DATA_KEY)\n\n    this._config              = null\n    this._element             = null\n    this._dialog              = null\n    this._backdrop            = null\n    this._isShown             = null\n    this._isBodyOverflowing   = null\n    this._ignoreBackdropClick = null\n    this._isTransitioning     = null\n    this._scrollbarWidth      = null\n  }\n\n  handleUpdate() {\n    this._adjustDialog()\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...config\n    }\n    Util.typeCheckConfig(NAME, config, DefaultType)\n    return config\n  }\n\n  _triggerBackdropTransition() {\n    if (this._config.backdrop === 'static') {\n      const hideEventPrevented = $.Event(EVENT_HIDE_PREVENTED)\n\n      $(this._element).trigger(hideEventPrevented)\n      if (hideEventPrevented.defaultPrevented) {\n        return\n      }\n\n      this._element.classList.add(CLASS_NAME_STATIC)\n\n      const modalTransitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element).one(Util.TRANSITION_END, () => {\n        this._element.classList.remove(CLASS_NAME_STATIC)\n      })\n        .emulateTransitionEnd(modalTransitionDuration)\n      this._element.focus()\n    } else {\n      this.hide()\n    }\n  }\n\n  _showElement(relatedTarget) {\n    const transition = $(this._element).hasClass(CLASS_NAME_FADE)\n    const modalBody = this._dialog ? this._dialog.querySelector(SELECTOR_MODAL_BODY) : null\n\n    if (!this._element.parentNode ||\n        this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {\n      // Don't move modal's DOM position\n      document.body.appendChild(this._element)\n    }\n\n    this._element.style.display = 'block'\n    this._element.removeAttribute('aria-hidden')\n    this._element.setAttribute('aria-modal', true)\n\n    if ($(this._dialog).hasClass(CLASS_NAME_SCROLLABLE) && modalBody) {\n      modalBody.scrollTop = 0\n    } else {\n      this._element.scrollTop = 0\n    }\n\n    if (transition) {\n      Util.reflow(this._element)\n    }\n\n    $(this._element).addClass(CLASS_NAME_SHOW)\n\n    if (this._config.focus) {\n      this._enforceFocus()\n    }\n\n    const shownEvent = $.Event(EVENT_SHOWN, {\n      relatedTarget\n    })\n\n    const transitionComplete = () => {\n      if (this._config.focus) {\n        this._element.focus()\n      }\n      this._isTransitioning = false\n      $(this._element).trigger(shownEvent)\n    }\n\n    if (transition) {\n      const transitionDuration  = Util.getTransitionDurationFromElement(this._dialog)\n\n      $(this._dialog)\n        .one(Util.TRANSITION_END, transitionComplete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      transitionComplete()\n    }\n  }\n\n  _enforceFocus() {\n    $(document)\n      .off(EVENT_FOCUSIN) // Guard against infinite focus loop\n      .on(EVENT_FOCUSIN, (event) => {\n        if (document !== event.target &&\n            this._element !== event.target &&\n            $(this._element).has(event.target).length === 0) {\n          this._element.focus()\n        }\n      })\n  }\n\n  _setEscapeEvent() {\n    if (this._isShown) {\n      $(this._element).on(EVENT_KEYDOWN_DISMISS, (event) => {\n        if (this._config.keyboard && event.which === ESCAPE_KEYCODE) {\n          event.preventDefault()\n          this.hide()\n        } else if (!this._config.keyboard && event.which === ESCAPE_KEYCODE) {\n          this._triggerBackdropTransition()\n        }\n      })\n    } else if (!this._isShown) {\n      $(this._element).off(EVENT_KEYDOWN_DISMISS)\n    }\n  }\n\n  _setResizeEvent() {\n    if (this._isShown) {\n      $(window).on(EVENT_RESIZE, (event) => this.handleUpdate(event))\n    } else {\n      $(window).off(EVENT_RESIZE)\n    }\n  }\n\n  _hideModal() {\n    this._element.style.display = 'none'\n    this._element.setAttribute('aria-hidden', true)\n    this._element.removeAttribute('aria-modal')\n    this._isTransitioning = false\n    this._showBackdrop(() => {\n      $(document.body).removeClass(CLASS_NAME_OPEN)\n      this._resetAdjustments()\n      this._resetScrollbar()\n      $(this._element).trigger(EVENT_HIDDEN)\n    })\n  }\n\n  _removeBackdrop() {\n    if (this._backdrop) {\n      $(this._backdrop).remove()\n      this._backdrop = null\n    }\n  }\n\n  _showBackdrop(callback) {\n    const animate = $(this._element).hasClass(CLASS_NAME_FADE)\n      ? CLASS_NAME_FADE : ''\n\n    if (this._isShown && this._config.backdrop) {\n      this._backdrop = document.createElement('div')\n      this._backdrop.className = CLASS_NAME_BACKDROP\n\n      if (animate) {\n        this._backdrop.classList.add(animate)\n      }\n\n      $(this._backdrop).appendTo(document.body)\n\n      $(this._element).on(EVENT_CLICK_DISMISS, (event) => {\n        if (this._ignoreBackdropClick) {\n          this._ignoreBackdropClick = false\n          return\n        }\n        if (event.target !== event.currentTarget) {\n          return\n        }\n\n        this._triggerBackdropTransition()\n      })\n\n      if (animate) {\n        Util.reflow(this._backdrop)\n      }\n\n      $(this._backdrop).addClass(CLASS_NAME_SHOW)\n\n      if (!callback) {\n        return\n      }\n\n      if (!animate) {\n        callback()\n        return\n      }\n\n      const backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop)\n\n      $(this._backdrop)\n        .one(Util.TRANSITION_END, callback)\n        .emulateTransitionEnd(backdropTransitionDuration)\n    } else if (!this._isShown && this._backdrop) {\n      $(this._backdrop).removeClass(CLASS_NAME_SHOW)\n\n      const callbackRemove = () => {\n        this._removeBackdrop()\n        if (callback) {\n          callback()\n        }\n      }\n\n      if ($(this._element).hasClass(CLASS_NAME_FADE)) {\n        const backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop)\n\n        $(this._backdrop)\n          .one(Util.TRANSITION_END, callbackRemove)\n          .emulateTransitionEnd(backdropTransitionDuration)\n      } else {\n        callbackRemove()\n      }\n    } else if (callback) {\n      callback()\n    }\n  }\n\n  // ----------------------------------------------------------------------\n  // the following methods are used to handle overflowing modals\n  // todo (fat): these should probably be refactored out of modal.js\n  // ----------------------------------------------------------------------\n\n  _adjustDialog() {\n    const isModalOverflowing =\n      this._element.scrollHeight > document.documentElement.clientHeight\n\n    if (!this._isBodyOverflowing && isModalOverflowing) {\n      this._element.style.paddingLeft = `${this._scrollbarWidth}px`\n    }\n\n    if (this._isBodyOverflowing && !isModalOverflowing) {\n      this._element.style.paddingRight = `${this._scrollbarWidth}px`\n    }\n  }\n\n  _resetAdjustments() {\n    this._element.style.paddingLeft = ''\n    this._element.style.paddingRight = ''\n  }\n\n  _checkScrollbar() {\n    const rect = document.body.getBoundingClientRect()\n    this._isBodyOverflowing = Math.round(rect.left + rect.right) < window.innerWidth\n    this._scrollbarWidth = this._getScrollbarWidth()\n  }\n\n  _setScrollbar() {\n    if (this._isBodyOverflowing) {\n      // Note: DOMNode.style.paddingRight returns the actual value or '' if not set\n      //   while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set\n      const fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT))\n      const stickyContent = [].slice.call(document.querySelectorAll(SELECTOR_STICKY_CONTENT))\n\n      // Adjust fixed content padding\n      $(fixedContent).each((index, element) => {\n        const actualPadding = element.style.paddingRight\n        const calculatedPadding = $(element).css('padding-right')\n        $(element)\n          .data('padding-right', actualPadding)\n          .css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`)\n      })\n\n      // Adjust sticky content margin\n      $(stickyContent).each((index, element) => {\n        const actualMargin = element.style.marginRight\n        const calculatedMargin = $(element).css('margin-right')\n        $(element)\n          .data('margin-right', actualMargin)\n          .css('margin-right', `${parseFloat(calculatedMargin) - this._scrollbarWidth}px`)\n      })\n\n      // Adjust body padding\n      const actualPadding = document.body.style.paddingRight\n      const calculatedPadding = $(document.body).css('padding-right')\n      $(document.body)\n        .data('padding-right', actualPadding)\n        .css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`)\n    }\n\n    $(document.body).addClass(CLASS_NAME_OPEN)\n  }\n\n  _resetScrollbar() {\n    // Restore fixed content padding\n    const fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT))\n    $(fixedContent).each((index, element) => {\n      const padding = $(element).data('padding-right')\n      $(element).removeData('padding-right')\n      element.style.paddingRight = padding ? padding : ''\n    })\n\n    // Restore sticky content\n    const elements = [].slice.call(document.querySelectorAll(`${SELECTOR_STICKY_CONTENT}`))\n    $(elements).each((index, element) => {\n      const margin = $(element).data('margin-right')\n      if (typeof margin !== 'undefined') {\n        $(element).css('margin-right', margin).removeData('margin-right')\n      }\n    })\n\n    // Restore body padding\n    const padding = $(document.body).data('padding-right')\n    $(document.body).removeData('padding-right')\n    document.body.style.paddingRight = padding ? padding : ''\n  }\n\n  _getScrollbarWidth() { // thx d.walsh\n    const scrollDiv = document.createElement('div')\n    scrollDiv.className = CLASS_NAME_SCROLLBAR_MEASURER\n    document.body.appendChild(scrollDiv)\n    const scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth\n    document.body.removeChild(scrollDiv)\n    return scrollbarWidth\n  }\n\n  // Static\n\n  static _jQueryInterface(config, relatedTarget) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = {\n        ...Default,\n        ...$(this).data(),\n        ...typeof config === 'object' && config ? config : {}\n      }\n\n      if (!data) {\n        data = new Modal(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config](relatedTarget)\n      } else if (_config.show) {\n        data.show(relatedTarget)\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {\n  let target\n  const selector = Util.getSelectorFromElement(this)\n\n  if (selector) {\n    target = document.querySelector(selector)\n  }\n\n  const config = $(target).data(DATA_KEY)\n    ? 'toggle' : {\n      ...$(target).data(),\n      ...$(this).data()\n    }\n\n  if (this.tagName === 'A' || this.tagName === 'AREA') {\n    event.preventDefault()\n  }\n\n  const $target = $(target).one(EVENT_SHOW, (showEvent) => {\n    if (showEvent.isDefaultPrevented()) {\n      // Only register focus restorer if modal will actually get shown\n      return\n    }\n\n    $target.one(EVENT_HIDDEN, () => {\n      if ($(this).is(':visible')) {\n        this.focus()\n      }\n    })\n  })\n\n  Modal._jQueryInterface.call($(target), config, this)\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Modal._jQueryInterface\n$.fn[NAME].Constructor = Modal\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Modal._jQueryInterface\n}\n\nexport default Modal\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): tools/sanitizer.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nconst uriAttrs = [\n  'background',\n  'cite',\n  'href',\n  'itemtype',\n  'longdesc',\n  'poster',\n  'src',\n  'xlink:href'\n]\n\nconst ARIA_ATTRIBUTE_PATTERN = /^aria-[\\w-]*$/i\n\nexport const DefaultWhitelist = {\n  // Global attributes allowed on any supplied element below.\n  '*': ['class', 'dir', 'id', 'lang', 'role', ARIA_ATTRIBUTE_PATTERN],\n  a: ['target', 'href', 'title', 'rel'],\n  area: [],\n  b: [],\n  br: [],\n  col: [],\n  code: [],\n  div: [],\n  em: [],\n  hr: [],\n  h1: [],\n  h2: [],\n  h3: [],\n  h4: [],\n  h5: [],\n  h6: [],\n  i: [],\n  img: ['src', 'srcset', 'alt', 'title', 'width', 'height'],\n  li: [],\n  ol: [],\n  p: [],\n  pre: [],\n  s: [],\n  small: [],\n  span: [],\n  sub: [],\n  sup: [],\n  strong: [],\n  u: [],\n  ul: []\n}\n\n/**\n * A pattern that recognizes a commonly useful subset of URLs that are safe.\n *\n * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts\n */\nconst SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/gi\n\n/**\n * A pattern that matches safe data URLs. Only matches image, video and audio types.\n *\n * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts\n */\nconst DATA_URL_PATTERN = /^data:(?:image\\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\\/(?:mpeg|mp4|ogg|webm)|audio\\/(?:mp3|oga|ogg|opus));base64,[\\d+/a-z]+=*$/i\n\nfunction allowedAttribute(attr, allowedAttributeList) {\n  const attrName = attr.nodeName.toLowerCase()\n\n  if (allowedAttributeList.indexOf(attrName) !== -1) {\n    if (uriAttrs.indexOf(attrName) !== -1) {\n      return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN))\n    }\n\n    return true\n  }\n\n  const regExp = allowedAttributeList.filter((attrRegex) => attrRegex instanceof RegExp)\n\n  // Check if a regular expression validates the attribute.\n  for (let i = 0, len = regExp.length; i < len; i++) {\n    if (attrName.match(regExp[i])) {\n      return true\n    }\n  }\n\n  return false\n}\n\nexport function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) {\n  if (unsafeHtml.length === 0) {\n    return unsafeHtml\n  }\n\n  if (sanitizeFn && typeof sanitizeFn === 'function') {\n    return sanitizeFn(unsafeHtml)\n  }\n\n  const domParser = new window.DOMParser()\n  const createdDocument = domParser.parseFromString(unsafeHtml, 'text/html')\n  const whitelistKeys = Object.keys(whiteList)\n  const elements = [].slice.call(createdDocument.body.querySelectorAll('*'))\n\n  for (let i = 0, len = elements.length; i < len; i++) {\n    const el = elements[i]\n    const elName = el.nodeName.toLowerCase()\n\n    if (whitelistKeys.indexOf(el.nodeName.toLowerCase()) === -1) {\n      el.parentNode.removeChild(el)\n\n      continue\n    }\n\n    const attributeList = [].slice.call(el.attributes)\n    const whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || [])\n\n    attributeList.forEach((attr) => {\n      if (!allowedAttribute(attr, whitelistedAttributes)) {\n        el.removeAttribute(attr.nodeName)\n      }\n    })\n  }\n\n  return createdDocument.body.innerHTML\n}\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): tooltip.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport {\n  DefaultWhitelist,\n  sanitizeHtml\n} from './tools/sanitizer'\nimport $ from 'jquery'\nimport Popper from 'popper.js'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                  = 'tooltip'\nconst VERSION               = '4.5.0'\nconst DATA_KEY              = 'bs.tooltip'\nconst EVENT_KEY             = `.${DATA_KEY}`\nconst JQUERY_NO_CONFLICT    = $.fn[NAME]\nconst CLASS_PREFIX          = 'bs-tooltip'\nconst BSCLS_PREFIX_REGEX    = new RegExp(`(^|\\\\s)${CLASS_PREFIX}\\\\S+`, 'g')\nconst DISALLOWED_ATTRIBUTES = ['sanitize', 'whiteList', 'sanitizeFn']\n\nconst DefaultType = {\n  animation         : 'boolean',\n  template          : 'string',\n  title             : '(string|element|function)',\n  trigger           : 'string',\n  delay             : '(number|object)',\n  html              : 'boolean',\n  selector          : '(string|boolean)',\n  placement         : '(string|function)',\n  offset            : '(number|string|function)',\n  container         : '(string|element|boolean)',\n  fallbackPlacement : '(string|array)',\n  boundary          : '(string|element)',\n  sanitize          : 'boolean',\n  sanitizeFn        : '(null|function)',\n  whiteList         : 'object',\n  popperConfig      : '(null|object)'\n}\n\nconst AttachmentMap = {\n  AUTO   : 'auto',\n  TOP    : 'top',\n  RIGHT  : 'right',\n  BOTTOM : 'bottom',\n  LEFT   : 'left'\n}\n\nconst Default = {\n  animation         : true,\n  template          : '<div class=\"tooltip\" role=\"tooltip\">' +\n                    '<div class=\"arrow\"></div>' +\n                    '<div class=\"tooltip-inner\"></div></div>',\n  trigger           : 'hover focus',\n  title             : '',\n  delay             : 0,\n  html              : false,\n  selector          : false,\n  placement         : 'top',\n  offset            : 0,\n  container         : false,\n  fallbackPlacement : 'flip',\n  boundary          : 'scrollParent',\n  sanitize          : true,\n  sanitizeFn        : null,\n  whiteList         : DefaultWhitelist,\n  popperConfig      : null\n}\n\nconst HOVER_STATE_SHOW = 'show'\nconst HOVER_STATE_OUT  = 'out'\n\nconst Event = {\n  HIDE       : `hide${EVENT_KEY}`,\n  HIDDEN     : `hidden${EVENT_KEY}`,\n  SHOW       : `show${EVENT_KEY}`,\n  SHOWN      : `shown${EVENT_KEY}`,\n  INSERTED   : `inserted${EVENT_KEY}`,\n  CLICK      : `click${EVENT_KEY}`,\n  FOCUSIN    : `focusin${EVENT_KEY}`,\n  FOCUSOUT   : `focusout${EVENT_KEY}`,\n  MOUSEENTER : `mouseenter${EVENT_KEY}`,\n  MOUSELEAVE : `mouseleave${EVENT_KEY}`\n}\n\nconst CLASS_NAME_FADE = 'fade'\nconst CLASS_NAME_SHOW = 'show'\n\nconst SELECTOR_TOOLTIP_INNER = '.tooltip-inner'\nconst SELECTOR_ARROW         = '.arrow'\n\nconst TRIGGER_HOVER  = 'hover'\nconst TRIGGER_FOCUS  = 'focus'\nconst TRIGGER_CLICK  = 'click'\nconst TRIGGER_MANUAL = 'manual'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Tooltip {\n  constructor(element, config) {\n    if (typeof Popper === 'undefined') {\n      throw new TypeError('Bootstrap\\'s tooltips require Popper.js (https://popper.js.org/)')\n    }\n\n    // private\n    this._isEnabled     = true\n    this._timeout       = 0\n    this._hoverState    = ''\n    this._activeTrigger = {}\n    this._popper        = null\n\n    // Protected\n    this.element = element\n    this.config  = this._getConfig(config)\n    this.tip     = null\n\n    this._setListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  static get NAME() {\n    return NAME\n  }\n\n  static get DATA_KEY() {\n    return DATA_KEY\n  }\n\n  static get Event() {\n    return Event\n  }\n\n  static get EVENT_KEY() {\n    return EVENT_KEY\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  // Public\n\n  enable() {\n    this._isEnabled = true\n  }\n\n  disable() {\n    this._isEnabled = false\n  }\n\n  toggleEnabled() {\n    this._isEnabled = !this._isEnabled\n  }\n\n  toggle(event) {\n    if (!this._isEnabled) {\n      return\n    }\n\n    if (event) {\n      const dataKey = this.constructor.DATA_KEY\n      let context = $(event.currentTarget).data(dataKey)\n\n      if (!context) {\n        context = new this.constructor(\n          event.currentTarget,\n          this._getDelegateConfig()\n        )\n        $(event.currentTarget).data(dataKey, context)\n      }\n\n      context._activeTrigger.click = !context._activeTrigger.click\n\n      if (context._isWithActiveTrigger()) {\n        context._enter(null, context)\n      } else {\n        context._leave(null, context)\n      }\n    } else {\n      if ($(this.getTipElement()).hasClass(CLASS_NAME_SHOW)) {\n        this._leave(null, this)\n        return\n      }\n\n      this._enter(null, this)\n    }\n  }\n\n  dispose() {\n    clearTimeout(this._timeout)\n\n    $.removeData(this.element, this.constructor.DATA_KEY)\n\n    $(this.element).off(this.constructor.EVENT_KEY)\n    $(this.element).closest('.modal').off('hide.bs.modal', this._hideModalHandler)\n\n    if (this.tip) {\n      $(this.tip).remove()\n    }\n\n    this._isEnabled     = null\n    this._timeout       = null\n    this._hoverState    = null\n    this._activeTrigger = null\n    if (this._popper) {\n      this._popper.destroy()\n    }\n\n    this._popper = null\n    this.element = null\n    this.config  = null\n    this.tip     = null\n  }\n\n  show() {\n    if ($(this.element).css('display') === 'none') {\n      throw new Error('Please use show on visible elements')\n    }\n\n    const showEvent = $.Event(this.constructor.Event.SHOW)\n    if (this.isWithContent() && this._isEnabled) {\n      $(this.element).trigger(showEvent)\n\n      const shadowRoot = Util.findShadowRoot(this.element)\n      const isInTheDom = $.contains(\n        shadowRoot !== null ? shadowRoot : this.element.ownerDocument.documentElement,\n        this.element\n      )\n\n      if (showEvent.isDefaultPrevented() || !isInTheDom) {\n        return\n      }\n\n      const tip   = this.getTipElement()\n      const tipId = Util.getUID(this.constructor.NAME)\n\n      tip.setAttribute('id', tipId)\n      this.element.setAttribute('aria-describedby', tipId)\n\n      this.setContent()\n\n      if (this.config.animation) {\n        $(tip).addClass(CLASS_NAME_FADE)\n      }\n\n      const placement  = typeof this.config.placement === 'function'\n        ? this.config.placement.call(this, tip, this.element)\n        : this.config.placement\n\n      const attachment = this._getAttachment(placement)\n      this.addAttachmentClass(attachment)\n\n      const container = this._getContainer()\n      $(tip).data(this.constructor.DATA_KEY, this)\n\n      if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {\n        $(tip).appendTo(container)\n      }\n\n      $(this.element).trigger(this.constructor.Event.INSERTED)\n\n      this._popper = new Popper(this.element, tip, this._getPopperConfig(attachment))\n\n      $(tip).addClass(CLASS_NAME_SHOW)\n\n      // If this is a touch-enabled device we add extra\n      // empty mouseover listeners to the body's immediate children;\n      // only needed because of broken event delegation on iOS\n      // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html\n      if ('ontouchstart' in document.documentElement) {\n        $(document.body).children().on('mouseover', null, $.noop)\n      }\n\n      const complete = () => {\n        if (this.config.animation) {\n          this._fixTransition()\n        }\n        const prevHoverState = this._hoverState\n        this._hoverState     = null\n\n        $(this.element).trigger(this.constructor.Event.SHOWN)\n\n        if (prevHoverState === HOVER_STATE_OUT) {\n          this._leave(null, this)\n        }\n      }\n\n      if ($(this.tip).hasClass(CLASS_NAME_FADE)) {\n        const transitionDuration = Util.getTransitionDurationFromElement(this.tip)\n\n        $(this.tip)\n          .one(Util.TRANSITION_END, complete)\n          .emulateTransitionEnd(transitionDuration)\n      } else {\n        complete()\n      }\n    }\n  }\n\n  hide(callback) {\n    const tip       = this.getTipElement()\n    const hideEvent = $.Event(this.constructor.Event.HIDE)\n    const complete = () => {\n      if (this._hoverState !== HOVER_STATE_SHOW && tip.parentNode) {\n        tip.parentNode.removeChild(tip)\n      }\n\n      this._cleanTipClass()\n      this.element.removeAttribute('aria-describedby')\n      $(this.element).trigger(this.constructor.Event.HIDDEN)\n      if (this._popper !== null) {\n        this._popper.destroy()\n      }\n\n      if (callback) {\n        callback()\n      }\n    }\n\n    $(this.element).trigger(hideEvent)\n\n    if (hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    $(tip).removeClass(CLASS_NAME_SHOW)\n\n    // If this is a touch-enabled device we remove the extra\n    // empty mouseover listeners we added for iOS support\n    if ('ontouchstart' in document.documentElement) {\n      $(document.body).children().off('mouseover', null, $.noop)\n    }\n\n    this._activeTrigger[TRIGGER_CLICK] = false\n    this._activeTrigger[TRIGGER_FOCUS] = false\n    this._activeTrigger[TRIGGER_HOVER] = false\n\n    if ($(this.tip).hasClass(CLASS_NAME_FADE)) {\n      const transitionDuration = Util.getTransitionDurationFromElement(tip)\n\n      $(tip)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n\n    this._hoverState = ''\n  }\n\n  update() {\n    if (this._popper !== null) {\n      this._popper.scheduleUpdate()\n    }\n  }\n\n  // Protected\n\n  isWithContent() {\n    return Boolean(this.getTitle())\n  }\n\n  addAttachmentClass(attachment) {\n    $(this.getTipElement()).addClass(`${CLASS_PREFIX}-${attachment}`)\n  }\n\n  getTipElement() {\n    this.tip = this.tip || $(this.config.template)[0]\n    return this.tip\n  }\n\n  setContent() {\n    const tip = this.getTipElement()\n    this.setElementContent($(tip.querySelectorAll(SELECTOR_TOOLTIP_INNER)), this.getTitle())\n    $(tip).removeClass(`${CLASS_NAME_FADE} ${CLASS_NAME_SHOW}`)\n  }\n\n  setElementContent($element, content) {\n    if (typeof content === 'object' && (content.nodeType || content.jquery)) {\n      // Content is a DOM node or a jQuery\n      if (this.config.html) {\n        if (!$(content).parent().is($element)) {\n          $element.empty().append(content)\n        }\n      } else {\n        $element.text($(content).text())\n      }\n\n      return\n    }\n\n    if (this.config.html) {\n      if (this.config.sanitize) {\n        content = sanitizeHtml(content, this.config.whiteList, this.config.sanitizeFn)\n      }\n\n      $element.html(content)\n    } else {\n      $element.text(content)\n    }\n  }\n\n  getTitle() {\n    let title = this.element.getAttribute('data-original-title')\n\n    if (!title) {\n      title = typeof this.config.title === 'function'\n        ? this.config.title.call(this.element)\n        : this.config.title\n    }\n\n    return title\n  }\n\n  // Private\n\n  _getPopperConfig(attachment) {\n    const defaultBsConfig = {\n      placement: attachment,\n      modifiers: {\n        offset: this._getOffset(),\n        flip: {\n          behavior: this.config.fallbackPlacement\n        },\n        arrow: {\n          element: SELECTOR_ARROW\n        },\n        preventOverflow: {\n          boundariesElement: this.config.boundary\n        }\n      },\n      onCreate: (data) => {\n        if (data.originalPlacement !== data.placement) {\n          this._handlePopperPlacementChange(data)\n        }\n      },\n      onUpdate: (data) => this._handlePopperPlacementChange(data)\n    }\n\n    return {\n      ...defaultBsConfig,\n      ...this.config.popperConfig\n    }\n  }\n\n  _getOffset() {\n    const offset = {}\n\n    if (typeof this.config.offset === 'function') {\n      offset.fn = (data) => {\n        data.offsets = {\n          ...data.offsets,\n          ...this.config.offset(data.offsets, this.element) || {}\n        }\n\n        return data\n      }\n    } else {\n      offset.offset = this.config.offset\n    }\n\n    return offset\n  }\n\n  _getContainer() {\n    if (this.config.container === false) {\n      return document.body\n    }\n\n    if (Util.isElement(this.config.container)) {\n      return $(this.config.container)\n    }\n\n    return $(document).find(this.config.container)\n  }\n\n  _getAttachment(placement) {\n    return AttachmentMap[placement.toUpperCase()]\n  }\n\n  _setListeners() {\n    const triggers = this.config.trigger.split(' ')\n\n    triggers.forEach((trigger) => {\n      if (trigger === 'click') {\n        $(this.element).on(\n          this.constructor.Event.CLICK,\n          this.config.selector,\n          (event) => this.toggle(event)\n        )\n      } else if (trigger !== TRIGGER_MANUAL) {\n        const eventIn = trigger === TRIGGER_HOVER\n          ? this.constructor.Event.MOUSEENTER\n          : this.constructor.Event.FOCUSIN\n        const eventOut = trigger === TRIGGER_HOVER\n          ? this.constructor.Event.MOUSELEAVE\n          : this.constructor.Event.FOCUSOUT\n\n        $(this.element)\n          .on(eventIn, this.config.selector, (event) => this._enter(event))\n          .on(eventOut, this.config.selector, (event) => this._leave(event))\n      }\n    })\n\n    this._hideModalHandler = () => {\n      if (this.element) {\n        this.hide()\n      }\n    }\n\n    $(this.element).closest('.modal').on('hide.bs.modal', this._hideModalHandler)\n\n    if (this.config.selector) {\n      this.config = {\n        ...this.config,\n        trigger: 'manual',\n        selector: ''\n      }\n    } else {\n      this._fixTitle()\n    }\n  }\n\n  _fixTitle() {\n    const titleType = typeof this.element.getAttribute('data-original-title')\n\n    if (this.element.getAttribute('title') || titleType !== 'string') {\n      this.element.setAttribute(\n        'data-original-title',\n        this.element.getAttribute('title') || ''\n      )\n\n      this.element.setAttribute('title', '')\n    }\n  }\n\n  _enter(event, context) {\n    const dataKey = this.constructor.DATA_KEY\n    context = context || $(event.currentTarget).data(dataKey)\n\n    if (!context) {\n      context = new this.constructor(\n        event.currentTarget,\n        this._getDelegateConfig()\n      )\n      $(event.currentTarget).data(dataKey, context)\n    }\n\n    if (event) {\n      context._activeTrigger[\n        event.type === 'focusin' ? TRIGGER_FOCUS : TRIGGER_HOVER\n      ] = true\n    }\n\n    if ($(context.getTipElement()).hasClass(CLASS_NAME_SHOW) || context._hoverState === HOVER_STATE_SHOW) {\n      context._hoverState = HOVER_STATE_SHOW\n      return\n    }\n\n    clearTimeout(context._timeout)\n\n    context._hoverState = HOVER_STATE_SHOW\n\n    if (!context.config.delay || !context.config.delay.show) {\n      context.show()\n      return\n    }\n\n    context._timeout = setTimeout(() => {\n      if (context._hoverState === HOVER_STATE_SHOW) {\n        context.show()\n      }\n    }, context.config.delay.show)\n  }\n\n  _leave(event, context) {\n    const dataKey = this.constructor.DATA_KEY\n    context = context || $(event.currentTarget).data(dataKey)\n\n    if (!context) {\n      context = new this.constructor(\n        event.currentTarget,\n        this._getDelegateConfig()\n      )\n      $(event.currentTarget).data(dataKey, context)\n    }\n\n    if (event) {\n      context._activeTrigger[\n        event.type === 'focusout' ? TRIGGER_FOCUS : TRIGGER_HOVER\n      ] = false\n    }\n\n    if (context._isWithActiveTrigger()) {\n      return\n    }\n\n    clearTimeout(context._timeout)\n\n    context._hoverState = HOVER_STATE_OUT\n\n    if (!context.config.delay || !context.config.delay.hide) {\n      context.hide()\n      return\n    }\n\n    context._timeout = setTimeout(() => {\n      if (context._hoverState === HOVER_STATE_OUT) {\n        context.hide()\n      }\n    }, context.config.delay.hide)\n  }\n\n  _isWithActiveTrigger() {\n    for (const trigger in this._activeTrigger) {\n      if (this._activeTrigger[trigger]) {\n        return true\n      }\n    }\n\n    return false\n  }\n\n  _getConfig(config) {\n    const dataAttributes = $(this.element).data()\n\n    Object.keys(dataAttributes)\n      .forEach((dataAttr) => {\n        if (DISALLOWED_ATTRIBUTES.indexOf(dataAttr) !== -1) {\n          delete dataAttributes[dataAttr]\n        }\n      })\n\n    config = {\n      ...this.constructor.Default,\n      ...dataAttributes,\n      ...typeof config === 'object' && config ? config : {}\n    }\n\n    if (typeof config.delay === 'number') {\n      config.delay = {\n        show: config.delay,\n        hide: config.delay\n      }\n    }\n\n    if (typeof config.title === 'number') {\n      config.title = config.title.toString()\n    }\n\n    if (typeof config.content === 'number') {\n      config.content = config.content.toString()\n    }\n\n    Util.typeCheckConfig(\n      NAME,\n      config,\n      this.constructor.DefaultType\n    )\n\n    if (config.sanitize) {\n      config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn)\n    }\n\n    return config\n  }\n\n  _getDelegateConfig() {\n    const config = {}\n\n    if (this.config) {\n      for (const key in this.config) {\n        if (this.constructor.Default[key] !== this.config[key]) {\n          config[key] = this.config[key]\n        }\n      }\n    }\n\n    return config\n  }\n\n  _cleanTipClass() {\n    const $tip = $(this.getTipElement())\n    const tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX)\n    if (tabClass !== null && tabClass.length) {\n      $tip.removeClass(tabClass.join(''))\n    }\n  }\n\n  _handlePopperPlacementChange(popperData) {\n    this.tip = popperData.instance.popper\n    this._cleanTipClass()\n    this.addAttachmentClass(this._getAttachment(popperData.placement))\n  }\n\n  _fixTransition() {\n    const tip = this.getTipElement()\n    const initConfigAnimation = this.config.animation\n\n    if (tip.getAttribute('x-placement') !== null) {\n      return\n    }\n\n    $(tip).removeClass(CLASS_NAME_FADE)\n    this.config.animation = false\n    this.hide()\n    this.show()\n    this.config.animation = initConfigAnimation\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' && config\n\n      if (!data && /dispose|hide/.test(config)) {\n        return\n      }\n\n      if (!data) {\n        data = new Tooltip(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Tooltip._jQueryInterface\n$.fn[NAME].Constructor = Tooltip\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Tooltip._jQueryInterface\n}\n\nexport default Tooltip\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): popover.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Tooltip from './tooltip'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'popover'\nconst VERSION             = '4.5.0'\nconst DATA_KEY            = 'bs.popover'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\nconst CLASS_PREFIX        = 'bs-popover'\nconst BSCLS_PREFIX_REGEX  = new RegExp(`(^|\\\\s)${CLASS_PREFIX}\\\\S+`, 'g')\n\nconst Default = {\n  ...Tooltip.Default,\n  placement : 'right',\n  trigger   : 'click',\n  content   : '',\n  template  : '<div class=\"popover\" role=\"tooltip\">' +\n              '<div class=\"arrow\"></div>' +\n              '<h3 class=\"popover-header\"></h3>' +\n              '<div class=\"popover-body\"></div></div>'\n}\n\nconst DefaultType = {\n  ...Tooltip.DefaultType,\n  content : '(string|element|function)'\n}\n\nconst CLASS_NAME_FADE = 'fade'\nconst CLASS_NAME_SHOW = 'show'\n\nconst SELECTOR_TITLE   = '.popover-header'\nconst SELECTOR_CONTENT = '.popover-body'\n\nconst Event = {\n  HIDE       : `hide${EVENT_KEY}`,\n  HIDDEN     : `hidden${EVENT_KEY}`,\n  SHOW       : `show${EVENT_KEY}`,\n  SHOWN      : `shown${EVENT_KEY}`,\n  INSERTED   : `inserted${EVENT_KEY}`,\n  CLICK      : `click${EVENT_KEY}`,\n  FOCUSIN    : `focusin${EVENT_KEY}`,\n  FOCUSOUT   : `focusout${EVENT_KEY}`,\n  MOUSEENTER : `mouseenter${EVENT_KEY}`,\n  MOUSELEAVE : `mouseleave${EVENT_KEY}`\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Popover extends Tooltip {\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  static get NAME() {\n    return NAME\n  }\n\n  static get DATA_KEY() {\n    return DATA_KEY\n  }\n\n  static get Event() {\n    return Event\n  }\n\n  static get EVENT_KEY() {\n    return EVENT_KEY\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  // Overrides\n\n  isWithContent() {\n    return this.getTitle() || this._getContent()\n  }\n\n  addAttachmentClass(attachment) {\n    $(this.getTipElement()).addClass(`${CLASS_PREFIX}-${attachment}`)\n  }\n\n  getTipElement() {\n    this.tip = this.tip || $(this.config.template)[0]\n    return this.tip\n  }\n\n  setContent() {\n    const $tip = $(this.getTipElement())\n\n    // We use append for html objects to maintain js events\n    this.setElementContent($tip.find(SELECTOR_TITLE), this.getTitle())\n    let content = this._getContent()\n    if (typeof content === 'function') {\n      content = content.call(this.element)\n    }\n    this.setElementContent($tip.find(SELECTOR_CONTENT), content)\n\n    $tip.removeClass(`${CLASS_NAME_FADE} ${CLASS_NAME_SHOW}`)\n  }\n\n  // Private\n\n  _getContent() {\n    return this.element.getAttribute('data-content') ||\n      this.config.content\n  }\n\n  _cleanTipClass() {\n    const $tip = $(this.getTipElement())\n    const tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX)\n    if (tabClass !== null && tabClass.length > 0) {\n      $tip.removeClass(tabClass.join(''))\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' ? config : null\n\n      if (!data && /dispose|hide/.test(config)) {\n        return\n      }\n\n      if (!data) {\n        data = new Popover(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Popover._jQueryInterface\n$.fn[NAME].Constructor = Popover\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Popover._jQueryInterface\n}\n\nexport default Popover\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): scrollspy.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'scrollspy'\nconst VERSION            = '4.5.0'\nconst DATA_KEY           = 'bs.scrollspy'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst DATA_API_KEY       = '.data-api'\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\n\nconst Default = {\n  offset : 10,\n  method : 'auto',\n  target : ''\n}\n\nconst DefaultType = {\n  offset : 'number',\n  method : 'string',\n  target : '(string|element)'\n}\n\nconst EVENT_ACTIVATE      = `activate${EVENT_KEY}`\nconst EVENT_SCROLL        = `scroll${EVENT_KEY}`\nconst EVENT_LOAD_DATA_API = `load${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_DROPDOWN_ITEM = 'dropdown-item'\nconst CLASS_NAME_ACTIVE        = 'active'\n\nconst SELECTOR_DATA_SPY        = '[data-spy=\"scroll\"]'\nconst SELECTOR_NAV_LIST_GROUP  = '.nav, .list-group'\nconst SELECTOR_NAV_LINKS       = '.nav-link'\nconst SELECTOR_NAV_ITEMS       = '.nav-item'\nconst SELECTOR_LIST_ITEMS      = '.list-group-item'\nconst SELECTOR_DROPDOWN        = '.dropdown'\nconst SELECTOR_DROPDOWN_ITEMS  = '.dropdown-item'\nconst SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle'\n\nconst METHOD_OFFSET   = 'offset'\nconst METHOD_POSITION = 'position'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass ScrollSpy {\n  constructor(element, config) {\n    this._element       = element\n    this._scrollElement = element.tagName === 'BODY' ? window : element\n    this._config        = this._getConfig(config)\n    this._selector      = `${this._config.target} ${SELECTOR_NAV_LINKS},` +\n                          `${this._config.target} ${SELECTOR_LIST_ITEMS},` +\n                          `${this._config.target} ${SELECTOR_DROPDOWN_ITEMS}`\n    this._offsets       = []\n    this._targets       = []\n    this._activeTarget  = null\n    this._scrollHeight  = 0\n\n    $(this._scrollElement).on(EVENT_SCROLL, (event) => this._process(event))\n\n    this.refresh()\n    this._process()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  refresh() {\n    const autoMethod = this._scrollElement === this._scrollElement.window\n      ? METHOD_OFFSET : METHOD_POSITION\n\n    const offsetMethod = this._config.method === 'auto'\n      ? autoMethod : this._config.method\n\n    const offsetBase = offsetMethod === METHOD_POSITION\n      ? this._getScrollTop() : 0\n\n    this._offsets = []\n    this._targets = []\n\n    this._scrollHeight = this._getScrollHeight()\n\n    const targets = [].slice.call(document.querySelectorAll(this._selector))\n\n    targets\n      .map((element) => {\n        let target\n        const targetSelector = Util.getSelectorFromElement(element)\n\n        if (targetSelector) {\n          target = document.querySelector(targetSelector)\n        }\n\n        if (target) {\n          const targetBCR = target.getBoundingClientRect()\n          if (targetBCR.width || targetBCR.height) {\n            // TODO (fat): remove sketch reliance on jQuery position/offset\n            return [\n              $(target)[offsetMethod]().top + offsetBase,\n              targetSelector\n            ]\n          }\n        }\n        return null\n      })\n      .filter((item) => item)\n      .sort((a, b) => a[0] - b[0])\n      .forEach((item) => {\n        this._offsets.push(item[0])\n        this._targets.push(item[1])\n      })\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    $(this._scrollElement).off(EVENT_KEY)\n\n    this._element       = null\n    this._scrollElement = null\n    this._config        = null\n    this._selector      = null\n    this._offsets       = null\n    this._targets       = null\n    this._activeTarget  = null\n    this._scrollHeight  = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...typeof config === 'object' && config ? config : {}\n    }\n\n    if (typeof config.target !== 'string' && Util.isElement(config.target)) {\n      let id = $(config.target).attr('id')\n      if (!id) {\n        id = Util.getUID(NAME)\n        $(config.target).attr('id', id)\n      }\n      config.target = `#${id}`\n    }\n\n    Util.typeCheckConfig(NAME, config, DefaultType)\n\n    return config\n  }\n\n  _getScrollTop() {\n    return this._scrollElement === window\n      ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop\n  }\n\n  _getScrollHeight() {\n    return this._scrollElement.scrollHeight || Math.max(\n      document.body.scrollHeight,\n      document.documentElement.scrollHeight\n    )\n  }\n\n  _getOffsetHeight() {\n    return this._scrollElement === window\n      ? window.innerHeight : this._scrollElement.getBoundingClientRect().height\n  }\n\n  _process() {\n    const scrollTop    = this._getScrollTop() + this._config.offset\n    const scrollHeight = this._getScrollHeight()\n    const maxScroll    = this._config.offset + scrollHeight - this._getOffsetHeight()\n\n    if (this._scrollHeight !== scrollHeight) {\n      this.refresh()\n    }\n\n    if (scrollTop >= maxScroll) {\n      const target = this._targets[this._targets.length - 1]\n\n      if (this._activeTarget !== target) {\n        this._activate(target)\n      }\n      return\n    }\n\n    if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) {\n      this._activeTarget = null\n      this._clear()\n      return\n    }\n\n    for (let i = this._offsets.length; i--;) {\n      const isActiveTarget = this._activeTarget !== this._targets[i] &&\n          scrollTop >= this._offsets[i] &&\n          (typeof this._offsets[i + 1] === 'undefined' ||\n              scrollTop < this._offsets[i + 1])\n\n      if (isActiveTarget) {\n        this._activate(this._targets[i])\n      }\n    }\n  }\n\n  _activate(target) {\n    this._activeTarget = target\n\n    this._clear()\n\n    const queries = this._selector\n      .split(',')\n      .map((selector) => `${selector}[data-target=\"${target}\"],${selector}[href=\"${target}\"]`)\n\n    const $link = $([].slice.call(document.querySelectorAll(queries.join(','))))\n\n    if ($link.hasClass(CLASS_NAME_DROPDOWN_ITEM)) {\n      $link.closest(SELECTOR_DROPDOWN)\n        .find(SELECTOR_DROPDOWN_TOGGLE)\n        .addClass(CLASS_NAME_ACTIVE)\n      $link.addClass(CLASS_NAME_ACTIVE)\n    } else {\n      // Set triggered link as active\n      $link.addClass(CLASS_NAME_ACTIVE)\n      // Set triggered links parents as active\n      // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor\n      $link.parents(SELECTOR_NAV_LIST_GROUP)\n        .prev(`${SELECTOR_NAV_LINKS}, ${SELECTOR_LIST_ITEMS}`)\n        .addClass(CLASS_NAME_ACTIVE)\n      // Handle special case when .nav-link is inside .nav-item\n      $link.parents(SELECTOR_NAV_LIST_GROUP)\n        .prev(SELECTOR_NAV_ITEMS)\n        .children(SELECTOR_NAV_LINKS)\n        .addClass(CLASS_NAME_ACTIVE)\n    }\n\n    $(this._scrollElement).trigger(EVENT_ACTIVATE, {\n      relatedTarget: target\n    })\n  }\n\n  _clear() {\n    [].slice.call(document.querySelectorAll(this._selector))\n      .filter((node) => node.classList.contains(CLASS_NAME_ACTIVE))\n      .forEach((node) => node.classList.remove(CLASS_NAME_ACTIVE))\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' && config\n\n      if (!data) {\n        data = new ScrollSpy(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(window).on(EVENT_LOAD_DATA_API, () => {\n  const scrollSpys = [].slice.call(document.querySelectorAll(SELECTOR_DATA_SPY))\n  const scrollSpysLength = scrollSpys.length\n\n  for (let i = scrollSpysLength; i--;) {\n    const $spy = $(scrollSpys[i])\n    ScrollSpy._jQueryInterface.call($spy, $spy.data())\n  }\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = ScrollSpy._jQueryInterface\n$.fn[NAME].Constructor = ScrollSpy\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return ScrollSpy._jQueryInterface\n}\n\nexport default ScrollSpy\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): tab.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'tab'\nconst VERSION            = '4.5.0'\nconst DATA_KEY           = 'bs.tab'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst DATA_API_KEY       = '.data-api'\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\n\nconst EVENT_HIDE           = `hide${EVENT_KEY}`\nconst EVENT_HIDDEN         = `hidden${EVENT_KEY}`\nconst EVENT_SHOW           = `show${EVENT_KEY}`\nconst EVENT_SHOWN          = `shown${EVENT_KEY}`\nconst EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`\n\nconst CLASS_NAME_DROPDOWN_MENU = 'dropdown-menu'\nconst CLASS_NAME_ACTIVE        = 'active'\nconst CLASS_NAME_DISABLED      = 'disabled'\nconst CLASS_NAME_FADE          = 'fade'\nconst CLASS_NAME_SHOW          = 'show'\n\nconst SELECTOR_DROPDOWN              = '.dropdown'\nconst SELECTOR_NAV_LIST_GROUP        = '.nav, .list-group'\nconst SELECTOR_ACTIVE                = '.active'\nconst SELECTOR_ACTIVE_UL             = '> li > .active'\nconst SELECTOR_DATA_TOGGLE           = '[data-toggle=\"tab\"], [data-toggle=\"pill\"], [data-toggle=\"list\"]'\nconst SELECTOR_DROPDOWN_TOGGLE       = '.dropdown-toggle'\nconst SELECTOR_DROPDOWN_ACTIVE_CHILD = '> .dropdown-menu .active'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Tab {\n  constructor(element) {\n    this._element = element\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  // Public\n\n  show() {\n    if (this._element.parentNode &&\n        this._element.parentNode.nodeType === Node.ELEMENT_NODE &&\n        $(this._element).hasClass(CLASS_NAME_ACTIVE) ||\n        $(this._element).hasClass(CLASS_NAME_DISABLED)) {\n      return\n    }\n\n    let target\n    let previous\n    const listElement = $(this._element).closest(SELECTOR_NAV_LIST_GROUP)[0]\n    const selector = Util.getSelectorFromElement(this._element)\n\n    if (listElement) {\n      const itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? SELECTOR_ACTIVE_UL : SELECTOR_ACTIVE\n      previous = $.makeArray($(listElement).find(itemSelector))\n      previous = previous[previous.length - 1]\n    }\n\n    const hideEvent = $.Event(EVENT_HIDE, {\n      relatedTarget: this._element\n    })\n\n    const showEvent = $.Event(EVENT_SHOW, {\n      relatedTarget: previous\n    })\n\n    if (previous) {\n      $(previous).trigger(hideEvent)\n    }\n\n    $(this._element).trigger(showEvent)\n\n    if (showEvent.isDefaultPrevented() ||\n        hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (selector) {\n      target = document.querySelector(selector)\n    }\n\n    this._activate(\n      this._element,\n      listElement\n    )\n\n    const complete = () => {\n      const hiddenEvent = $.Event(EVENT_HIDDEN, {\n        relatedTarget: this._element\n      })\n\n      const shownEvent = $.Event(EVENT_SHOWN, {\n        relatedTarget: previous\n      })\n\n      $(previous).trigger(hiddenEvent)\n      $(this._element).trigger(shownEvent)\n    }\n\n    if (target) {\n      this._activate(target, target.parentNode, complete)\n    } else {\n      complete()\n    }\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n  }\n\n  // Private\n\n  _activate(element, container, callback) {\n    const activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL')\n      ? $(container).find(SELECTOR_ACTIVE_UL)\n      : $(container).children(SELECTOR_ACTIVE)\n\n    const active = activeElements[0]\n    const isTransitioning = callback && (active && $(active).hasClass(CLASS_NAME_FADE))\n    const complete = () => this._transitionComplete(\n      element,\n      active,\n      callback\n    )\n\n    if (active && isTransitioning) {\n      const transitionDuration = Util.getTransitionDurationFromElement(active)\n\n      $(active)\n        .removeClass(CLASS_NAME_SHOW)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n  }\n\n  _transitionComplete(element, active, callback) {\n    if (active) {\n      $(active).removeClass(CLASS_NAME_ACTIVE)\n\n      const dropdownChild = $(active.parentNode).find(\n        SELECTOR_DROPDOWN_ACTIVE_CHILD\n      )[0]\n\n      if (dropdownChild) {\n        $(dropdownChild).removeClass(CLASS_NAME_ACTIVE)\n      }\n\n      if (active.getAttribute('role') === 'tab') {\n        active.setAttribute('aria-selected', false)\n      }\n    }\n\n    $(element).addClass(CLASS_NAME_ACTIVE)\n    if (element.getAttribute('role') === 'tab') {\n      element.setAttribute('aria-selected', true)\n    }\n\n    Util.reflow(element)\n\n    if (element.classList.contains(CLASS_NAME_FADE)) {\n      element.classList.add(CLASS_NAME_SHOW)\n    }\n\n    if (element.parentNode && $(element.parentNode).hasClass(CLASS_NAME_DROPDOWN_MENU)) {\n      const dropdownElement = $(element).closest(SELECTOR_DROPDOWN)[0]\n\n      if (dropdownElement) {\n        const dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(SELECTOR_DROPDOWN_TOGGLE))\n\n        $(dropdownToggleList).addClass(CLASS_NAME_ACTIVE)\n      }\n\n      element.setAttribute('aria-expanded', true)\n    }\n\n    if (callback) {\n      callback()\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $this = $(this)\n      let data = $this.data(DATA_KEY)\n\n      if (!data) {\n        data = new Tab(this)\n        $this.data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {\n    event.preventDefault()\n    Tab._jQueryInterface.call($(this), 'show')\n  })\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Tab._jQueryInterface\n$.fn[NAME].Constructor = Tab\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Tab._jQueryInterface\n}\n\nexport default Tab\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.5.0): toast.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'toast'\nconst VERSION            = '4.5.0'\nconst DATA_KEY           = 'bs.toast'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\n\nconst EVENT_CLICK_DISMISS = `click.dismiss${EVENT_KEY}`\nconst EVENT_HIDE          = `hide${EVENT_KEY}`\nconst EVENT_HIDDEN        = `hidden${EVENT_KEY}`\nconst EVENT_SHOW          = `show${EVENT_KEY}`\nconst EVENT_SHOWN         = `shown${EVENT_KEY}`\n\nconst CLASS_NAME_FADE    = 'fade'\nconst CLASS_NAME_HIDE    = 'hide'\nconst CLASS_NAME_SHOW    = 'show'\nconst CLASS_NAME_SHOWING = 'showing'\n\nconst DefaultType = {\n  animation : 'boolean',\n  autohide  : 'boolean',\n  delay     : 'number'\n}\n\nconst Default = {\n  animation : true,\n  autohide  : true,\n  delay     : 500\n}\n\nconst SELECTOR_DATA_DISMISS = '[data-dismiss=\"toast\"]'\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Toast {\n  constructor(element, config) {\n    this._element = element\n    this._config  = this._getConfig(config)\n    this._timeout = null\n    this._setListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  show() {\n    const showEvent = $.Event(EVENT_SHOW)\n\n    $(this._element).trigger(showEvent)\n    if (showEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (this._config.animation) {\n      this._element.classList.add(CLASS_NAME_FADE)\n    }\n\n    const complete = () => {\n      this._element.classList.remove(CLASS_NAME_SHOWING)\n      this._element.classList.add(CLASS_NAME_SHOW)\n\n      $(this._element).trigger(EVENT_SHOWN)\n\n      if (this._config.autohide) {\n        this._timeout = setTimeout(() => {\n          this.hide()\n        }, this._config.delay)\n      }\n    }\n\n    this._element.classList.remove(CLASS_NAME_HIDE)\n    Util.reflow(this._element)\n    this._element.classList.add(CLASS_NAME_SHOWING)\n    if (this._config.animation) {\n      const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n  }\n\n  hide() {\n    if (!this._element.classList.contains(CLASS_NAME_SHOW)) {\n      return\n    }\n\n    const hideEvent = $.Event(EVENT_HIDE)\n\n    $(this._element).trigger(hideEvent)\n    if (hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._close()\n  }\n\n  dispose() {\n    clearTimeout(this._timeout)\n    this._timeout = null\n\n    if (this._element.classList.contains(CLASS_NAME_SHOW)) {\n      this._element.classList.remove(CLASS_NAME_SHOW)\n    }\n\n    $(this._element).off(EVENT_CLICK_DISMISS)\n\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n    this._config  = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...$(this._element).data(),\n      ...typeof config === 'object' && config ? config : {}\n    }\n\n    Util.typeCheckConfig(\n      NAME,\n      config,\n      this.constructor.DefaultType\n    )\n\n    return config\n  }\n\n  _setListeners() {\n    $(this._element).on(EVENT_CLICK_DISMISS, SELECTOR_DATA_DISMISS, () => this.hide())\n  }\n\n  _close() {\n    const complete = () => {\n      this._element.classList.add(CLASS_NAME_HIDE)\n      $(this._element).trigger(EVENT_HIDDEN)\n    }\n\n    this._element.classList.remove(CLASS_NAME_SHOW)\n    if (this._config.animation) {\n      const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $element = $(this)\n      let data       = $element.data(DATA_KEY)\n      const _config  = typeof config === 'object' && config\n\n      if (!data) {\n        data = new Toast(this, _config)\n        $element.data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n\n        data[config](this)\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME]             = Toast._jQueryInterface\n$.fn[NAME].Constructor = Toast\n$.fn[NAME].noConflict  = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Toast._jQueryInterface\n}\n\nexport default Toast\n"],"names":["TRANSITION_END","MAX_UID","MILLISECONDS_MULTIPLIER","toType","obj","toString","call","match","toLowerCase","getSpecialTransitionEndEvent","bindType","delegateType","handle","event","$","target","is","handleObj","handler","apply","arguments","undefined","transitionEndEmulator","duration","called","one","Util","setTimeout","triggerTransitionEnd","setTransitionEndSupport","fn","emulateTransitionEnd","special","getUID","prefix","Math","random","document","getElementById","getSelectorFromElement","element","selector","getAttribute","hrefAttr","trim","querySelector","err","getTransitionDurationFromElement","transitionDuration","css","transitionDelay","floatTransitionDuration","parseFloat","floatTransitionDelay","split","reflow","offsetHeight","trigger","supportsTransitionEnd","Boolean","isElement","nodeType","typeCheckConfig","componentName","config","configTypes","property","Object","prototype","hasOwnProperty","expectedTypes","value","valueType","RegExp","test","Error","toUpperCase","findShadowRoot","documentElement","attachShadow","getRootNode","root","ShadowRoot","parentNode","jQueryDetection","TypeError","version","jquery","minMajor","ltMajor","minMinor","minPatch","maxMajor","NAME","VERSION","DATA_KEY","EVENT_KEY","DATA_API_KEY","JQUERY_NO_CONFLICT","SELECTOR_DISMISS","EVENT_CLOSE","EVENT_CLOSED","EVENT_CLICK_DATA_API","CLASS_NAME_ALERT","CLASS_NAME_FADE","CLASS_NAME_SHOW","Alert","_element","close","rootElement","_getRootElement","customEvent","_triggerCloseEvent","isDefaultPrevented","_removeElement","dispose","removeData","parent","closest","closeEvent","Event","removeClass","hasClass","_destroyElement","detach","remove","_jQueryInterface","each","$element","data","_handleDismiss","alertInstance","preventDefault","on","Constructor","noConflict","CLASS_NAME_ACTIVE","CLASS_NAME_BUTTON","CLASS_NAME_FOCUS","SELECTOR_DATA_TOGGLE_CARROT","SELECTOR_DATA_TOGGLES","SELECTOR_DATA_TOGGLE","SELECTOR_DATA_TOGGLES_BUTTONS","SELECTOR_INPUT","SELECTOR_ACTIVE","SELECTOR_BUTTON","EVENT_FOCUS_BLUR_DATA_API","EVENT_LOAD_DATA_API","Button","toggle","triggerChangeEvent","addAriaPressed","input","type","checked","classList","contains","activeElement","focus","hasAttribute","setAttribute","toggleClass","button","initialButton","inputBtn","tagName","window","buttons","slice","querySelectorAll","i","len","length","add","ARROW_LEFT_KEYCODE","ARROW_RIGHT_KEYCODE","TOUCHEVENT_COMPAT_WAIT","SWIPE_THRESHOLD","Default","interval","keyboard","slide","pause","wrap","touch","DefaultType","DIRECTION_NEXT","DIRECTION_PREV","DIRECTION_LEFT","DIRECTION_RIGHT","EVENT_SLIDE","EVENT_SLID","EVENT_KEYDOWN","EVENT_MOUSEENTER","EVENT_MOUSELEAVE","EVENT_TOUCHSTART","EVENT_TOUCHMOVE","EVENT_TOUCHEND","EVENT_POINTERDOWN","EVENT_POINTERUP","EVENT_DRAG_START","CLASS_NAME_CAROUSEL","CLASS_NAME_SLIDE","CLASS_NAME_RIGHT","CLASS_NAME_LEFT","CLASS_NAME_NEXT","CLASS_NAME_PREV","CLASS_NAME_POINTER_EVENT","SELECTOR_ACTIVE_ITEM","SELECTOR_ITEM","SELECTOR_ITEM_IMG","SELECTOR_NEXT_PREV","SELECTOR_INDICATORS","SELECTOR_DATA_SLIDE","SELECTOR_DATA_RIDE","PointerType","TOUCH","PEN","Carousel","_items","_interval","_activeElement","_isPaused","_isSliding","touchTimeout","touchStartX","touchDeltaX","_config","_getConfig","_indicatorsElement","_touchSupported","navigator","maxTouchPoints","_pointerEvent","PointerEvent","MSPointerEvent","_addEventListeners","next","_slide","nextWhenVisible","hidden","prev","cycle","clearInterval","setInterval","visibilityState","bind","to","index","activeIndex","_getItemIndex","direction","off","_handleSwipe","absDeltax","abs","_keydown","_addTouchEventListeners","start","originalEvent","pointerType","clientX","touches","move","end","clearTimeout","e","which","indexOf","_getItemByDirection","isNextDirection","isPrevDirection","lastItemIndex","isGoingToWrap","delta","itemIndex","_triggerSlideEvent","relatedTarget","eventDirectionName","targetIndex","fromIndex","slideEvent","from","_setActiveIndicatorElement","indicators","nextIndicator","children","addClass","activeElementIndex","nextElement","nextElementIndex","isCycling","directionalClassName","orderClassName","slidEvent","nextElementInterval","parseInt","defaultInterval","action","ride","_dataApiClickHandler","slideIndex","carousels","$carousel","EVENT_SHOW","EVENT_SHOWN","EVENT_HIDE","EVENT_HIDDEN","CLASS_NAME_COLLAPSE","CLASS_NAME_COLLAPSING","CLASS_NAME_COLLAPSED","DIMENSION_WIDTH","DIMENSION_HEIGHT","SELECTOR_ACTIVES","Collapse","_isTransitioning","_triggerArray","id","toggleList","elem","filterElement","filter","foundElem","_selector","push","_parent","_getParent","_addAriaAndCollapsedClass","hide","show","actives","activesData","not","startEvent","dimension","_getDimension","style","attr","setTransitioning","complete","capitalizedDimension","scrollSize","getBoundingClientRect","triggerArrayLength","$elem","isTransitioning","hasWidth","_getTargetFromElement","triggerArray","isOpen","$this","currentTarget","$trigger","selectors","$target","ESCAPE_KEYCODE","SPACE_KEYCODE","TAB_KEYCODE","ARROW_UP_KEYCODE","ARROW_DOWN_KEYCODE","RIGHT_MOUSE_BUTTON_WHICH","REGEXP_KEYDOWN","EVENT_CLICK","EVENT_KEYDOWN_DATA_API","EVENT_KEYUP_DATA_API","CLASS_NAME_DISABLED","CLASS_NAME_DROPUP","CLASS_NAME_DROPRIGHT","CLASS_NAME_DROPLEFT","CLASS_NAME_MENURIGHT","CLASS_NAME_POSITION_STATIC","SELECTOR_FORM_CHILD","SELECTOR_MENU","SELECTOR_NAVBAR_NAV","SELECTOR_VISIBLE_ITEMS","PLACEMENT_TOP","PLACEMENT_TOPEND","PLACEMENT_BOTTOM","PLACEMENT_BOTTOMEND","PLACEMENT_RIGHT","PLACEMENT_LEFT","offset","flip","boundary","reference","display","popperConfig","Dropdown","_popper","_menu","_getMenuElement","_inNavbar","_detectNavbar","disabled","isActive","_clearMenus","usePopper","showEvent","_getParentFromElement","Popper","referenceElement","_getPopperConfig","body","noop","hideEvent","destroy","update","scheduleUpdate","stopPropagation","constructor","_getPlacement","$parentDropdown","placement","_getOffset","offsets","modifiers","enabled","preventOverflow","boundariesElement","applyStyle","toggles","context","clickEvent","dropdownMenu","_dataApiKeydownHandler","items","item","backdrop","EVENT_HIDE_PREVENTED","EVENT_FOCUSIN","EVENT_RESIZE","EVENT_CLICK_DISMISS","EVENT_KEYDOWN_DISMISS","EVENT_MOUSEUP_DISMISS","EVENT_MOUSEDOWN_DISMISS","CLASS_NAME_SCROLLABLE","CLASS_NAME_SCROLLBAR_MEASURER","CLASS_NAME_BACKDROP","CLASS_NAME_OPEN","CLASS_NAME_STATIC","SELECTOR_DIALOG","SELECTOR_MODAL_BODY","SELECTOR_DATA_DISMISS","SELECTOR_FIXED_CONTENT","SELECTOR_STICKY_CONTENT","Modal","_dialog","_backdrop","_isShown","_isBodyOverflowing","_ignoreBackdropClick","_scrollbarWidth","_checkScrollbar","_setScrollbar","_adjustDialog","_setEscapeEvent","_setResizeEvent","_showBackdrop","_showElement","transition","_hideModal","forEach","htmlElement","handleUpdate","_triggerBackdropTransition","hideEventPrevented","defaultPrevented","modalTransitionDuration","modalBody","Node","ELEMENT_NODE","appendChild","removeAttribute","scrollTop","_enforceFocus","shownEvent","transitionComplete","has","_resetAdjustments","_resetScrollbar","_removeBackdrop","callback","animate","createElement","className","appendTo","backdropTransitionDuration","callbackRemove","isModalOverflowing","scrollHeight","clientHeight","paddingLeft","paddingRight","rect","round","left","right","innerWidth","_getScrollbarWidth","fixedContent","stickyContent","actualPadding","calculatedPadding","actualMargin","marginRight","calculatedMargin","padding","elements","margin","scrollDiv","scrollbarWidth","width","clientWidth","removeChild","uriAttrs","ARIA_ATTRIBUTE_PATTERN","DefaultWhitelist","a","area","b","br","col","code","div","em","hr","h1","h2","h3","h4","h5","h6","img","li","ol","p","pre","s","small","span","sub","sup","strong","u","ul","SAFE_URL_PATTERN","DATA_URL_PATTERN","allowedAttribute","allowedAttributeList","attrName","nodeName","nodeValue","regExp","attrRegex","sanitizeHtml","unsafeHtml","whiteList","sanitizeFn","domParser","DOMParser","createdDocument","parseFromString","whitelistKeys","keys","el","elName","attributeList","attributes","whitelistedAttributes","concat","innerHTML","CLASS_PREFIX","BSCLS_PREFIX_REGEX","DISALLOWED_ATTRIBUTES","animation","template","title","delay","html","container","fallbackPlacement","sanitize","AttachmentMap","AUTO","TOP","RIGHT","BOTTOM","LEFT","HOVER_STATE_SHOW","HOVER_STATE_OUT","HIDE","HIDDEN","SHOW","SHOWN","INSERTED","CLICK","FOCUSIN","FOCUSOUT","MOUSEENTER","MOUSELEAVE","SELECTOR_TOOLTIP_INNER","SELECTOR_ARROW","TRIGGER_HOVER","TRIGGER_FOCUS","TRIGGER_CLICK","TRIGGER_MANUAL","Tooltip","_isEnabled","_timeout","_hoverState","_activeTrigger","tip","_setListeners","enable","disable","toggleEnabled","dataKey","_getDelegateConfig","click","_isWithActiveTrigger","_enter","_leave","getTipElement","_hideModalHandler","isWithContent","shadowRoot","isInTheDom","ownerDocument","tipId","setContent","attachment","_getAttachment","addAttachmentClass","_getContainer","_fixTransition","prevHoverState","_cleanTipClass","getTitle","setElementContent","content","empty","append","text","defaultBsConfig","behavior","arrow","onCreate","originalPlacement","_handlePopperPlacementChange","onUpdate","find","triggers","eventIn","eventOut","_fixTitle","titleType","dataAttributes","dataAttr","key","$tip","tabClass","join","popperData","instance","popper","initConfigAnimation","SELECTOR_TITLE","SELECTOR_CONTENT","Popover","_getContent","method","EVENT_ACTIVATE","EVENT_SCROLL","CLASS_NAME_DROPDOWN_ITEM","SELECTOR_DATA_SPY","SELECTOR_NAV_LIST_GROUP","SELECTOR_NAV_LINKS","SELECTOR_NAV_ITEMS","SELECTOR_LIST_ITEMS","SELECTOR_DROPDOWN","SELECTOR_DROPDOWN_ITEMS","SELECTOR_DROPDOWN_TOGGLE","METHOD_OFFSET","METHOD_POSITION","ScrollSpy","_scrollElement","_offsets","_targets","_activeTarget","_scrollHeight","_process","refresh","autoMethod","offsetMethod","offsetBase","_getScrollTop","_getScrollHeight","targets","map","targetSelector","targetBCR","height","top","sort","pageYOffset","max","_getOffsetHeight","innerHeight","maxScroll","_activate","_clear","isActiveTarget","queries","$link","parents","node","scrollSpys","scrollSpysLength","$spy","CLASS_NAME_DROPDOWN_MENU","SELECTOR_ACTIVE_UL","SELECTOR_DROPDOWN_ACTIVE_CHILD","Tab","previous","listElement","itemSelector","makeArray","hiddenEvent","activeElements","active","_transitionComplete","dropdownChild","dropdownElement","dropdownToggleList","CLASS_NAME_HIDE","CLASS_NAME_SHOWING","autohide","Toast","_close"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;;;;;;EASA;;;;;;EAMA,IAAMA,cAAc,GAAG,eAAvB;EACA,IAAMC,OAAO,GAAG,OAAhB;EACA,IAAMC,uBAAuB,GAAG,IAAhC;;EAGA,SAASC,MAAT,CAAgBC,GAAhB,EAAqB;EACnB,MAAIA,GAAG,KAAK,IAAR,IAAgB,OAAOA,GAAP,KAAe,WAAnC,EAAgD;EAC9C,gBAAUA,GAAV;EACD;;EAED,SAAO,GAAGC,QAAH,CAAYC,IAAZ,CAAiBF,GAAjB,EAAsBG,KAAtB,CAA4B,aAA5B,EAA2C,CAA3C,EAA8CC,WAA9C,EAAP;EACD;;EAED,SAASC,4BAAT,GAAwC;EACtC,SAAO;EACLC,IAAAA,QAAQ,EAAEV,cADL;EAELW,IAAAA,YAAY,EAAEX,cAFT;EAGLY,IAAAA,MAHK,kBAGEC,KAHF,EAGS;EACZ,UAAIC,CAAC,CAACD,KAAK,CAACE,MAAP,CAAD,CAAgBC,EAAhB,CAAmB,IAAnB,CAAJ,EAA8B;EAC5B,eAAOH,KAAK,CAACI,SAAN,CAAgBC,OAAhB,CAAwBC,KAAxB,CAA8B,IAA9B,EAAoCC,SAApC,CAAP,CAD4B;EAE7B;;EACD,aAAOC,SAAP;EACD;EARI,GAAP;EAUD;;EAED,SAASC,qBAAT,CAA+BC,QAA/B,EAAyC;EAAA;;EACvC,MAAIC,MAAM,GAAG,KAAb;EAEAV,EAAAA,CAAC,CAAC,IAAD,CAAD,CAAQW,GAAR,CAAYC,IAAI,CAAC1B,cAAjB,EAAiC,YAAM;EACrCwB,IAAAA,MAAM,GAAG,IAAT;EACD,GAFD;EAIAG,EAAAA,UAAU,CAAC,YAAM;EACf,QAAI,CAACH,MAAL,EAAa;EACXE,MAAAA,IAAI,CAACE,oBAAL,CAA0B,KAA1B;EACD;EACF,GAJS,EAIPL,QAJO,CAAV;EAMA,SAAO,IAAP;EACD;;EAED,SAASM,uBAAT,GAAmC;EACjCf,EAAAA,CAAC,CAACgB,EAAF,CAAKC,oBAAL,GAA4BT,qBAA5B;EACAR,EAAAA,CAAC,CAACD,KAAF,CAAQmB,OAAR,CAAgBN,IAAI,CAAC1B,cAArB,IAAuCS,4BAA4B,EAAnE;EACD;EAED;;;;;;;MAMMiB,IAAI,GAAG;EACX1B,EAAAA,cAAc,EAAE,iBADL;EAGXiC,EAAAA,MAHW,kBAGJC,MAHI,EAGI;EACb,OAAG;EACD;EACAA,MAAAA,MAAM,IAAI,CAAC,EAAEC,IAAI,CAACC,MAAL,KAAgBnC,OAAlB,CAAX,CAFC;EAGF,KAHD,QAGSoC,QAAQ,CAACC,cAAT,CAAwBJ,MAAxB,CAHT;;EAIA,WAAOA,MAAP;EACD,GATU;EAWXK,EAAAA,sBAXW,kCAWYC,OAXZ,EAWqB;EAC9B,QAAIC,QAAQ,GAAGD,OAAO,CAACE,YAAR,CAAqB,aAArB,CAAf;;EAEA,QAAI,CAACD,QAAD,IAAaA,QAAQ,KAAK,GAA9B,EAAmC;EACjC,UAAME,QAAQ,GAAGH,OAAO,CAACE,YAAR,CAAqB,MAArB,CAAjB;EACAD,MAAAA,QAAQ,GAAGE,QAAQ,IAAIA,QAAQ,KAAK,GAAzB,GAA+BA,QAAQ,CAACC,IAAT,EAA/B,GAAiD,EAA5D;EACD;;EAED,QAAI;EACF,aAAOP,QAAQ,CAACQ,aAAT,CAAuBJ,QAAvB,IAAmCA,QAAnC,GAA8C,IAArD;EACD,KAFD,CAEE,OAAOK,GAAP,EAAY;EACZ,aAAO,IAAP;EACD;EACF,GAxBU;EA0BXC,EAAAA,gCA1BW,4CA0BsBP,OA1BtB,EA0B+B;EACxC,QAAI,CAACA,OAAL,EAAc;EACZ,aAAO,CAAP;EACD,KAHuC;;;EAMxC,QAAIQ,kBAAkB,GAAGlC,CAAC,CAAC0B,OAAD,CAAD,CAAWS,GAAX,CAAe,qBAAf,CAAzB;EACA,QAAIC,eAAe,GAAGpC,CAAC,CAAC0B,OAAD,CAAD,CAAWS,GAAX,CAAe,kBAAf,CAAtB;EAEA,QAAME,uBAAuB,GAAGC,UAAU,CAACJ,kBAAD,CAA1C;EACA,QAAMK,oBAAoB,GAAGD,UAAU,CAACF,eAAD,CAAvC,CAVwC;;EAaxC,QAAI,CAACC,uBAAD,IAA4B,CAACE,oBAAjC,EAAuD;EACrD,aAAO,CAAP;EACD,KAfuC;;;EAkBxCL,IAAAA,kBAAkB,GAAGA,kBAAkB,CAACM,KAAnB,CAAyB,GAAzB,EAA8B,CAA9B,CAArB;EACAJ,IAAAA,eAAe,GAAGA,eAAe,CAACI,KAAhB,CAAsB,GAAtB,EAA2B,CAA3B,CAAlB;EAEA,WAAO,CAACF,UAAU,CAACJ,kBAAD,CAAV,GAAiCI,UAAU,CAACF,eAAD,CAA5C,IAAiEhD,uBAAxE;EACD,GAhDU;EAkDXqD,EAAAA,MAlDW,kBAkDJf,OAlDI,EAkDK;EACd,WAAOA,OAAO,CAACgB,YAAf;EACD,GApDU;EAsDX5B,EAAAA,oBAtDW,gCAsDUY,OAtDV,EAsDmB;EAC5B1B,IAAAA,CAAC,CAAC0B,OAAD,CAAD,CAAWiB,OAAX,CAAmBzD,cAAnB;EACD,GAxDU;EA0DX;EACA0D,EAAAA,qBA3DW,mCA2Da;EACtB,WAAOC,OAAO,CAAC3D,cAAD,CAAd;EACD,GA7DU;EA+DX4D,EAAAA,SA/DW,qBA+DDxD,GA/DC,EA+DI;EACb,WAAO,CAACA,GAAG,CAAC,CAAD,CAAH,IAAUA,GAAX,EAAgByD,QAAvB;EACD,GAjEU;EAmEXC,EAAAA,eAnEW,2BAmEKC,aAnEL,EAmEoBC,MAnEpB,EAmE4BC,WAnE5B,EAmEyC;EAClD,SAAK,IAAMC,QAAX,IAAuBD,WAAvB,EAAoC;EAClC,UAAIE,MAAM,CAACC,SAAP,CAAiBC,cAAjB,CAAgC/D,IAAhC,CAAqC2D,WAArC,EAAkDC,QAAlD,CAAJ,EAAiE;EAC/D,YAAMI,aAAa,GAAGL,WAAW,CAACC,QAAD,CAAjC;EACA,YAAMK,KAAK,GAAWP,MAAM,CAACE,QAAD,CAA5B;EACA,YAAMM,SAAS,GAAOD,KAAK,IAAI7C,IAAI,CAACkC,SAAL,CAAeW,KAAf,CAAT,GAClB,SADkB,GACNpE,MAAM,CAACoE,KAAD,CADtB;;EAGA,YAAI,CAAC,IAAIE,MAAJ,CAAWH,aAAX,EAA0BI,IAA1B,CAA+BF,SAA/B,CAAL,EAAgD;EAC9C,gBAAM,IAAIG,KAAJ,CACDZ,aAAa,CAACa,WAAd,EAAH,yBACWV,QADX,2BACuCM,SADvC,sCAEsBF,aAFtB,SADI,CAAN;EAID;EACF;EACF;EACF,GAnFU;EAqFXO,EAAAA,cArFW,0BAqFIrC,OArFJ,EAqFa;EACtB,QAAI,CAACH,QAAQ,CAACyC,eAAT,CAAyBC,YAA9B,EAA4C;EAC1C,aAAO,IAAP;EACD,KAHqB;;;EAMtB,QAAI,OAAOvC,OAAO,CAACwC,WAAf,KAA+B,UAAnC,EAA+C;EAC7C,UAAMC,IAAI,GAAGzC,OAAO,CAACwC,WAAR,EAAb;EACA,aAAOC,IAAI,YAAYC,UAAhB,GAA6BD,IAA7B,GAAoC,IAA3C;EACD;;EAED,QAAIzC,OAAO,YAAY0C,UAAvB,EAAmC;EACjC,aAAO1C,OAAP;EACD,KAbqB;;;EAgBtB,QAAI,CAACA,OAAO,CAAC2C,UAAb,EAAyB;EACvB,aAAO,IAAP;EACD;;EAED,WAAOzD,IAAI,CAACmD,cAAL,CAAoBrC,OAAO,CAAC2C,UAA5B,CAAP;EACD,GA1GU;EA4GXC,EAAAA,eA5GW,6BA4GO;EAChB,QAAI,OAAOtE,CAAP,KAAa,WAAjB,EAA8B;EAC5B,YAAM,IAAIuE,SAAJ,CAAc,kGAAd,CAAN;EACD;;EAED,QAAMC,OAAO,GAAGxE,CAAC,CAACgB,EAAF,CAAKyD,MAAL,CAAYjC,KAAZ,CAAkB,GAAlB,EAAuB,CAAvB,EAA0BA,KAA1B,CAAgC,GAAhC,CAAhB;EACA,QAAMkC,QAAQ,GAAG,CAAjB;EACA,QAAMC,OAAO,GAAG,CAAhB;EACA,QAAMC,QAAQ,GAAG,CAAjB;EACA,QAAMC,QAAQ,GAAG,CAAjB;EACA,QAAMC,QAAQ,GAAG,CAAjB;;EAEA,QAAIN,OAAO,CAAC,CAAD,CAAP,GAAaG,OAAb,IAAwBH,OAAO,CAAC,CAAD,CAAP,GAAaI,QAArC,IAAiDJ,OAAO,CAAC,CAAD,CAAP,KAAeE,QAAf,IAA2BF,OAAO,CAAC,CAAD,CAAP,KAAeI,QAA1C,IAAsDJ,OAAO,CAAC,CAAD,CAAP,GAAaK,QAApH,IAAgIL,OAAO,CAAC,CAAD,CAAP,IAAcM,QAAlJ,EAA4J;EAC1J,YAAM,IAAIjB,KAAJ,CAAU,8EAAV,CAAN;EACD;EACF;EA3HU;EA8HbjD,IAAI,CAAC0D,eAAL;EACAvD,uBAAuB;;ECzLvB;;;;;;EAMA,IAAMgE,IAAI,GAAkB,OAA5B;EACA,IAAMC,OAAO,GAAe,OAA5B;EACA,IAAMC,QAAQ,GAAc,UAA5B;EACA,IAAMC,SAAS,SAAiBD,QAAhC;EACA,IAAME,YAAY,GAAU,WAA5B;EACA,IAAMC,kBAAkB,GAAIpF,CAAC,CAACgB,EAAF,CAAK+D,IAAL,CAA5B;EAEA,IAAMM,gBAAgB,GAAG,wBAAzB;EAEA,IAAMC,WAAW,aAAoBJ,SAArC;EACA,IAAMK,YAAY,cAAoBL,SAAtC;EACA,IAAMM,oBAAoB,aAAWN,SAAX,GAAuBC,YAAjD;EAEA,IAAMM,gBAAgB,GAAG,OAAzB;EACA,IAAMC,eAAe,GAAI,MAAzB;EACA,IAAMC,eAAe,GAAI,MAAzB;EAEA;;;;;;MAMMC;EACJ,iBAAYlE,OAAZ,EAAqB;EACnB,SAAKmE,QAAL,GAAgBnE,OAAhB;EACD;;;;;EAQD;WAEAoE,QAAA,eAAMpE,OAAN,EAAe;EACb,QAAIqE,WAAW,GAAG,KAAKF,QAAvB;;EACA,QAAInE,OAAJ,EAAa;EACXqE,MAAAA,WAAW,GAAG,KAAKC,eAAL,CAAqBtE,OAArB,CAAd;EACD;;EAED,QAAMuE,WAAW,GAAG,KAAKC,kBAAL,CAAwBH,WAAxB,CAApB;;EAEA,QAAIE,WAAW,CAACE,kBAAZ,EAAJ,EAAsC;EACpC;EACD;;EAED,SAAKC,cAAL,CAAoBL,WAApB;EACD;;WAEDM,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,QAA5B;EACA,SAAKY,QAAL,GAAgB,IAAhB;EACD;;;WAIDG,kBAAA,yBAAgBtE,OAAhB,EAAyB;EACvB,QAAMC,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4BC,OAA5B,CAAjB;EACA,QAAI6E,MAAM,GAAO,KAAjB;;EAEA,QAAI5E,QAAJ,EAAc;EACZ4E,MAAAA,MAAM,GAAGhF,QAAQ,CAACQ,aAAT,CAAuBJ,QAAvB,CAAT;EACD;;EAED,QAAI,CAAC4E,MAAL,EAAa;EACXA,MAAAA,MAAM,GAAGvG,CAAC,CAAC0B,OAAD,CAAD,CAAW8E,OAAX,OAAuBf,gBAAvB,EAA2C,CAA3C,CAAT;EACD;;EAED,WAAOc,MAAP;EACD;;WAEDL,qBAAA,4BAAmBxE,OAAnB,EAA4B;EAC1B,QAAM+E,UAAU,GAAGzG,CAAC,CAAC0G,KAAF,CAAQpB,WAAR,CAAnB;EAEAtF,IAAAA,CAAC,CAAC0B,OAAD,CAAD,CAAWiB,OAAX,CAAmB8D,UAAnB;EACA,WAAOA,UAAP;EACD;;WAEDL,iBAAA,wBAAe1E,OAAf,EAAwB;EAAA;;EACtB1B,IAAAA,CAAC,CAAC0B,OAAD,CAAD,CAAWiF,WAAX,CAAuBhB,eAAvB;;EAEA,QAAI,CAAC3F,CAAC,CAAC0B,OAAD,CAAD,CAAWkF,QAAX,CAAoBlB,eAApB,CAAL,EAA2C;EACzC,WAAKmB,eAAL,CAAqBnF,OAArB;;EACA;EACD;;EAED,QAAMQ,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsCP,OAAtC,CAA3B;EAEA1B,IAAAA,CAAC,CAAC0B,OAAD,CAAD,CACGf,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4B,UAACa,KAAD;EAAA,aAAW,KAAI,CAAC8G,eAAL,CAAqBnF,OAArB,EAA8B3B,KAA9B,CAAX;EAAA,KAD5B,EAEGkB,oBAFH,CAEwBiB,kBAFxB;EAGD;;WAED2E,kBAAA,yBAAgBnF,OAAhB,EAAyB;EACvB1B,IAAAA,CAAC,CAAC0B,OAAD,CAAD,CACGoF,MADH,GAEGnE,OAFH,CAEW4C,YAFX,EAGGwB,MAHH;EAID;;;UAIMC,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAMC,QAAQ,GAAGlH,CAAC,CAAC,IAAD,CAAlB;EACA,UAAImH,IAAI,GAASD,QAAQ,CAACC,IAAT,CAAclC,QAAd,CAAjB;;EAEA,UAAI,CAACkC,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAIvB,KAAJ,CAAU,IAAV,CAAP;EACAsB,QAAAA,QAAQ,CAACC,IAAT,CAAclC,QAAd,EAAwBkC,IAAxB;EACD;;EAED,UAAIjE,MAAM,KAAK,OAAf,EAAwB;EACtBiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ,CAAa,IAAb;EACD;EACF,KAZM,CAAP;EAaD;;UAEMkE,iBAAP,wBAAsBC,aAAtB,EAAqC;EACnC,WAAO,UAAUtH,KAAV,EAAiB;EACtB,UAAIA,KAAJ,EAAW;EACTA,QAAAA,KAAK,CAACuH,cAAN;EACD;;EAEDD,MAAAA,aAAa,CAACvB,KAAd,CAAoB,IAApB;EACD,KAND;EAOD;;;;0BAlGoB;EACnB,aAAOd,OAAP;EACD;;;;;EAmGH;;;;;;;EAMAhF,CAAC,CAACuB,QAAD,CAAD,CAAYgG,EAAZ,CACE/B,oBADF,EAEEH,gBAFF,EAGEO,KAAK,CAACwB,cAAN,CAAqB,IAAIxB,KAAJ,EAArB,CAHF;EAMA;;;;;;EAMA5F,CAAC,CAACgB,EAAF,CAAK+D,IAAL,IAAyBa,KAAK,CAACoB,gBAA/B;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,IAAL,EAAWyC,WAAX,GAAyB5B,KAAzB;;EACA5F,CAAC,CAACgB,EAAF,CAAK+D,IAAL,EAAW0C,UAAX,GAAyB,YAAM;EAC7BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,IAAL,IAAaK,kBAAb;EACA,SAAOQ,KAAK,CAACoB,gBAAb;EACD,CAHD;;EC9JA;;;;;;EAMA,IAAMjC,MAAI,GAAkB,QAA5B;EACA,IAAMC,SAAO,GAAe,OAA5B;EACA,IAAMC,UAAQ,GAAc,WAA5B;EACA,IAAMC,WAAS,SAAiBD,UAAhC;EACA,IAAME,cAAY,GAAU,WAA5B;EACA,IAAMC,oBAAkB,GAAIpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA5B;EAEA,IAAM2C,iBAAiB,GAAG,QAA1B;EACA,IAAMC,iBAAiB,GAAG,KAA1B;EACA,IAAMC,gBAAgB,GAAI,OAA1B;EAEA,IAAMC,2BAA2B,GAAK,yBAAtC;EACA,IAAMC,qBAAqB,GAAW,yBAAtC;EACA,IAAMC,oBAAoB,GAAY,wBAAtC;EACA,IAAMC,6BAA6B,GAAG,8BAAtC;EACA,IAAMC,cAAc,GAAkB,4BAAtC;EACA,IAAMC,eAAe,GAAiB,SAAtC;EACA,IAAMC,eAAe,GAAiB,MAAtC;EAEA,IAAM3C,sBAAoB,aAAgBN,WAAhB,GAA4BC,cAAtD;EACA,IAAMiD,yBAAyB,GAAG,UAAQlD,WAAR,GAAoBC,cAApB,mBACDD,WADC,GACWC,cADX,CAAlC;EAEA,IAAMkD,mBAAmB,YAAgBnD,WAAhB,GAA4BC,cAArD;EAEA;;;;;;MAMMmD;EACJ,kBAAY5G,OAAZ,EAAqB;EACnB,SAAKmE,QAAL,GAAgBnE,OAAhB;EACD;;;;;EAQD;WAEA6G,SAAA,kBAAS;EACP,QAAIC,kBAAkB,GAAG,IAAzB;EACA,QAAIC,cAAc,GAAG,IAArB;EACA,QAAM1C,WAAW,GAAG/F,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBW,OAAjB,CAClBsB,qBADkB,EAElB,CAFkB,CAApB;;EAIA,QAAI/B,WAAJ,EAAiB;EACf,UAAM2C,KAAK,GAAG,KAAK7C,QAAL,CAAc9D,aAAd,CAA4BkG,cAA5B,CAAd;;EAEA,UAAIS,KAAJ,EAAW;EACT,YAAIA,KAAK,CAACC,IAAN,KAAe,OAAnB,EAA4B;EAC1B,cAAID,KAAK,CAACE,OAAN,IACF,KAAK/C,QAAL,CAAcgD,SAAd,CAAwBC,QAAxB,CAAiCpB,iBAAjC,CADF,EACuD;EACrDc,YAAAA,kBAAkB,GAAG,KAArB;EACD,WAHD,MAGO;EACL,gBAAMO,aAAa,GAAGhD,WAAW,CAAChE,aAAZ,CAA0BmG,eAA1B,CAAtB;;EAEA,gBAAIa,aAAJ,EAAmB;EACjB/I,cAAAA,CAAC,CAAC+I,aAAD,CAAD,CAAiBpC,WAAjB,CAA6Be,iBAA7B;EACD;EACF;EACF;;EAED,YAAIc,kBAAJ,EAAwB;EACtB;EACA,cAAIE,KAAK,CAACC,IAAN,KAAe,UAAf,IAA6BD,KAAK,CAACC,IAAN,KAAe,OAAhD,EAAyD;EACvDD,YAAAA,KAAK,CAACE,OAAN,GAAgB,CAAC,KAAK/C,QAAL,CAAcgD,SAAd,CAAwBC,QAAxB,CAAiCpB,iBAAjC,CAAjB;EACD;;EACD1H,UAAAA,CAAC,CAAC0I,KAAD,CAAD,CAAS/F,OAAT,CAAiB,QAAjB;EACD;;EAED+F,QAAAA,KAAK,CAACM,KAAN;EACAP,QAAAA,cAAc,GAAG,KAAjB;EACD;EACF;;EAED,QAAI,EAAE,KAAK5C,QAAL,CAAcoD,YAAd,CAA2B,UAA3B,KAA0C,KAAKpD,QAAL,CAAcgD,SAAd,CAAwBC,QAAxB,CAAiC,UAAjC,CAA5C,CAAJ,EAA+F;EAC7F,UAAIL,cAAJ,EAAoB;EAClB,aAAK5C,QAAL,CAAcqD,YAAd,CAA2B,cAA3B,EACE,CAAC,KAAKrD,QAAL,CAAcgD,SAAd,CAAwBC,QAAxB,CAAiCpB,iBAAjC,CADH;EAED;;EAED,UAAIc,kBAAJ,EAAwB;EACtBxI,QAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBsD,WAAjB,CAA6BzB,iBAA7B;EACD;EACF;EACF;;WAEDrB,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EACA,SAAKY,QAAL,GAAgB,IAAhB;EACD;;;WAIMmB,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EAEA,UAAI,CAACkC,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAImB,MAAJ,CAAW,IAAX,CAAP;EACAtI,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAIjE,MAAM,KAAK,QAAf,EAAyB;EACvBiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAXM,CAAP;EAYD;;;;0BA3EoB;EACnB,aAAO8B,SAAP;EACD;;;;;EA4EH;;;;;;;EAMAhF,CAAC,CAACuB,QAAD,CAAD,CACGgG,EADH,CACM/B,sBADN,EAC4BqC,2BAD5B,EACyD,UAAC9H,KAAD,EAAW;EAChE,MAAIqJ,MAAM,GAAGrJ,KAAK,CAACE,MAAnB;EACA,MAAMoJ,aAAa,GAAGD,MAAtB;;EAEA,MAAI,CAACpJ,CAAC,CAACoJ,MAAD,CAAD,CAAUxC,QAAV,CAAmBe,iBAAnB,CAAL,EAA4C;EAC1CyB,IAAAA,MAAM,GAAGpJ,CAAC,CAACoJ,MAAD,CAAD,CAAU5C,OAAV,CAAkB2B,eAAlB,EAAmC,CAAnC,CAAT;EACD;;EAED,MAAI,CAACiB,MAAD,IAAWA,MAAM,CAACH,YAAP,CAAoB,UAApB,CAAX,IAA8CG,MAAM,CAACP,SAAP,CAAiBC,QAAjB,CAA0B,UAA1B,CAAlD,EAAyF;EACvF/I,IAAAA,KAAK,CAACuH,cAAN,GADuF;EAExF,GAFD,MAEO;EACL,QAAMgC,QAAQ,GAAGF,MAAM,CAACrH,aAAP,CAAqBkG,cAArB,CAAjB;;EAEA,QAAIqB,QAAQ,KAAKA,QAAQ,CAACL,YAAT,CAAsB,UAAtB,KAAqCK,QAAQ,CAACT,SAAT,CAAmBC,QAAnB,CAA4B,UAA5B,CAA1C,CAAZ,EAAgG;EAC9F/I,MAAAA,KAAK,CAACuH,cAAN,GAD8F;;EAE9F;EACD;;EAED,QAAI+B,aAAa,CAACE,OAAd,KAA0B,OAA1B,IAAqCD,QAArC,IAAiDA,QAAQ,CAACX,IAAT,KAAkB,UAAvE,EAAmF;EACjF5I,MAAAA,KAAK,CAACuH,cAAN,GADiF;EAElF;;EACDgB,IAAAA,MAAM,CAACtB,gBAAP,CAAwBxH,IAAxB,CAA6BQ,CAAC,CAACoJ,MAAD,CAA9B,EAAwC,QAAxC;EACD;EACF,CAxBH,EAyBG7B,EAzBH,CAyBMa,yBAzBN,EAyBiCP,2BAzBjC,EAyB8D,UAAC9H,KAAD,EAAW;EACrE,MAAMqJ,MAAM,GAAGpJ,CAAC,CAACD,KAAK,CAACE,MAAP,CAAD,CAAgBuG,OAAhB,CAAwB2B,eAAxB,EAAyC,CAAzC,CAAf;EACAnI,EAAAA,CAAC,CAACoJ,MAAD,CAAD,CAAUD,WAAV,CAAsBvB,gBAAtB,EAAwC,eAAehE,IAAf,CAAoB7D,KAAK,CAAC4I,IAA1B,CAAxC;EACD,CA5BH;EA8BA3I,CAAC,CAACwJ,MAAD,CAAD,CAAUjC,EAAV,CAAac,mBAAb,EAAkC,YAAM;EACtC;EAEA;EACA,MAAIoB,OAAO,GAAG,GAAGC,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B3B,6BAA1B,CAAd,CAAd;;EACA,OAAK,IAAI4B,CAAC,GAAG,CAAR,EAAWC,GAAG,GAAGJ,OAAO,CAACK,MAA9B,EAAsCF,CAAC,GAAGC,GAA1C,EAA+CD,CAAC,EAAhD,EAAoD;EAClD,QAAMR,MAAM,GAAGK,OAAO,CAACG,CAAD,CAAtB;EACA,QAAMlB,KAAK,GAAGU,MAAM,CAACrH,aAAP,CAAqBkG,cAArB,CAAd;;EACA,QAAIS,KAAK,CAACE,OAAN,IAAiBF,KAAK,CAACO,YAAN,CAAmB,SAAnB,CAArB,EAAoD;EAClDG,MAAAA,MAAM,CAACP,SAAP,CAAiBkB,GAAjB,CAAqBrC,iBAArB;EACD,KAFD,MAEO;EACL0B,MAAAA,MAAM,CAACP,SAAP,CAAiB9B,MAAjB,CAAwBW,iBAAxB;EACD;EACF,GAbqC;;;EAgBtC+B,EAAAA,OAAO,GAAG,GAAGC,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B5B,oBAA1B,CAAd,CAAV;;EACA,OAAK,IAAI6B,EAAC,GAAG,CAAR,EAAWC,IAAG,GAAGJ,OAAO,CAACK,MAA9B,EAAsCF,EAAC,GAAGC,IAA1C,EAA+CD,EAAC,EAAhD,EAAoD;EAClD,QAAMR,OAAM,GAAGK,OAAO,CAACG,EAAD,CAAtB;;EACA,QAAIR,OAAM,CAACxH,YAAP,CAAoB,cAApB,MAAwC,MAA5C,EAAoD;EAClDwH,MAAAA,OAAM,CAACP,SAAP,CAAiBkB,GAAjB,CAAqBrC,iBAArB;EACD,KAFD,MAEO;EACL0B,MAAAA,OAAM,CAACP,SAAP,CAAiB9B,MAAjB,CAAwBW,iBAAxB;EACD;EACF;EACF,CAzBD;EA2BA;;;;;;EAMA1H,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAauD,MAAM,CAACtB,gBAApB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBc,MAAzB;;EACAtI,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAOkD,MAAM,CAACtB,gBAAd;EACD,CAHD;;EC/LA;;;;;;EAMA,IAAMjC,MAAI,GAAqB,UAA/B;EACA,IAAMC,SAAO,GAAkB,OAA/B;EACA,IAAMC,UAAQ,GAAiB,aAA/B;EACA,IAAMC,WAAS,SAAoBD,UAAnC;EACA,IAAME,cAAY,GAAa,WAA/B;EACA,IAAMC,oBAAkB,GAAOpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA/B;EACA,IAAMiF,kBAAkB,GAAO,EAA/B;;EACA,IAAMC,mBAAmB,GAAM,EAA/B;;EACA,IAAMC,sBAAsB,GAAG,GAA/B;;EACA,IAAMC,eAAe,GAAU,EAA/B;EAEA,IAAMC,OAAO,GAAG;EACdC,EAAAA,QAAQ,EAAG,IADG;EAEdC,EAAAA,QAAQ,EAAG,IAFG;EAGdC,EAAAA,KAAK,EAAM,KAHG;EAIdC,EAAAA,KAAK,EAAM,OAJG;EAKdC,EAAAA,IAAI,EAAO,IALG;EAMdC,EAAAA,KAAK,EAAM;EANG,CAAhB;EASA,IAAMC,WAAW,GAAG;EAClBN,EAAAA,QAAQ,EAAG,kBADO;EAElBC,EAAAA,QAAQ,EAAG,SAFO;EAGlBC,EAAAA,KAAK,EAAM,kBAHO;EAIlBC,EAAAA,KAAK,EAAM,kBAJO;EAKlBC,EAAAA,IAAI,EAAO,SALO;EAMlBC,EAAAA,KAAK,EAAM;EANO,CAApB;EASA,IAAME,cAAc,GAAO,MAA3B;EACA,IAAMC,cAAc,GAAO,MAA3B;EACA,IAAMC,cAAc,GAAO,MAA3B;EACA,IAAMC,eAAe,GAAM,OAA3B;EAEA,IAAMC,WAAW,aAAoB9F,WAArC;EACA,IAAM+F,UAAU,YAAoB/F,WAApC;EACA,IAAMgG,aAAa,eAAoBhG,WAAvC;EACA,IAAMiG,gBAAgB,kBAAoBjG,WAA1C;EACA,IAAMkG,gBAAgB,kBAAoBlG,WAA1C;EACA,IAAMmG,gBAAgB,kBAAoBnG,WAA1C;EACA,IAAMoG,eAAe,iBAAoBpG,WAAzC;EACA,IAAMqG,cAAc,gBAAoBrG,WAAxC;EACA,IAAMsG,iBAAiB,mBAAoBtG,WAA3C;EACA,IAAMuG,eAAe,iBAAoBvG,WAAzC;EACA,IAAMwG,gBAAgB,iBAAmBxG,WAAzC;EACA,IAAMmD,qBAAmB,YAAWnD,WAAX,GAAuBC,cAAhD;EACA,IAAMK,sBAAoB,aAAWN,WAAX,GAAuBC,cAAjD;EAEA,IAAMwG,mBAAmB,GAAQ,UAAjC;EACA,IAAMjE,mBAAiB,GAAU,QAAjC;EACA,IAAMkE,gBAAgB,GAAW,OAAjC;EACA,IAAMC,gBAAgB,GAAW,qBAAjC;EACA,IAAMC,eAAe,GAAY,oBAAjC;EACA,IAAMC,eAAe,GAAY,oBAAjC;EACA,IAAMC,eAAe,GAAY,oBAAjC;EACA,IAAMC,wBAAwB,GAAG,eAAjC;EAEA,IAAM/D,iBAAe,GAAQ,SAA7B;EACA,IAAMgE,oBAAoB,GAAG,uBAA7B;EACA,IAAMC,aAAa,GAAU,gBAA7B;EACA,IAAMC,iBAAiB,GAAM,oBAA7B;EACA,IAAMC,kBAAkB,GAAK,0CAA7B;EACA,IAAMC,mBAAmB,GAAI,sBAA7B;EACA,IAAMC,mBAAmB,GAAI,+BAA7B;EACA,IAAMC,kBAAkB,GAAK,wBAA7B;EAEA,IAAMC,WAAW,GAAG;EAClBC,EAAAA,KAAK,EAAG,OADU;EAElBC,EAAAA,GAAG,EAAK;EAFU,CAApB;EAKA;;;;;;MAKMC;EACJ,oBAAYlL,OAAZ,EAAqBwB,MAArB,EAA6B;EAC3B,SAAK2J,MAAL,GAAsB,IAAtB;EACA,SAAKC,SAAL,GAAsB,IAAtB;EACA,SAAKC,cAAL,GAAsB,IAAtB;EACA,SAAKC,SAAL,GAAsB,KAAtB;EACA,SAAKC,UAAL,GAAsB,KAAtB;EACA,SAAKC,YAAL,GAAsB,IAAtB;EACA,SAAKC,WAAL,GAAsB,CAAtB;EACA,SAAKC,WAAL,GAAsB,CAAtB;EAEA,SAAKC,OAAL,GAA0B,KAAKC,UAAL,CAAgBpK,MAAhB,CAA1B;EACA,SAAK2C,QAAL,GAA0BnE,OAA1B;EACA,SAAK6L,kBAAL,GAA0B,KAAK1H,QAAL,CAAc9D,aAAd,CAA4BuK,mBAA5B,CAA1B;EACA,SAAKkB,eAAL,GAA0B,kBAAkBjM,QAAQ,CAACyC,eAA3B,IAA8CyJ,SAAS,CAACC,cAAV,GAA2B,CAAnG;EACA,SAAKC,aAAL,GAA0B9K,OAAO,CAAC2G,MAAM,CAACoE,YAAP,IAAuBpE,MAAM,CAACqE,cAA/B,CAAjC;;EAEA,SAAKC,kBAAL;EACD;;;;;EAYD;WAEAC,OAAA,gBAAO;EACL,QAAI,CAAC,KAAKd,UAAV,EAAsB;EACpB,WAAKe,MAAL,CAAYpD,cAAZ;EACD;EACF;;WAEDqD,kBAAA,2BAAkB;EAChB;EACA;EACA,QAAI,CAAC1M,QAAQ,CAAC2M,MAAV,IACDlO,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB3F,EAAjB,CAAoB,UAApB,KAAmCF,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB1D,GAAjB,CAAqB,YAArB,MAAuC,QAD7E,EACwF;EACtF,WAAK4L,IAAL;EACD;EACF;;WAEDI,OAAA,gBAAO;EACL,QAAI,CAAC,KAAKlB,UAAV,EAAsB;EACpB,WAAKe,MAAL,CAAYnD,cAAZ;EACD;EACF;;WAEDL,QAAA,eAAMzK,KAAN,EAAa;EACX,QAAI,CAACA,KAAL,EAAY;EACV,WAAKiN,SAAL,GAAiB,IAAjB;EACD;;EAED,QAAI,KAAKnH,QAAL,CAAc9D,aAAd,CAA4BsK,kBAA5B,CAAJ,EAAqD;EACnDzL,MAAAA,IAAI,CAACE,oBAAL,CAA0B,KAAK+E,QAA/B;EACA,WAAKuI,KAAL,CAAW,IAAX;EACD;;EAEDC,IAAAA,aAAa,CAAC,KAAKvB,SAAN,CAAb;EACA,SAAKA,SAAL,GAAiB,IAAjB;EACD;;WAEDsB,QAAA,eAAMrO,KAAN,EAAa;EACX,QAAI,CAACA,KAAL,EAAY;EACV,WAAKiN,SAAL,GAAiB,KAAjB;EACD;;EAED,QAAI,KAAKF,SAAT,EAAoB;EAClBuB,MAAAA,aAAa,CAAC,KAAKvB,SAAN,CAAb;EACA,WAAKA,SAAL,GAAiB,IAAjB;EACD;;EAED,QAAI,KAAKO,OAAL,CAAahD,QAAb,IAAyB,CAAC,KAAK2C,SAAnC,EAA8C;EAC5C,WAAKF,SAAL,GAAiBwB,WAAW,CAC1B,CAAC/M,QAAQ,CAACgN,eAAT,GAA2B,KAAKN,eAAhC,GAAkD,KAAKF,IAAxD,EAA8DS,IAA9D,CAAmE,IAAnE,CAD0B,EAE1B,KAAKnB,OAAL,CAAahD,QAFa,CAA5B;EAID;EACF;;WAEDoE,KAAA,YAAGC,KAAH,EAAU;EAAA;;EACR,SAAK3B,cAAL,GAAsB,KAAKlH,QAAL,CAAc9D,aAAd,CAA4BmK,oBAA5B,CAAtB;;EAEA,QAAMyC,WAAW,GAAG,KAAKC,aAAL,CAAmB,KAAK7B,cAAxB,CAApB;;EAEA,QAAI2B,KAAK,GAAG,KAAK7B,MAAL,CAAY/C,MAAZ,GAAqB,CAA7B,IAAkC4E,KAAK,GAAG,CAA9C,EAAiD;EAC/C;EACD;;EAED,QAAI,KAAKzB,UAAT,EAAqB;EACnBjN,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlF,GAAjB,CAAqBsK,UAArB,EAAiC;EAAA,eAAM,KAAI,CAACwD,EAAL,CAAQC,KAAR,CAAN;EAAA,OAAjC;EACA;EACD;;EAED,QAAIC,WAAW,KAAKD,KAApB,EAA2B;EACzB,WAAKlE,KAAL;EACA,WAAK4D,KAAL;EACA;EACD;;EAED,QAAMS,SAAS,GAAGH,KAAK,GAAGC,WAAR,GACd/D,cADc,GAEdC,cAFJ;;EAIA,SAAKmD,MAAL,CAAYa,SAAZ,EAAuB,KAAKhC,MAAL,CAAY6B,KAAZ,CAAvB;EACD;;WAEDrI,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBiJ,GAAjB,CAAqB5J,WAArB;EACAlF,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EAEA,SAAK4H,MAAL,GAA0B,IAA1B;EACA,SAAKQ,OAAL,GAA0B,IAA1B;EACA,SAAKxH,QAAL,GAA0B,IAA1B;EACA,SAAKiH,SAAL,GAA0B,IAA1B;EACA,SAAKE,SAAL,GAA0B,IAA1B;EACA,SAAKC,UAAL,GAA0B,IAA1B;EACA,SAAKF,cAAL,GAA0B,IAA1B;EACA,SAAKQ,kBAAL,GAA0B,IAA1B;EACD;;;WAIDD,aAAA,oBAAWpK,MAAX,EAAmB;EACjBA,IAAAA,MAAM,qCACDkH,OADC,GAEDlH,MAFC,CAAN;EAIAtC,IAAAA,IAAI,CAACoC,eAAL,CAAqB+B,MAArB,EAA2B7B,MAA3B,EAAmCyH,WAAnC;EACA,WAAOzH,MAAP;EACD;;WAED6L,eAAA,wBAAe;EACb,QAAMC,SAAS,GAAG3N,IAAI,CAAC4N,GAAL,CAAS,KAAK7B,WAAd,CAAlB;;EAEA,QAAI4B,SAAS,IAAI7E,eAAjB,EAAkC;EAChC;EACD;;EAED,QAAM0E,SAAS,GAAGG,SAAS,GAAG,KAAK5B,WAAnC;EAEA,SAAKA,WAAL,GAAmB,CAAnB,CATa;;EAYb,QAAIyB,SAAS,GAAG,CAAhB,EAAmB;EACjB,WAAKV,IAAL;EACD,KAdY;;;EAiBb,QAAIU,SAAS,GAAG,CAAhB,EAAmB;EACjB,WAAKd,IAAL;EACD;EACF;;WAEDD,qBAAA,8BAAqB;EAAA;;EACnB,QAAI,KAAKT,OAAL,CAAa/C,QAAjB,EAA2B;EACzBtK,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoB2D,aAApB,EAAmC,UAACnL,KAAD;EAAA,eAAW,MAAI,CAACmP,QAAL,CAAcnP,KAAd,CAAX;EAAA,OAAnC;EACD;;EAED,QAAI,KAAKsN,OAAL,CAAa7C,KAAb,KAAuB,OAA3B,EAAoC;EAClCxK,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACG0B,EADH,CACM4D,gBADN,EACwB,UAACpL,KAAD;EAAA,eAAW,MAAI,CAACyK,KAAL,CAAWzK,KAAX,CAAX;EAAA,OADxB,EAEGwH,EAFH,CAEM6D,gBAFN,EAEwB,UAACrL,KAAD;EAAA,eAAW,MAAI,CAACqO,KAAL,CAAWrO,KAAX,CAAX;EAAA,OAFxB;EAGD;;EAED,QAAI,KAAKsN,OAAL,CAAa3C,KAAjB,EAAwB;EACtB,WAAKyE,uBAAL;EACD;EACF;;WAEDA,0BAAA,mCAA0B;EAAA;;EACxB,QAAI,CAAC,KAAK3B,eAAV,EAA2B;EACzB;EACD;;EAED,QAAM4B,KAAK,GAAG,SAARA,KAAQ,CAACrP,KAAD,EAAW;EACvB,UAAI,MAAI,CAAC4N,aAAL,IAAsBlB,WAAW,CAAC1M,KAAK,CAACsP,aAAN,CAAoBC,WAApB,CAAgCxL,WAAhC,EAAD,CAArC,EAAsF;EACpF,QAAA,MAAI,CAACqJ,WAAL,GAAmBpN,KAAK,CAACsP,aAAN,CAAoBE,OAAvC;EACD,OAFD,MAEO,IAAI,CAAC,MAAI,CAAC5B,aAAV,EAAyB;EAC9B,QAAA,MAAI,CAACR,WAAL,GAAmBpN,KAAK,CAACsP,aAAN,CAAoBG,OAApB,CAA4B,CAA5B,EAA+BD,OAAlD;EACD;EACF,KAND;;EAQA,QAAME,IAAI,GAAG,SAAPA,IAAO,CAAC1P,KAAD,EAAW;EACtB;EACA,UAAIA,KAAK,CAACsP,aAAN,CAAoBG,OAApB,IAA+BzP,KAAK,CAACsP,aAAN,CAAoBG,OAApB,CAA4B1F,MAA5B,GAAqC,CAAxE,EAA2E;EACzE,QAAA,MAAI,CAACsD,WAAL,GAAmB,CAAnB;EACD,OAFD,MAEO;EACL,QAAA,MAAI,CAACA,WAAL,GAAmBrN,KAAK,CAACsP,aAAN,CAAoBG,OAApB,CAA4B,CAA5B,EAA+BD,OAA/B,GAAyC,MAAI,CAACpC,WAAjE;EACD;EACF,KAPD;;EASA,QAAMuC,GAAG,GAAG,SAANA,GAAM,CAAC3P,KAAD,EAAW;EACrB,UAAI,MAAI,CAAC4N,aAAL,IAAsBlB,WAAW,CAAC1M,KAAK,CAACsP,aAAN,CAAoBC,WAApB,CAAgCxL,WAAhC,EAAD,CAArC,EAAsF;EACpF,QAAA,MAAI,CAACsJ,WAAL,GAAmBrN,KAAK,CAACsP,aAAN,CAAoBE,OAApB,GAA8B,MAAI,CAACpC,WAAtD;EACD;;EAED,MAAA,MAAI,CAAC4B,YAAL;;EACA,UAAI,MAAI,CAAC1B,OAAL,CAAa7C,KAAb,KAAuB,OAA3B,EAAoC;EAClC;EACA;EACA;EACA;EACA;EACA;EACA;EAEA,QAAA,MAAI,CAACA,KAAL;;EACA,YAAI,MAAI,CAAC0C,YAAT,EAAuB;EACrByC,UAAAA,YAAY,CAAC,MAAI,CAACzC,YAAN,CAAZ;EACD;;EACD,QAAA,MAAI,CAACA,YAAL,GAAoBrM,UAAU,CAAC,UAACd,KAAD;EAAA,iBAAW,MAAI,CAACqO,KAAL,CAAWrO,KAAX,CAAX;EAAA,SAAD,EAA+BmK,sBAAsB,GAAG,MAAI,CAACmD,OAAL,CAAahD,QAArE,CAA9B;EACD;EACF,KArBD;;EAuBArK,IAAAA,CAAC,CAAC,KAAK6F,QAAL,CAAc8D,gBAAd,CAA+ByC,iBAA/B,CAAD,CAAD,CACG7E,EADH,CACMmE,gBADN,EACwB,UAACkE,CAAD;EAAA,aAAOA,CAAC,CAACtI,cAAF,EAAP;EAAA,KADxB;;EAGA,QAAI,KAAKqG,aAAT,EAAwB;EACtB3N,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoBiE,iBAApB,EAAuC,UAACzL,KAAD;EAAA,eAAWqP,KAAK,CAACrP,KAAD,CAAhB;EAAA,OAAvC;EACAC,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoBkE,eAApB,EAAqC,UAAC1L,KAAD;EAAA,eAAW2P,GAAG,CAAC3P,KAAD,CAAd;EAAA,OAArC;;EAEA,WAAK8F,QAAL,CAAcgD,SAAd,CAAwBkB,GAAxB,CAA4BkC,wBAA5B;EACD,KALD,MAKO;EACLjM,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoB8D,gBAApB,EAAsC,UAACtL,KAAD;EAAA,eAAWqP,KAAK,CAACrP,KAAD,CAAhB;EAAA,OAAtC;EACAC,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoB+D,eAApB,EAAqC,UAACvL,KAAD;EAAA,eAAW0P,IAAI,CAAC1P,KAAD,CAAf;EAAA,OAArC;EACAC,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoBgE,cAApB,EAAoC,UAACxL,KAAD;EAAA,eAAW2P,GAAG,CAAC3P,KAAD,CAAd;EAAA,OAApC;EACD;EACF;;WAEDmP,WAAA,kBAASnP,KAAT,EAAgB;EACd,QAAI,kBAAkB6D,IAAlB,CAAuB7D,KAAK,CAACE,MAAN,CAAasJ,OAApC,CAAJ,EAAkD;EAChD;EACD;;EAED,YAAQxJ,KAAK,CAAC8P,KAAd;EACE,WAAK7F,kBAAL;EACEjK,QAAAA,KAAK,CAACuH,cAAN;EACA,aAAK6G,IAAL;EACA;;EACF,WAAKlE,mBAAL;EACElK,QAAAA,KAAK,CAACuH,cAAN;EACA,aAAKyG,IAAL;EACA;EARJ;EAWD;;WAEDa,gBAAA,uBAAclN,OAAd,EAAuB;EACrB,SAAKmL,MAAL,GAAcnL,OAAO,IAAIA,OAAO,CAAC2C,UAAnB,GACV,GAAGqF,KAAH,CAASlK,IAAT,CAAckC,OAAO,CAAC2C,UAAR,CAAmBsF,gBAAnB,CAAoCwC,aAApC,CAAd,CADU,GAEV,EAFJ;EAGA,WAAO,KAAKU,MAAL,CAAYiD,OAAZ,CAAoBpO,OAApB,CAAP;EACD;;WAEDqO,sBAAA,6BAAoBlB,SAApB,EAA+B9F,aAA/B,EAA8C;EAC5C,QAAMiH,eAAe,GAAGnB,SAAS,KAAKjE,cAAtC;EACA,QAAMqF,eAAe,GAAGpB,SAAS,KAAKhE,cAAtC;;EACA,QAAM8D,WAAW,GAAO,KAAKC,aAAL,CAAmB7F,aAAnB,CAAxB;;EACA,QAAMmH,aAAa,GAAK,KAAKrD,MAAL,CAAY/C,MAAZ,GAAqB,CAA7C;EACA,QAAMqG,aAAa,GAAKF,eAAe,IAAItB,WAAW,KAAK,CAAnC,IACAqB,eAAe,IAAIrB,WAAW,KAAKuB,aAD3D;;EAGA,QAAIC,aAAa,IAAI,CAAC,KAAK9C,OAAL,CAAa5C,IAAnC,EAAyC;EACvC,aAAO1B,aAAP;EACD;;EAED,QAAMqH,KAAK,GAAOvB,SAAS,KAAKhE,cAAd,GAA+B,CAAC,CAAhC,GAAoC,CAAtD;EACA,QAAMwF,SAAS,GAAG,CAAC1B,WAAW,GAAGyB,KAAf,IAAwB,KAAKvD,MAAL,CAAY/C,MAAtD;EAEA,WAAOuG,SAAS,KAAK,CAAC,CAAf,GACH,KAAKxD,MAAL,CAAY,KAAKA,MAAL,CAAY/C,MAAZ,GAAqB,CAAjC,CADG,GACmC,KAAK+C,MAAL,CAAYwD,SAAZ,CAD1C;EAED;;WAEDC,qBAAA,4BAAmBC,aAAnB,EAAkCC,kBAAlC,EAAsD;EACpD,QAAMC,WAAW,GAAG,KAAK7B,aAAL,CAAmB2B,aAAnB,CAApB;;EACA,QAAMG,SAAS,GAAG,KAAK9B,aAAL,CAAmB,KAAK/I,QAAL,CAAc9D,aAAd,CAA4BmK,oBAA5B,CAAnB,CAAlB;;EACA,QAAMyE,UAAU,GAAG3Q,CAAC,CAAC0G,KAAF,CAAQsE,WAAR,EAAqB;EACtCuF,MAAAA,aAAa,EAAbA,aADsC;EAEtC1B,MAAAA,SAAS,EAAE2B,kBAF2B;EAGtCI,MAAAA,IAAI,EAAEF,SAHgC;EAItCjC,MAAAA,EAAE,EAAEgC;EAJkC,KAArB,CAAnB;EAOAzQ,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBgO,UAAzB;EAEA,WAAOA,UAAP;EACD;;WAEDE,6BAAA,oCAA2BnP,OAA3B,EAAoC;EAClC,QAAI,KAAK6L,kBAAT,EAA6B;EAC3B,UAAMuD,UAAU,GAAG,GAAGpH,KAAH,CAASlK,IAAT,CAAc,KAAK+N,kBAAL,CAAwB5D,gBAAxB,CAAyCzB,iBAAzC,CAAd,CAAnB;EACAlI,MAAAA,CAAC,CAAC8Q,UAAD,CAAD,CAAcnK,WAAd,CAA0Be,mBAA1B;;EAEA,UAAMqJ,aAAa,GAAG,KAAKxD,kBAAL,CAAwByD,QAAxB,CACpB,KAAKpC,aAAL,CAAmBlN,OAAnB,CADoB,CAAtB;;EAIA,UAAIqP,aAAJ,EAAmB;EACjB/Q,QAAAA,CAAC,CAAC+Q,aAAD,CAAD,CAAiBE,QAAjB,CAA0BvJ,mBAA1B;EACD;EACF;EACF;;WAEDsG,SAAA,gBAAOa,SAAP,EAAkBnN,OAAlB,EAA2B;EAAA;;EACzB,QAAMqH,aAAa,GAAG,KAAKlD,QAAL,CAAc9D,aAAd,CAA4BmK,oBAA5B,CAAtB;;EACA,QAAMgF,kBAAkB,GAAG,KAAKtC,aAAL,CAAmB7F,aAAnB,CAA3B;;EACA,QAAMoI,WAAW,GAAKzP,OAAO,IAAIqH,aAAa,IAC5C,KAAKgH,mBAAL,CAAyBlB,SAAzB,EAAoC9F,aAApC,CADF;;EAEA,QAAMqI,gBAAgB,GAAG,KAAKxC,aAAL,CAAmBuC,WAAnB,CAAzB;;EACA,QAAME,SAAS,GAAGxO,OAAO,CAAC,KAAKiK,SAAN,CAAzB;EAEA,QAAIwE,oBAAJ;EACA,QAAIC,cAAJ;EACA,QAAIf,kBAAJ;;EAEA,QAAI3B,SAAS,KAAKjE,cAAlB,EAAkC;EAChC0G,MAAAA,oBAAoB,GAAGxF,eAAvB;EACAyF,MAAAA,cAAc,GAAGxF,eAAjB;EACAyE,MAAAA,kBAAkB,GAAG1F,cAArB;EACD,KAJD,MAIO;EACLwG,MAAAA,oBAAoB,GAAGzF,gBAAvB;EACA0F,MAAAA,cAAc,GAAGvF,eAAjB;EACAwE,MAAAA,kBAAkB,GAAGzF,eAArB;EACD;;EAED,QAAIoG,WAAW,IAAInR,CAAC,CAACmR,WAAD,CAAD,CAAevK,QAAf,CAAwBc,mBAAxB,CAAnB,EAA+D;EAC7D,WAAKuF,UAAL,GAAkB,KAAlB;EACA;EACD;;EAED,QAAM0D,UAAU,GAAG,KAAKL,kBAAL,CAAwBa,WAAxB,EAAqCX,kBAArC,CAAnB;;EACA,QAAIG,UAAU,CAACxK,kBAAX,EAAJ,EAAqC;EACnC;EACD;;EAED,QAAI,CAAC4C,aAAD,IAAkB,CAACoI,WAAvB,EAAoC;EAClC;EACA;EACD;;EAED,SAAKlE,UAAL,GAAkB,IAAlB;;EAEA,QAAIoE,SAAJ,EAAe;EACb,WAAK7G,KAAL;EACD;;EAED,SAAKqG,0BAAL,CAAgCM,WAAhC;;EAEA,QAAMK,SAAS,GAAGxR,CAAC,CAAC0G,KAAF,CAAQuE,UAAR,EAAoB;EACpCsF,MAAAA,aAAa,EAAEY,WADqB;EAEpCtC,MAAAA,SAAS,EAAE2B,kBAFyB;EAGpCI,MAAAA,IAAI,EAAEM,kBAH8B;EAIpCzC,MAAAA,EAAE,EAAE2C;EAJgC,KAApB,CAAlB;;EAOA,QAAIpR,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BgF,gBAA1B,CAAJ,EAAiD;EAC/C5L,MAAAA,CAAC,CAACmR,WAAD,CAAD,CAAeF,QAAf,CAAwBM,cAAxB;EAEA3Q,MAAAA,IAAI,CAAC6B,MAAL,CAAY0O,WAAZ;EAEAnR,MAAAA,CAAC,CAAC+I,aAAD,CAAD,CAAiBkI,QAAjB,CAA0BK,oBAA1B;EACAtR,MAAAA,CAAC,CAACmR,WAAD,CAAD,CAAeF,QAAf,CAAwBK,oBAAxB;EAEA,UAAMG,mBAAmB,GAAGC,QAAQ,CAACP,WAAW,CAACvP,YAAZ,CAAyB,eAAzB,CAAD,EAA4C,EAA5C,CAApC;;EACA,UAAI6P,mBAAJ,EAAyB;EACvB,aAAKpE,OAAL,CAAasE,eAAb,GAA+B,KAAKtE,OAAL,CAAasE,eAAb,IAAgC,KAAKtE,OAAL,CAAahD,QAA5E;EACA,aAAKgD,OAAL,CAAahD,QAAb,GAAwBoH,mBAAxB;EACD,OAHD,MAGO;EACL,aAAKpE,OAAL,CAAahD,QAAb,GAAwB,KAAKgD,OAAL,CAAasE,eAAb,IAAgC,KAAKtE,OAAL,CAAahD,QAArE;EACD;;EAED,UAAMnI,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC8G,aAAtC,CAA3B;EAEA/I,MAAAA,CAAC,CAAC+I,aAAD,CAAD,CACGpI,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4B,YAAM;EAC9Bc,QAAAA,CAAC,CAACmR,WAAD,CAAD,CACGxK,WADH,CACkB2K,oBADlB,SAC0CC,cAD1C,EAEGN,QAFH,CAEYvJ,mBAFZ;EAIA1H,QAAAA,CAAC,CAAC+I,aAAD,CAAD,CAAiBpC,WAAjB,CAAgCe,mBAAhC,SAAqD6J,cAArD,SAAuED,oBAAvE;EAEA,QAAA,MAAI,CAACrE,UAAL,GAAkB,KAAlB;EAEApM,QAAAA,UAAU,CAAC;EAAA,iBAAMb,CAAC,CAAC,MAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyB6O,SAAzB,CAAN;EAAA,SAAD,EAA4C,CAA5C,CAAV;EACD,OAXH,EAYGvQ,oBAZH,CAYwBiB,kBAZxB;EAaD,KA/BD,MA+BO;EACLlC,MAAAA,CAAC,CAAC+I,aAAD,CAAD,CAAiBpC,WAAjB,CAA6Be,mBAA7B;EACA1H,MAAAA,CAAC,CAACmR,WAAD,CAAD,CAAeF,QAAf,CAAwBvJ,mBAAxB;EAEA,WAAKuF,UAAL,GAAkB,KAAlB;EACAjN,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyB6O,SAAzB;EACD;;EAED,QAAIH,SAAJ,EAAe;EACb,WAAKjD,KAAL;EACD;EACF;;;aAIMpH,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EACA,UAAIoI,OAAO,qCACNjD,OADM,GAENpK,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,EAFM,CAAX;;EAKA,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9BmK,QAAAA,OAAO,qCACFA,OADE,GAEFnK,MAFE,CAAP;EAID;;EAED,UAAM0O,MAAM,GAAG,OAAO1O,MAAP,KAAkB,QAAlB,GAA6BA,MAA7B,GAAsCmK,OAAO,CAAC9C,KAA7D;;EAEA,UAAI,CAACpD,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAIyF,QAAJ,CAAa,IAAb,EAAmBS,OAAnB,CAAP;EACArN,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9BiE,QAAAA,IAAI,CAACsH,EAAL,CAAQvL,MAAR;EACD,OAFD,MAEO,IAAI,OAAO0O,MAAP,KAAkB,QAAtB,EAAgC;EACrC,YAAI,OAAOzK,IAAI,CAACyK,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIrN,SAAJ,wBAAkCqN,MAAlC,QAAN;EACD;;EACDzK,QAAAA,IAAI,CAACyK,MAAD,CAAJ;EACD,OALM,MAKA,IAAIvE,OAAO,CAAChD,QAAR,IAAoBgD,OAAO,CAACwE,IAAhC,EAAsC;EAC3C1K,QAAAA,IAAI,CAACqD,KAAL;EACArD,QAAAA,IAAI,CAACiH,KAAL;EACD;EACF,KAhCM,CAAP;EAiCD;;aAEM0D,uBAAP,8BAA4B/R,KAA5B,EAAmC;EACjC,QAAM4B,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4B,IAA5B,CAAjB;;EAEA,QAAI,CAACE,QAAL,EAAe;EACb;EACD;;EAED,QAAM1B,MAAM,GAAGD,CAAC,CAAC2B,QAAD,CAAD,CAAY,CAAZ,CAAf;;EAEA,QAAI,CAAC1B,MAAD,IAAW,CAACD,CAAC,CAACC,MAAD,CAAD,CAAU2G,QAAV,CAAmB+E,mBAAnB,CAAhB,EAAyD;EACvD;EACD;;EAED,QAAMzI,MAAM,qCACPlD,CAAC,CAACC,MAAD,CAAD,CAAUkH,IAAV,EADO,GAEPnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,EAFO,CAAZ;;EAIA,QAAM4K,UAAU,GAAG,KAAKnQ,YAAL,CAAkB,eAAlB,CAAnB;;EAEA,QAAImQ,UAAJ,EAAgB;EACd7O,MAAAA,MAAM,CAACmH,QAAP,GAAkB,KAAlB;EACD;;EAEDuC,IAAAA,QAAQ,CAAC5F,gBAAT,CAA0BxH,IAA1B,CAA+BQ,CAAC,CAACC,MAAD,CAAhC,EAA0CiD,MAA1C;;EAEA,QAAI6O,UAAJ,EAAgB;EACd/R,MAAAA,CAAC,CAACC,MAAD,CAAD,CAAUkH,IAAV,CAAelC,UAAf,EAAyBwJ,EAAzB,CAA4BsD,UAA5B;EACD;;EAEDhS,IAAAA,KAAK,CAACuH,cAAN;EACD;;;;0BAncoB;EACnB,aAAOtC,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,OAAP;EACD;;;;;EAgcH;;;;;;;EAMApK,CAAC,CAACuB,QAAD,CAAD,CAAYgG,EAAZ,CAAe/B,sBAAf,EAAqC+G,mBAArC,EAA0DK,QAAQ,CAACkF,oBAAnE;EAEA9R,CAAC,CAACwJ,MAAD,CAAD,CAAUjC,EAAV,CAAac,qBAAb,EAAkC,YAAM;EACtC,MAAM2J,SAAS,GAAG,GAAGtI,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B6C,kBAA1B,CAAd,CAAlB;;EACA,OAAK,IAAI5C,CAAC,GAAG,CAAR,EAAWC,GAAG,GAAGmI,SAAS,CAAClI,MAAhC,EAAwCF,CAAC,GAAGC,GAA5C,EAAiDD,CAAC,EAAlD,EAAsD;EACpD,QAAMqI,SAAS,GAAGjS,CAAC,CAACgS,SAAS,CAACpI,CAAD,CAAV,CAAnB;;EACAgD,IAAAA,QAAQ,CAAC5F,gBAAT,CAA0BxH,IAA1B,CAA+ByS,SAA/B,EAA0CA,SAAS,CAAC9K,IAAV,EAA1C;EACD;EACF,CAND;EAQA;;;;;;EAMAnH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAa6H,QAAQ,CAAC5F,gBAAtB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBoF,QAAzB;;EACA5M,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAOwH,QAAQ,CAAC5F,gBAAhB;EACD,CAHD;;ECtkBA;;;;;;EAMA,IAAMjC,MAAI,GAAkB,UAA5B;EACA,IAAMC,SAAO,GAAe,OAA5B;EACA,IAAMC,UAAQ,GAAc,aAA5B;EACA,IAAMC,WAAS,SAAiBD,UAAhC;EACA,IAAME,cAAY,GAAU,WAA5B;EACA,IAAMC,oBAAkB,GAAIpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA5B;EAEA,IAAMqF,SAAO,GAAG;EACd7B,EAAAA,MAAM,EAAG,IADK;EAEdhC,EAAAA,MAAM,EAAG;EAFK,CAAhB;EAKA,IAAMoE,aAAW,GAAG;EAClBpC,EAAAA,MAAM,EAAG,SADS;EAElBhC,EAAAA,MAAM,EAAG;EAFS,CAApB;EAKA,IAAM2L,UAAU,YAAoBhN,WAApC;EACA,IAAMiN,WAAW,aAAoBjN,WAArC;EACA,IAAMkN,UAAU,YAAoBlN,WAApC;EACA,IAAMmN,YAAY,cAAoBnN,WAAtC;EACA,IAAMM,sBAAoB,aAAWN,WAAX,GAAuBC,cAAjD;EAEA,IAAMQ,iBAAe,GAAS,MAA9B;EACA,IAAM2M,mBAAmB,GAAK,UAA9B;EACA,IAAMC,qBAAqB,GAAG,YAA9B;EACA,IAAMC,oBAAoB,GAAI,WAA9B;EAEA,IAAMC,eAAe,GAAI,OAAzB;EACA,IAAMC,gBAAgB,GAAG,QAAzB;EAEA,IAAMC,gBAAgB,GAAO,oBAA7B;EACA,IAAM5K,sBAAoB,GAAG,0BAA7B;EAEA;;;;;;MAMM6K;EACJ,oBAAYlR,OAAZ,EAAqBwB,MAArB,EAA6B;EAC3B,SAAK2P,gBAAL,GAAwB,KAAxB;EACA,SAAKhN,QAAL,GAAwBnE,OAAxB;EACA,SAAK2L,OAAL,GAAwB,KAAKC,UAAL,CAAgBpK,MAAhB,CAAxB;EACA,SAAK4P,aAAL,GAAwB,GAAGpJ,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CACpC,wCAAmCjI,OAAO,CAACqR,EAA3C,4DAC0CrR,OAAO,CAACqR,EADlD,SADoC,CAAd,CAAxB;EAKA,QAAMC,UAAU,GAAG,GAAGtJ,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B5B,sBAA1B,CAAd,CAAnB;;EACA,SAAK,IAAI6B,CAAC,GAAG,CAAR,EAAWC,GAAG,GAAGmJ,UAAU,CAAClJ,MAAjC,EAAyCF,CAAC,GAAGC,GAA7C,EAAkDD,CAAC,EAAnD,EAAuD;EACrD,UAAMqJ,IAAI,GAAGD,UAAU,CAACpJ,CAAD,CAAvB;EACA,UAAMjI,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4BwR,IAA5B,CAAjB;EACA,UAAMC,aAAa,GAAG,GAAGxJ,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0BhI,QAA1B,CAAd,EACnBwR,MADmB,CACZ,UAACC,SAAD;EAAA,eAAeA,SAAS,KAAK1R,OAA7B;EAAA,OADY,CAAtB;;EAGA,UAAIC,QAAQ,KAAK,IAAb,IAAqBuR,aAAa,CAACpJ,MAAd,GAAuB,CAAhD,EAAmD;EACjD,aAAKuJ,SAAL,GAAiB1R,QAAjB;;EACA,aAAKmR,aAAL,CAAmBQ,IAAnB,CAAwBL,IAAxB;EACD;EACF;;EAED,SAAKM,OAAL,GAAe,KAAKlG,OAAL,CAAa9G,MAAb,GAAsB,KAAKiN,UAAL,EAAtB,GAA0C,IAAzD;;EAEA,QAAI,CAAC,KAAKnG,OAAL,CAAa9G,MAAlB,EAA0B;EACxB,WAAKkN,yBAAL,CAA+B,KAAK5N,QAApC,EAA8C,KAAKiN,aAAnD;EACD;;EAED,QAAI,KAAKzF,OAAL,CAAa9E,MAAjB,EAAyB;EACvB,WAAKA,MAAL;EACD;EACF;;;;;EAYD;WAEAA,SAAA,kBAAS;EACP,QAAIvI,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BjB,iBAA1B,CAAJ,EAAgD;EAC9C,WAAK+N,IAAL;EACD,KAFD,MAEO;EACL,WAAKC,IAAL;EACD;EACF;;WAEDA,OAAA,gBAAO;EAAA;;EACL,QAAI,KAAKd,gBAAL,IACF7S,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BjB,iBAA1B,CADF,EAC8C;EAC5C;EACD;;EAED,QAAIiO,OAAJ;EACA,QAAIC,WAAJ;;EAEA,QAAI,KAAKN,OAAT,EAAkB;EAChBK,MAAAA,OAAO,GAAG,GAAGlK,KAAH,CAASlK,IAAT,CAAc,KAAK+T,OAAL,CAAa5J,gBAAb,CAA8BgJ,gBAA9B,CAAd,EACPQ,MADO,CACA,UAACF,IAAD,EAAU;EAChB,YAAI,OAAO,KAAI,CAAC5F,OAAL,CAAa9G,MAApB,KAA+B,QAAnC,EAA6C;EAC3C,iBAAO0M,IAAI,CAACrR,YAAL,CAAkB,aAAlB,MAAqC,KAAI,CAACyL,OAAL,CAAa9G,MAAzD;EACD;;EAED,eAAO0M,IAAI,CAACpK,SAAL,CAAeC,QAAf,CAAwBwJ,mBAAxB,CAAP;EACD,OAPO,CAAV;;EASA,UAAIsB,OAAO,CAAC9J,MAAR,KAAmB,CAAvB,EAA0B;EACxB8J,QAAAA,OAAO,GAAG,IAAV;EACD;EACF;;EAED,QAAIA,OAAJ,EAAa;EACXC,MAAAA,WAAW,GAAG7T,CAAC,CAAC4T,OAAD,CAAD,CAAWE,GAAX,CAAe,KAAKT,SAApB,EAA+BlM,IAA/B,CAAoClC,UAApC,CAAd;;EACA,UAAI4O,WAAW,IAAIA,WAAW,CAAChB,gBAA/B,EAAiD;EAC/C;EACD;EACF;;EAED,QAAMkB,UAAU,GAAG/T,CAAC,CAAC0G,KAAF,CAAQwL,UAAR,CAAnB;EACAlS,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBoR,UAAzB;;EACA,QAAIA,UAAU,CAAC5N,kBAAX,EAAJ,EAAqC;EACnC;EACD;;EAED,QAAIyN,OAAJ,EAAa;EACXhB,MAAAA,QAAQ,CAAC5L,gBAAT,CAA0BxH,IAA1B,CAA+BQ,CAAC,CAAC4T,OAAD,CAAD,CAAWE,GAAX,CAAe,KAAKT,SAApB,CAA/B,EAA+D,MAA/D;;EACA,UAAI,CAACQ,WAAL,EAAkB;EAChB7T,QAAAA,CAAC,CAAC4T,OAAD,CAAD,CAAWzM,IAAX,CAAgBlC,UAAhB,EAA0B,IAA1B;EACD;EACF;;EAED,QAAM+O,SAAS,GAAG,KAAKC,aAAL,EAAlB;;EAEAjU,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGc,WADH,CACe2L,mBADf,EAEGrB,QAFH,CAEYsB,qBAFZ;EAIA,SAAK1M,QAAL,CAAcqO,KAAd,CAAoBF,SAApB,IAAiC,CAAjC;;EAEA,QAAI,KAAKlB,aAAL,CAAmBhJ,MAAvB,EAA+B;EAC7B9J,MAAAA,CAAC,CAAC,KAAK8S,aAAN,CAAD,CACGnM,WADH,CACe6L,oBADf,EAEG2B,IAFH,CAEQ,eAFR,EAEyB,IAFzB;EAGD;;EAED,SAAKC,gBAAL,CAAsB,IAAtB;;EAEA,QAAMC,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrBrU,MAAAA,CAAC,CAAC,KAAI,CAAC6F,QAAN,CAAD,CACGc,WADH,CACe4L,qBADf,EAEGtB,QAFH,CAEeqB,mBAFf,SAEsC3M,iBAFtC;EAIA,MAAA,KAAI,CAACE,QAAL,CAAcqO,KAAd,CAAoBF,SAApB,IAAiC,EAAjC;;EAEA,MAAA,KAAI,CAACI,gBAAL,CAAsB,KAAtB;;EAEApU,MAAAA,CAAC,CAAC,KAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBwP,WAAzB;EACD,KAVD;;EAYA,QAAMmC,oBAAoB,GAAGN,SAAS,CAAC,CAAD,CAAT,CAAalQ,WAAb,KAA6BkQ,SAAS,CAACtK,KAAV,CAAgB,CAAhB,CAA1D;EACA,QAAM6K,UAAU,cAAYD,oBAA5B;EACA,QAAMpS,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC,KAAK4D,QAA3C,CAA3B;EAEA7F,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGlF,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4BmV,QAD5B,EAEGpT,oBAFH,CAEwBiB,kBAFxB;EAIA,SAAK2D,QAAL,CAAcqO,KAAd,CAAoBF,SAApB,IAAoC,KAAKnO,QAAL,CAAc0O,UAAd,CAApC;EACD;;WAEDb,OAAA,gBAAO;EAAA;;EACL,QAAI,KAAKb,gBAAL,IACF,CAAC7S,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BjB,iBAA1B,CADH,EAC+C;EAC7C;EACD;;EAED,QAAMoO,UAAU,GAAG/T,CAAC,CAAC0G,KAAF,CAAQ0L,UAAR,CAAnB;EACApS,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBoR,UAAzB;;EACA,QAAIA,UAAU,CAAC5N,kBAAX,EAAJ,EAAqC;EACnC;EACD;;EAED,QAAM6N,SAAS,GAAG,KAAKC,aAAL,EAAlB;;EAEA,SAAKpO,QAAL,CAAcqO,KAAd,CAAoBF,SAApB,IAAoC,KAAKnO,QAAL,CAAc2O,qBAAd,GAAsCR,SAAtC,CAApC;EAEApT,IAAAA,IAAI,CAAC6B,MAAL,CAAY,KAAKoD,QAAjB;EAEA7F,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGoL,QADH,CACYsB,qBADZ,EAEG5L,WAFH,CAEkB2L,mBAFlB,SAEyC3M,iBAFzC;EAIA,QAAM8O,kBAAkB,GAAG,KAAK3B,aAAL,CAAmBhJ,MAA9C;;EACA,QAAI2K,kBAAkB,GAAG,CAAzB,EAA4B;EAC1B,WAAK,IAAI7K,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAG6K,kBAApB,EAAwC7K,CAAC,EAAzC,EAA6C;EAC3C,YAAMjH,OAAO,GAAG,KAAKmQ,aAAL,CAAmBlJ,CAAnB,CAAhB;EACA,YAAMjI,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4BkB,OAA5B,CAAjB;;EAEA,YAAIhB,QAAQ,KAAK,IAAjB,EAAuB;EACrB,cAAM+S,KAAK,GAAG1U,CAAC,CAAC,GAAG0J,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0BhI,QAA1B,CAAd,CAAD,CAAf;;EACA,cAAI,CAAC+S,KAAK,CAAC9N,QAAN,CAAejB,iBAAf,CAAL,EAAsC;EACpC3F,YAAAA,CAAC,CAAC2C,OAAD,CAAD,CAAWsO,QAAX,CAAoBuB,oBAApB,EACG2B,IADH,CACQ,eADR,EACyB,KADzB;EAED;EACF;EACF;EACF;;EAED,SAAKC,gBAAL,CAAsB,IAAtB;;EAEA,QAAMC,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrB,MAAA,MAAI,CAACD,gBAAL,CAAsB,KAAtB;;EACApU,MAAAA,CAAC,CAAC,MAAI,CAAC6F,QAAN,CAAD,CACGc,WADH,CACe4L,qBADf,EAEGtB,QAFH,CAEYqB,mBAFZ,EAGG3P,OAHH,CAGW0P,YAHX;EAID,KAND;;EAQA,SAAKxM,QAAL,CAAcqO,KAAd,CAAoBF,SAApB,IAAiC,EAAjC;EACA,QAAM9R,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC,KAAK4D,QAA3C,CAA3B;EAEA7F,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGlF,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4BmV,QAD5B,EAEGpT,oBAFH,CAEwBiB,kBAFxB;EAGD;;WAEDkS,mBAAA,0BAAiBO,eAAjB,EAAkC;EAChC,SAAK9B,gBAAL,GAAwB8B,eAAxB;EACD;;WAEDtO,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EAEA,SAAKoI,OAAL,GAAwB,IAAxB;EACA,SAAKkG,OAAL,GAAwB,IAAxB;EACA,SAAK1N,QAAL,GAAwB,IAAxB;EACA,SAAKiN,aAAL,GAAwB,IAAxB;EACA,SAAKD,gBAAL,GAAwB,IAAxB;EACD;;;WAIDvF,aAAA,oBAAWpK,MAAX,EAAmB;EACjBA,IAAAA,MAAM,qCACDkH,SADC,GAEDlH,MAFC,CAAN;EAIAA,IAAAA,MAAM,CAACqF,MAAP,GAAgB1F,OAAO,CAACK,MAAM,CAACqF,MAAR,CAAvB,CALiB;;EAMjB3H,IAAAA,IAAI,CAACoC,eAAL,CAAqB+B,MAArB,EAA2B7B,MAA3B,EAAmCyH,aAAnC;EACA,WAAOzH,MAAP;EACD;;WAED+Q,gBAAA,yBAAgB;EACd,QAAMW,QAAQ,GAAG5U,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0B6L,eAA1B,CAAjB;EACA,WAAOmC,QAAQ,GAAGnC,eAAH,GAAqBC,gBAApC;EACD;;WAEDc,aAAA,sBAAa;EAAA;;EACX,QAAIjN,MAAJ;;EAEA,QAAI3F,IAAI,CAACkC,SAAL,CAAe,KAAKuK,OAAL,CAAa9G,MAA5B,CAAJ,EAAyC;EACvCA,MAAAA,MAAM,GAAG,KAAK8G,OAAL,CAAa9G,MAAtB,CADuC;;EAIvC,UAAI,OAAO,KAAK8G,OAAL,CAAa9G,MAAb,CAAoB9B,MAA3B,KAAsC,WAA1C,EAAuD;EACrD8B,QAAAA,MAAM,GAAG,KAAK8G,OAAL,CAAa9G,MAAb,CAAoB,CAApB,CAAT;EACD;EACF,KAPD,MAOO;EACLA,MAAAA,MAAM,GAAGhF,QAAQ,CAACQ,aAAT,CAAuB,KAAKsL,OAAL,CAAa9G,MAApC,CAAT;EACD;;EAED,QAAM5E,QAAQ,iDAA4C,KAAK0L,OAAL,CAAa9G,MAAzD,QAAd;EACA,QAAMyK,QAAQ,GAAG,GAAGtH,KAAH,CAASlK,IAAT,CAAc+G,MAAM,CAACoD,gBAAP,CAAwBhI,QAAxB,CAAd,CAAjB;EAEA3B,IAAAA,CAAC,CAACgR,QAAD,CAAD,CAAY/J,IAAZ,CAAiB,UAAC2C,CAAD,EAAIlI,OAAJ,EAAgB;EAC/B,MAAA,MAAI,CAAC+R,yBAAL,CACEb,QAAQ,CAACiC,qBAAT,CAA+BnT,OAA/B,CADF,EAEE,CAACA,OAAD,CAFF;EAID,KALD;EAOA,WAAO6E,MAAP;EACD;;WAEDkN,4BAAA,mCAA0B/R,OAA1B,EAAmCoT,YAAnC,EAAiD;EAC/C,QAAMC,MAAM,GAAG/U,CAAC,CAAC0B,OAAD,CAAD,CAAWkF,QAAX,CAAoBjB,iBAApB,CAAf;;EAEA,QAAImP,YAAY,CAAChL,MAAjB,EAAyB;EACvB9J,MAAAA,CAAC,CAAC8U,YAAD,CAAD,CACG3L,WADH,CACeqJ,oBADf,EACqC,CAACuC,MADtC,EAEGZ,IAFH,CAEQ,eAFR,EAEyBY,MAFzB;EAGD;EACF;;;aAIMF,wBAAP,+BAA6BnT,OAA7B,EAAsC;EACpC,QAAMC,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4BC,OAA5B,CAAjB;EACA,WAAOC,QAAQ,GAAGJ,QAAQ,CAACQ,aAAT,CAAuBJ,QAAvB,CAAH,GAAsC,IAArD;EACD;;aAEMqF,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAM+N,KAAK,GAAKhV,CAAC,CAAC,IAAD,CAAjB;EACA,UAAImH,IAAI,GAAQ6N,KAAK,CAAC7N,IAAN,CAAWlC,UAAX,CAAhB;;EACA,UAAMoI,OAAO,oDACRjD,SADQ,GAER4K,KAAK,CAAC7N,IAAN,EAFQ,GAGR,OAAOjE,MAAP,KAAkB,QAAlB,IAA8BA,MAA9B,GAAuCA,MAAvC,GAAgD,EAHxC,CAAb;;EAMA,UAAI,CAACiE,IAAD,IAASkG,OAAO,CAAC9E,MAAjB,IAA2B,OAAOrF,MAAP,KAAkB,QAA7C,IAAyD,YAAYU,IAAZ,CAAiBV,MAAjB,CAA7D,EAAuF;EACrFmK,QAAAA,OAAO,CAAC9E,MAAR,GAAiB,KAAjB;EACD;;EAED,UAAI,CAACpB,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAIyL,QAAJ,CAAa,IAAb,EAAmBvF,OAAnB,CAAP;EACA2H,QAAAA,KAAK,CAAC7N,IAAN,CAAWlC,UAAX,EAAqBkC,IAArB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAxBM,CAAP;EAyBD;;;;0BAlQoB;EACnB,aAAO8B,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,SAAP;EACD;;;;;EA+PH;;;;;;;EAMApK,CAAC,CAACuB,QAAD,CAAD,CAAYgG,EAAZ,CAAe/B,sBAAf,EAAqCuC,sBAArC,EAA2D,UAAUhI,KAAV,EAAiB;EAC1E;EACA,MAAIA,KAAK,CAACkV,aAAN,CAAoB1L,OAApB,KAAgC,GAApC,EAAyC;EACvCxJ,IAAAA,KAAK,CAACuH,cAAN;EACD;;EAED,MAAM4N,QAAQ,GAAGlV,CAAC,CAAC,IAAD,CAAlB;EACA,MAAM2B,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4B,IAA5B,CAAjB;EACA,MAAM0T,SAAS,GAAG,GAAGzL,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0BhI,QAA1B,CAAd,CAAlB;EAEA3B,EAAAA,CAAC,CAACmV,SAAD,CAAD,CAAalO,IAAb,CAAkB,YAAY;EAC5B,QAAMmO,OAAO,GAAGpV,CAAC,CAAC,IAAD,CAAjB;EACA,QAAMmH,IAAI,GAAMiO,OAAO,CAACjO,IAAR,CAAalC,UAAb,CAAhB;EACA,QAAM/B,MAAM,GAAIiE,IAAI,GAAG,QAAH,GAAc+N,QAAQ,CAAC/N,IAAT,EAAlC;;EACAyL,IAAAA,QAAQ,CAAC5L,gBAAT,CAA0BxH,IAA1B,CAA+B4V,OAA/B,EAAwClS,MAAxC;EACD,GALD;EAMD,CAhBD;EAkBA;;;;;;EAMAlD,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAa6N,QAAQ,CAAC5L,gBAAtB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBoL,QAAzB;;EACA5S,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAOwN,QAAQ,CAAC5L,gBAAhB;EACD,CAHD;;ECjYA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,SAAS,KAAK,WAAW,CAAC;AACrH;EACA,IAAI,eAAe,GAAG,YAAY;EAClC,EAAE,IAAI,qBAAqB,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;EAC7D,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;EAC5D,IAAI,IAAI,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;EACjF,MAAM,OAAO,CAAC,CAAC;EACf,KAAK;EACL,GAAG;EACH,EAAE,OAAO,CAAC,CAAC;EACX,CAAC,EAAE,CAAC;AACJ;EACA,SAAS,iBAAiB,CAAC,EAAE,EAAE;EAC/B,EAAE,IAAI,MAAM,GAAG,KAAK,CAAC;EACrB,EAAE,OAAO,YAAY;EACrB,IAAI,IAAI,MAAM,EAAE;EAChB,MAAM,OAAO;EACb,KAAK;EACL,IAAI,MAAM,GAAG,IAAI,CAAC;EAClB,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,YAAY;EAC9C,MAAM,MAAM,GAAG,KAAK,CAAC;EACrB,MAAM,EAAE,EAAE,CAAC;EACX,KAAK,CAAC,CAAC;EACP,GAAG,CAAC;EACJ,CAAC;AACD;EACA,SAAS,YAAY,CAAC,EAAE,EAAE;EAC1B,EAAE,IAAI,SAAS,GAAG,KAAK,CAAC;EACxB,EAAE,OAAO,YAAY;EACrB,IAAI,IAAI,CAAC,SAAS,EAAE;EACpB,MAAM,SAAS,GAAG,IAAI,CAAC;EACvB,MAAM,UAAU,CAAC,YAAY;EAC7B,QAAQ,SAAS,GAAG,KAAK,CAAC;EAC1B,QAAQ,EAAE,EAAE,CAAC;EACb,OAAO,EAAE,eAAe,CAAC,CAAC;EAC1B,KAAK;EACL,GAAG,CAAC;EACJ,CAAC;AACD;EACA,IAAI,kBAAkB,GAAG,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC;AACrD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,QAAQ,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,YAAY,CAAC;AACrE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,UAAU,CAAC,eAAe,EAAE;EACrC,EAAE,IAAI,OAAO,GAAG,EAAE,CAAC;EACnB,EAAE,OAAO,eAAe,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,mBAAmB,CAAC;EAC3F,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE;EACrD,EAAE,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC,EAAE;EAC9B,IAAI,OAAO,EAAE,CAAC;EACd,GAAG;EACH;EACA,EAAE,IAAI,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC;EACjD,EAAE,IAAI,GAAG,GAAG,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;EACnD,EAAE,OAAO,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;EACxC,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,aAAa,CAAC,OAAO,EAAE;EAChC,EAAE,IAAI,OAAO,CAAC,QAAQ,KAAK,MAAM,EAAE;EACnC,IAAI,OAAO,OAAO,CAAC;EACnB,GAAG;EACH,EAAE,OAAO,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;EAC5C,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,eAAe,CAAC,OAAO,EAAE;EAClC;EACA,EAAE,IAAI,CAAC,OAAO,EAAE;EAChB,IAAI,OAAO,QAAQ,CAAC,IAAI,CAAC;EACzB,GAAG;AACH;EACA,EAAE,QAAQ,OAAO,CAAC,QAAQ;EAC1B,IAAI,KAAK,MAAM,CAAC;EAChB,IAAI,KAAK,MAAM;EACf,MAAM,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;EACxC,IAAI,KAAK,WAAW;EACpB,MAAM,OAAO,OAAO,CAAC,IAAI,CAAC;EAC1B,GAAG;AACH;EACA;AACA;EACA,EAAE,IAAI,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,CAAC;EAC/D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;EAC/C,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS;EACjD,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC;AAClD;EACA,EAAE,IAAI,uBAAuB,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC,EAAE;EACtE,IAAI,OAAO,OAAO,CAAC;EACnB,GAAG;AACH;EACA,EAAE,OAAO,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;EACjD,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,gBAAgB,CAAC,SAAS,EAAE;EACrC,EAAE,OAAO,SAAS,IAAI,SAAS,CAAC,aAAa,GAAG,SAAS,CAAC,aAAa,GAAG,SAAS,CAAC;EACpF,CAAC;AACD;EACA,IAAI,MAAM,GAAG,SAAS,IAAI,CAAC,EAAE,MAAM,CAAC,oBAAoB,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;EACnF,IAAI,MAAM,GAAG,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAC9D;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,IAAI,CAAC,OAAO,EAAE;EACvB,EAAE,IAAI,OAAO,KAAK,EAAE,EAAE;EACtB,IAAI,OAAO,MAAM,CAAC;EAClB,GAAG;EACH,EAAE,IAAI,OAAO,KAAK,EAAE,EAAE;EACtB,IAAI,OAAO,MAAM,CAAC;EAClB,GAAG;EACH,EAAE,OAAO,MAAM,IAAI,MAAM,CAAC;EAC1B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,eAAe,CAAC,OAAO,EAAE;EAClC,EAAE,IAAI,CAAC,OAAO,EAAE;EAChB,IAAI,OAAO,QAAQ,CAAC,eAAe,CAAC;EACpC,GAAG;AACH;EACA,EAAE,IAAI,cAAc,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACvD;EACA;EACA,EAAE,IAAI,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC;EAClD;EACA,EAAE,OAAO,YAAY,KAAK,cAAc,IAAI,OAAO,CAAC,kBAAkB,EAAE;EACxE,IAAI,YAAY,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,kBAAkB,EAAE,YAAY,CAAC;EACvE,GAAG;AACH;EACA,EAAE,IAAI,QAAQ,GAAG,YAAY,IAAI,YAAY,CAAC,QAAQ,CAAC;AACvD;EACA,EAAE,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,MAAM,EAAE;EAC/D,IAAI,OAAO,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;EACtF,GAAG;AACH;EACA;EACA;EACA,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,wBAAwB,CAAC,YAAY,EAAE,UAAU,CAAC,KAAK,QAAQ,EAAE;EACtI,IAAI,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;EACzC,GAAG;AACH;EACA,EAAE,OAAO,YAAY,CAAC;EACtB,CAAC;AACD;EACA,SAAS,iBAAiB,CAAC,OAAO,EAAE;EACpC,EAAE,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AAClC;EACA,EAAE,IAAI,QAAQ,KAAK,MAAM,EAAE;EAC3B,IAAI,OAAO,KAAK,CAAC;EACjB,GAAG;EACH,EAAE,OAAO,QAAQ,KAAK,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC;EACvF,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,OAAO,CAAC,IAAI,EAAE;EACvB,EAAE,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE;EAChC,IAAI,OAAO,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;EACpC,GAAG;AACH;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE;EACpD;EACA,EAAE,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;EAC1E,IAAI,OAAO,QAAQ,CAAC,eAAe,CAAC;EACpC,GAAG;AACH;EACA;EACA,EAAE,IAAI,KAAK,GAAG,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,2BAA2B,CAAC;EAC5F,EAAE,IAAI,KAAK,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;EAC1C,EAAE,IAAI,GAAG,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;AACxC;EACA;EACA,EAAE,IAAI,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;EACrC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;EAC3B,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;EACvB,EAAE,IAAI,uBAAuB,GAAG,KAAK,CAAC,uBAAuB,CAAC;AAC9D;EACA;AACA;EACA,EAAE,IAAI,QAAQ,KAAK,uBAAuB,IAAI,QAAQ,KAAK,uBAAuB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;EAC3G,IAAI,IAAI,iBAAiB,CAAC,uBAAuB,CAAC,EAAE;EACpD,MAAM,OAAO,uBAAuB,CAAC;EACrC,KAAK;AACL;EACA,IAAI,OAAO,eAAe,CAAC,uBAAuB,CAAC,CAAC;EACpD,GAAG;AACH;EACA;EACA,EAAE,IAAI,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;EACvC,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE;EACzB,IAAI,OAAO,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;EAC/D,GAAG,MAAM;EACT,IAAI,OAAO,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;EACpE,GAAG;EACH,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,SAAS,CAAC,OAAO,EAAE;EAC5B,EAAE,IAAI,IAAI,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AACvF;EACA,EAAE,IAAI,SAAS,GAAG,IAAI,KAAK,KAAK,GAAG,WAAW,GAAG,YAAY,CAAC;EAC9D,EAAE,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AAClC;EACA,EAAE,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,MAAM,EAAE;EAClD,IAAI,IAAI,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC;EACrD,IAAI,IAAI,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,gBAAgB,IAAI,IAAI,CAAC;EAC1E,IAAI,OAAO,gBAAgB,CAAC,SAAS,CAAC,CAAC;EACvC,GAAG;AACH;EACA,EAAE,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;EAC5B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE;EACtC,EAAE,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAC3F;EACA,EAAE,IAAI,SAAS,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;EAC5C,EAAE,IAAI,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;EAC9C,EAAE,IAAI,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;EACnC,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS,GAAG,QAAQ,CAAC;EACnC,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS,GAAG,QAAQ,CAAC;EACtC,EAAE,IAAI,CAAC,IAAI,IAAI,UAAU,GAAG,QAAQ,CAAC;EACrC,EAAE,IAAI,CAAC,KAAK,IAAI,UAAU,GAAG,QAAQ,CAAC;EACtC,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA,SAAS,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE;EACtC,EAAE,IAAI,KAAK,GAAG,IAAI,KAAK,GAAG,GAAG,MAAM,GAAG,KAAK,CAAC;EAC5C,EAAE,IAAI,KAAK,GAAG,KAAK,KAAK,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AACpD;EACA,EAAE,OAAO,UAAU,CAAC,MAAM,CAAC,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;EACjH,CAAC;AACD;EACA,SAAS,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE;EAClD,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,IAAI,IAAI,KAAK,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,IAAI,IAAI,KAAK,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;EAC/U,CAAC;AACD;EACA,SAAS,cAAc,CAAC,QAAQ,EAAE;EAClC,EAAE,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;EAC3B,EAAE,IAAI,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;EACtC,EAAE,IAAI,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACzD;EACA,EAAE,OAAO;EACT,IAAI,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC;EACxD,IAAI,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC;EACtD,GAAG,CAAC;EACJ,CAAC;AACD;EACA,IAAI,cAAc,GAAG,UAAU,QAAQ,EAAE,WAAW,EAAE;EACtD,EAAE,IAAI,EAAE,QAAQ,YAAY,WAAW,CAAC,EAAE;EAC1C,IAAI,MAAM,IAAI,SAAS,CAAC,mCAAmC,CAAC,CAAC;EAC7D,GAAG;EACH,CAAC,CAAC;AACF;EACA,IAAI,WAAW,GAAG,YAAY;EAC9B,EAAE,SAAS,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE;EAC3C,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;EAC3C,MAAM,IAAI,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;EAChC,MAAM,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,KAAK,CAAC;EAC7D,MAAM,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;EACrC,MAAM,IAAI,OAAO,IAAI,UAAU,EAAE,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;EAC5D,MAAM,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;EAChE,KAAK;EACL,GAAG;AACH;EACA,EAAE,OAAO,UAAU,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE;EACzD,IAAI,IAAI,UAAU,EAAE,gBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;EACxE,IAAI,IAAI,WAAW,EAAE,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;EAChE,IAAI,OAAO,WAAW,CAAC;EACvB,GAAG,CAAC;EACJ,CAAC,EAAE,CAAC;AACJ;AACA;AACA;AACA;AACA;EACA,IAAI,cAAc,GAAG,UAAU,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE;EAChD,EAAE,IAAI,GAAG,IAAI,GAAG,EAAE;EAClB,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE;EACpC,MAAM,KAAK,EAAE,KAAK;EAClB,MAAM,UAAU,EAAE,IAAI;EACtB,MAAM,YAAY,EAAE,IAAI;EACxB,MAAM,QAAQ,EAAE,IAAI;EACpB,KAAK,CAAC,CAAC;EACP,GAAG,MAAM;EACT,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;EACrB,GAAG;AACH;EACA,EAAE,OAAO,GAAG,CAAC;EACb,CAAC,CAAC;AACF;EACA,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,IAAI,UAAU,MAAM,EAAE;EAClD,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;EAC7C,IAAI,IAAI,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AAC9B;EACA,IAAI,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;EAC5B,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;EAC7D,QAAQ,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;EAClC,OAAO;EACP,KAAK;EACL,GAAG;AACH;EACA,EAAE,OAAO,MAAM,CAAC;EAChB,CAAC,CAAC;AACF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,aAAa,CAAC,OAAO,EAAE;EAChC,EAAE,OAAO,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE;EAC/B,IAAI,KAAK,EAAE,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK;EACvC,IAAI,MAAM,EAAE,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM;EACxC,GAAG,CAAC,CAAC;EACL,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,qBAAqB,CAAC,OAAO,EAAE;EACxC,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;AAChB;EACA;EACA;EACA;EACA,EAAE,IAAI;EACN,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE;EAClB,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;EAC7C,MAAM,IAAI,SAAS,GAAG,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;EAChD,MAAM,IAAI,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;EAClD,MAAM,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC;EAC5B,MAAM,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC;EAC9B,MAAM,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;EAC/B,MAAM,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC;EAC/B,KAAK,MAAM;EACX,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;EAC7C,KAAK;EACL,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;AAChB;EACA,EAAE,IAAI,MAAM,GAAG;EACf,IAAI,IAAI,EAAE,IAAI,CAAC,IAAI;EACnB,IAAI,GAAG,EAAE,IAAI,CAAC,GAAG;EACjB,IAAI,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI;EACjC,IAAI,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG;EAClC,GAAG,CAAC;AACJ;EACA;EACA,EAAE,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;EACvF,EAAE,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,OAAO,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC;EACjE,EAAE,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC;AACrE;EACA,EAAE,IAAI,cAAc,GAAG,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;EACnD,EAAE,IAAI,aAAa,GAAG,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;AACpD;EACA;EACA;EACA,EAAE,IAAI,cAAc,IAAI,aAAa,EAAE;EACvC,IAAI,IAAI,MAAM,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;EACnD,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;EAClD,IAAI,aAAa,IAAI,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACjD;EACA,IAAI,MAAM,CAAC,KAAK,IAAI,cAAc,CAAC;EACnC,IAAI,MAAM,CAAC,MAAM,IAAI,aAAa,CAAC;EACnC,GAAG;AACH;EACA,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;EAC/B,CAAC;AACD;EACA,SAAS,oCAAoC,CAAC,QAAQ,EAAE,MAAM,EAAE;EAChE,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAChG;EACA,EAAE,IAAI,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;EACxB,EAAE,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC;EAC1C,EAAE,IAAI,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;EACrD,EAAE,IAAI,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;EACjD,EAAE,IAAI,YAAY,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AAC/C;EACA,EAAE,IAAI,MAAM,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;EAChD,EAAE,IAAI,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;EAC7D,EAAE,IAAI,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;AAC/D;EACA;EACA,EAAE,IAAI,aAAa,IAAI,MAAM,EAAE;EAC/B,IAAI,UAAU,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;EACjD,IAAI,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;EACnD,GAAG;EACH,EAAE,IAAI,OAAO,GAAG,aAAa,CAAC;EAC9B,IAAI,GAAG,EAAE,YAAY,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,GAAG,cAAc;EAC3D,IAAI,IAAI,EAAE,YAAY,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,GAAG,eAAe;EAC/D,IAAI,KAAK,EAAE,YAAY,CAAC,KAAK;EAC7B,IAAI,MAAM,EAAE,YAAY,CAAC,MAAM;EAC/B,GAAG,CAAC,CAAC;EACL,EAAE,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;EACxB,EAAE,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC;AACzB;EACA;EACA;EACA;EACA;EACA,EAAE,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE;EACzB,IAAI,IAAI,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;EACrD,IAAI,IAAI,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AACvD;EACA,IAAI,OAAO,CAAC,GAAG,IAAI,cAAc,GAAG,SAAS,CAAC;EAC9C,IAAI,OAAO,CAAC,MAAM,IAAI,cAAc,GAAG,SAAS,CAAC;EACjD,IAAI,OAAO,CAAC,IAAI,IAAI,eAAe,GAAG,UAAU,CAAC;EACjD,IAAI,OAAO,CAAC,KAAK,IAAI,eAAe,GAAG,UAAU,CAAC;AAClD;EACA;EACA,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;EAClC,IAAI,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;EACpC,GAAG;AACH;EACA,EAAE,IAAI,MAAM,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,MAAM,KAAK,YAAY,IAAI,YAAY,CAAC,QAAQ,KAAK,MAAM,EAAE;EAC9H,IAAI,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;EAC7C,GAAG;AACH;EACA,EAAE,OAAO,OAAO,CAAC;EACjB,CAAC;AACD;EACA,SAAS,6CAA6C,CAAC,OAAO,EAAE;EAChE,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAChG;EACA,EAAE,IAAI,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC;EACnD,EAAE,IAAI,cAAc,GAAG,oCAAoC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;EAC3E,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;EACjE,EAAE,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;AACpE;EACA,EAAE,IAAI,SAAS,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EACvD,EAAE,IAAI,UAAU,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;AAChE;EACA,EAAE,IAAI,MAAM,GAAG;EACf,IAAI,GAAG,EAAE,SAAS,GAAG,cAAc,CAAC,GAAG,GAAG,cAAc,CAAC,SAAS;EAClE,IAAI,IAAI,EAAE,UAAU,GAAG,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,UAAU;EACtE,IAAI,KAAK,EAAE,KAAK;EAChB,IAAI,MAAM,EAAE,MAAM;EAClB,GAAG,CAAC;AACJ;EACA,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;EAC/B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,OAAO,CAAC,OAAO,EAAE;EAC1B,EAAE,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;EAClC,EAAE,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,MAAM,EAAE;EAClD,IAAI,OAAO,KAAK,CAAC;EACjB,GAAG;EACH,EAAE,IAAI,wBAAwB,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,OAAO,EAAE;EACjE,IAAI,OAAO,IAAI,CAAC;EAChB,GAAG;EACH,EAAE,IAAI,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;EAC1C,EAAE,IAAI,CAAC,UAAU,EAAE;EACnB,IAAI,OAAO,KAAK,CAAC;EACjB,GAAG;EACH,EAAE,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;EAC7B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA,SAAS,4BAA4B,CAAC,OAAO,EAAE;EAC/C;EACA,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,IAAI,EAAE,EAAE;EACpD,IAAI,OAAO,QAAQ,CAAC,eAAe,CAAC;EACpC,GAAG;EACH,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;EACjC,EAAE,OAAO,EAAE,IAAI,wBAAwB,CAAC,EAAE,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE;EACrE,IAAI,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC;EAC1B,GAAG;EACH,EAAE,OAAO,EAAE,IAAI,QAAQ,CAAC,eAAe,CAAC;EACxC,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,iBAAiB,EAAE;EACtE,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAChG;EACA;AACA;EACA,EAAE,IAAI,UAAU,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;EACvC,EAAE,IAAI,YAAY,GAAG,aAAa,GAAG,4BAA4B,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;AACxI;EACA;EACA,EAAE,IAAI,iBAAiB,KAAK,UAAU,EAAE;EACxC,IAAI,UAAU,GAAG,6CAA6C,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;EAC5F,GAAG,MAAM;EACT;EACA,IAAI,IAAI,cAAc,GAAG,KAAK,CAAC,CAAC;EAChC,IAAI,IAAI,iBAAiB,KAAK,cAAc,EAAE;EAC9C,MAAM,cAAc,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;EACjE,MAAM,IAAI,cAAc,CAAC,QAAQ,KAAK,MAAM,EAAE;EAC9C,QAAQ,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC;EAC9D,OAAO;EACP,KAAK,MAAM,IAAI,iBAAiB,KAAK,QAAQ,EAAE;EAC/C,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC;EAC5D,KAAK,MAAM;EACX,MAAM,cAAc,GAAG,iBAAiB,CAAC;EACzC,KAAK;AACL;EACA,IAAI,IAAI,OAAO,GAAG,oCAAoC,CAAC,cAAc,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AACpG;EACA;EACA,IAAI,IAAI,cAAc,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;EACtE,MAAM,IAAI,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC;EAChE,UAAU,MAAM,GAAG,eAAe,CAAC,MAAM;EACzC,UAAU,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;AACxC;EACA,MAAM,UAAU,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC;EACxD,MAAM,UAAU,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;EAC/C,MAAM,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;EAC3D,MAAM,UAAU,CAAC,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;EAC9C,KAAK,MAAM;EACX;EACA,MAAM,UAAU,GAAG,OAAO,CAAC;EAC3B,KAAK;EACL,GAAG;AACH;EACA;EACA,EAAE,OAAO,GAAG,OAAO,IAAI,CAAC,CAAC;EACzB,EAAE,IAAI,eAAe,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC;EACpD,EAAE,UAAU,CAAC,IAAI,IAAI,eAAe,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;EACnE,EAAE,UAAU,CAAC,GAAG,IAAI,eAAe,GAAG,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;EACjE,EAAE,UAAU,CAAC,KAAK,IAAI,eAAe,GAAG,OAAO,GAAG,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC;EACrE,EAAE,UAAU,CAAC,MAAM,IAAI,eAAe,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC;AACvE;EACA,EAAE,OAAO,UAAU,CAAC;EACpB,CAAC;AACD;EACA,SAAS,OAAO,CAAC,IAAI,EAAE;EACvB,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK;EACxB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAC3B;EACA,EAAE,OAAO,KAAK,GAAG,MAAM,CAAC;EACxB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE;EACxF,EAAE,IAAI,OAAO,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACtF;EACA,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;EACxC,IAAI,OAAO,SAAS,CAAC;EACrB,GAAG;AACH;EACA,EAAE,IAAI,UAAU,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;AAChF;EACA,EAAE,IAAI,KAAK,GAAG;EACd,IAAI,GAAG,EAAE;EACT,MAAM,KAAK,EAAE,UAAU,CAAC,KAAK;EAC7B,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG;EAC1C,KAAK;EACL,IAAI,KAAK,EAAE;EACX,MAAM,KAAK,EAAE,UAAU,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK;EAC7C,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM;EAC/B,KAAK;EACL,IAAI,MAAM,EAAE;EACZ,MAAM,KAAK,EAAE,UAAU,CAAC,KAAK;EAC7B,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM;EAChD,KAAK;EACL,IAAI,IAAI,EAAE;EACV,MAAM,KAAK,EAAE,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI;EAC3C,MAAM,MAAM,EAAE,UAAU,CAAC,MAAM;EAC/B,KAAK;EACL,GAAG,CAAC;AACJ;EACA,EAAE,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,GAAG,EAAE;EAC1D,IAAI,OAAO,QAAQ,CAAC;EACpB,MAAM,GAAG,EAAE,GAAG;EACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;EACnB,MAAM,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;EAC/B,KAAK,CAAC,CAAC;EACP,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;EAC1B,IAAI,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;EAC3B,GAAG,CAAC,CAAC;AACL;EACA,EAAE,IAAI,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE;EAC1D,IAAI,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK;EAC3B,QAAQ,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;EAC9B,IAAI,OAAO,KAAK,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC;EACxE,GAAG,CAAC,CAAC;AACL;EACA,EAAE,IAAI,iBAAiB,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAC/F;EACA,EAAE,IAAI,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C;EACA,EAAE,OAAO,iBAAiB,IAAI,SAAS,GAAG,GAAG,GAAG,SAAS,GAAG,EAAE,CAAC,CAAC;EAChE,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE;EACvD,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;AAC/F;EACA,EAAE,IAAI,kBAAkB,GAAG,aAAa,GAAG,4BAA4B,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;EAC9I,EAAE,OAAO,oCAAoC,CAAC,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;EAC5F,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,aAAa,CAAC,OAAO,EAAE;EAChC,EAAE,IAAI,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC;EACjD,EAAE,IAAI,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;EAChD,EAAE,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;EACnF,EAAE,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;EACnF,EAAE,IAAI,MAAM,GAAG;EACf,IAAI,KAAK,EAAE,OAAO,CAAC,WAAW,GAAG,CAAC;EAClC,IAAI,MAAM,EAAE,OAAO,CAAC,YAAY,GAAG,CAAC;EACpC,GAAG,CAAC;EACJ,EAAE,OAAO,MAAM,CAAC;EAChB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,oBAAoB,CAAC,SAAS,EAAE;EACzC,EAAE,IAAI,IAAI,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;EAC5E,EAAE,OAAO,SAAS,CAAC,OAAO,CAAC,wBAAwB,EAAE,UAAU,OAAO,EAAE;EACxE,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;EACzB,GAAG,CAAC,CAAC;EACL,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE;EAC/D,EAAE,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACtC;EACA;EACA,EAAE,IAAI,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AACzC;EACA;EACA,EAAE,IAAI,aAAa,GAAG;EACtB,IAAI,KAAK,EAAE,UAAU,CAAC,KAAK;EAC3B,IAAI,MAAM,EAAE,UAAU,CAAC,MAAM;EAC7B,GAAG,CAAC;AACJ;EACA;EACA,EAAE,IAAI,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;EAC5D,EAAE,IAAI,QAAQ,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;EAC1C,EAAE,IAAI,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;EAC/C,EAAE,IAAI,WAAW,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;EACjD,EAAE,IAAI,oBAAoB,GAAG,CAAC,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AAC3D;EACA,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;EACzH,EAAE,IAAI,SAAS,KAAK,aAAa,EAAE;EACnC,IAAI,aAAa,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;EACtG,GAAG,MAAM;EACT,IAAI,aAAa,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC;EACzF,GAAG;AACH;EACA,EAAE,OAAO,aAAa,CAAC;EACvB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE;EAC1B;EACA,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE;EAC5B,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;EAC3B,GAAG;AACH;EACA;EACA,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;EAC9B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE;EACrC;EACA,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE;EACjC,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,UAAU,GAAG,EAAE;EACxC,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;EACjC,KAAK,CAAC,CAAC;EACP,GAAG;AACH;EACA;EACA,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,EAAE;EACvC,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;EAC/B,GAAG,CAAC,CAAC;EACL,EAAE,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;EAC5B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE;EAC7C,EAAE,IAAI,cAAc,GAAG,IAAI,KAAK,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAC/G;EACA,EAAE,cAAc,CAAC,OAAO,CAAC,UAAU,QAAQ,EAAE;EAC7C,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE;EAC9B;EACA,MAAM,OAAO,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;EAC5E,KAAK;EACL,IAAI,IAAI,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC;EACjD,IAAI,IAAI,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC,EAAE;EAC5C;EACA;EACA;EACA,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;EAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACrE;EACA,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;EAChC,KAAK;EACL,GAAG,CAAC,CAAC;AACL;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,MAAM,GAAG;EAClB;EACA,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;EAC9B,IAAI,OAAO;EACX,GAAG;AACH;EACA,EAAE,IAAI,IAAI,GAAG;EACb,IAAI,QAAQ,EAAE,IAAI;EAClB,IAAI,MAAM,EAAE,EAAE;EACd,IAAI,WAAW,EAAE,EAAE;EACnB,IAAI,UAAU,EAAE,EAAE;EAClB,IAAI,OAAO,EAAE,KAAK;EAClB,IAAI,OAAO,EAAE,EAAE;EACf,GAAG,CAAC;AACJ;EACA;EACA,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AACpH;EACA;EACA;EACA;EACA,EAAE,IAAI,CAAC,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACzM;EACA;EACA,EAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC;AAC1C;EACA,EAAE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;AAClD;EACA;EACA,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;AAC9F;EACA,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,OAAO,GAAG,UAAU,CAAC;AACnF;EACA;EACA,EAAE,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAC5C;EACA;EACA;EACA,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;EAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;EAChC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;EAChC,GAAG,MAAM;EACT,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;EAChC,GAAG;EACH,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,iBAAiB,CAAC,SAAS,EAAE,YAAY,EAAE;EACpD,EAAE,OAAO,SAAS,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE;EACxC,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI;EACxB,QAAQ,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;EAC/B,IAAI,OAAO,OAAO,IAAI,IAAI,KAAK,YAAY,CAAC;EAC5C,GAAG,CAAC,CAAC;EACL,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,wBAAwB,CAAC,QAAQ,EAAE;EAC5C,EAAE,IAAI,QAAQ,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;EACrD,EAAE,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACvE;EACA,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;EAC5C,IAAI,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;EAC7B,IAAI,IAAI,OAAO,GAAG,MAAM,GAAG,EAAE,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;EAC9D,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,WAAW,EAAE;EAC7D,MAAM,OAAO,OAAO,CAAC;EACrB,KAAK;EACL,GAAG;EACH,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,OAAO,GAAG;EACnB,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;AAChC;EACA;EACA,EAAE,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE;EACvD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;EAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC;EACpC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC;EAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;EAChC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;EACjC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;EAClC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC;EACtC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;EAClE,GAAG;AACH;EACA,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC;AAC/B;EACA;EACA;EACA,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;EACpC,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;EACpD,GAAG;EACH,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,SAAS,CAAC,OAAO,EAAE;EAC5B,EAAE,IAAI,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;EAC5C,EAAE,OAAO,aAAa,GAAG,aAAa,CAAC,WAAW,GAAG,MAAM,CAAC;EAC5D,CAAC;AACD;EACA,SAAS,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE;EAC7E,EAAE,IAAI,MAAM,GAAG,YAAY,CAAC,QAAQ,KAAK,MAAM,CAAC;EAChD,EAAE,IAAI,MAAM,GAAG,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC,WAAW,GAAG,YAAY,CAAC;EAC9E,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D;EACA,EAAE,IAAI,CAAC,MAAM,EAAE;EACf,IAAI,qBAAqB,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;EAC9F,GAAG;EACH,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;EAC7B,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,mBAAmB,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE;EACrE;EACA,EAAE,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;EAClC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACxF;EACA;EACA,EAAE,IAAI,aAAa,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;EACjD,EAAE,qBAAqB,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;EACzF,EAAE,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;EACtC,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;AAC7B;EACA,EAAE,OAAO,KAAK,CAAC;EACf,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,oBAAoB,GAAG;EAChC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;EACjC,IAAI,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;EACpG,GAAG;EACH,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE;EAChD;EACA,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;AACxE;EACA;EACA,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,MAAM,EAAE;EAChD,IAAI,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;EAC5D,GAAG,CAAC,CAAC;AACL;EACA;EACA,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;EAC3B,EAAE,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC;EAC3B,EAAE,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;EAC7B,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;EAC9B,EAAE,OAAO,KAAK,CAAC;EACf,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,qBAAqB,GAAG;EACjC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;EAChC,IAAI,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;EAC9C,IAAI,IAAI,CAAC,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;EAClE,GAAG;EACH,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,SAAS,CAAC,CAAC,EAAE;EACtB,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;EAC1D,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE;EACpC,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE;EAC9C,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;EAClB;EACA,IAAI,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;EAC/G,MAAM,IAAI,GAAG,IAAI,CAAC;EAClB,KAAK;EACL,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;EAC9C,GAAG,CAAC,CAAC;EACL,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE;EAC5C,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE;EAClD,IAAI,IAAI,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;EACjC,IAAI,IAAI,KAAK,KAAK,KAAK,EAAE;EACzB,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;EACnD,KAAK,MAAM;EACX,MAAM,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;EACpC,KAAK;EACL,GAAG,CAAC,CAAC;EACL,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,UAAU,CAAC,IAAI,EAAE;EAC1B;EACA;EACA;EACA;EACA,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/C;EACA;EACA;EACA,EAAE,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;AACvD;EACA;EACA,EAAE,IAAI,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE;EACjE,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;EACnD,GAAG;AACH;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE;EAC9E;EACA,EAAE,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;AAC9F;EACA;EACA;EACA;EACA,EAAE,IAAI,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACzK;EACA,EAAE,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;AAChD;EACA;EACA;EACA,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,aAAa,GAAG,OAAO,GAAG,UAAU,EAAE,CAAC,CAAC;AAChF;EACA,EAAE,OAAO,OAAO,CAAC;EACjB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE;EAC9C,EAAE,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO;EAClC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM;EACnC,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;EAC1C,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK;EACxB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;AACzB;EACA,EAAE,IAAI,OAAO,GAAG,SAAS,OAAO,CAAC,CAAC,EAAE;EACpC,IAAI,OAAO,CAAC,CAAC;EACb,GAAG,CAAC;AACJ;EACA,EAAE,IAAI,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;EAC9C,EAAE,IAAI,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACxC;EACA,EAAE,IAAI,UAAU,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;EACpE,EAAE,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;EACvD,EAAE,IAAI,eAAe,GAAG,cAAc,GAAG,CAAC,KAAK,WAAW,GAAG,CAAC,CAAC;EAC/D,EAAE,IAAI,YAAY,GAAG,cAAc,GAAG,CAAC,KAAK,CAAC,IAAI,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC;AACvE;EACA,EAAE,IAAI,mBAAmB,GAAG,CAAC,WAAW,GAAG,OAAO,GAAG,UAAU,IAAI,WAAW,IAAI,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;EAClH,EAAE,IAAI,iBAAiB,GAAG,CAAC,WAAW,GAAG,OAAO,GAAG,KAAK,CAAC;AACzD;EACA,EAAE,OAAO;EACT,IAAI,IAAI,EAAE,mBAAmB,CAAC,YAAY,IAAI,CAAC,WAAW,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;EAC1G,IAAI,GAAG,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC;EACtC,IAAI,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC;EAC5C,IAAI,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC;EAC5C,GAAG,CAAC;EACJ,CAAC;AACD;EACA,IAAI,SAAS,GAAG,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AAClE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE;EACrC,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;EACnB,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;EACpB,EAAE,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;AACnC;EACA;AACA;EACA,EAAE,IAAI,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,QAAQ,EAAE;EACtF,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,YAAY,CAAC;EAC1C,GAAG,CAAC,CAAC,eAAe,CAAC;EACrB,EAAE,IAAI,2BAA2B,KAAK,SAAS,EAAE;EACjD,IAAI,OAAO,CAAC,IAAI,CAAC,+HAA+H,CAAC,CAAC;EAClJ,GAAG;EACH,EAAE,IAAI,eAAe,GAAG,2BAA2B,KAAK,SAAS,GAAG,2BAA2B,GAAG,OAAO,CAAC,eAAe,CAAC;AAC1H;EACA,EAAE,IAAI,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;EAC3D,EAAE,IAAI,gBAAgB,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;AAC7D;EACA;EACA,EAAE,IAAI,MAAM,GAAG;EACf,IAAI,QAAQ,EAAE,MAAM,CAAC,QAAQ;EAC7B,GAAG,CAAC;AACJ;EACA,EAAE,IAAI,OAAO,GAAG,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,gBAAgB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AACnF;EACA,EAAE,IAAI,KAAK,GAAG,CAAC,KAAK,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAC;EAChD,EAAE,IAAI,KAAK,GAAG,CAAC,KAAK,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;AAC/C;EACA;EACA;EACA;EACA,EAAE,IAAI,gBAAgB,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;AAC/D;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;EACnB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC;EACnB,EAAE,IAAI,KAAK,KAAK,QAAQ,EAAE;EAC1B;EACA;EACA,IAAI,IAAI,YAAY,CAAC,QAAQ,KAAK,MAAM,EAAE;EAC1C,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;EACxD,KAAK,MAAM;EACX,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;EACtD,KAAK;EACL,GAAG,MAAM;EACT,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;EACtB,GAAG;EACH,EAAE,IAAI,KAAK,KAAK,OAAO,EAAE;EACzB,IAAI,IAAI,YAAY,CAAC,QAAQ,KAAK,MAAM,EAAE;EAC1C,MAAM,IAAI,GAAG,CAAC,YAAY,CAAC,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;EACvD,KAAK,MAAM;EACX,MAAM,IAAI,GAAG,CAAC,gBAAgB,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;EACrD,KAAK;EACL,GAAG,MAAM;EACT,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;EACxB,GAAG;EACH,EAAE,IAAI,eAAe,IAAI,gBAAgB,EAAE;EAC3C,IAAI,MAAM,CAAC,gBAAgB,CAAC,GAAG,cAAc,GAAG,IAAI,GAAG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC;EAC/E,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;EACtB,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;EACtB,IAAI,MAAM,CAAC,UAAU,GAAG,WAAW,CAAC;EACpC,GAAG,MAAM;EACT;EACA,IAAI,IAAI,SAAS,GAAG,KAAK,KAAK,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;EAChD,IAAI,IAAI,UAAU,GAAG,KAAK,KAAK,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;EAChD,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC;EACpC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC;EACtC,IAAI,MAAM,CAAC,UAAU,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC;EAC7C,GAAG;AACH;EACA;EACA,EAAE,IAAI,UAAU,GAAG;EACnB,IAAI,aAAa,EAAE,IAAI,CAAC,SAAS;EACjC,GAAG,CAAC;AACJ;EACA;EACA,EAAE,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;EAC9D,EAAE,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;EAClD,EAAE,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;AACxE;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,kBAAkB,CAAC,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE;EACtE,EAAE,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,IAAI,EAAE;EACnD,IAAI,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;EACzB,IAAI,OAAO,IAAI,KAAK,cAAc,CAAC;EACnC,GAAG,CAAC,CAAC;AACL;EACA,EAAE,IAAI,UAAU,GAAG,CAAC,CAAC,UAAU,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,QAAQ,EAAE;EACtE,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,aAAa,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;EACpG,GAAG,CAAC,CAAC;AACL;EACA,EAAE,IAAI,CAAC,UAAU,EAAE;EACnB,IAAI,IAAI,WAAW,GAAG,GAAG,GAAG,cAAc,GAAG,GAAG,CAAC;EACjD,IAAI,IAAI,SAAS,GAAG,GAAG,GAAG,aAAa,GAAG,GAAG,CAAC;EAC9C,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,2BAA2B,GAAG,WAAW,GAAG,2DAA2D,GAAG,WAAW,GAAG,GAAG,CAAC,CAAC;EAC1J,GAAG;EACH,EAAE,OAAO,UAAU,CAAC;EACpB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE;EAC9B,EAAE,IAAI,mBAAmB,CAAC;AAC1B;EACA;EACA,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE;EAC7E,IAAI,OAAO,IAAI,CAAC;EAChB,GAAG;AACH;EACA,EAAE,IAAI,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;AACrC;EACA;EACA,EAAE,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;EACxC,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;AACpE;EACA;EACA,IAAI,IAAI,CAAC,YAAY,EAAE;EACvB,MAAM,OAAO,IAAI,CAAC;EAClB,KAAK;EACL,GAAG,MAAM;EACT;EACA;EACA,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;EACtD,MAAM,OAAO,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;EACpF,MAAM,OAAO,IAAI,CAAC;EAClB,KAAK;EACL,GAAG;AACH;EACA,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;EAC/C,EAAE,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO;EAClC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM;EACnC,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;AAC1C;EACA,EAAE,IAAI,UAAU,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/D;EACA,EAAE,IAAI,GAAG,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC;EAC5C,EAAE,IAAI,eAAe,GAAG,UAAU,GAAG,KAAK,GAAG,MAAM,CAAC;EACpD,EAAE,IAAI,IAAI,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;EAC3C,EAAE,IAAI,OAAO,GAAG,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;EAC5C,EAAE,IAAI,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC;EAC/C,EAAE,IAAI,gBAAgB,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC;AAC1D;EACA;EACA;EACA;EACA;AACA;EACA;EACA,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,GAAG,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE;EAC3D,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC;EACvF,GAAG;EACH;EACA,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE;EAC3D,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;EACrF,GAAG;EACH,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3D;EACA;EACA,EAAE,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,gBAAgB,GAAG,CAAC,CAAC;AAC3E;EACA;EACA;EACA,EAAE,IAAI,GAAG,GAAG,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;EAC3D,EAAE,IAAI,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;EACzE,EAAE,IAAI,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;EACnF,EAAE,IAAI,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAC3F;EACA;EACA,EAAE,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,gBAAgB,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/E;EACA,EAAE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;EACnC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,mBAAmB,GAAG,EAAE,EAAE,cAAc,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,mBAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAC3L;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,oBAAoB,CAAC,SAAS,EAAE;EACzC,EAAE,IAAI,SAAS,KAAK,KAAK,EAAE;EAC3B,IAAI,OAAO,OAAO,CAAC;EACnB,GAAG,MAAM,IAAI,SAAS,KAAK,OAAO,EAAE;EACpC,IAAI,OAAO,KAAK,CAAC;EACjB,GAAG;EACH,EAAE,OAAO,SAAS,CAAC;EACnB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,UAAU,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAClM;EACA;EACA,IAAI,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC1C;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,SAAS,CAAC,SAAS,EAAE;EAC9B,EAAE,IAAI,OAAO,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAC1F;EACA,EAAE,IAAI,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;EACjD,EAAE,IAAI,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;EACrF,EAAE,OAAO,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC;EACvC,CAAC;AACD;EACA,IAAI,SAAS,GAAG;EAChB,EAAE,IAAI,EAAE,MAAM;EACd,EAAE,SAAS,EAAE,WAAW;EACxB,EAAE,gBAAgB,EAAE,kBAAkB;EACtC,CAAC,CAAC;AACF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE;EAC7B;EACA,EAAE,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;EAC3D,IAAI,OAAO,IAAI,CAAC;EAChB,GAAG;AACH;EACA,EAAE,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,iBAAiB,EAAE;EACjE;EACA,IAAI,OAAO,IAAI,CAAC;EAChB,GAAG;AACH;EACA,EAAE,IAAI,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;AAChJ;EACA,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;EAC/C,EAAE,IAAI,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;EAC1D,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACrD;EACA,EAAE,IAAI,SAAS,GAAG,EAAE,CAAC;AACrB;EACA,EAAE,QAAQ,OAAO,CAAC,QAAQ;EAC1B,IAAI,KAAK,SAAS,CAAC,IAAI;EACvB,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;EACjD,MAAM,MAAM;EACZ,IAAI,KAAK,SAAS,CAAC,SAAS;EAC5B,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;EACvC,MAAM,MAAM;EACZ,IAAI,KAAK,SAAS,CAAC,gBAAgB;EACnC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;EAC7C,MAAM,MAAM;EACZ,IAAI;EACJ,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;EACnC,GAAG;AACH;EACA,EAAE,SAAS,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,KAAK,EAAE;EAC3C,IAAI,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,GAAG,CAAC,EAAE;EAC9D,MAAM,OAAO,IAAI,CAAC;EAClB,KAAK;AACL;EACA,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;EAC7C,IAAI,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;AACxD;EACA,IAAI,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;EAC5C,IAAI,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;AAC5C;EACA;EACA,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;EAC3B,IAAI,IAAI,WAAW,GAAG,SAAS,KAAK,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,KAAK,OAAO,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,SAAS,KAAK,KAAK,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,SAAS,KAAK,QAAQ,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACjV;EACA,IAAI,IAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;EAC3E,IAAI,IAAI,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;EAC9E,IAAI,IAAI,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;EACxE,IAAI,IAAI,eAAe,GAAG,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACjF;EACA,IAAI,IAAI,mBAAmB,GAAG,SAAS,KAAK,MAAM,IAAI,aAAa,IAAI,SAAS,KAAK,OAAO,IAAI,cAAc,IAAI,SAAS,KAAK,KAAK,IAAI,YAAY,IAAI,SAAS,KAAK,QAAQ,IAAI,eAAe,CAAC;AACnM;EACA;EACA,IAAI,IAAI,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AACjE;EACA;EACA,IAAI,IAAI,qBAAqB,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,KAAK,UAAU,IAAI,SAAS,KAAK,OAAO,IAAI,aAAa,IAAI,UAAU,IAAI,SAAS,KAAK,KAAK,IAAI,cAAc,IAAI,CAAC,UAAU,IAAI,SAAS,KAAK,OAAO,IAAI,YAAY,IAAI,CAAC,UAAU,IAAI,SAAS,KAAK,KAAK,IAAI,eAAe,CAAC,CAAC;AAC3R;EACA;EACA,IAAI,IAAI,yBAAyB,GAAG,CAAC,CAAC,OAAO,CAAC,uBAAuB,KAAK,UAAU,IAAI,SAAS,KAAK,OAAO,IAAI,cAAc,IAAI,UAAU,IAAI,SAAS,KAAK,KAAK,IAAI,aAAa,IAAI,CAAC,UAAU,IAAI,SAAS,KAAK,OAAO,IAAI,eAAe,IAAI,CAAC,UAAU,IAAI,SAAS,KAAK,KAAK,IAAI,YAAY,CAAC,CAAC;AACxS;EACA,IAAI,IAAI,gBAAgB,GAAG,qBAAqB,IAAI,yBAAyB,CAAC;AAC9E;EACA,IAAI,IAAI,WAAW,IAAI,mBAAmB,IAAI,gBAAgB,EAAE;EAChE;EACA,MAAM,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;AAC1B;EACA,MAAM,IAAI,WAAW,IAAI,mBAAmB,EAAE;EAC9C,QAAQ,SAAS,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;EACzC,OAAO;AACP;EACA,MAAM,IAAI,gBAAgB,EAAE;EAC5B,QAAQ,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;EACpD,OAAO;AACP;EACA,MAAM,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,SAAS,GAAG,GAAG,GAAG,SAAS,GAAG,EAAE,CAAC,CAAC;AACtE;EACA;EACA;EACA,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;AAC9I;EACA,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;EACjE,KAAK;EACL,GAAG,CAAC,CAAC;EACL,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,YAAY,CAAC,IAAI,EAAE;EAC5B,EAAE,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO;EAClC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM;EACnC,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;AAC1C;EACA,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;EAC/C,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;EACzB,EAAE,IAAI,UAAU,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;EAC/D,EAAE,IAAI,IAAI,GAAG,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;EAC7C,EAAE,IAAI,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;EAC3C,EAAE,IAAI,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;AACpD;EACA,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE;EAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;EACjF,GAAG;EACH,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE;EAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;EACzD,GAAG;AACH;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE;EACpE;EACA,EAAE,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;EACrD,EAAE,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;EACxB,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACtB;EACA;EACA,EAAE,IAAI,CAAC,KAAK,EAAE;EACd,IAAI,OAAO,GAAG,CAAC;EACf,GAAG;AACH;EACA,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;EAC/B,IAAI,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC;EACzB,IAAI,QAAQ,IAAI;EAChB,MAAM,KAAK,IAAI;EACf,QAAQ,OAAO,GAAG,aAAa,CAAC;EAChC,QAAQ,MAAM;EACd,MAAM,KAAK,GAAG,CAAC;EACf,MAAM,KAAK,IAAI,CAAC;EAChB,MAAM;EACN,QAAQ,OAAO,GAAG,gBAAgB,CAAC;EACnC,KAAK;AACL;EACA,IAAI,IAAI,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;EACtC,IAAI,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC;EAC3C,GAAG,MAAM,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE;EAC7C;EACA,IAAI,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC;EACtB,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE;EACvB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC;EACtF,KAAK,MAAM;EACX,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;EACpF,KAAK;EACL,IAAI,OAAO,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;EAC9B,GAAG,MAAM;EACT;EACA;EACA,IAAI,OAAO,KAAK,CAAC;EACjB,GAAG;EACH,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE;EAC7E,EAAE,IAAI,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvB;EACA;EACA;EACA;EACA,EAAE,IAAI,SAAS,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE;EACA;EACA;EACA,EAAE,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE;EAC9D,IAAI,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;EACvB,GAAG,CAAC,CAAC;AACL;EACA;EACA;EACA,EAAE,IAAI,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,IAAI,EAAE;EAClE,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;EACtC,GAAG,CAAC,CAAC,CAAC;AACN;EACA,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;EACpE,IAAI,OAAO,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;EACjG,GAAG;AACH;EACA;EACA;EACA,EAAE,IAAI,UAAU,GAAG,aAAa,CAAC;EACjC,EAAE,IAAI,GAAG,GAAG,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC3M;EACA;EACA,EAAE,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE;EACrC;EACA,IAAI,IAAI,WAAW,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,SAAS,IAAI,QAAQ,GAAG,OAAO,CAAC;EAClF,IAAI,IAAI,iBAAiB,GAAG,KAAK,CAAC;EAClC,IAAI,OAAO,EAAE;EACb;EACA;EACA,KAAK,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;EAC5B,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;EAClE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;EAC5B,QAAQ,iBAAiB,GAAG,IAAI,CAAC;EACjC,QAAQ,OAAO,CAAC,CAAC;EACjB,OAAO,MAAM,IAAI,iBAAiB,EAAE;EACpC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;EAC7B,QAAQ,iBAAiB,GAAG,KAAK,CAAC;EAClC,QAAQ,OAAO,CAAC,CAAC;EACjB,OAAO,MAAM;EACb,QAAQ,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;EAC3B,OAAO;EACP,KAAK,EAAE,EAAE,CAAC;EACV;EACA,KAAK,GAAG,CAAC,UAAU,GAAG,EAAE;EACxB,MAAM,OAAO,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;EACxE,KAAK,CAAC,CAAC;EACP,GAAG,CAAC,CAAC;AACL;EACA;EACA,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE;EACnC,IAAI,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,MAAM,EAAE;EACvC,MAAM,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE;EAC3B,QAAQ,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;EACnE,OAAO;EACP,KAAK,CAAC,CAAC;EACP,GAAG,CAAC,CAAC;EACL,EAAE,OAAO,OAAO,CAAC;EACjB,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE;EAC5B,EAAE,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;EAC3B,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS;EAChC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO;EAClC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM;EACnC,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;AAC1C;EACA,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9C;EACA,EAAE,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC;EACvB,EAAE,IAAI,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE;EAC1B,IAAI,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;EAC3B,GAAG,MAAM;EACT,IAAI,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;EACpE,GAAG;AACH;EACA,EAAE,IAAI,aAAa,KAAK,MAAM,EAAE;EAChC,IAAI,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC7B,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC9B,GAAG,MAAM,IAAI,aAAa,KAAK,OAAO,EAAE;EACxC,IAAI,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC7B,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC9B,GAAG,MAAM,IAAI,aAAa,KAAK,KAAK,EAAE;EACtC,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC9B,IAAI,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC7B,GAAG,MAAM,IAAI,aAAa,KAAK,QAAQ,EAAE;EACzC,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC9B,IAAI,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;EAC7B,GAAG;AACH;EACA,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;EACvB,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE;EACxC,EAAE,IAAI,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC7F;EACA;EACA;EACA;EACA,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,KAAK,iBAAiB,EAAE;EACrD,IAAI,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;EAC3D,GAAG;AACH;EACA;EACA;EACA;EACA,EAAE,IAAI,aAAa,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;EAC5D,EAAE,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;EAChD,EAAE,IAAI,GAAG,GAAG,YAAY,CAAC,GAAG;EAC5B,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI;EAC9B,MAAM,SAAS,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;AAC9C;EACA,EAAE,YAAY,CAAC,GAAG,GAAG,EAAE,CAAC;EACxB,EAAE,YAAY,CAAC,IAAI,GAAG,EAAE,CAAC;EACzB,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;AACnC;EACA,EAAE,IAAI,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;AACxI;EACA;EACA;EACA,EAAE,YAAY,CAAC,GAAG,GAAG,GAAG,CAAC;EACzB,EAAE,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;EAC3B,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AAC1C;EACA,EAAE,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;AAClC;EACA,EAAE,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAC/B,EAAE,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;AACnC;EACA,EAAE,IAAI,KAAK,GAAG;EACd,IAAI,OAAO,EAAE,SAAS,OAAO,CAAC,SAAS,EAAE;EACzC,MAAM,IAAI,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;EACpC,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;EACrF,QAAQ,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;EACnE,OAAO;EACP,MAAM,OAAO,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;EAClD,KAAK;EACL,IAAI,SAAS,EAAE,SAAS,SAAS,CAAC,SAAS,EAAE;EAC7C,MAAM,IAAI,QAAQ,GAAG,SAAS,KAAK,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;EAC5D,MAAM,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;EACnC,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;EACrF,QAAQ,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,KAAK,OAAO,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;EAC3H,OAAO;EACP,MAAM,OAAO,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;EACjD,KAAK;EACL,GAAG,CAAC;AACJ;EACA,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,SAAS,EAAE;EACrC,IAAI,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,GAAG,WAAW,CAAC;EACnF,IAAI,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;EAC1D,GAAG,CAAC,CAAC;AACL;EACA,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;AAC/B;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,KAAK,CAAC,IAAI,EAAE;EACrB,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;EACjC,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;EAC9C,EAAE,IAAI,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C;EACA;EACA,EAAE,IAAI,cAAc,EAAE;EACtB,IAAI,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO;EACpC,QAAQ,SAAS,GAAG,aAAa,CAAC,SAAS;EAC3C,QAAQ,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;AACtC;EACA,IAAI,IAAI,UAAU,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;EACrE,IAAI,IAAI,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;EAC3C,IAAI,IAAI,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;AACtD;EACA,IAAI,IAAI,YAAY,GAAG;EACvB,MAAM,KAAK,EAAE,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;EACtD,MAAM,GAAG,EAAE,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;EACnG,KAAK,CAAC;AACN;EACA,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;EAC7E,GAAG;AACH;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,IAAI,CAAC,IAAI,EAAE;EACpB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE;EAC/E,IAAI,OAAO,IAAI,CAAC;EAChB,GAAG;AACH;EACA,EAAE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;EACvC,EAAE,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,QAAQ,EAAE;EAChE,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,iBAAiB,CAAC;EAC/C,GAAG,CAAC,CAAC,UAAU,CAAC;AAChB;EACA,EAAE,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE;EAC5H;EACA,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;EAC5B,MAAM,OAAO,IAAI,CAAC;EAClB,KAAK;AACL;EACA,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;EACrB,IAAI,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC;EAChD,GAAG,MAAM;EACT;EACA,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;EAC7B,MAAM,OAAO,IAAI,CAAC;EAClB,KAAK;AACL;EACA,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;EACtB,IAAI,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,GAAG,KAAK,CAAC;EACnD,GAAG;AACH;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SAAS,KAAK,CAAC,IAAI,EAAE;EACrB,EAAE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;EACjC,EAAE,IAAI,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;EAC9C,EAAE,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO;EAClC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM;EACnC,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;AAC1C;EACA,EAAE,IAAI,OAAO,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AAChE;EACA,EAAE,IAAI,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AACrE;EACA,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,cAAc,GAAG,MAAM,CAAC,OAAO,GAAG,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5H;EACA,EAAE,IAAI,CAAC,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;EACnD,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAC9C;EACA,EAAE,OAAO,IAAI,CAAC;EACd,CAAC;AACD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,SAAS,GAAG;EAChB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,KAAK,EAAE;EACT;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,KAAK;EACb,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,MAAM,EAAE;EACV;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,MAAM;EACd;EACA;EACA;EACA,IAAI,MAAM,EAAE,CAAC;EACb,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,eAAe,EAAE;EACnB;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,eAAe;EACvB;EACA;EACA;EACA;EACA;EACA,IAAI,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC;EAChD;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,OAAO,EAAE,CAAC;EACd;EACA;EACA;EACA;EACA;EACA,IAAI,iBAAiB,EAAE,cAAc;EACrC,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,YAAY,EAAE;EAChB;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,YAAY;EACpB,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,KAAK,EAAE;EACT;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,KAAK;EACb;EACA,IAAI,OAAO,EAAE,WAAW;EACxB,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,IAAI,EAAE;EACR;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,IAAI;EACZ;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,QAAQ,EAAE,MAAM;EACpB;EACA;EACA;EACA;EACA,IAAI,OAAO,EAAE,CAAC;EACd;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,iBAAiB,EAAE,UAAU;EACjC;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,cAAc,EAAE,KAAK;EACzB;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,uBAAuB,EAAE,KAAK;EAClC,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,KAAK,EAAE;EACT;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,KAAK;EAClB;EACA,IAAI,EAAE,EAAE,KAAK;EACb,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,IAAI,EAAE;EACR;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,IAAI;EACZ,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,YAAY,EAAE;EAChB;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,YAAY;EACpB;EACA;EACA;EACA;EACA;EACA,IAAI,eAAe,EAAE,IAAI;EACzB;EACA;EACA;EACA;EACA;EACA,IAAI,CAAC,EAAE,QAAQ;EACf;EACA;EACA;EACA;EACA;EACA,IAAI,CAAC,EAAE,OAAO;EACd,GAAG;AACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,UAAU,EAAE;EACd;EACA,IAAI,KAAK,EAAE,GAAG;EACd;EACA,IAAI,OAAO,EAAE,IAAI;EACjB;EACA,IAAI,EAAE,EAAE,UAAU;EAClB;EACA,IAAI,MAAM,EAAE,gBAAgB;EAC5B;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,eAAe,EAAE,SAAS;EAC9B,GAAG;EACH,CAAC,CAAC;AACF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,QAAQ,GAAG;EACf;EACA;EACA;EACA;EACA,EAAE,SAAS,EAAE,QAAQ;AACrB;EACA;EACA;EACA;EACA;EACA,EAAE,aAAa,EAAE,KAAK;AACtB;EACA;EACA;EACA;EACA;EACA,EAAE,aAAa,EAAE,IAAI;AACrB;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,eAAe,EAAE,KAAK;AACxB;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,QAAQ,EAAE,SAAS,QAAQ,GAAG,EAAE;AAClC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,QAAQ,EAAE,SAAS,QAAQ,GAAG,EAAE;AAClC;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,SAAS,EAAE,SAAS;EACtB,CAAC,CAAC;AACF;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA,IAAI,MAAM,GAAG,YAAY;EACzB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,EAAE,SAAS,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE;EACrC,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC;AACrB;EACA,IAAI,IAAI,OAAO,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;EACzF,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjC;EACA,IAAI,IAAI,CAAC,cAAc,GAAG,YAAY;EACtC,MAAM,OAAO,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;EACjD,KAAK,CAAC;AACN;EACA;EACA,IAAI,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACnD;EACA;EACA,IAAI,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC1D;EACA;EACA,IAAI,IAAI,CAAC,KAAK,GAAG;EACjB,MAAM,WAAW,EAAE,KAAK;EACxB,MAAM,SAAS,EAAE,KAAK;EACtB,MAAM,aAAa,EAAE,EAAE;EACvB,KAAK,CAAC;AACN;EACA;EACA,IAAI,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;EAC9E,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;AAC/D;EACA;EACA,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;EAChC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE;EACpG,MAAM,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;EAC5I,KAAK,CAAC,CAAC;AACP;EACA;EACA,IAAI,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE;EAC7E,MAAM,OAAO,QAAQ,CAAC;EACtB,QAAQ,IAAI,EAAE,IAAI;EAClB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;EACxC,KAAK,CAAC;EACN;EACA,KAAK,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;EAC1B,MAAM,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;EAC/B,KAAK,CAAC,CAAC;AACP;EACA;EACA;EACA;EACA;EACA,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,eAAe,EAAE;EACtD,MAAM,IAAI,eAAe,CAAC,OAAO,IAAI,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE;EACzE,QAAQ,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;EAC3G,OAAO;EACP,KAAK,CAAC,CAAC;AACP;EACA;EACA,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;AAClB;EACA,IAAI,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;EACnD,IAAI,IAAI,aAAa,EAAE;EACvB;EACA,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;EAClC,KAAK;AACL;EACA,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;EAC7C,GAAG;AACH;EACA;EACA;AACA;AACA;EACA,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;EACvB,IAAI,GAAG,EAAE,QAAQ;EACjB,IAAI,KAAK,EAAE,SAAS,SAAS,GAAG;EAChC,MAAM,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;EAC/B,KAAK;EACL,GAAG,EAAE;EACL,IAAI,GAAG,EAAE,SAAS;EAClB,IAAI,KAAK,EAAE,SAAS,UAAU,GAAG;EACjC,MAAM,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;EAChC,KAAK;EACL,GAAG,EAAE;EACL,IAAI,GAAG,EAAE,sBAAsB;EAC/B,IAAI,KAAK,EAAE,SAAS,uBAAuB,GAAG;EAC9C,MAAM,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;EAC7C,KAAK;EACL,GAAG,EAAE;EACL,IAAI,GAAG,EAAE,uBAAuB;EAChC,IAAI,KAAK,EAAE,SAAS,wBAAwB,GAAG;EAC/C,MAAM,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;EAC9C,KAAK;AACL;EACA;EACA;EACA;EACA;EACA;AACA;AACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA,GAAG,CAAC,CAAC,CAAC;EACN,EAAE,OAAO,MAAM,CAAC;EAChB,CAAC,EAAE,CAAC;AACJ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;AACA;EACA,MAAM,CAAC,KAAK,GAAG,CAAC,OAAO,MAAM,KAAK,WAAW,GAAG,MAAM,GAAG,MAAM,EAAE,WAAW,CAAC;EAC7E,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;EAC/B,MAAM,CAAC,QAAQ,GAAG,QAAQ;;ECziF1B;;;;;;EAMA,IAAMjC,MAAI,GAAuB,UAAjC;EACA,IAAMC,SAAO,GAAoB,OAAjC;EACA,IAAMC,UAAQ,GAAmB,aAAjC;EACA,IAAMC,WAAS,SAAsBD,UAArC;EACA,IAAME,cAAY,GAAe,WAAjC;EACA,IAAMC,oBAAkB,GAASpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAAjC;EACA,IAAMsQ,cAAc,GAAa,EAAjC;;EACA,IAAMC,aAAa,GAAc,EAAjC;;EACA,IAAMC,WAAW,GAAgB,CAAjC;;EACA,IAAMC,gBAAgB,GAAW,EAAjC;;EACA,IAAMC,kBAAkB,GAAS,EAAjC;;EACA,IAAMC,wBAAwB,GAAG,CAAjC;;EACA,IAAMC,cAAc,GAAa,IAAIhS,MAAJ,CAAc6R,gBAAd,SAAkCC,kBAAlC,SAAwDJ,cAAxD,CAAjC;EAEA,IAAMjD,YAAU,YAAsBlN,WAAtC;EACA,IAAMmN,cAAY,cAAsBnN,WAAxC;EACA,IAAMgN,YAAU,YAAsBhN,WAAtC;EACA,IAAMiN,aAAW,aAAsBjN,WAAvC;EACA,IAAM0Q,WAAW,aAAsB1Q,WAAvC;EACA,IAAMM,sBAAoB,aAAaN,WAAb,GAAyBC,cAAnD;EACA,IAAM0Q,sBAAsB,eAAa3Q,WAAb,GAAyBC,cAArD;EACA,IAAM2Q,oBAAoB,aAAa5Q,WAAb,GAAyBC,cAAnD;EAEA,IAAM4Q,mBAAmB,GAAU,UAAnC;EACA,IAAMpQ,iBAAe,GAAc,MAAnC;EACA,IAAMqQ,iBAAiB,GAAY,QAAnC;EACA,IAAMC,oBAAoB,GAAS,WAAnC;EACA,IAAMC,mBAAmB,GAAU,UAAnC;EACA,IAAMC,oBAAoB,GAAS,qBAAnC;EACA,IAAMC,0BAA0B,GAAG,iBAAnC;EAEA,IAAMrO,sBAAoB,GAAK,0BAA/B;EACA,IAAMsO,mBAAmB,GAAM,gBAA/B;EACA,IAAMC,aAAa,GAAY,gBAA/B;EACA,IAAMC,mBAAmB,GAAM,aAA/B;EACA,IAAMC,sBAAsB,GAAG,6DAA/B;EAEA,IAAMC,aAAa,GAAS,WAA5B;EACA,IAAMC,gBAAgB,GAAM,SAA5B;EACA,IAAMC,gBAAgB,GAAM,cAA5B;EACA,IAAMC,mBAAmB,GAAG,YAA5B;EACA,IAAMC,eAAe,GAAO,aAA5B;EACA,IAAMC,cAAc,GAAQ,YAA5B;EAEA,IAAM1M,SAAO,GAAG;EACd2M,EAAAA,MAAM,EAAS,CADD;EAEdC,EAAAA,IAAI,EAAW,IAFD;EAGdC,EAAAA,QAAQ,EAAO,cAHD;EAIdC,EAAAA,SAAS,EAAM,QAJD;EAKdC,EAAAA,OAAO,EAAQ,SALD;EAMdC,EAAAA,YAAY,EAAG;EAND,CAAhB;EASA,IAAMzM,aAAW,GAAG;EAClBoM,EAAAA,MAAM,EAAS,0BADG;EAElBC,EAAAA,IAAI,EAAW,SAFG;EAGlBC,EAAAA,QAAQ,EAAO,kBAHG;EAIlBC,EAAAA,SAAS,EAAM,kBAJG;EAKlBC,EAAAA,OAAO,EAAQ,QALG;EAMlBC,EAAAA,YAAY,EAAG;EANG,CAApB;EASA;;;;;;MAMMC;EACJ,oBAAY3V,OAAZ,EAAqBwB,MAArB,EAA6B;EAC3B,SAAK2C,QAAL,GAAiBnE,OAAjB;EACA,SAAK4V,OAAL,GAAiB,IAAjB;EACA,SAAKjK,OAAL,GAAiB,KAAKC,UAAL,CAAgBpK,MAAhB,CAAjB;EACA,SAAKqU,KAAL,GAAiB,KAAKC,eAAL,EAAjB;EACA,SAAKC,SAAL,GAAiB,KAAKC,aAAL,EAAjB;;EAEA,SAAK5J,kBAAL;EACD;;;;;EAgBD;WAEAvF,SAAA,kBAAS;EACP,QAAI,KAAK1C,QAAL,CAAc8R,QAAd,IAA0B3X,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BmP,mBAA1B,CAA9B,EAA8E;EAC5E;EACD;;EAED,QAAM6B,QAAQ,GAAG5X,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAc3Q,QAAd,CAAuBjB,iBAAvB,CAAjB;;EAEA0R,IAAAA,QAAQ,CAACQ,WAAT;;EAEA,QAAID,QAAJ,EAAc;EACZ;EACD;;EAED,SAAKjE,IAAL,CAAU,IAAV;EACD;;WAEDA,OAAA,cAAKmE,SAAL,EAAwB;EAAA,QAAnBA,SAAmB;EAAnBA,MAAAA,SAAmB,GAAP,KAAO;EAAA;;EACtB,QAAI,KAAKjS,QAAL,CAAc8R,QAAd,IAA0B3X,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BmP,mBAA1B,CAA1B,IAA4E/V,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAc3Q,QAAd,CAAuBjB,iBAAvB,CAAhF,EAAyH;EACvH;EACD;;EAED,QAAM4K,aAAa,GAAG;EACpBA,MAAAA,aAAa,EAAE,KAAK1K;EADA,KAAtB;EAGA,QAAMkS,SAAS,GAAG/X,CAAC,CAAC0G,KAAF,CAAQwL,YAAR,EAAoB3B,aAApB,CAAlB;;EACA,QAAMhK,MAAM,GAAG8Q,QAAQ,CAACW,qBAAT,CAA+B,KAAKnS,QAApC,CAAf;;EAEA7F,IAAAA,CAAC,CAACuG,MAAD,CAAD,CAAU5D,OAAV,CAAkBoV,SAAlB;;EAEA,QAAIA,SAAS,CAAC5R,kBAAV,EAAJ,EAAoC;EAClC;EACD,KAfqB;;;EAkBtB,QAAI,CAAC,KAAKsR,SAAN,IAAmBK,SAAvB,EAAkC;EAChC;;;;EAIA,UAAI,OAAOG,MAAP,KAAkB,WAAtB,EAAmC;EACjC,cAAM,IAAI1T,SAAJ,CAAc,mEAAd,CAAN;EACD;;EAED,UAAI2T,gBAAgB,GAAG,KAAKrS,QAA5B;;EAEA,UAAI,KAAKwH,OAAL,CAAa6J,SAAb,KAA2B,QAA/B,EAAyC;EACvCgB,QAAAA,gBAAgB,GAAG3R,MAAnB;EACD,OAFD,MAEO,IAAI3F,IAAI,CAACkC,SAAL,CAAe,KAAKuK,OAAL,CAAa6J,SAA5B,CAAJ,EAA4C;EACjDgB,QAAAA,gBAAgB,GAAG,KAAK7K,OAAL,CAAa6J,SAAhC,CADiD;;EAIjD,YAAI,OAAO,KAAK7J,OAAL,CAAa6J,SAAb,CAAuBzS,MAA9B,KAAyC,WAA7C,EAA0D;EACxDyT,UAAAA,gBAAgB,GAAG,KAAK7K,OAAL,CAAa6J,SAAb,CAAuB,CAAvB,CAAnB;EACD;EACF,OApB+B;EAuBhC;EACA;;;EACA,UAAI,KAAK7J,OAAL,CAAa4J,QAAb,KAA0B,cAA9B,EAA8C;EAC5CjX,QAAAA,CAAC,CAACuG,MAAD,CAAD,CAAU0K,QAAV,CAAmBmF,0BAAnB;EACD;;EACD,WAAKkB,OAAL,GAAe,IAAIW,MAAJ,CAAWC,gBAAX,EAA6B,KAAKX,KAAlC,EAAyC,KAAKY,gBAAL,EAAzC,CAAf;EACD,KA/CqB;EAkDtB;EACA;EACA;;;EACA,QAAI,kBAAkB5W,QAAQ,CAACyC,eAA3B,IACAhE,CAAC,CAACuG,MAAD,CAAD,CAAUC,OAAV,CAAkB+P,mBAAlB,EAAuCzM,MAAvC,KAAkD,CADtD,EACyD;EACvD9J,MAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBpH,QAAjB,GAA4BzJ,EAA5B,CAA+B,WAA/B,EAA4C,IAA5C,EAAkDvH,CAAC,CAACqY,IAApD;EACD;;EAED,SAAKxS,QAAL,CAAcmD,KAAd;;EACA,SAAKnD,QAAL,CAAcqD,YAAd,CAA2B,eAA3B,EAA4C,IAA5C;;EAEAlJ,IAAAA,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAcpO,WAAd,CAA0BxD,iBAA1B;EACA3F,IAAAA,CAAC,CAACuG,MAAD,CAAD,CACG4C,WADH,CACexD,iBADf,EAEGhD,OAFH,CAEW3C,CAAC,CAAC0G,KAAF,CAAQyL,aAAR,EAAqB5B,aAArB,CAFX;EAGD;;WAEDmD,OAAA,gBAAO;EACL,QAAI,KAAK7N,QAAL,CAAc8R,QAAd,IAA0B3X,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BmP,mBAA1B,CAA1B,IAA4E,CAAC/V,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAc3Q,QAAd,CAAuBjB,iBAAvB,CAAjF,EAA0H;EACxH;EACD;;EAED,QAAM4K,aAAa,GAAG;EACpBA,MAAAA,aAAa,EAAE,KAAK1K;EADA,KAAtB;EAGA,QAAMyS,SAAS,GAAGtY,CAAC,CAAC0G,KAAF,CAAQ0L,YAAR,EAAoB7B,aAApB,CAAlB;;EACA,QAAMhK,MAAM,GAAG8Q,QAAQ,CAACW,qBAAT,CAA+B,KAAKnS,QAApC,CAAf;;EAEA7F,IAAAA,CAAC,CAACuG,MAAD,CAAD,CAAU5D,OAAV,CAAkB2V,SAAlB;;EAEA,QAAIA,SAAS,CAACnS,kBAAV,EAAJ,EAAoC;EAClC;EACD;;EAED,QAAI,KAAKmR,OAAT,EAAkB;EAChB,WAAKA,OAAL,CAAaiB,OAAb;EACD;;EAEDvY,IAAAA,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAcpO,WAAd,CAA0BxD,iBAA1B;EACA3F,IAAAA,CAAC,CAACuG,MAAD,CAAD,CACG4C,WADH,CACexD,iBADf,EAEGhD,OAFH,CAEW3C,CAAC,CAAC0G,KAAF,CAAQ2L,cAAR,EAAsB9B,aAAtB,CAFX;EAGD;;WAEDlK,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EACAjF,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBiJ,GAAjB,CAAqB5J,WAArB;EACA,SAAKW,QAAL,GAAgB,IAAhB;EACA,SAAK0R,KAAL,GAAa,IAAb;;EACA,QAAI,KAAKD,OAAL,KAAiB,IAArB,EAA2B;EACzB,WAAKA,OAAL,CAAaiB,OAAb;;EACA,WAAKjB,OAAL,GAAe,IAAf;EACD;EACF;;WAEDkB,SAAA,kBAAS;EACP,SAAKf,SAAL,GAAiB,KAAKC,aAAL,EAAjB;;EACA,QAAI,KAAKJ,OAAL,KAAiB,IAArB,EAA2B;EACzB,WAAKA,OAAL,CAAamB,cAAb;EACD;EACF;;;WAID3K,qBAAA,8BAAqB;EAAA;;EACnB9N,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoBqO,WAApB,EAAiC,UAAC7V,KAAD,EAAW;EAC1CA,MAAAA,KAAK,CAACuH,cAAN;EACAvH,MAAAA,KAAK,CAAC2Y,eAAN;;EACA,MAAA,KAAI,CAACnQ,MAAL;EACD,KAJD;EAKD;;WAED+E,aAAA,oBAAWpK,MAAX,EAAmB;EACjBA,IAAAA,MAAM,oDACD,KAAKyV,WAAL,CAAiBvO,OADhB,GAEDpK,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBsB,IAAjB,EAFC,GAGDjE,MAHC,CAAN;EAMAtC,IAAAA,IAAI,CAACoC,eAAL,CACE+B,MADF,EAEE7B,MAFF,EAGE,KAAKyV,WAAL,CAAiBhO,WAHnB;EAMA,WAAOzH,MAAP;EACD;;WAEDsU,kBAAA,2BAAkB;EAChB,QAAI,CAAC,KAAKD,KAAV,EAAiB;EACf,UAAMhR,MAAM,GAAG8Q,QAAQ,CAACW,qBAAT,CAA+B,KAAKnS,QAApC,CAAf;;EAEA,UAAIU,MAAJ,EAAY;EACV,aAAKgR,KAAL,GAAahR,MAAM,CAACxE,aAAP,CAAqBuU,aAArB,CAAb;EACD;EACF;;EACD,WAAO,KAAKiB,KAAZ;EACD;;WAEDqB,gBAAA,yBAAgB;EACd,QAAMC,eAAe,GAAG7Y,CAAC,CAAC,KAAK6F,QAAL,CAAcxB,UAAf,CAAzB;EACA,QAAIyU,SAAS,GAAGnC,gBAAhB,CAFc;;EAKd,QAAIkC,eAAe,CAACjS,QAAhB,CAAyBoP,iBAAzB,CAAJ,EAAiD;EAC/C8C,MAAAA,SAAS,GAAG9Y,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAc3Q,QAAd,CAAuBuP,oBAAvB,IACRO,gBADQ,GAERD,aAFJ;EAGD,KAJD,MAIO,IAAIoC,eAAe,CAACjS,QAAhB,CAAyBqP,oBAAzB,CAAJ,EAAoD;EACzD6C,MAAAA,SAAS,GAAGjC,eAAZ;EACD,KAFM,MAEA,IAAIgC,eAAe,CAACjS,QAAhB,CAAyBsP,mBAAzB,CAAJ,EAAmD;EACxD4C,MAAAA,SAAS,GAAGhC,cAAZ;EACD,KAFM,MAEA,IAAI9W,CAAC,CAAC,KAAKuX,KAAN,CAAD,CAAc3Q,QAAd,CAAuBuP,oBAAvB,CAAJ,EAAkD;EACvD2C,MAAAA,SAAS,GAAGlC,mBAAZ;EACD;;EACD,WAAOkC,SAAP;EACD;;WAEDpB,gBAAA,yBAAgB;EACd,WAAO1X,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBW,OAAjB,CAAyB,SAAzB,EAAoCsD,MAApC,GAA6C,CAApD;EACD;;WAEDiP,aAAA,sBAAa;EAAA;;EACX,QAAMhC,MAAM,GAAG,EAAf;;EAEA,QAAI,OAAO,KAAK1J,OAAL,CAAa0J,MAApB,KAA+B,UAAnC,EAA+C;EAC7CA,MAAAA,MAAM,CAAC/V,EAAP,GAAY,UAACmG,IAAD,EAAU;EACpBA,QAAAA,IAAI,CAAC6R,OAAL,qCACK7R,IAAI,CAAC6R,OADV,GAEK,MAAI,CAAC3L,OAAL,CAAa0J,MAAb,CAAoB5P,IAAI,CAAC6R,OAAzB,EAAkC,MAAI,CAACnT,QAAvC,KAAoD,EAFzD;EAKA,eAAOsB,IAAP;EACD,OAPD;EAQD,KATD,MASO;EACL4P,MAAAA,MAAM,CAACA,MAAP,GAAgB,KAAK1J,OAAL,CAAa0J,MAA7B;EACD;;EAED,WAAOA,MAAP;EACD;;WAEDoB,mBAAA,4BAAmB;EACjB,QAAMf,YAAY,GAAG;EACnB0B,MAAAA,SAAS,EAAE,KAAKF,aAAL,EADQ;EAEnBK,MAAAA,SAAS,EAAE;EACTlC,QAAAA,MAAM,EAAE,KAAKgC,UAAL,EADC;EAET/B,QAAAA,IAAI,EAAE;EACJkC,UAAAA,OAAO,EAAE,KAAK7L,OAAL,CAAa2J;EADlB,SAFG;EAKTmC,QAAAA,eAAe,EAAE;EACfC,UAAAA,iBAAiB,EAAE,KAAK/L,OAAL,CAAa4J;EADjB;EALR;EAFQ,KAArB,CADiB;;EAejB,QAAI,KAAK5J,OAAL,CAAa8J,OAAb,KAAyB,QAA7B,EAAuC;EACrCC,MAAAA,YAAY,CAAC6B,SAAb,CAAuBI,UAAvB,GAAoC;EAClCH,QAAAA,OAAO,EAAE;EADyB,OAApC;EAGD;;EAED,6CACK9B,YADL,GAEK,KAAK/J,OAAL,CAAa+J,YAFlB;EAID;;;aAIMpQ,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EACA,UAAMoI,OAAO,GAAG,OAAOnK,MAAP,KAAkB,QAAlB,GAA6BA,MAA7B,GAAsC,IAAtD;;EAEA,UAAI,CAACiE,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAIkQ,QAAJ,CAAa,IAAb,EAAmBhK,OAAnB,CAAP;EACArN,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAfM,CAAP;EAgBD;;aAEM2U,cAAP,qBAAmB9X,KAAnB,EAA0B;EACxB,QAAIA,KAAK,KAAKA,KAAK,CAAC8P,KAAN,KAAgB6F,wBAAhB,IACZ3V,KAAK,CAAC4I,IAAN,KAAe,OAAf,IAA0B5I,KAAK,CAAC8P,KAAN,KAAgB0F,WADnC,CAAT,EAC0D;EACxD;EACD;;EAED,QAAM+D,OAAO,GAAG,GAAG5P,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B5B,sBAA1B,CAAd,CAAhB;;EAEA,SAAK,IAAI6B,CAAC,GAAG,CAAR,EAAWC,GAAG,GAAGyP,OAAO,CAACxP,MAA9B,EAAsCF,CAAC,GAAGC,GAA1C,EAA+CD,CAAC,EAAhD,EAAoD;EAClD,UAAMrD,MAAM,GAAG8Q,QAAQ,CAACW,qBAAT,CAA+BsB,OAAO,CAAC1P,CAAD,CAAtC,CAAf;;EACA,UAAM2P,OAAO,GAAGvZ,CAAC,CAACsZ,OAAO,CAAC1P,CAAD,CAAR,CAAD,CAAczC,IAAd,CAAmBlC,UAAnB,CAAhB;EACA,UAAMsL,aAAa,GAAG;EACpBA,QAAAA,aAAa,EAAE+I,OAAO,CAAC1P,CAAD;EADF,OAAtB;;EAIA,UAAI7J,KAAK,IAAIA,KAAK,CAAC4I,IAAN,KAAe,OAA5B,EAAqC;EACnC4H,QAAAA,aAAa,CAACiJ,UAAd,GAA2BzZ,KAA3B;EACD;;EAED,UAAI,CAACwZ,OAAL,EAAc;EACZ;EACD;;EAED,UAAME,YAAY,GAAGF,OAAO,CAAChC,KAA7B;;EACA,UAAI,CAACvX,CAAC,CAACuG,MAAD,CAAD,CAAUK,QAAV,CAAmBjB,iBAAnB,CAAL,EAA0C;EACxC;EACD;;EAED,UAAI5F,KAAK,KAAKA,KAAK,CAAC4I,IAAN,KAAe,OAAf,IACV,kBAAkB/E,IAAlB,CAAuB7D,KAAK,CAACE,MAAN,CAAasJ,OAApC,CADU,IACsCxJ,KAAK,CAAC4I,IAAN,KAAe,OAAf,IAA0B5I,KAAK,CAAC8P,KAAN,KAAgB0F,WADrF,CAAL,IAEAvV,CAAC,CAAC8I,QAAF,CAAWvC,MAAX,EAAmBxG,KAAK,CAACE,MAAzB,CAFJ,EAEsC;EACpC;EACD;;EAED,UAAMqY,SAAS,GAAGtY,CAAC,CAAC0G,KAAF,CAAQ0L,YAAR,EAAoB7B,aAApB,CAAlB;EACAvQ,MAAAA,CAAC,CAACuG,MAAD,CAAD,CAAU5D,OAAV,CAAkB2V,SAAlB;;EACA,UAAIA,SAAS,CAACnS,kBAAV,EAAJ,EAAoC;EAClC;EACD,OA9BiD;EAiClD;;;EACA,UAAI,kBAAkB5E,QAAQ,CAACyC,eAA/B,EAAgD;EAC9ChE,QAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBpH,QAAjB,GAA4BlC,GAA5B,CAAgC,WAAhC,EAA6C,IAA7C,EAAmD9O,CAAC,CAACqY,IAArD;EACD;;EAEDiB,MAAAA,OAAO,CAAC1P,CAAD,CAAP,CAAWV,YAAX,CAAwB,eAAxB,EAAyC,OAAzC;;EAEA,UAAIqQ,OAAO,CAACjC,OAAZ,EAAqB;EACnBiC,QAAAA,OAAO,CAACjC,OAAR,CAAgBiB,OAAhB;EACD;;EAEDvY,MAAAA,CAAC,CAACyZ,YAAD,CAAD,CAAgB9S,WAAhB,CAA4BhB,iBAA5B;EACA3F,MAAAA,CAAC,CAACuG,MAAD,CAAD,CACGI,WADH,CACehB,iBADf,EAEGhD,OAFH,CAEW3C,CAAC,CAAC0G,KAAF,CAAQ2L,cAAR,EAAsB9B,aAAtB,CAFX;EAGD;EACF;;aAEMyH,wBAAP,+BAA6BtW,OAA7B,EAAsC;EACpC,QAAI6E,MAAJ;EACA,QAAM5E,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4BC,OAA5B,CAAjB;;EAEA,QAAIC,QAAJ,EAAc;EACZ4E,MAAAA,MAAM,GAAGhF,QAAQ,CAACQ,aAAT,CAAuBJ,QAAvB,CAAT;EACD;;EAED,WAAO4E,MAAM,IAAI7E,OAAO,CAAC2C,UAAzB;EACD;;;aAGMqV,yBAAP,gCAA8B3Z,KAA9B,EAAqC;EACnC;EACA;EACA;EACA;EACA;EACA;EACA;EACA,QAAI,kBAAkB6D,IAAlB,CAAuB7D,KAAK,CAACE,MAAN,CAAasJ,OAApC,IACAxJ,KAAK,CAAC8P,KAAN,KAAgByF,aAAhB,IAAiCvV,KAAK,CAAC8P,KAAN,KAAgBwF,cAAhB,KAClCtV,KAAK,CAAC8P,KAAN,KAAgB4F,kBAAhB,IAAsC1V,KAAK,CAAC8P,KAAN,KAAgB2F,gBAAtD,IACCxV,CAAC,CAACD,KAAK,CAACE,MAAP,CAAD,CAAgBuG,OAAhB,CAAwB8P,aAAxB,EAAuCxM,MAFN,CADjC,GAGiD,CAAC6L,cAAc,CAAC/R,IAAf,CAAoB7D,KAAK,CAAC8P,KAA1B,CAHtD,EAGwF;EACtF;EACD;;EAED,QAAI,KAAK8H,QAAL,IAAiB3X,CAAC,CAAC,IAAD,CAAD,CAAQ4G,QAAR,CAAiBmP,mBAAjB,CAArB,EAA4D;EAC1D;EACD;;EAED,QAAMxP,MAAM,GAAK8Q,QAAQ,CAACW,qBAAT,CAA+B,IAA/B,CAAjB;;EACA,QAAMJ,QAAQ,GAAG5X,CAAC,CAACuG,MAAD,CAAD,CAAUK,QAAV,CAAmBjB,iBAAnB,CAAjB;;EAEA,QAAI,CAACiS,QAAD,IAAa7X,KAAK,CAAC8P,KAAN,KAAgBwF,cAAjC,EAAiD;EAC/C;EACD;;EAEDtV,IAAAA,KAAK,CAACuH,cAAN;EACAvH,IAAAA,KAAK,CAAC2Y,eAAN;;EAEA,QAAI,CAACd,QAAD,IAAaA,QAAQ,KAAK7X,KAAK,CAAC8P,KAAN,KAAgBwF,cAAhB,IAAkCtV,KAAK,CAAC8P,KAAN,KAAgByF,aAAvD,CAAzB,EAAgG;EAC9F,UAAIvV,KAAK,CAAC8P,KAAN,KAAgBwF,cAApB,EAAoC;EAClCrV,QAAAA,CAAC,CAACuG,MAAM,CAACxE,aAAP,CAAqBgG,sBAArB,CAAD,CAAD,CAA8CpF,OAA9C,CAAsD,OAAtD;EACD;;EAED3C,MAAAA,CAAC,CAAC,IAAD,CAAD,CAAQ2C,OAAR,CAAgB,OAAhB;EACA;EACD;;EAED,QAAMgX,KAAK,GAAG,GAAGjQ,KAAH,CAASlK,IAAT,CAAc+G,MAAM,CAACoD,gBAAP,CAAwB6M,sBAAxB,CAAd,EACXrD,MADW,CACJ,UAACyG,IAAD;EAAA,aAAU5Z,CAAC,CAAC4Z,IAAD,CAAD,CAAQ1Z,EAAR,CAAW,UAAX,CAAV;EAAA,KADI,CAAd;;EAGA,QAAIyZ,KAAK,CAAC7P,MAAN,KAAiB,CAArB,EAAwB;EACtB;EACD;;EAED,QAAI4E,KAAK,GAAGiL,KAAK,CAAC7J,OAAN,CAAc/P,KAAK,CAACE,MAApB,CAAZ;;EAEA,QAAIF,KAAK,CAAC8P,KAAN,KAAgB2F,gBAAhB,IAAoC9G,KAAK,GAAG,CAAhD,EAAmD;EAAE;EACnDA,MAAAA,KAAK;EACN;;EAED,QAAI3O,KAAK,CAAC8P,KAAN,KAAgB4F,kBAAhB,IAAsC/G,KAAK,GAAGiL,KAAK,CAAC7P,MAAN,GAAe,CAAjE,EAAoE;EAAE;EACpE4E,MAAAA,KAAK;EACN;;EAED,QAAIA,KAAK,GAAG,CAAZ,EAAe;EACbA,MAAAA,KAAK,GAAG,CAAR;EACD;;EAEDiL,IAAAA,KAAK,CAACjL,KAAD,CAAL,CAAa1F,KAAb;EACD;;;;0BAhZoB;EACnB,aAAOhE,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,SAAP;EACD;;;0BAEwB;EACvB,aAAOO,aAAP;EACD;;;;;EAyYH;;;;;;;EAMA3K,CAAC,CAACuB,QAAD,CAAD,CACGgG,EADH,CACMsO,sBADN,EAC8B9N,sBAD9B,EACoDsP,QAAQ,CAACqC,sBAD7D,EAEGnS,EAFH,CAEMsO,sBAFN,EAE8BS,aAF9B,EAE6Ce,QAAQ,CAACqC,sBAFtD,EAGGnS,EAHH,CAGS/B,sBAHT,SAGiCsQ,oBAHjC,EAGyDuB,QAAQ,CAACQ,WAHlE,EAIGtQ,EAJH,CAIM/B,sBAJN,EAI4BuC,sBAJ5B,EAIkD,UAAUhI,KAAV,EAAiB;EAC/DA,EAAAA,KAAK,CAACuH,cAAN;EACAvH,EAAAA,KAAK,CAAC2Y,eAAN;;EACArB,EAAAA,QAAQ,CAACrQ,gBAAT,CAA0BxH,IAA1B,CAA+BQ,CAAC,CAAC,IAAD,CAAhC,EAAwC,QAAxC;EACD,CARH,EASGuH,EATH,CASM/B,sBATN,EAS4B6Q,mBAT5B,EASiD,UAACzG,CAAD,EAAO;EACpDA,EAAAA,CAAC,CAAC8I,eAAF;EACD,CAXH;EAaA;;;;;;EAMA1Y,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAasS,QAAQ,CAACrQ,gBAAtB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyB6P,QAAzB;;EACArX,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAOiS,QAAQ,CAACrQ,gBAAhB;EACD,CAHD;;ECtgBA;;;;;;EAMA,IAAMjC,MAAI,GAAiB,OAA3B;EACA,IAAMC,SAAO,GAAc,OAA3B;EACA,IAAMC,UAAQ,GAAa,UAA3B;EACA,IAAMC,WAAS,SAAgBD,UAA/B;EACA,IAAME,cAAY,GAAS,WAA3B;EACA,IAAMC,oBAAkB,GAAGpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA3B;EACA,IAAMsQ,gBAAc,GAAO,EAA3B;;EAEA,IAAMjL,SAAO,GAAG;EACdyP,EAAAA,QAAQ,EAAG,IADG;EAEdvP,EAAAA,QAAQ,EAAG,IAFG;EAGdtB,EAAAA,KAAK,EAAM,IAHG;EAId2K,EAAAA,IAAI,EAAO;EAJG,CAAhB;EAOA,IAAMhJ,aAAW,GAAG;EAClBkP,EAAAA,QAAQ,EAAG,kBADO;EAElBvP,EAAAA,QAAQ,EAAG,SAFO;EAGlBtB,EAAAA,KAAK,EAAM,SAHO;EAIlB2K,EAAAA,IAAI,EAAO;EAJO,CAApB;EAOA,IAAMvB,YAAU,YAAuBlN,WAAvC;EACA,IAAM4U,oBAAoB,qBAAsB5U,WAAhD;EACA,IAAMmN,cAAY,cAAuBnN,WAAzC;EACA,IAAMgN,YAAU,YAAuBhN,WAAvC;EACA,IAAMiN,aAAW,aAAuBjN,WAAxC;EACA,IAAM6U,aAAa,eAAuB7U,WAA1C;EACA,IAAM8U,YAAY,cAAuB9U,WAAzC;EACA,IAAM+U,mBAAmB,qBAAuB/U,WAAhD;EACA,IAAMgV,qBAAqB,uBAAuBhV,WAAlD;EACA,IAAMiV,qBAAqB,uBAAuBjV,WAAlD;EACA,IAAMkV,uBAAuB,yBAAuBlV,WAApD;EACA,IAAMM,sBAAoB,aAAcN,WAAd,GAA0BC,cAApD;EAEA,IAAMkV,qBAAqB,GAAW,yBAAtC;EACA,IAAMC,6BAA6B,GAAG,yBAAtC;EACA,IAAMC,mBAAmB,GAAa,gBAAtC;EACA,IAAMC,eAAe,GAAiB,YAAtC;EACA,IAAM9U,iBAAe,GAAiB,MAAtC;EACA,IAAMC,iBAAe,GAAiB,MAAtC;EACA,IAAM8U,iBAAiB,GAAe,cAAtC;EAEA,IAAMC,eAAe,GAAW,eAAhC;EACA,IAAMC,mBAAmB,GAAO,aAAhC;EACA,IAAM5S,sBAAoB,GAAM,uBAAhC;EACA,IAAM6S,qBAAqB,GAAK,wBAAhC;EACA,IAAMC,sBAAsB,GAAI,mDAAhC;EACA,IAAMC,uBAAuB,GAAG,aAAhC;EAEA;;;;;;MAMMC;EACJ,iBAAYrZ,OAAZ,EAAqBwB,MAArB,EAA6B;EAC3B,SAAKmK,OAAL,GAA4B,KAAKC,UAAL,CAAgBpK,MAAhB,CAA5B;EACA,SAAK2C,QAAL,GAA4BnE,OAA5B;EACA,SAAKsZ,OAAL,GAA4BtZ,OAAO,CAACK,aAAR,CAAsB2Y,eAAtB,CAA5B;EACA,SAAKO,SAAL,GAA4B,IAA5B;EACA,SAAKC,QAAL,GAA4B,KAA5B;EACA,SAAKC,kBAAL,GAA4B,KAA5B;EACA,SAAKC,oBAAL,GAA4B,KAA5B;EACA,SAAKvI,gBAAL,GAA4B,KAA5B;EACA,SAAKwI,eAAL,GAA4B,CAA5B;EACD;;;;;EAYD;WAEA9S,SAAA,gBAAOgI,aAAP,EAAsB;EACpB,WAAO,KAAK2K,QAAL,GAAgB,KAAKxH,IAAL,EAAhB,GAA8B,KAAKC,IAAL,CAAUpD,aAAV,CAArC;EACD;;WAEDoD,OAAA,cAAKpD,aAAL,EAAoB;EAAA;;EAClB,QAAI,KAAK2K,QAAL,IAAiB,KAAKrI,gBAA1B,EAA4C;EAC1C;EACD;;EAED,QAAI7S,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BlB,iBAA1B,CAAJ,EAAgD;EAC9C,WAAKmN,gBAAL,GAAwB,IAAxB;EACD;;EAED,QAAMkF,SAAS,GAAG/X,CAAC,CAAC0G,KAAF,CAAQwL,YAAR,EAAoB;EACpC3B,MAAAA,aAAa,EAAbA;EADoC,KAApB,CAAlB;EAIAvQ,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBoV,SAAzB;;EAEA,QAAI,KAAKmD,QAAL,IAAiBnD,SAAS,CAAC5R,kBAAV,EAArB,EAAqD;EACnD;EACD;;EAED,SAAK+U,QAAL,GAAgB,IAAhB;;EAEA,SAAKI,eAAL;;EACA,SAAKC,aAAL;;EAEA,SAAKC,aAAL;;EAEA,SAAKC,eAAL;;EACA,SAAKC,eAAL;;EAEA1b,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CACE0S,mBADF,EAEEW,qBAFF,EAGE,UAAC7a,KAAD;EAAA,aAAW,KAAI,CAAC2T,IAAL,CAAU3T,KAAV,CAAX;EAAA,KAHF;EAMAC,IAAAA,CAAC,CAAC,KAAKgb,OAAN,CAAD,CAAgBzT,EAAhB,CAAmB6S,uBAAnB,EAA4C,YAAM;EAChDpa,MAAAA,CAAC,CAAC,KAAI,CAAC6F,QAAN,CAAD,CAAiBlF,GAAjB,CAAqBwZ,qBAArB,EAA4C,UAACpa,KAAD,EAAW;EACrD,YAAIC,CAAC,CAACD,KAAK,CAACE,MAAP,CAAD,CAAgBC,EAAhB,CAAmB,KAAI,CAAC2F,QAAxB,CAAJ,EAAuC;EACrC,UAAA,KAAI,CAACuV,oBAAL,GAA4B,IAA5B;EACD;EACF,OAJD;EAKD,KAND;;EAQA,SAAKO,aAAL,CAAmB;EAAA,aAAM,KAAI,CAACC,YAAL,CAAkBrL,aAAlB,CAAN;EAAA,KAAnB;EACD;;WAEDmD,OAAA,cAAK3T,KAAL,EAAY;EAAA;;EACV,QAAIA,KAAJ,EAAW;EACTA,MAAAA,KAAK,CAACuH,cAAN;EACD;;EAED,QAAI,CAAC,KAAK4T,QAAN,IAAkB,KAAKrI,gBAA3B,EAA6C;EAC3C;EACD;;EAED,QAAMyF,SAAS,GAAGtY,CAAC,CAAC0G,KAAF,CAAQ0L,YAAR,CAAlB;EAEApS,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyB2V,SAAzB;;EAEA,QAAI,CAAC,KAAK4C,QAAN,IAAkB5C,SAAS,CAACnS,kBAAV,EAAtB,EAAsD;EACpD;EACD;;EAED,SAAK+U,QAAL,GAAgB,KAAhB;EACA,QAAMW,UAAU,GAAG7b,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BlB,iBAA1B,CAAnB;;EAEA,QAAImW,UAAJ,EAAgB;EACd,WAAKhJ,gBAAL,GAAwB,IAAxB;EACD;;EAED,SAAK4I,eAAL;;EACA,SAAKC,eAAL;;EAEA1b,IAAAA,CAAC,CAACuB,QAAD,CAAD,CAAYuN,GAAZ,CAAgBiL,aAAhB;EAEA/Z,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBc,WAAjB,CAA6BhB,iBAA7B;EAEA3F,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBiJ,GAAjB,CAAqBmL,mBAArB;EACAja,IAAAA,CAAC,CAAC,KAAKgb,OAAN,CAAD,CAAgBlM,GAAhB,CAAoBsL,uBAApB;;EAEA,QAAIyB,UAAJ,EAAgB;EACd,UAAM3Z,kBAAkB,GAAItB,IAAI,CAACqB,gCAAL,CAAsC,KAAK4D,QAA3C,CAA5B;EAEA7F,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGlF,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4B,UAACa,KAAD;EAAA,eAAW,MAAI,CAAC+b,UAAL,CAAgB/b,KAAhB,CAAX;EAAA,OAD5B,EAEGkB,oBAFH,CAEwBiB,kBAFxB;EAGD,KAND,MAMO;EACL,WAAK4Z,UAAL;EACD;EACF;;WAEDzV,UAAA,mBAAU;EACR,KAACmD,MAAD,EAAS,KAAK3D,QAAd,EAAwB,KAAKmV,OAA7B,EACGe,OADH,CACW,UAACC,WAAD;EAAA,aAAiBhc,CAAC,CAACgc,WAAD,CAAD,CAAelN,GAAf,CAAmB5J,WAAnB,CAAjB;EAAA,KADX;EAGA;;;;;;EAKAlF,IAAAA,CAAC,CAACuB,QAAD,CAAD,CAAYuN,GAAZ,CAAgBiL,aAAhB;EAEA/Z,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EAEA,SAAKoI,OAAL,GAA4B,IAA5B;EACA,SAAKxH,QAAL,GAA4B,IAA5B;EACA,SAAKmV,OAAL,GAA4B,IAA5B;EACA,SAAKC,SAAL,GAA4B,IAA5B;EACA,SAAKC,QAAL,GAA4B,IAA5B;EACA,SAAKC,kBAAL,GAA4B,IAA5B;EACA,SAAKC,oBAAL,GAA4B,IAA5B;EACA,SAAKvI,gBAAL,GAA4B,IAA5B;EACA,SAAKwI,eAAL,GAA4B,IAA5B;EACD;;WAEDY,eAAA,wBAAe;EACb,SAAKT,aAAL;EACD;;;WAIDlO,aAAA,oBAAWpK,MAAX,EAAmB;EACjBA,IAAAA,MAAM,qCACDkH,SADC,GAEDlH,MAFC,CAAN;EAIAtC,IAAAA,IAAI,CAACoC,eAAL,CAAqB+B,MAArB,EAA2B7B,MAA3B,EAAmCyH,aAAnC;EACA,WAAOzH,MAAP;EACD;;WAEDgZ,6BAAA,sCAA6B;EAAA;;EAC3B,QAAI,KAAK7O,OAAL,CAAawM,QAAb,KAA0B,QAA9B,EAAwC;EACtC,UAAMsC,kBAAkB,GAAGnc,CAAC,CAAC0G,KAAF,CAAQoT,oBAAR,CAA3B;EAEA9Z,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBwZ,kBAAzB;;EACA,UAAIA,kBAAkB,CAACC,gBAAvB,EAAyC;EACvC;EACD;;EAED,WAAKvW,QAAL,CAAcgD,SAAd,CAAwBkB,GAAxB,CAA4B0Q,iBAA5B;;EAEA,UAAM4B,uBAAuB,GAAGzb,IAAI,CAACqB,gCAAL,CAAsC,KAAK4D,QAA3C,CAAhC;EAEA7F,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlF,GAAjB,CAAqBC,IAAI,CAAC1B,cAA1B,EAA0C,YAAM;EAC9C,QAAA,MAAI,CAAC2G,QAAL,CAAcgD,SAAd,CAAwB9B,MAAxB,CAA+B0T,iBAA/B;EACD,OAFD,EAGGxZ,oBAHH,CAGwBob,uBAHxB;;EAIA,WAAKxW,QAAL,CAAcmD,KAAd;EACD,KAjBD,MAiBO;EACL,WAAK0K,IAAL;EACD;EACF;;WAEDkI,eAAA,sBAAarL,aAAb,EAA4B;EAAA;;EAC1B,QAAMsL,UAAU,GAAG7b,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BlB,iBAA1B,CAAnB;EACA,QAAM4W,SAAS,GAAG,KAAKtB,OAAL,GAAe,KAAKA,OAAL,CAAajZ,aAAb,CAA2B4Y,mBAA3B,CAAf,GAAiE,IAAnF;;EAEA,QAAI,CAAC,KAAK9U,QAAL,CAAcxB,UAAf,IACA,KAAKwB,QAAL,CAAcxB,UAAd,CAAyBtB,QAAzB,KAAsCwZ,IAAI,CAACC,YAD/C,EAC6D;EAC3D;EACAjb,MAAAA,QAAQ,CAAC6W,IAAT,CAAcqE,WAAd,CAA0B,KAAK5W,QAA/B;EACD;;EAED,SAAKA,QAAL,CAAcqO,KAAd,CAAoBiD,OAApB,GAA8B,OAA9B;;EACA,SAAKtR,QAAL,CAAc6W,eAAd,CAA8B,aAA9B;;EACA,SAAK7W,QAAL,CAAcqD,YAAd,CAA2B,YAA3B,EAAyC,IAAzC;;EAEA,QAAIlJ,CAAC,CAAC,KAAKgb,OAAN,CAAD,CAAgBpU,QAAhB,CAAyByT,qBAAzB,KAAmDiC,SAAvD,EAAkE;EAChEA,MAAAA,SAAS,CAACK,SAAV,GAAsB,CAAtB;EACD,KAFD,MAEO;EACL,WAAK9W,QAAL,CAAc8W,SAAd,GAA0B,CAA1B;EACD;;EAED,QAAId,UAAJ,EAAgB;EACdjb,MAAAA,IAAI,CAAC6B,MAAL,CAAY,KAAKoD,QAAjB;EACD;;EAED7F,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBoL,QAAjB,CAA0BtL,iBAA1B;;EAEA,QAAI,KAAK0H,OAAL,CAAarE,KAAjB,EAAwB;EACtB,WAAK4T,aAAL;EACD;;EAED,QAAMC,UAAU,GAAG7c,CAAC,CAAC0G,KAAF,CAAQyL,aAAR,EAAqB;EACtC5B,MAAAA,aAAa,EAAbA;EADsC,KAArB,CAAnB;;EAIA,QAAMuM,kBAAkB,GAAG,SAArBA,kBAAqB,GAAM;EAC/B,UAAI,MAAI,CAACzP,OAAL,CAAarE,KAAjB,EAAwB;EACtB,QAAA,MAAI,CAACnD,QAAL,CAAcmD,KAAd;EACD;;EACD,MAAA,MAAI,CAAC6J,gBAAL,GAAwB,KAAxB;EACA7S,MAAAA,CAAC,CAAC,MAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBka,UAAzB;EACD,KAND;;EAQA,QAAIhB,UAAJ,EAAgB;EACd,UAAM3Z,kBAAkB,GAAItB,IAAI,CAACqB,gCAAL,CAAsC,KAAK+Y,OAA3C,CAA5B;EAEAhb,MAAAA,CAAC,CAAC,KAAKgb,OAAN,CAAD,CACGra,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4B4d,kBAD5B,EAEG7b,oBAFH,CAEwBiB,kBAFxB;EAGD,KAND,MAMO;EACL4a,MAAAA,kBAAkB;EACnB;EACF;;WAEDF,gBAAA,yBAAgB;EAAA;;EACd5c,IAAAA,CAAC,CAACuB,QAAD,CAAD,CACGuN,GADH,CACOiL,aADP;EAAA,KAEGxS,EAFH,CAEMwS,aAFN,EAEqB,UAACha,KAAD,EAAW;EAC5B,UAAIwB,QAAQ,KAAKxB,KAAK,CAACE,MAAnB,IACA,MAAI,CAAC4F,QAAL,KAAkB9F,KAAK,CAACE,MADxB,IAEAD,CAAC,CAAC,MAAI,CAAC6F,QAAN,CAAD,CAAiBkX,GAAjB,CAAqBhd,KAAK,CAACE,MAA3B,EAAmC6J,MAAnC,KAA8C,CAFlD,EAEqD;EACnD,QAAA,MAAI,CAACjE,QAAL,CAAcmD,KAAd;EACD;EACF,KARH;EASD;;WAEDyS,kBAAA,2BAAkB;EAAA;;EAChB,QAAI,KAAKP,QAAT,EAAmB;EACjBlb,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoB2S,qBAApB,EAA2C,UAACna,KAAD,EAAW;EACpD,YAAI,MAAI,CAACsN,OAAL,CAAa/C,QAAb,IAAyBvK,KAAK,CAAC8P,KAAN,KAAgBwF,gBAA7C,EAA6D;EAC3DtV,UAAAA,KAAK,CAACuH,cAAN;;EACA,UAAA,MAAI,CAACoM,IAAL;EACD,SAHD,MAGO,IAAI,CAAC,MAAI,CAACrG,OAAL,CAAa/C,QAAd,IAA0BvK,KAAK,CAAC8P,KAAN,KAAgBwF,gBAA9C,EAA8D;EACnE,UAAA,MAAI,CAAC6G,0BAAL;EACD;EACF,OAPD;EAQD,KATD,MASO,IAAI,CAAC,KAAKhB,QAAV,EAAoB;EACzBlb,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBiJ,GAAjB,CAAqBoL,qBAArB;EACD;EACF;;WAEDwB,kBAAA,2BAAkB;EAAA;;EAChB,QAAI,KAAKR,QAAT,EAAmB;EACjBlb,MAAAA,CAAC,CAACwJ,MAAD,CAAD,CAAUjC,EAAV,CAAayS,YAAb,EAA2B,UAACja,KAAD;EAAA,eAAW,MAAI,CAACkc,YAAL,CAAkBlc,KAAlB,CAAX;EAAA,OAA3B;EACD,KAFD,MAEO;EACLC,MAAAA,CAAC,CAACwJ,MAAD,CAAD,CAAUsF,GAAV,CAAckL,YAAd;EACD;EACF;;WAED8B,aAAA,sBAAa;EAAA;;EACX,SAAKjW,QAAL,CAAcqO,KAAd,CAAoBiD,OAApB,GAA8B,MAA9B;;EACA,SAAKtR,QAAL,CAAcqD,YAAd,CAA2B,aAA3B,EAA0C,IAA1C;;EACA,SAAKrD,QAAL,CAAc6W,eAAd,CAA8B,YAA9B;;EACA,SAAK7J,gBAAL,GAAwB,KAAxB;;EACA,SAAK8I,aAAL,CAAmB,YAAM;EACvB3b,MAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBzR,WAAjB,CAA6B6T,eAA7B;;EACA,MAAA,MAAI,CAACwC,iBAAL;;EACA,MAAA,MAAI,CAACC,eAAL;;EACAjd,MAAAA,CAAC,CAAC,MAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyB0P,cAAzB;EACD,KALD;EAMD;;WAED6K,kBAAA,2BAAkB;EAChB,QAAI,KAAKjC,SAAT,EAAoB;EAClBjb,MAAAA,CAAC,CAAC,KAAKib,SAAN,CAAD,CAAkBlU,MAAlB;EACA,WAAKkU,SAAL,GAAiB,IAAjB;EACD;EACF;;WAEDU,gBAAA,uBAAcwB,QAAd,EAAwB;EAAA;;EACtB,QAAMC,OAAO,GAAGpd,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BlB,iBAA1B,IACZA,iBADY,GACM,EADtB;;EAGA,QAAI,KAAKwV,QAAL,IAAiB,KAAK7N,OAAL,CAAawM,QAAlC,EAA4C;EAC1C,WAAKoB,SAAL,GAAiB1Z,QAAQ,CAAC8b,aAAT,CAAuB,KAAvB,CAAjB;EACA,WAAKpC,SAAL,CAAeqC,SAAf,GAA2B/C,mBAA3B;;EAEA,UAAI6C,OAAJ,EAAa;EACX,aAAKnC,SAAL,CAAepS,SAAf,CAAyBkB,GAAzB,CAA6BqT,OAA7B;EACD;;EAEDpd,MAAAA,CAAC,CAAC,KAAKib,SAAN,CAAD,CAAkBsC,QAAlB,CAA2Bhc,QAAQ,CAAC6W,IAApC;EAEApY,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoB0S,mBAApB,EAAyC,UAACla,KAAD,EAAW;EAClD,YAAI,MAAI,CAACqb,oBAAT,EAA+B;EAC7B,UAAA,MAAI,CAACA,oBAAL,GAA4B,KAA5B;EACA;EACD;;EACD,YAAIrb,KAAK,CAACE,MAAN,KAAiBF,KAAK,CAACkV,aAA3B,EAA0C;EACxC;EACD;;EAED,QAAA,MAAI,CAACiH,0BAAL;EACD,OAVD;;EAYA,UAAIkB,OAAJ,EAAa;EACXxc,QAAAA,IAAI,CAAC6B,MAAL,CAAY,KAAKwY,SAAjB;EACD;;EAEDjb,MAAAA,CAAC,CAAC,KAAKib,SAAN,CAAD,CAAkBhK,QAAlB,CAA2BtL,iBAA3B;;EAEA,UAAI,CAACwX,QAAL,EAAe;EACb;EACD;;EAED,UAAI,CAACC,OAAL,EAAc;EACZD,QAAAA,QAAQ;EACR;EACD;;EAED,UAAMK,0BAA0B,GAAG5c,IAAI,CAACqB,gCAAL,CAAsC,KAAKgZ,SAA3C,CAAnC;EAEAjb,MAAAA,CAAC,CAAC,KAAKib,SAAN,CAAD,CACGta,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4Bie,QAD5B,EAEGlc,oBAFH,CAEwBuc,0BAFxB;EAGD,KA1CD,MA0CO,IAAI,CAAC,KAAKtC,QAAN,IAAkB,KAAKD,SAA3B,EAAsC;EAC3Cjb,MAAAA,CAAC,CAAC,KAAKib,SAAN,CAAD,CAAkBtU,WAAlB,CAA8BhB,iBAA9B;;EAEA,UAAM8X,cAAc,GAAG,SAAjBA,cAAiB,GAAM;EAC3B,QAAA,MAAI,CAACP,eAAL;;EACA,YAAIC,QAAJ,EAAc;EACZA,UAAAA,QAAQ;EACT;EACF,OALD;;EAOA,UAAInd,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BlB,iBAA1B,CAAJ,EAAgD;EAC9C,YAAM8X,2BAA0B,GAAG5c,IAAI,CAACqB,gCAAL,CAAsC,KAAKgZ,SAA3C,CAAnC;;EAEAjb,QAAAA,CAAC,CAAC,KAAKib,SAAN,CAAD,CACGta,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4Bue,cAD5B,EAEGxc,oBAFH,CAEwBuc,2BAFxB;EAGD,OAND,MAMO;EACLC,QAAAA,cAAc;EACf;EACF,KAnBM,MAmBA,IAAIN,QAAJ,EAAc;EACnBA,MAAAA,QAAQ;EACT;EACF;EAGD;EACA;EACA;;;WAEA3B,gBAAA,yBAAgB;EACd,QAAMkC,kBAAkB,GACtB,KAAK7X,QAAL,CAAc8X,YAAd,GAA6Bpc,QAAQ,CAACyC,eAAT,CAAyB4Z,YADxD;;EAGA,QAAI,CAAC,KAAKzC,kBAAN,IAA4BuC,kBAAhC,EAAoD;EAClD,WAAK7X,QAAL,CAAcqO,KAAd,CAAoB2J,WAApB,GAAqC,KAAKxC,eAA1C;EACD;;EAED,QAAI,KAAKF,kBAAL,IAA2B,CAACuC,kBAAhC,EAAoD;EAClD,WAAK7X,QAAL,CAAcqO,KAAd,CAAoB4J,YAApB,GAAsC,KAAKzC,eAA3C;EACD;EACF;;WAED2B,oBAAA,6BAAoB;EAClB,SAAKnX,QAAL,CAAcqO,KAAd,CAAoB2J,WAApB,GAAkC,EAAlC;EACA,SAAKhY,QAAL,CAAcqO,KAAd,CAAoB4J,YAApB,GAAmC,EAAnC;EACD;;WAEDxC,kBAAA,2BAAkB;EAChB,QAAMyC,IAAI,GAAGxc,QAAQ,CAAC6W,IAAT,CAAc5D,qBAAd,EAAb;EACA,SAAK2G,kBAAL,GAA0B9Z,IAAI,CAAC2c,KAAL,CAAWD,IAAI,CAACE,IAAL,GAAYF,IAAI,CAACG,KAA5B,IAAqC1U,MAAM,CAAC2U,UAAtE;EACA,SAAK9C,eAAL,GAAuB,KAAK+C,kBAAL,EAAvB;EACD;;WAED7C,gBAAA,yBAAgB;EAAA;;EACd,QAAI,KAAKJ,kBAAT,EAA6B;EAC3B;EACA;EACA,UAAMkD,YAAY,GAAG,GAAG3U,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0BkR,sBAA1B,CAAd,CAArB;EACA,UAAMyD,aAAa,GAAG,GAAG5U,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0BmR,uBAA1B,CAAd,CAAtB,CAJ2B;;EAO3B9a,MAAAA,CAAC,CAACqe,YAAD,CAAD,CAAgBpX,IAAhB,CAAqB,UAACyH,KAAD,EAAQhN,OAAR,EAAoB;EACvC,YAAM6c,aAAa,GAAG7c,OAAO,CAACwS,KAAR,CAAc4J,YAApC;EACA,YAAMU,iBAAiB,GAAGxe,CAAC,CAAC0B,OAAD,CAAD,CAAWS,GAAX,CAAe,eAAf,CAA1B;EACAnC,QAAAA,CAAC,CAAC0B,OAAD,CAAD,CACGyF,IADH,CACQ,eADR,EACyBoX,aADzB,EAEGpc,GAFH,CAEO,eAFP,EAE2BG,UAAU,CAACkc,iBAAD,CAAV,GAAgC,OAAI,CAACnD,eAFhE;EAGD,OAND,EAP2B;;EAgB3Brb,MAAAA,CAAC,CAACse,aAAD,CAAD,CAAiBrX,IAAjB,CAAsB,UAACyH,KAAD,EAAQhN,OAAR,EAAoB;EACxC,YAAM+c,YAAY,GAAG/c,OAAO,CAACwS,KAAR,CAAcwK,WAAnC;EACA,YAAMC,gBAAgB,GAAG3e,CAAC,CAAC0B,OAAD,CAAD,CAAWS,GAAX,CAAe,cAAf,CAAzB;EACAnC,QAAAA,CAAC,CAAC0B,OAAD,CAAD,CACGyF,IADH,CACQ,cADR,EACwBsX,YADxB,EAEGtc,GAFH,CAEO,cAFP,EAE0BG,UAAU,CAACqc,gBAAD,CAAV,GAA+B,OAAI,CAACtD,eAF9D;EAGD,OAND,EAhB2B;;EAyB3B,UAAMkD,aAAa,GAAGhd,QAAQ,CAAC6W,IAAT,CAAclE,KAAd,CAAoB4J,YAA1C;EACA,UAAMU,iBAAiB,GAAGxe,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBjW,GAAjB,CAAqB,eAArB,CAA1B;EACAnC,MAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CACGjR,IADH,CACQ,eADR,EACyBoX,aADzB,EAEGpc,GAFH,CAEO,eAFP,EAE2BG,UAAU,CAACkc,iBAAD,CAAV,GAAgC,KAAKnD,eAFhE;EAGD;;EAEDrb,IAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBnH,QAAjB,CAA0BuJ,eAA1B;EACD;;WAEDyC,kBAAA,2BAAkB;EAChB;EACA,QAAMoB,YAAY,GAAG,GAAG3U,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0BkR,sBAA1B,CAAd,CAArB;EACA7a,IAAAA,CAAC,CAACqe,YAAD,CAAD,CAAgBpX,IAAhB,CAAqB,UAACyH,KAAD,EAAQhN,OAAR,EAAoB;EACvC,UAAMkd,OAAO,GAAG5e,CAAC,CAAC0B,OAAD,CAAD,CAAWyF,IAAX,CAAgB,eAAhB,CAAhB;EACAnH,MAAAA,CAAC,CAAC0B,OAAD,CAAD,CAAW4E,UAAX,CAAsB,eAAtB;EACA5E,MAAAA,OAAO,CAACwS,KAAR,CAAc4J,YAAd,GAA6Bc,OAAO,GAAGA,OAAH,GAAa,EAAjD;EACD,KAJD,EAHgB;;EAUhB,QAAMC,QAAQ,GAAG,GAAGnV,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,MAA6BmR,uBAA7B,CAAd,CAAjB;EACA9a,IAAAA,CAAC,CAAC6e,QAAD,CAAD,CAAY5X,IAAZ,CAAiB,UAACyH,KAAD,EAAQhN,OAAR,EAAoB;EACnC,UAAMod,MAAM,GAAG9e,CAAC,CAAC0B,OAAD,CAAD,CAAWyF,IAAX,CAAgB,cAAhB,CAAf;;EACA,UAAI,OAAO2X,MAAP,KAAkB,WAAtB,EAAmC;EACjC9e,QAAAA,CAAC,CAAC0B,OAAD,CAAD,CAAWS,GAAX,CAAe,cAAf,EAA+B2c,MAA/B,EAAuCxY,UAAvC,CAAkD,cAAlD;EACD;EACF,KALD,EAXgB;;EAmBhB,QAAMsY,OAAO,GAAG5e,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBjR,IAAjB,CAAsB,eAAtB,CAAhB;EACAnH,IAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiB9R,UAAjB,CAA4B,eAA5B;EACA/E,IAAAA,QAAQ,CAAC6W,IAAT,CAAclE,KAAd,CAAoB4J,YAApB,GAAmCc,OAAO,GAAGA,OAAH,GAAa,EAAvD;EACD;;WAEDR,qBAAA,8BAAqB;EAAE;EACrB,QAAMW,SAAS,GAAGxd,QAAQ,CAAC8b,aAAT,CAAuB,KAAvB,CAAlB;EACA0B,IAAAA,SAAS,CAACzB,SAAV,GAAsBhD,6BAAtB;EACA/Y,IAAAA,QAAQ,CAAC6W,IAAT,CAAcqE,WAAd,CAA0BsC,SAA1B;EACA,QAAMC,cAAc,GAAGD,SAAS,CAACvK,qBAAV,GAAkCyK,KAAlC,GAA0CF,SAAS,CAACG,WAA3E;EACA3d,IAAAA,QAAQ,CAAC6W,IAAT,CAAc+G,WAAd,CAA0BJ,SAA1B;EACA,WAAOC,cAAP;EACD;;;UAIMhY,mBAAP,0BAAwB9D,MAAxB,EAAgCqN,aAAhC,EAA+C;EAC7C,WAAO,KAAKtJ,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EACA,UAAMoI,OAAO,oDACRjD,SADQ,GAERpK,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,EAFQ,GAGR,OAAOjE,MAAP,KAAkB,QAAlB,IAA8BA,MAA9B,GAAuCA,MAAvC,GAAgD,EAHxC,CAAb;;EAMA,UAAI,CAACiE,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAI4T,KAAJ,CAAU,IAAV,EAAgB1N,OAAhB,CAAP;EACArN,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ,CAAaqN,aAAb;EACD,OALD,MAKO,IAAIlD,OAAO,CAACsG,IAAZ,EAAkB;EACvBxM,QAAAA,IAAI,CAACwM,IAAL,CAAUpD,aAAV;EACD;EACF,KArBM,CAAP;EAsBD;;;;0BApdoB;EACnB,aAAOvL,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,SAAP;EACD;;;;;EAidH;;;;;;;EAMApK,CAAC,CAACuB,QAAD,CAAD,CAAYgG,EAAZ,CAAe/B,sBAAf,EAAqCuC,sBAArC,EAA2D,UAAUhI,KAAV,EAAiB;EAAA;;EAC1E,MAAIE,MAAJ;EACA,MAAM0B,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4B,IAA5B,CAAjB;;EAEA,MAAIE,QAAJ,EAAc;EACZ1B,IAAAA,MAAM,GAAGsB,QAAQ,CAACQ,aAAT,CAAuBJ,QAAvB,CAAT;EACD;;EAED,MAAMuB,MAAM,GAAGlD,CAAC,CAACC,MAAD,CAAD,CAAUkH,IAAV,CAAelC,UAAf,IACX,QADW,qCAERjF,CAAC,CAACC,MAAD,CAAD,CAAUkH,IAAV,EAFQ,GAGRnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,EAHQ,CAAf;;EAMA,MAAI,KAAKoC,OAAL,KAAiB,GAAjB,IAAwB,KAAKA,OAAL,KAAiB,MAA7C,EAAqD;EACnDxJ,IAAAA,KAAK,CAACuH,cAAN;EACD;;EAED,MAAM8N,OAAO,GAAGpV,CAAC,CAACC,MAAD,CAAD,CAAUU,GAAV,CAAcuR,YAAd,EAA0B,UAAC6F,SAAD,EAAe;EACvD,QAAIA,SAAS,CAAC5R,kBAAV,EAAJ,EAAoC;EAClC;EACA;EACD;;EAEDiP,IAAAA,OAAO,CAACzU,GAAR,CAAY0R,cAAZ,EAA0B,YAAM;EAC9B,UAAIrS,CAAC,CAAC,OAAD,CAAD,CAAQE,EAAR,CAAW,UAAX,CAAJ,EAA4B;EAC1B,QAAA,OAAI,CAAC8I,KAAL;EACD;EACF,KAJD;EAKD,GAXe,CAAhB;;EAaA+R,EAAAA,KAAK,CAAC/T,gBAAN,CAAuBxH,IAAvB,CAA4BQ,CAAC,CAACC,MAAD,CAA7B,EAAuCiD,MAAvC,EAA+C,IAA/C;EACD,CAhCD;EAkCA;;;;;;EAMAlD,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAagW,KAAK,CAAC/T,gBAAnB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBuT,KAAzB;;EACA/a,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAO2V,KAAK,CAAC/T,gBAAb;EACD,CAHD;;EC9lBA;;;;;;EAOA,IAAMoY,QAAQ,GAAG,CACf,YADe,EAEf,MAFe,EAGf,MAHe,EAIf,UAJe,EAKf,UALe,EAMf,QANe,EAOf,KAPe,EAQf,YARe,CAAjB;EAWA,IAAMC,sBAAsB,GAAG,gBAA/B;EAEO,IAAMC,gBAAgB,GAAG;EAC9B;EACA,OAAK,CAAC,OAAD,EAAU,KAAV,EAAiB,IAAjB,EAAuB,MAAvB,EAA+B,MAA/B,EAAuCD,sBAAvC,CAFyB;EAG9BE,EAAAA,CAAC,EAAE,CAAC,QAAD,EAAW,MAAX,EAAmB,OAAnB,EAA4B,KAA5B,CAH2B;EAI9BC,EAAAA,IAAI,EAAE,EAJwB;EAK9BC,EAAAA,CAAC,EAAE,EAL2B;EAM9BC,EAAAA,EAAE,EAAE,EAN0B;EAO9BC,EAAAA,GAAG,EAAE,EAPyB;EAQ9BC,EAAAA,IAAI,EAAE,EARwB;EAS9BC,EAAAA,GAAG,EAAE,EATyB;EAU9BC,EAAAA,EAAE,EAAE,EAV0B;EAW9BC,EAAAA,EAAE,EAAE,EAX0B;EAY9BC,EAAAA,EAAE,EAAE,EAZ0B;EAa9BC,EAAAA,EAAE,EAAE,EAb0B;EAc9BC,EAAAA,EAAE,EAAE,EAd0B;EAe9BC,EAAAA,EAAE,EAAE,EAf0B;EAgB9BC,EAAAA,EAAE,EAAE,EAhB0B;EAiB9BC,EAAAA,EAAE,EAAE,EAjB0B;EAkB9BzW,EAAAA,CAAC,EAAE,EAlB2B;EAmB9B0W,EAAAA,GAAG,EAAE,CAAC,KAAD,EAAQ,QAAR,EAAkB,KAAlB,EAAyB,OAAzB,EAAkC,OAAlC,EAA2C,QAA3C,CAnByB;EAoB9BC,EAAAA,EAAE,EAAE,EApB0B;EAqB9BC,EAAAA,EAAE,EAAE,EArB0B;EAsB9BC,EAAAA,CAAC,EAAE,EAtB2B;EAuB9BC,EAAAA,GAAG,EAAE,EAvByB;EAwB9BC,EAAAA,CAAC,EAAE,EAxB2B;EAyB9BC,EAAAA,KAAK,EAAE,EAzBuB;EA0B9BC,EAAAA,IAAI,EAAE,EA1BwB;EA2B9BC,EAAAA,GAAG,EAAE,EA3ByB;EA4B9BC,EAAAA,GAAG,EAAE,EA5ByB;EA6B9BC,EAAAA,MAAM,EAAE,EA7BsB;EA8B9BC,EAAAA,CAAC,EAAE,EA9B2B;EA+B9BC,EAAAA,EAAE,EAAE;EA/B0B,CAAzB;EAkCP;;;;;;EAKA,IAAMC,gBAAgB,GAAG,6DAAzB;EAEA;;;;;;EAKA,IAAMC,gBAAgB,GAAG,oIAAzB;;EAEA,SAASC,gBAAT,CAA0BlN,IAA1B,EAAgCmN,oBAAhC,EAAsD;EACpD,MAAMC,QAAQ,GAAGpN,IAAI,CAACqN,QAAL,CAAc9hB,WAAd,EAAjB;;EAEA,MAAI4hB,oBAAoB,CAACxR,OAArB,CAA6ByR,QAA7B,MAA2C,CAAC,CAAhD,EAAmD;EACjD,QAAInC,QAAQ,CAACtP,OAAT,CAAiByR,QAAjB,MAA+B,CAAC,CAApC,EAAuC;EACrC,aAAO1e,OAAO,CAACsR,IAAI,CAACsN,SAAL,CAAehiB,KAAf,CAAqB0hB,gBAArB,KAA0ChN,IAAI,CAACsN,SAAL,CAAehiB,KAAf,CAAqB2hB,gBAArB,CAA3C,CAAd;EACD;;EAED,WAAO,IAAP;EACD;;EAED,MAAMM,MAAM,GAAGJ,oBAAoB,CAACnO,MAArB,CAA4B,UAACwO,SAAD;EAAA,WAAeA,SAAS,YAAYhe,MAApC;EAAA,GAA5B,CAAf,CAXoD;;EAcpD,OAAK,IAAIiG,CAAC,GAAG,CAAR,EAAWC,GAAG,GAAG6X,MAAM,CAAC5X,MAA7B,EAAqCF,CAAC,GAAGC,GAAzC,EAA8CD,CAAC,EAA/C,EAAmD;EACjD,QAAI2X,QAAQ,CAAC9hB,KAAT,CAAeiiB,MAAM,CAAC9X,CAAD,CAArB,CAAJ,EAA+B;EAC7B,aAAO,IAAP;EACD;EACF;;EAED,SAAO,KAAP;EACD;;EAEM,SAASgY,YAAT,CAAsBC,UAAtB,EAAkCC,SAAlC,EAA6CC,UAA7C,EAAyD;EAC9D,MAAIF,UAAU,CAAC/X,MAAX,KAAsB,CAA1B,EAA6B;EAC3B,WAAO+X,UAAP;EACD;;EAED,MAAIE,UAAU,IAAI,OAAOA,UAAP,KAAsB,UAAxC,EAAoD;EAClD,WAAOA,UAAU,CAACF,UAAD,CAAjB;EACD;;EAED,MAAMG,SAAS,GAAG,IAAIxY,MAAM,CAACyY,SAAX,EAAlB;EACA,MAAMC,eAAe,GAAGF,SAAS,CAACG,eAAV,CAA0BN,UAA1B,EAAsC,WAAtC,CAAxB;EACA,MAAMO,aAAa,GAAG/e,MAAM,CAACgf,IAAP,CAAYP,SAAZ,CAAtB;EACA,MAAMjD,QAAQ,GAAG,GAAGnV,KAAH,CAASlK,IAAT,CAAc0iB,eAAe,CAAC9J,IAAhB,CAAqBzO,gBAArB,CAAsC,GAAtC,CAAd,CAAjB;;EAZ8D,6BAcrDC,CAdqD,EAc9CC,GAd8C;EAe5D,QAAMyY,EAAE,GAAGzD,QAAQ,CAACjV,CAAD,CAAnB;EACA,QAAM2Y,MAAM,GAAGD,EAAE,CAACd,QAAH,CAAY9hB,WAAZ,EAAf;;EAEA,QAAI0iB,aAAa,CAACtS,OAAd,CAAsBwS,EAAE,CAACd,QAAH,CAAY9hB,WAAZ,EAAtB,MAAqD,CAAC,CAA1D,EAA6D;EAC3D4iB,MAAAA,EAAE,CAACje,UAAH,CAAc8a,WAAd,CAA0BmD,EAA1B;EAEA;EACD;;EAED,QAAME,aAAa,GAAG,GAAG9Y,KAAH,CAASlK,IAAT,CAAc8iB,EAAE,CAACG,UAAjB,CAAtB;EACA,QAAMC,qBAAqB,GAAG,GAAGC,MAAH,CAAUb,SAAS,CAAC,GAAD,CAAT,IAAkB,EAA5B,EAAgCA,SAAS,CAACS,MAAD,CAAT,IAAqB,EAArD,CAA9B;EAEAC,IAAAA,aAAa,CAACzG,OAAd,CAAsB,UAAC5H,IAAD,EAAU;EAC9B,UAAI,CAACkN,gBAAgB,CAAClN,IAAD,EAAOuO,qBAAP,CAArB,EAAoD;EAClDJ,QAAAA,EAAE,CAAC5F,eAAH,CAAmBvI,IAAI,CAACqN,QAAxB;EACD;EACF,KAJD;EA3B4D;;EAc9D,OAAK,IAAI5X,CAAC,GAAG,CAAR,EAAWC,GAAG,GAAGgV,QAAQ,CAAC/U,MAA/B,EAAuCF,CAAC,GAAGC,GAA3C,EAAgDD,CAAC,EAAjD,EAAqD;EAAA,qBAA5CA,CAA4C;;EAAA,6BAOjD;EAWH;;EAED,SAAOsY,eAAe,CAAC9J,IAAhB,CAAqBwK,SAA5B;EACD;;EC/GD;;;;;;EAMA,IAAM7d,MAAI,GAAoB,SAA9B;EACA,IAAMC,SAAO,GAAiB,OAA9B;EACA,IAAMC,UAAQ,GAAgB,YAA9B;EACA,IAAMC,WAAS,SAAmBD,UAAlC;EACA,IAAMG,oBAAkB,GAAMpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA9B;EACA,IAAM8d,YAAY,GAAY,YAA9B;EACA,IAAMC,kBAAkB,GAAM,IAAInf,MAAJ,aAAqBkf,YAArB,WAAyC,GAAzC,CAA9B;EACA,IAAME,qBAAqB,GAAG,CAAC,UAAD,EAAa,WAAb,EAA0B,YAA1B,CAA9B;EAEA,IAAMpY,aAAW,GAAG;EAClBqY,EAAAA,SAAS,EAAW,SADF;EAElBC,EAAAA,QAAQ,EAAY,QAFF;EAGlBC,EAAAA,KAAK,EAAe,2BAHF;EAIlBvgB,EAAAA,OAAO,EAAa,QAJF;EAKlBwgB,EAAAA,KAAK,EAAe,iBALF;EAMlBC,EAAAA,IAAI,EAAgB,SANF;EAOlBzhB,EAAAA,QAAQ,EAAY,kBAPF;EAQlBmX,EAAAA,SAAS,EAAW,mBARF;EASlB/B,EAAAA,MAAM,EAAc,0BATF;EAUlBsM,EAAAA,SAAS,EAAW,0BAVF;EAWlBC,EAAAA,iBAAiB,EAAG,gBAXF;EAYlBrM,EAAAA,QAAQ,EAAY,kBAZF;EAalBsM,EAAAA,QAAQ,EAAY,SAbF;EAclBxB,EAAAA,UAAU,EAAU,iBAdF;EAelBD,EAAAA,SAAS,EAAW,QAfF;EAgBlB1K,EAAAA,YAAY,EAAQ;EAhBF,CAApB;EAmBA,IAAMoM,aAAa,GAAG;EACpBC,EAAAA,IAAI,EAAK,MADW;EAEpBC,EAAAA,GAAG,EAAM,KAFW;EAGpBC,EAAAA,KAAK,EAAI,OAHW;EAIpBC,EAAAA,MAAM,EAAG,QAJW;EAKpBC,EAAAA,IAAI,EAAK;EALW,CAAtB;EAQA,IAAMzZ,SAAO,GAAG;EACd4Y,EAAAA,SAAS,EAAW,IADN;EAEdC,EAAAA,QAAQ,EAAY,yCACF,2BADE,GAEF,yCAJJ;EAKdtgB,EAAAA,OAAO,EAAa,aALN;EAMdugB,EAAAA,KAAK,EAAe,EANN;EAOdC,EAAAA,KAAK,EAAe,CAPN;EAQdC,EAAAA,IAAI,EAAgB,KARN;EASdzhB,EAAAA,QAAQ,EAAY,KATN;EAUdmX,EAAAA,SAAS,EAAW,KAVN;EAWd/B,EAAAA,MAAM,EAAc,CAXN;EAYdsM,EAAAA,SAAS,EAAW,KAZN;EAadC,EAAAA,iBAAiB,EAAG,MAbN;EAcdrM,EAAAA,QAAQ,EAAY,cAdN;EAedsM,EAAAA,QAAQ,EAAY,IAfN;EAgBdxB,EAAAA,UAAU,EAAU,IAhBN;EAiBdD,EAAAA,SAAS,EAAWxC,gBAjBN;EAkBdlI,EAAAA,YAAY,EAAQ;EAlBN,CAAhB;EAqBA,IAAM0M,gBAAgB,GAAG,MAAzB;EACA,IAAMC,eAAe,GAAI,KAAzB;EAEA,IAAMrd,KAAK,GAAG;EACZsd,EAAAA,IAAI,WAAgB9e,WADR;EAEZ+e,EAAAA,MAAM,aAAgB/e,WAFV;EAGZgf,EAAAA,IAAI,WAAgBhf,WAHR;EAIZif,EAAAA,KAAK,YAAgBjf,WAJT;EAKZkf,EAAAA,QAAQ,eAAgBlf,WALZ;EAMZmf,EAAAA,KAAK,YAAgBnf,WANT;EAOZof,EAAAA,OAAO,cAAgBpf,WAPX;EAQZqf,EAAAA,QAAQ,eAAgBrf,WARZ;EASZsf,EAAAA,UAAU,iBAAgBtf,WATd;EAUZuf,EAAAA,UAAU,iBAAgBvf;EAVd,CAAd;EAaA,IAAMQ,iBAAe,GAAG,MAAxB;EACA,IAAMC,iBAAe,GAAG,MAAxB;EAEA,IAAM+e,sBAAsB,GAAG,gBAA/B;EACA,IAAMC,cAAc,GAAW,QAA/B;EAEA,IAAMC,aAAa,GAAI,OAAvB;EACA,IAAMC,aAAa,GAAI,OAAvB;EACA,IAAMC,aAAa,GAAI,OAAvB;EACA,IAAMC,cAAc,GAAG,QAAvB;EAEA;;;;;;MAMMC;EACJ,mBAAYtjB,OAAZ,EAAqBwB,MAArB,EAA6B;EAC3B,QAAI,OAAO+U,MAAP,KAAkB,WAAtB,EAAmC;EACjC,YAAM,IAAI1T,SAAJ,CAAc,kEAAd,CAAN;EACD,KAH0B;;;EAM3B,SAAK0gB,UAAL,GAAsB,IAAtB;EACA,SAAKC,QAAL,GAAsB,CAAtB;EACA,SAAKC,WAAL,GAAsB,EAAtB;EACA,SAAKC,cAAL,GAAsB,EAAtB;EACA,SAAK9N,OAAL,GAAsB,IAAtB,CAV2B;;EAa3B,SAAK5V,OAAL,GAAeA,OAAf;EACA,SAAKwB,MAAL,GAAe,KAAKoK,UAAL,CAAgBpK,MAAhB,CAAf;EACA,SAAKmiB,GAAL,GAAe,IAAf;;EAEA,SAAKC,aAAL;EACD;;;;;EAgCD;WAEAC,SAAA,kBAAS;EACP,SAAKN,UAAL,GAAkB,IAAlB;EACD;;WAEDO,UAAA,mBAAU;EACR,SAAKP,UAAL,GAAkB,KAAlB;EACD;;WAEDQ,gBAAA,yBAAgB;EACd,SAAKR,UAAL,GAAkB,CAAC,KAAKA,UAAxB;EACD;;WAED1c,SAAA,gBAAOxI,KAAP,EAAc;EACZ,QAAI,CAAC,KAAKklB,UAAV,EAAsB;EACpB;EACD;;EAED,QAAIllB,KAAJ,EAAW;EACT,UAAM2lB,OAAO,GAAG,KAAK/M,WAAL,CAAiB1T,QAAjC;EACA,UAAIsU,OAAO,GAAGvZ,CAAC,CAACD,KAAK,CAACkV,aAAP,CAAD,CAAuB9N,IAAvB,CAA4Bue,OAA5B,CAAd;;EAEA,UAAI,CAACnM,OAAL,EAAc;EACZA,QAAAA,OAAO,GAAG,IAAI,KAAKZ,WAAT,CACR5Y,KAAK,CAACkV,aADE,EAER,KAAK0Q,kBAAL,EAFQ,CAAV;EAIA3lB,QAAAA,CAAC,CAACD,KAAK,CAACkV,aAAP,CAAD,CAAuB9N,IAAvB,CAA4Bue,OAA5B,EAAqCnM,OAArC;EACD;;EAEDA,MAAAA,OAAO,CAAC6L,cAAR,CAAuBQ,KAAvB,GAA+B,CAACrM,OAAO,CAAC6L,cAAR,CAAuBQ,KAAvD;;EAEA,UAAIrM,OAAO,CAACsM,oBAAR,EAAJ,EAAoC;EAClCtM,QAAAA,OAAO,CAACuM,MAAR,CAAe,IAAf,EAAqBvM,OAArB;EACD,OAFD,MAEO;EACLA,QAAAA,OAAO,CAACwM,MAAR,CAAe,IAAf,EAAqBxM,OAArB;EACD;EACF,KAnBD,MAmBO;EACL,UAAIvZ,CAAC,CAAC,KAAKgmB,aAAL,EAAD,CAAD,CAAwBpf,QAAxB,CAAiCjB,iBAAjC,CAAJ,EAAuD;EACrD,aAAKogB,MAAL,CAAY,IAAZ,EAAkB,IAAlB;;EACA;EACD;;EAED,WAAKD,MAAL,CAAY,IAAZ,EAAkB,IAAlB;EACD;EACF;;WAEDzf,UAAA,mBAAU;EACRsJ,IAAAA,YAAY,CAAC,KAAKuV,QAAN,CAAZ;EAEAllB,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAK5E,OAAlB,EAA2B,KAAKiX,WAAL,CAAiB1T,QAA5C;EAEAjF,IAAAA,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgBoN,GAAhB,CAAoB,KAAK6J,WAAL,CAAiBzT,SAArC;EACAlF,IAAAA,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgB8E,OAAhB,CAAwB,QAAxB,EAAkCsI,GAAlC,CAAsC,eAAtC,EAAuD,KAAKmX,iBAA5D;;EAEA,QAAI,KAAKZ,GAAT,EAAc;EACZrlB,MAAAA,CAAC,CAAC,KAAKqlB,GAAN,CAAD,CAAYte,MAAZ;EACD;;EAED,SAAKke,UAAL,GAAsB,IAAtB;EACA,SAAKC,QAAL,GAAsB,IAAtB;EACA,SAAKC,WAAL,GAAsB,IAAtB;EACA,SAAKC,cAAL,GAAsB,IAAtB;;EACA,QAAI,KAAK9N,OAAT,EAAkB;EAChB,WAAKA,OAAL,CAAaiB,OAAb;EACD;;EAED,SAAKjB,OAAL,GAAe,IAAf;EACA,SAAK5V,OAAL,GAAe,IAAf;EACA,SAAKwB,MAAL,GAAe,IAAf;EACA,SAAKmiB,GAAL,GAAe,IAAf;EACD;;WAED1R,OAAA,gBAAO;EAAA;;EACL,QAAI3T,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgBS,GAAhB,CAAoB,SAApB,MAAmC,MAAvC,EAA+C;EAC7C,YAAM,IAAI0B,KAAJ,CAAU,qCAAV,CAAN;EACD;;EAED,QAAMkU,SAAS,GAAG/X,CAAC,CAAC0G,KAAF,CAAQ,KAAKiS,WAAL,CAAiBjS,KAAjB,CAAuBwd,IAA/B,CAAlB;;EACA,QAAI,KAAKgC,aAAL,MAAwB,KAAKjB,UAAjC,EAA6C;EAC3CjlB,MAAAA,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgBiB,OAAhB,CAAwBoV,SAAxB;EAEA,UAAMoO,UAAU,GAAGvlB,IAAI,CAACmD,cAAL,CAAoB,KAAKrC,OAAzB,CAAnB;EACA,UAAM0kB,UAAU,GAAGpmB,CAAC,CAAC8I,QAAF,CACjBqd,UAAU,KAAK,IAAf,GAAsBA,UAAtB,GAAmC,KAAKzkB,OAAL,CAAa2kB,aAAb,CAA2BriB,eAD7C,EAEjB,KAAKtC,OAFY,CAAnB;;EAKA,UAAIqW,SAAS,CAAC5R,kBAAV,MAAkC,CAACigB,UAAvC,EAAmD;EACjD;EACD;;EAED,UAAMf,GAAG,GAAK,KAAKW,aAAL,EAAd;EACA,UAAMM,KAAK,GAAG1lB,IAAI,CAACO,MAAL,CAAY,KAAKwX,WAAL,CAAiB5T,IAA7B,CAAd;EAEAsgB,MAAAA,GAAG,CAACnc,YAAJ,CAAiB,IAAjB,EAAuBod,KAAvB;EACA,WAAK5kB,OAAL,CAAawH,YAAb,CAA0B,kBAA1B,EAA8Cod,KAA9C;EAEA,WAAKC,UAAL;;EAEA,UAAI,KAAKrjB,MAAL,CAAY8f,SAAhB,EAA2B;EACzBhjB,QAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAOpU,QAAP,CAAgBvL,iBAAhB;EACD;;EAED,UAAMoT,SAAS,GAAI,OAAO,KAAK5V,MAAL,CAAY4V,SAAnB,KAAiC,UAAjC,GACf,KAAK5V,MAAL,CAAY4V,SAAZ,CAAsBtZ,IAAtB,CAA2B,IAA3B,EAAiC6lB,GAAjC,EAAsC,KAAK3jB,OAA3C,CADe,GAEf,KAAKwB,MAAL,CAAY4V,SAFhB;;EAIA,UAAM0N,UAAU,GAAG,KAAKC,cAAL,CAAoB3N,SAApB,CAAnB;;EACA,WAAK4N,kBAAL,CAAwBF,UAAxB;;EAEA,UAAMnD,SAAS,GAAG,KAAKsD,aAAL,EAAlB;;EACA3mB,MAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAOle,IAAP,CAAY,KAAKwR,WAAL,CAAiB1T,QAA7B,EAAuC,IAAvC;;EAEA,UAAI,CAACjF,CAAC,CAAC8I,QAAF,CAAW,KAAKpH,OAAL,CAAa2kB,aAAb,CAA2BriB,eAAtC,EAAuD,KAAKqhB,GAA5D,CAAL,EAAuE;EACrErlB,QAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAO9H,QAAP,CAAgB8F,SAAhB;EACD;;EAEDrjB,MAAAA,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgBiB,OAAhB,CAAwB,KAAKgW,WAAL,CAAiBjS,KAAjB,CAAuB0d,QAA/C;EAEA,WAAK9M,OAAL,GAAe,IAAIW,MAAJ,CAAW,KAAKvW,OAAhB,EAAyB2jB,GAAzB,EAA8B,KAAKlN,gBAAL,CAAsBqO,UAAtB,CAA9B,CAAf;EAEAxmB,MAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAOpU,QAAP,CAAgBtL,iBAAhB,EA3C2C;EA8C3C;EACA;EACA;;EACA,UAAI,kBAAkBpE,QAAQ,CAACyC,eAA/B,EAAgD;EAC9ChE,QAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBpH,QAAjB,GAA4BzJ,EAA5B,CAA+B,WAA/B,EAA4C,IAA5C,EAAkDvH,CAAC,CAACqY,IAApD;EACD;;EAED,UAAMhE,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrB,YAAI,KAAI,CAACnR,MAAL,CAAY8f,SAAhB,EAA2B;EACzB,UAAA,KAAI,CAAC4D,cAAL;EACD;;EACD,YAAMC,cAAc,GAAG,KAAI,CAAC1B,WAA5B;EACA,QAAA,KAAI,CAACA,WAAL,GAAuB,IAAvB;EAEAnlB,QAAAA,CAAC,CAAC,KAAI,CAAC0B,OAAN,CAAD,CAAgBiB,OAAhB,CAAwB,KAAI,CAACgW,WAAL,CAAiBjS,KAAjB,CAAuByd,KAA/C;;EAEA,YAAI0C,cAAc,KAAK9C,eAAvB,EAAwC;EACtC,UAAA,KAAI,CAACgC,MAAL,CAAY,IAAZ,EAAkB,KAAlB;EACD;EACF,OAZD;;EAcA,UAAI/lB,CAAC,CAAC,KAAKqlB,GAAN,CAAD,CAAYze,QAAZ,CAAqBlB,iBAArB,CAAJ,EAA2C;EACzC,YAAMxD,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC,KAAKojB,GAA3C,CAA3B;EAEArlB,QAAAA,CAAC,CAAC,KAAKqlB,GAAN,CAAD,CACG1kB,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4BmV,QAD5B,EAEGpT,oBAFH,CAEwBiB,kBAFxB;EAGD,OAND,MAMO;EACLmS,QAAAA,QAAQ;EACT;EACF;EACF;;WAEDX,OAAA,cAAKyJ,QAAL,EAAe;EAAA;;EACb,QAAMkI,GAAG,GAAS,KAAKW,aAAL,EAAlB;EACA,QAAM1N,SAAS,GAAGtY,CAAC,CAAC0G,KAAF,CAAQ,KAAKiS,WAAL,CAAiBjS,KAAjB,CAAuBsd,IAA/B,CAAlB;;EACA,QAAM3P,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrB,UAAI,MAAI,CAAC8Q,WAAL,KAAqBrB,gBAArB,IAAyCuB,GAAG,CAAChhB,UAAjD,EAA6D;EAC3DghB,QAAAA,GAAG,CAAChhB,UAAJ,CAAe8a,WAAf,CAA2BkG,GAA3B;EACD;;EAED,MAAA,MAAI,CAACyB,cAAL;;EACA,MAAA,MAAI,CAACplB,OAAL,CAAagb,eAAb,CAA6B,kBAA7B;;EACA1c,MAAAA,CAAC,CAAC,MAAI,CAAC0B,OAAN,CAAD,CAAgBiB,OAAhB,CAAwB,MAAI,CAACgW,WAAL,CAAiBjS,KAAjB,CAAuBud,MAA/C;;EACA,UAAI,MAAI,CAAC3M,OAAL,KAAiB,IAArB,EAA2B;EACzB,QAAA,MAAI,CAACA,OAAL,CAAaiB,OAAb;EACD;;EAED,UAAI4E,QAAJ,EAAc;EACZA,QAAAA,QAAQ;EACT;EACF,KAfD;;EAiBAnd,IAAAA,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgBiB,OAAhB,CAAwB2V,SAAxB;;EAEA,QAAIA,SAAS,CAACnS,kBAAV,EAAJ,EAAoC;EAClC;EACD;;EAEDnG,IAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAO1e,WAAP,CAAmBhB,iBAAnB,EA1Ba;EA6Bb;;EACA,QAAI,kBAAkBpE,QAAQ,CAACyC,eAA/B,EAAgD;EAC9ChE,MAAAA,CAAC,CAACuB,QAAQ,CAAC6W,IAAV,CAAD,CAAiBpH,QAAjB,GAA4BlC,GAA5B,CAAgC,WAAhC,EAA6C,IAA7C,EAAmD9O,CAAC,CAACqY,IAArD;EACD;;EAED,SAAK+M,cAAL,CAAoBN,aAApB,IAAqC,KAArC;EACA,SAAKM,cAAL,CAAoBP,aAApB,IAAqC,KAArC;EACA,SAAKO,cAAL,CAAoBR,aAApB,IAAqC,KAArC;;EAEA,QAAI5kB,CAAC,CAAC,KAAKqlB,GAAN,CAAD,CAAYze,QAAZ,CAAqBlB,iBAArB,CAAJ,EAA2C;EACzC,UAAMxD,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsCojB,GAAtC,CAA3B;EAEArlB,MAAAA,CAAC,CAACqlB,GAAD,CAAD,CACG1kB,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4BmV,QAD5B,EAEGpT,oBAFH,CAEwBiB,kBAFxB;EAGD,KAND,MAMO;EACLmS,MAAAA,QAAQ;EACT;;EAED,SAAK8Q,WAAL,GAAmB,EAAnB;EACD;;WAED3M,SAAA,kBAAS;EACP,QAAI,KAAKlB,OAAL,KAAiB,IAArB,EAA2B;EACzB,WAAKA,OAAL,CAAamB,cAAb;EACD;EACF;;;WAIDyN,gBAAA,yBAAgB;EACd,WAAOrjB,OAAO,CAAC,KAAKkkB,QAAL,EAAD,CAAd;EACD;;WAEDL,qBAAA,4BAAmBF,UAAnB,EAA+B;EAC7BxmB,IAAAA,CAAC,CAAC,KAAKgmB,aAAL,EAAD,CAAD,CAAwB/U,QAAxB,CAAoC4R,YAApC,SAAoD2D,UAApD;EACD;;WAEDR,gBAAA,yBAAgB;EACd,SAAKX,GAAL,GAAW,KAAKA,GAAL,IAAYrlB,CAAC,CAAC,KAAKkD,MAAL,CAAY+f,QAAb,CAAD,CAAwB,CAAxB,CAAvB;EACA,WAAO,KAAKoC,GAAZ;EACD;;WAEDkB,aAAA,sBAAa;EACX,QAAMlB,GAAG,GAAG,KAAKW,aAAL,EAAZ;EACA,SAAKgB,iBAAL,CAAuBhnB,CAAC,CAACqlB,GAAG,CAAC1b,gBAAJ,CAAqB+a,sBAArB,CAAD,CAAxB,EAAwE,KAAKqC,QAAL,EAAxE;EACA/mB,IAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAO1e,WAAP,CAAsBjB,iBAAtB,SAAyCC,iBAAzC;EACD;;WAEDqhB,oBAAA,2BAAkB9f,QAAlB,EAA4B+f,OAA5B,EAAqC;EACnC,QAAI,OAAOA,OAAP,KAAmB,QAAnB,KAAgCA,OAAO,CAAClkB,QAAR,IAAoBkkB,OAAO,CAACxiB,MAA5D,CAAJ,EAAyE;EACvE;EACA,UAAI,KAAKvB,MAAL,CAAYkgB,IAAhB,EAAsB;EACpB,YAAI,CAACpjB,CAAC,CAACinB,OAAD,CAAD,CAAW1gB,MAAX,GAAoBrG,EAApB,CAAuBgH,QAAvB,CAAL,EAAuC;EACrCA,UAAAA,QAAQ,CAACggB,KAAT,GAAiBC,MAAjB,CAAwBF,OAAxB;EACD;EACF,OAJD,MAIO;EACL/f,QAAAA,QAAQ,CAACkgB,IAAT,CAAcpnB,CAAC,CAACinB,OAAD,CAAD,CAAWG,IAAX,EAAd;EACD;;EAED;EACD;;EAED,QAAI,KAAKlkB,MAAL,CAAYkgB,IAAhB,EAAsB;EACpB,UAAI,KAAKlgB,MAAL,CAAYqgB,QAAhB,EAA0B;EACxB0D,QAAAA,OAAO,GAAGrF,YAAY,CAACqF,OAAD,EAAU,KAAK/jB,MAAL,CAAY4e,SAAtB,EAAiC,KAAK5e,MAAL,CAAY6e,UAA7C,CAAtB;EACD;;EAED7a,MAAAA,QAAQ,CAACkc,IAAT,CAAc6D,OAAd;EACD,KAND,MAMO;EACL/f,MAAAA,QAAQ,CAACkgB,IAAT,CAAcH,OAAd;EACD;EACF;;WAEDF,WAAA,oBAAW;EACT,QAAI7D,KAAK,GAAG,KAAKxhB,OAAL,CAAaE,YAAb,CAA0B,qBAA1B,CAAZ;;EAEA,QAAI,CAACshB,KAAL,EAAY;EACVA,MAAAA,KAAK,GAAG,OAAO,KAAKhgB,MAAL,CAAYggB,KAAnB,KAA6B,UAA7B,GACJ,KAAKhgB,MAAL,CAAYggB,KAAZ,CAAkB1jB,IAAlB,CAAuB,KAAKkC,OAA5B,CADI,GAEJ,KAAKwB,MAAL,CAAYggB,KAFhB;EAGD;;EAED,WAAOA,KAAP;EACD;;;WAID/K,mBAAA,0BAAiBqO,UAAjB,EAA6B;EAAA;;EAC3B,QAAMa,eAAe,GAAG;EACtBvO,MAAAA,SAAS,EAAE0N,UADW;EAEtBvN,MAAAA,SAAS,EAAE;EACTlC,QAAAA,MAAM,EAAE,KAAKgC,UAAL,EADC;EAET/B,QAAAA,IAAI,EAAE;EACJsQ,UAAAA,QAAQ,EAAE,KAAKpkB,MAAL,CAAYogB;EADlB,SAFG;EAKTiE,QAAAA,KAAK,EAAE;EACL7lB,UAAAA,OAAO,EAAEijB;EADJ,SALE;EAQTxL,QAAAA,eAAe,EAAE;EACfC,UAAAA,iBAAiB,EAAE,KAAKlW,MAAL,CAAY+T;EADhB;EARR,OAFW;EActBuQ,MAAAA,QAAQ,EAAE,kBAACrgB,IAAD,EAAU;EAClB,YAAIA,IAAI,CAACsgB,iBAAL,KAA2BtgB,IAAI,CAAC2R,SAApC,EAA+C;EAC7C,UAAA,MAAI,CAAC4O,4BAAL,CAAkCvgB,IAAlC;EACD;EACF,OAlBqB;EAmBtBwgB,MAAAA,QAAQ,EAAE,kBAACxgB,IAAD;EAAA,eAAU,MAAI,CAACugB,4BAAL,CAAkCvgB,IAAlC,CAAV;EAAA;EAnBY,KAAxB;EAsBA,6CACKkgB,eADL,GAEK,KAAKnkB,MAAL,CAAYkU,YAFjB;EAID;;WAED2B,aAAA,sBAAa;EAAA;;EACX,QAAMhC,MAAM,GAAG,EAAf;;EAEA,QAAI,OAAO,KAAK7T,MAAL,CAAY6T,MAAnB,KAA8B,UAAlC,EAA8C;EAC5CA,MAAAA,MAAM,CAAC/V,EAAP,GAAY,UAACmG,IAAD,EAAU;EACpBA,QAAAA,IAAI,CAAC6R,OAAL,qCACK7R,IAAI,CAAC6R,OADV,GAEK,MAAI,CAAC9V,MAAL,CAAY6T,MAAZ,CAAmB5P,IAAI,CAAC6R,OAAxB,EAAiC,MAAI,CAACtX,OAAtC,KAAkD,EAFvD;EAKA,eAAOyF,IAAP;EACD,OAPD;EAQD,KATD,MASO;EACL4P,MAAAA,MAAM,CAACA,MAAP,GAAgB,KAAK7T,MAAL,CAAY6T,MAA5B;EACD;;EAED,WAAOA,MAAP;EACD;;WAED4P,gBAAA,yBAAgB;EACd,QAAI,KAAKzjB,MAAL,CAAYmgB,SAAZ,KAA0B,KAA9B,EAAqC;EACnC,aAAO9hB,QAAQ,CAAC6W,IAAhB;EACD;;EAED,QAAIxX,IAAI,CAACkC,SAAL,CAAe,KAAKI,MAAL,CAAYmgB,SAA3B,CAAJ,EAA2C;EACzC,aAAOrjB,CAAC,CAAC,KAAKkD,MAAL,CAAYmgB,SAAb,CAAR;EACD;;EAED,WAAOrjB,CAAC,CAACuB,QAAD,CAAD,CAAYqmB,IAAZ,CAAiB,KAAK1kB,MAAL,CAAYmgB,SAA7B,CAAP;EACD;;WAEDoD,iBAAA,wBAAe3N,SAAf,EAA0B;EACxB,WAAO0K,aAAa,CAAC1K,SAAS,CAAChV,WAAV,EAAD,CAApB;EACD;;WAEDwhB,gBAAA,yBAAgB;EAAA;;EACd,QAAMuC,QAAQ,GAAG,KAAK3kB,MAAL,CAAYP,OAAZ,CAAoBH,KAApB,CAA0B,GAA1B,CAAjB;EAEAqlB,IAAAA,QAAQ,CAAC9L,OAAT,CAAiB,UAACpZ,OAAD,EAAa;EAC5B,UAAIA,OAAO,KAAK,OAAhB,EAAyB;EACvB3C,QAAAA,CAAC,CAAC,MAAI,CAAC0B,OAAN,CAAD,CAAgB6F,EAAhB,CACE,MAAI,CAACoR,WAAL,CAAiBjS,KAAjB,CAAuB2d,KADzB,EAEE,MAAI,CAACnhB,MAAL,CAAYvB,QAFd,EAGE,UAAC5B,KAAD;EAAA,iBAAW,MAAI,CAACwI,MAAL,CAAYxI,KAAZ,CAAX;EAAA,SAHF;EAKD,OAND,MAMO,IAAI4C,OAAO,KAAKoiB,cAAhB,EAAgC;EACrC,YAAM+C,OAAO,GAAGnlB,OAAO,KAAKiiB,aAAZ,GACZ,MAAI,CAACjM,WAAL,CAAiBjS,KAAjB,CAAuB8d,UADX,GAEZ,MAAI,CAAC7L,WAAL,CAAiBjS,KAAjB,CAAuB4d,OAF3B;EAGA,YAAMyD,QAAQ,GAAGplB,OAAO,KAAKiiB,aAAZ,GACb,MAAI,CAACjM,WAAL,CAAiBjS,KAAjB,CAAuB+d,UADV,GAEb,MAAI,CAAC9L,WAAL,CAAiBjS,KAAjB,CAAuB6d,QAF3B;EAIAvkB,QAAAA,CAAC,CAAC,MAAI,CAAC0B,OAAN,CAAD,CACG6F,EADH,CACMugB,OADN,EACe,MAAI,CAAC5kB,MAAL,CAAYvB,QAD3B,EACqC,UAAC5B,KAAD;EAAA,iBAAW,MAAI,CAAC+lB,MAAL,CAAY/lB,KAAZ,CAAX;EAAA,SADrC,EAEGwH,EAFH,CAEMwgB,QAFN,EAEgB,MAAI,CAAC7kB,MAAL,CAAYvB,QAF5B,EAEsC,UAAC5B,KAAD;EAAA,iBAAW,MAAI,CAACgmB,MAAL,CAAYhmB,KAAZ,CAAX;EAAA,SAFtC;EAGD;EACF,KAnBD;;EAqBA,SAAKkmB,iBAAL,GAAyB,YAAM;EAC7B,UAAI,MAAI,CAACvkB,OAAT,EAAkB;EAChB,QAAA,MAAI,CAACgS,IAAL;EACD;EACF,KAJD;;EAMA1T,IAAAA,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgB8E,OAAhB,CAAwB,QAAxB,EAAkCe,EAAlC,CAAqC,eAArC,EAAsD,KAAK0e,iBAA3D;;EAEA,QAAI,KAAK/iB,MAAL,CAAYvB,QAAhB,EAA0B;EACxB,WAAKuB,MAAL,qCACK,KAAKA,MADV;EAEEP,QAAAA,OAAO,EAAE,QAFX;EAGEhB,QAAAA,QAAQ,EAAE;EAHZ;EAKD,KAND,MAMO;EACL,WAAKqmB,SAAL;EACD;EACF;;WAEDA,YAAA,qBAAY;EACV,QAAMC,SAAS,GAAG,OAAO,KAAKvmB,OAAL,CAAaE,YAAb,CAA0B,qBAA1B,CAAzB;;EAEA,QAAI,KAAKF,OAAL,CAAaE,YAAb,CAA0B,OAA1B,KAAsCqmB,SAAS,KAAK,QAAxD,EAAkE;EAChE,WAAKvmB,OAAL,CAAawH,YAAb,CACE,qBADF,EAEE,KAAKxH,OAAL,CAAaE,YAAb,CAA0B,OAA1B,KAAsC,EAFxC;EAKA,WAAKF,OAAL,CAAawH,YAAb,CAA0B,OAA1B,EAAmC,EAAnC;EACD;EACF;;WAED4c,SAAA,gBAAO/lB,KAAP,EAAcwZ,OAAd,EAAuB;EACrB,QAAMmM,OAAO,GAAG,KAAK/M,WAAL,CAAiB1T,QAAjC;EACAsU,IAAAA,OAAO,GAAGA,OAAO,IAAIvZ,CAAC,CAACD,KAAK,CAACkV,aAAP,CAAD,CAAuB9N,IAAvB,CAA4Bue,OAA5B,CAArB;;EAEA,QAAI,CAACnM,OAAL,EAAc;EACZA,MAAAA,OAAO,GAAG,IAAI,KAAKZ,WAAT,CACR5Y,KAAK,CAACkV,aADE,EAER,KAAK0Q,kBAAL,EAFQ,CAAV;EAIA3lB,MAAAA,CAAC,CAACD,KAAK,CAACkV,aAAP,CAAD,CAAuB9N,IAAvB,CAA4Bue,OAA5B,EAAqCnM,OAArC;EACD;;EAED,QAAIxZ,KAAJ,EAAW;EACTwZ,MAAAA,OAAO,CAAC6L,cAAR,CACErlB,KAAK,CAAC4I,IAAN,KAAe,SAAf,GAA2Bkc,aAA3B,GAA2CD,aAD7C,IAEI,IAFJ;EAGD;;EAED,QAAI5kB,CAAC,CAACuZ,OAAO,CAACyM,aAAR,EAAD,CAAD,CAA2Bpf,QAA3B,CAAoCjB,iBAApC,KAAwD4T,OAAO,CAAC4L,WAAR,KAAwBrB,gBAApF,EAAsG;EACpGvK,MAAAA,OAAO,CAAC4L,WAAR,GAAsBrB,gBAAtB;EACA;EACD;;EAEDnU,IAAAA,YAAY,CAAC4J,OAAO,CAAC2L,QAAT,CAAZ;EAEA3L,IAAAA,OAAO,CAAC4L,WAAR,GAAsBrB,gBAAtB;;EAEA,QAAI,CAACvK,OAAO,CAACrW,MAAR,CAAeigB,KAAhB,IAAyB,CAAC5J,OAAO,CAACrW,MAAR,CAAeigB,KAAf,CAAqBxP,IAAnD,EAAyD;EACvD4F,MAAAA,OAAO,CAAC5F,IAAR;EACA;EACD;;EAED4F,IAAAA,OAAO,CAAC2L,QAAR,GAAmBrkB,UAAU,CAAC,YAAM;EAClC,UAAI0Y,OAAO,CAAC4L,WAAR,KAAwBrB,gBAA5B,EAA8C;EAC5CvK,QAAAA,OAAO,CAAC5F,IAAR;EACD;EACF,KAJ4B,EAI1B4F,OAAO,CAACrW,MAAR,CAAeigB,KAAf,CAAqBxP,IAJK,CAA7B;EAKD;;WAEDoS,SAAA,gBAAOhmB,KAAP,EAAcwZ,OAAd,EAAuB;EACrB,QAAMmM,OAAO,GAAG,KAAK/M,WAAL,CAAiB1T,QAAjC;EACAsU,IAAAA,OAAO,GAAGA,OAAO,IAAIvZ,CAAC,CAACD,KAAK,CAACkV,aAAP,CAAD,CAAuB9N,IAAvB,CAA4Bue,OAA5B,CAArB;;EAEA,QAAI,CAACnM,OAAL,EAAc;EACZA,MAAAA,OAAO,GAAG,IAAI,KAAKZ,WAAT,CACR5Y,KAAK,CAACkV,aADE,EAER,KAAK0Q,kBAAL,EAFQ,CAAV;EAIA3lB,MAAAA,CAAC,CAACD,KAAK,CAACkV,aAAP,CAAD,CAAuB9N,IAAvB,CAA4Bue,OAA5B,EAAqCnM,OAArC;EACD;;EAED,QAAIxZ,KAAJ,EAAW;EACTwZ,MAAAA,OAAO,CAAC6L,cAAR,CACErlB,KAAK,CAAC4I,IAAN,KAAe,UAAf,GAA4Bkc,aAA5B,GAA4CD,aAD9C,IAEI,KAFJ;EAGD;;EAED,QAAIrL,OAAO,CAACsM,oBAAR,EAAJ,EAAoC;EAClC;EACD;;EAEDlW,IAAAA,YAAY,CAAC4J,OAAO,CAAC2L,QAAT,CAAZ;EAEA3L,IAAAA,OAAO,CAAC4L,WAAR,GAAsBpB,eAAtB;;EAEA,QAAI,CAACxK,OAAO,CAACrW,MAAR,CAAeigB,KAAhB,IAAyB,CAAC5J,OAAO,CAACrW,MAAR,CAAeigB,KAAf,CAAqBzP,IAAnD,EAAyD;EACvD6F,MAAAA,OAAO,CAAC7F,IAAR;EACA;EACD;;EAED6F,IAAAA,OAAO,CAAC2L,QAAR,GAAmBrkB,UAAU,CAAC,YAAM;EAClC,UAAI0Y,OAAO,CAAC4L,WAAR,KAAwBpB,eAA5B,EAA6C;EAC3CxK,QAAAA,OAAO,CAAC7F,IAAR;EACD;EACF,KAJ4B,EAI1B6F,OAAO,CAACrW,MAAR,CAAeigB,KAAf,CAAqBzP,IAJK,CAA7B;EAKD;;WAEDmS,uBAAA,gCAAuB;EACrB,SAAK,IAAMljB,OAAX,IAAsB,KAAKyiB,cAA3B,EAA2C;EACzC,UAAI,KAAKA,cAAL,CAAoBziB,OAApB,CAAJ,EAAkC;EAChC,eAAO,IAAP;EACD;EACF;;EAED,WAAO,KAAP;EACD;;WAED2K,aAAA,oBAAWpK,MAAX,EAAmB;EACjB,QAAMglB,cAAc,GAAGloB,CAAC,CAAC,KAAK0B,OAAN,CAAD,CAAgByF,IAAhB,EAAvB;EAEA9D,IAAAA,MAAM,CAACgf,IAAP,CAAY6F,cAAZ,EACGnM,OADH,CACW,UAACoM,QAAD,EAAc;EACrB,UAAIpF,qBAAqB,CAACjT,OAAtB,CAA8BqY,QAA9B,MAA4C,CAAC,CAAjD,EAAoD;EAClD,eAAOD,cAAc,CAACC,QAAD,CAArB;EACD;EACF,KALH;EAOAjlB,IAAAA,MAAM,oDACD,KAAKyV,WAAL,CAAiBvO,OADhB,GAED8d,cAFC,GAGD,OAAOhlB,MAAP,KAAkB,QAAlB,IAA8BA,MAA9B,GAAuCA,MAAvC,GAAgD,EAH/C,CAAN;;EAMA,QAAI,OAAOA,MAAM,CAACigB,KAAd,KAAwB,QAA5B,EAAsC;EACpCjgB,MAAAA,MAAM,CAACigB,KAAP,GAAe;EACbxP,QAAAA,IAAI,EAAEzQ,MAAM,CAACigB,KADA;EAEbzP,QAAAA,IAAI,EAAExQ,MAAM,CAACigB;EAFA,OAAf;EAID;;EAED,QAAI,OAAOjgB,MAAM,CAACggB,KAAd,KAAwB,QAA5B,EAAsC;EACpChgB,MAAAA,MAAM,CAACggB,KAAP,GAAehgB,MAAM,CAACggB,KAAP,CAAa3jB,QAAb,EAAf;EACD;;EAED,QAAI,OAAO2D,MAAM,CAAC+jB,OAAd,KAA0B,QAA9B,EAAwC;EACtC/jB,MAAAA,MAAM,CAAC+jB,OAAP,GAAiB/jB,MAAM,CAAC+jB,OAAP,CAAe1nB,QAAf,EAAjB;EACD;;EAEDqB,IAAAA,IAAI,CAACoC,eAAL,CACE+B,MADF,EAEE7B,MAFF,EAGE,KAAKyV,WAAL,CAAiBhO,WAHnB;;EAMA,QAAIzH,MAAM,CAACqgB,QAAX,EAAqB;EACnBrgB,MAAAA,MAAM,CAAC+f,QAAP,GAAkBrB,YAAY,CAAC1e,MAAM,CAAC+f,QAAR,EAAkB/f,MAAM,CAAC4e,SAAzB,EAAoC5e,MAAM,CAAC6e,UAA3C,CAA9B;EACD;;EAED,WAAO7e,MAAP;EACD;;WAEDyiB,qBAAA,8BAAqB;EACnB,QAAMziB,MAAM,GAAG,EAAf;;EAEA,QAAI,KAAKA,MAAT,EAAiB;EACf,WAAK,IAAMklB,GAAX,IAAkB,KAAKllB,MAAvB,EAA+B;EAC7B,YAAI,KAAKyV,WAAL,CAAiBvO,OAAjB,CAAyBge,GAAzB,MAAkC,KAAKllB,MAAL,CAAYklB,GAAZ,CAAtC,EAAwD;EACtDllB,UAAAA,MAAM,CAACklB,GAAD,CAAN,GAAc,KAAKllB,MAAL,CAAYklB,GAAZ,CAAd;EACD;EACF;EACF;;EAED,WAAOllB,MAAP;EACD;;WAED4jB,iBAAA,0BAAiB;EACf,QAAMuB,IAAI,GAAGroB,CAAC,CAAC,KAAKgmB,aAAL,EAAD,CAAd;EACA,QAAMsC,QAAQ,GAAGD,IAAI,CAAClU,IAAL,CAAU,OAAV,EAAmB1U,KAAnB,CAAyBqjB,kBAAzB,CAAjB;;EACA,QAAIwF,QAAQ,KAAK,IAAb,IAAqBA,QAAQ,CAACxe,MAAlC,EAA0C;EACxCue,MAAAA,IAAI,CAAC1hB,WAAL,CAAiB2hB,QAAQ,CAACC,IAAT,CAAc,EAAd,CAAjB;EACD;EACF;;WAEDb,+BAAA,sCAA6Bc,UAA7B,EAAyC;EACvC,SAAKnD,GAAL,GAAWmD,UAAU,CAACC,QAAX,CAAoBC,MAA/B;;EACA,SAAK5B,cAAL;;EACA,SAAKJ,kBAAL,CAAwB,KAAKD,cAAL,CAAoB+B,UAAU,CAAC1P,SAA/B,CAAxB;EACD;;WAED8N,iBAAA,0BAAiB;EACf,QAAMvB,GAAG,GAAG,KAAKW,aAAL,EAAZ;EACA,QAAM2C,mBAAmB,GAAG,KAAKzlB,MAAL,CAAY8f,SAAxC;;EAEA,QAAIqC,GAAG,CAACzjB,YAAJ,CAAiB,aAAjB,MAAoC,IAAxC,EAA8C;EAC5C;EACD;;EAED5B,IAAAA,CAAC,CAACqlB,GAAD,CAAD,CAAO1e,WAAP,CAAmBjB,iBAAnB;EACA,SAAKxC,MAAL,CAAY8f,SAAZ,GAAwB,KAAxB;EACA,SAAKtP,IAAL;EACA,SAAKC,IAAL;EACA,SAAKzQ,MAAL,CAAY8f,SAAZ,GAAwB2F,mBAAxB;EACD;;;YAIM3hB,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EACA,UAAMoI,OAAO,GAAG,OAAOnK,MAAP,KAAkB,QAAlB,IAA8BA,MAA9C;;EAEA,UAAI,CAACiE,IAAD,IAAS,eAAevD,IAAf,CAAoBV,MAApB,CAAb,EAA0C;EACxC;EACD;;EAED,UAAI,CAACiE,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAI6d,OAAJ,CAAY,IAAZ,EAAkB3X,OAAlB,CAAP;EACArN,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAnBM,CAAP;EAoBD;;;;0BA7mBoB;EACnB,aAAO8B,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,SAAP;EACD;;;0BAEiB;EAChB,aAAOrF,MAAP;EACD;;;0BAEqB;EACpB,aAAOE,UAAP;EACD;;;0BAEkB;EACjB,aAAOyB,KAAP;EACD;;;0BAEsB;EACrB,aAAOxB,WAAP;EACD;;;0BAEwB;EACvB,aAAOyF,aAAP;EACD;;;;;EAslBH;;;;;;;EAMA3K,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaigB,OAAO,CAAChe,gBAArB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBwd,OAAzB;;EACAhlB,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAO4f,OAAO,CAAChe,gBAAf;EACD,CAHD;;ECpvBA;;;;;;EAMA,IAAMjC,MAAI,GAAkB,SAA5B;EACA,IAAMC,SAAO,GAAe,OAA5B;EACA,IAAMC,UAAQ,GAAc,YAA5B;EACA,IAAMC,WAAS,SAAiBD,UAAhC;EACA,IAAMG,oBAAkB,GAAIpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA5B;EACA,IAAM8d,cAAY,GAAU,YAA5B;EACA,IAAMC,oBAAkB,GAAI,IAAInf,MAAJ,aAAqBkf,cAArB,WAAyC,GAAzC,CAA5B;;EAEA,IAAMzY,SAAO,qCACR4a,OAAO,CAAC5a,OADA;EAEX0O,EAAAA,SAAS,EAAG,OAFD;EAGXnW,EAAAA,OAAO,EAAK,OAHD;EAIXskB,EAAAA,OAAO,EAAK,EAJD;EAKXhE,EAAAA,QAAQ,EAAI,yCACA,2BADA,GAEA,kCAFA,GAGA;EARD,EAAb;;EAWA,IAAMtY,aAAW,qCACZqa,OAAO,CAACra,WADI;EAEfsc,EAAAA,OAAO,EAAG;EAFK,EAAjB;;EAKA,IAAMvhB,iBAAe,GAAG,MAAxB;EACA,IAAMC,iBAAe,GAAG,MAAxB;EAEA,IAAMijB,cAAc,GAAK,iBAAzB;EACA,IAAMC,gBAAgB,GAAG,eAAzB;EAEA,IAAMniB,OAAK,GAAG;EACZsd,EAAAA,IAAI,WAAgB9e,WADR;EAEZ+e,EAAAA,MAAM,aAAgB/e,WAFV;EAGZgf,EAAAA,IAAI,WAAgBhf,WAHR;EAIZif,EAAAA,KAAK,YAAgBjf,WAJT;EAKZkf,EAAAA,QAAQ,eAAgBlf,WALZ;EAMZmf,EAAAA,KAAK,YAAgBnf,WANT;EAOZof,EAAAA,OAAO,cAAgBpf,WAPX;EAQZqf,EAAAA,QAAQ,eAAgBrf,WARZ;EASZsf,EAAAA,UAAU,iBAAgBtf,WATd;EAUZuf,EAAAA,UAAU,iBAAgBvf;EAVd,CAAd;EAaA;;;;;;MAMM4jB;;;;;;;;;EA+BJ;WAEA5C,gBAAA,yBAAgB;EACd,WAAO,KAAKa,QAAL,MAAmB,KAAKgC,WAAL,EAA1B;EACD;;WAEDrC,qBAAA,4BAAmBF,UAAnB,EAA+B;EAC7BxmB,IAAAA,CAAC,CAAC,KAAKgmB,aAAL,EAAD,CAAD,CAAwB/U,QAAxB,CAAoC4R,cAApC,SAAoD2D,UAApD;EACD;;WAEDR,gBAAA,yBAAgB;EACd,SAAKX,GAAL,GAAW,KAAKA,GAAL,IAAYrlB,CAAC,CAAC,KAAKkD,MAAL,CAAY+f,QAAb,CAAD,CAAwB,CAAxB,CAAvB;EACA,WAAO,KAAKoC,GAAZ;EACD;;WAEDkB,aAAA,sBAAa;EACX,QAAM8B,IAAI,GAAGroB,CAAC,CAAC,KAAKgmB,aAAL,EAAD,CAAd,CADW;;EAIX,SAAKgB,iBAAL,CAAuBqB,IAAI,CAACT,IAAL,CAAUgB,cAAV,CAAvB,EAAkD,KAAK7B,QAAL,EAAlD;;EACA,QAAIE,OAAO,GAAG,KAAK8B,WAAL,EAAd;;EACA,QAAI,OAAO9B,OAAP,KAAmB,UAAvB,EAAmC;EACjCA,MAAAA,OAAO,GAAGA,OAAO,CAACznB,IAAR,CAAa,KAAKkC,OAAlB,CAAV;EACD;;EACD,SAAKslB,iBAAL,CAAuBqB,IAAI,CAACT,IAAL,CAAUiB,gBAAV,CAAvB,EAAoD5B,OAApD;EAEAoB,IAAAA,IAAI,CAAC1hB,WAAL,CAAoBjB,iBAApB,SAAuCC,iBAAvC;EACD;;;WAIDojB,cAAA,uBAAc;EACZ,WAAO,KAAKrnB,OAAL,CAAaE,YAAb,CAA0B,cAA1B,KACL,KAAKsB,MAAL,CAAY+jB,OADd;EAED;;WAEDH,iBAAA,0BAAiB;EACf,QAAMuB,IAAI,GAAGroB,CAAC,CAAC,KAAKgmB,aAAL,EAAD,CAAd;EACA,QAAMsC,QAAQ,GAAGD,IAAI,CAAClU,IAAL,CAAU,OAAV,EAAmB1U,KAAnB,CAAyBqjB,oBAAzB,CAAjB;;EACA,QAAIwF,QAAQ,KAAK,IAAb,IAAqBA,QAAQ,CAACxe,MAAT,GAAkB,CAA3C,EAA8C;EAC5Cue,MAAAA,IAAI,CAAC1hB,WAAL,CAAiB2hB,QAAQ,CAACC,IAAT,CAAc,EAAd,CAAjB;EACD;EACF;;;YAIMvhB,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EACA,UAAMoI,OAAO,GAAG,OAAOnK,MAAP,KAAkB,QAAlB,GAA6BA,MAA7B,GAAsC,IAAtD;;EAEA,UAAI,CAACiE,IAAD,IAAS,eAAevD,IAAf,CAAoBV,MAApB,CAAb,EAA0C;EACxC;EACD;;EAED,UAAI,CAACiE,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAI2hB,OAAJ,CAAY,IAAZ,EAAkBzb,OAAlB,CAAP;EACArN,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAnBM,CAAP;EAoBD;;;;EAjGD;0BAEqB;EACnB,aAAO8B,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,SAAP;EACD;;;0BAEiB;EAChB,aAAOrF,MAAP;EACD;;;0BAEqB;EACpB,aAAOE,UAAP;EACD;;;0BAEkB;EACjB,aAAOyB,OAAP;EACD;;;0BAEsB;EACrB,aAAOxB,WAAP;EACD;;;0BAEwB;EACvB,aAAOyF,aAAP;EACD;;;;IA7BmBqa;EAqGtB;;;;;;;EAMAhlB,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAa+jB,OAAO,CAAC9hB,gBAArB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBshB,OAAzB;;EACA9oB,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAO0jB,OAAO,CAAC9hB,gBAAf;EACD,CAHD;;ECpKA;;;;;;EAMA,IAAMjC,MAAI,GAAiB,WAA3B;EACA,IAAMC,SAAO,GAAc,OAA3B;EACA,IAAMC,UAAQ,GAAa,cAA3B;EACA,IAAMC,WAAS,SAAgBD,UAA/B;EACA,IAAME,cAAY,GAAS,WAA3B;EACA,IAAMC,oBAAkB,GAAGpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA3B;EAEA,IAAMqF,SAAO,GAAG;EACd2M,EAAAA,MAAM,EAAG,EADK;EAEdiS,EAAAA,MAAM,EAAG,MAFK;EAGd/oB,EAAAA,MAAM,EAAG;EAHK,CAAhB;EAMA,IAAM0K,aAAW,GAAG;EAClBoM,EAAAA,MAAM,EAAG,QADS;EAElBiS,EAAAA,MAAM,EAAG,QAFS;EAGlB/oB,EAAAA,MAAM,EAAG;EAHS,CAApB;EAMA,IAAMgpB,cAAc,gBAAmB/jB,WAAvC;EACA,IAAMgkB,YAAY,cAAmBhkB,WAArC;EACA,IAAMmD,qBAAmB,YAAUnD,WAAV,GAAsBC,cAA/C;EAEA,IAAMgkB,wBAAwB,GAAG,eAAjC;EACA,IAAMzhB,mBAAiB,GAAU,QAAjC;EAEA,IAAM0hB,iBAAiB,GAAU,qBAAjC;EACA,IAAMC,uBAAuB,GAAI,mBAAjC;EACA,IAAMC,kBAAkB,GAAS,WAAjC;EACA,IAAMC,kBAAkB,GAAS,WAAjC;EACA,IAAMC,mBAAmB,GAAQ,kBAAjC;EACA,IAAMC,iBAAiB,GAAU,WAAjC;EACA,IAAMC,uBAAuB,GAAI,gBAAjC;EACA,IAAMC,wBAAwB,GAAG,kBAAjC;EAEA,IAAMC,aAAa,GAAK,QAAxB;EACA,IAAMC,eAAe,GAAG,UAAxB;EAEA;;;;;;MAMMC;EACJ,qBAAYpoB,OAAZ,EAAqBwB,MAArB,EAA6B;EAAA;;EAC3B,SAAK2C,QAAL,GAAsBnE,OAAtB;EACA,SAAKqoB,cAAL,GAAsBroB,OAAO,CAAC6H,OAAR,KAAoB,MAApB,GAA6BC,MAA7B,GAAsC9H,OAA5D;EACA,SAAK2L,OAAL,GAAsB,KAAKC,UAAL,CAAgBpK,MAAhB,CAAtB;EACA,SAAKmQ,SAAL,GAAyB,KAAKhG,OAAL,CAAapN,MAAhB,SAA0BqpB,kBAA1B,UACG,KAAKjc,OAAL,CAAapN,MADhB,SAC0BupB,mBAD1B,WAEG,KAAKnc,OAAL,CAAapN,MAFhB,SAE0BypB,uBAF1B,CAAtB;EAGA,SAAKM,QAAL,GAAsB,EAAtB;EACA,SAAKC,QAAL,GAAsB,EAAtB;EACA,SAAKC,aAAL,GAAsB,IAAtB;EACA,SAAKC,aAAL,GAAsB,CAAtB;EAEAnqB,IAAAA,CAAC,CAAC,KAAK+pB,cAAN,CAAD,CAAuBxiB,EAAvB,CAA0B2hB,YAA1B,EAAwC,UAACnpB,KAAD;EAAA,aAAW,KAAI,CAACqqB,QAAL,CAAcrqB,KAAd,CAAX;EAAA,KAAxC;EAEA,SAAKsqB,OAAL;;EACA,SAAKD,QAAL;EACD;;;;;EAYD;WAEAC,UAAA,mBAAU;EAAA;;EACR,QAAMC,UAAU,GAAG,KAAKP,cAAL,KAAwB,KAAKA,cAAL,CAAoBvgB,MAA5C,GACfogB,aADe,GACCC,eADpB;EAGA,QAAMU,YAAY,GAAG,KAAKld,OAAL,CAAa2b,MAAb,KAAwB,MAAxB,GACjBsB,UADiB,GACJ,KAAKjd,OAAL,CAAa2b,MAD9B;EAGA,QAAMwB,UAAU,GAAGD,YAAY,KAAKV,eAAjB,GACf,KAAKY,aAAL,EADe,GACQ,CAD3B;EAGA,SAAKT,QAAL,GAAgB,EAAhB;EACA,SAAKC,QAAL,GAAgB,EAAhB;EAEA,SAAKE,aAAL,GAAqB,KAAKO,gBAAL,EAArB;EAEA,QAAMC,OAAO,GAAG,GAAGjhB,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B,KAAK0J,SAA/B,CAAd,CAAhB;EAEAsX,IAAAA,OAAO,CACJC,GADH,CACO,UAAClpB,OAAD,EAAa;EAChB,UAAIzB,MAAJ;EACA,UAAM4qB,cAAc,GAAGjqB,IAAI,CAACa,sBAAL,CAA4BC,OAA5B,CAAvB;;EAEA,UAAImpB,cAAJ,EAAoB;EAClB5qB,QAAAA,MAAM,GAAGsB,QAAQ,CAACQ,aAAT,CAAuB8oB,cAAvB,CAAT;EACD;;EAED,UAAI5qB,MAAJ,EAAY;EACV,YAAM6qB,SAAS,GAAG7qB,MAAM,CAACuU,qBAAP,EAAlB;;EACA,YAAIsW,SAAS,CAAC7L,KAAV,IAAmB6L,SAAS,CAACC,MAAjC,EAAyC;EACvC;EACA,iBAAO,CACL/qB,CAAC,CAACC,MAAD,CAAD,CAAUsqB,YAAV,IAA0BS,GAA1B,GAAgCR,UAD3B,EAELK,cAFK,CAAP;EAID;EACF;;EACD,aAAO,IAAP;EACD,KApBH,EAqBG1X,MArBH,CAqBU,UAACyG,IAAD;EAAA,aAAUA,IAAV;EAAA,KArBV,EAsBGqR,IAtBH,CAsBQ,UAAC1L,CAAD,EAAIE,CAAJ;EAAA,aAAUF,CAAC,CAAC,CAAD,CAAD,GAAOE,CAAC,CAAC,CAAD,CAAlB;EAAA,KAtBR,EAuBG1D,OAvBH,CAuBW,UAACnC,IAAD,EAAU;EACjB,MAAA,MAAI,CAACoQ,QAAL,CAAc1W,IAAd,CAAmBsG,IAAI,CAAC,CAAD,CAAvB;;EACA,MAAA,MAAI,CAACqQ,QAAL,CAAc3W,IAAd,CAAmBsG,IAAI,CAAC,CAAD,CAAvB;EACD,KA1BH;EA2BD;;WAEDvT,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EACAjF,IAAAA,CAAC,CAAC,KAAK+pB,cAAN,CAAD,CAAuBjb,GAAvB,CAA2B5J,WAA3B;EAEA,SAAKW,QAAL,GAAsB,IAAtB;EACA,SAAKkkB,cAAL,GAAsB,IAAtB;EACA,SAAK1c,OAAL,GAAsB,IAAtB;EACA,SAAKgG,SAAL,GAAsB,IAAtB;EACA,SAAK2W,QAAL,GAAsB,IAAtB;EACA,SAAKC,QAAL,GAAsB,IAAtB;EACA,SAAKC,aAAL,GAAsB,IAAtB;EACA,SAAKC,aAAL,GAAsB,IAAtB;EACD;;;WAID7c,aAAA,oBAAWpK,MAAX,EAAmB;EACjBA,IAAAA,MAAM,qCACDkH,SADC,GAED,OAAOlH,MAAP,KAAkB,QAAlB,IAA8BA,MAA9B,GAAuCA,MAAvC,GAAgD,EAF/C,CAAN;;EAKA,QAAI,OAAOA,MAAM,CAACjD,MAAd,KAAyB,QAAzB,IAAqCW,IAAI,CAACkC,SAAL,CAAeI,MAAM,CAACjD,MAAtB,CAAzC,EAAwE;EACtE,UAAI8S,EAAE,GAAG/S,CAAC,CAACkD,MAAM,CAACjD,MAAR,CAAD,CAAiBkU,IAAjB,CAAsB,IAAtB,CAAT;;EACA,UAAI,CAACpB,EAAL,EAAS;EACPA,QAAAA,EAAE,GAAGnS,IAAI,CAACO,MAAL,CAAY4D,MAAZ,CAAL;EACA/E,QAAAA,CAAC,CAACkD,MAAM,CAACjD,MAAR,CAAD,CAAiBkU,IAAjB,CAAsB,IAAtB,EAA4BpB,EAA5B;EACD;;EACD7P,MAAAA,MAAM,CAACjD,MAAP,SAAoB8S,EAApB;EACD;;EAEDnS,IAAAA,IAAI,CAACoC,eAAL,CAAqB+B,MAArB,EAA2B7B,MAA3B,EAAmCyH,aAAnC;EAEA,WAAOzH,MAAP;EACD;;WAEDunB,gBAAA,yBAAgB;EACd,WAAO,KAAKV,cAAL,KAAwBvgB,MAAxB,GACH,KAAKugB,cAAL,CAAoBmB,WADjB,GAC+B,KAAKnB,cAAL,CAAoBpN,SAD1D;EAED;;WAED+N,mBAAA,4BAAmB;EACjB,WAAO,KAAKX,cAAL,CAAoBpM,YAApB,IAAoCtc,IAAI,CAAC8pB,GAAL,CACzC5pB,QAAQ,CAAC6W,IAAT,CAAcuF,YAD2B,EAEzCpc,QAAQ,CAACyC,eAAT,CAAyB2Z,YAFgB,CAA3C;EAID;;WAEDyN,mBAAA,4BAAmB;EACjB,WAAO,KAAKrB,cAAL,KAAwBvgB,MAAxB,GACHA,MAAM,CAAC6hB,WADJ,GACkB,KAAKtB,cAAL,CAAoBvV,qBAApB,GAA4CuW,MADrE;EAED;;WAEDX,WAAA,oBAAW;EACT,QAAMzN,SAAS,GAAM,KAAK8N,aAAL,KAAuB,KAAKpd,OAAL,CAAa0J,MAAzD;;EACA,QAAM4G,YAAY,GAAG,KAAK+M,gBAAL,EAArB;;EACA,QAAMY,SAAS,GAAM,KAAKje,OAAL,CAAa0J,MAAb,GAAsB4G,YAAtB,GAAqC,KAAKyN,gBAAL,EAA1D;;EAEA,QAAI,KAAKjB,aAAL,KAAuBxM,YAA3B,EAAyC;EACvC,WAAK0M,OAAL;EACD;;EAED,QAAI1N,SAAS,IAAI2O,SAAjB,EAA4B;EAC1B,UAAMrrB,MAAM,GAAG,KAAKgqB,QAAL,CAAc,KAAKA,QAAL,CAAcngB,MAAd,GAAuB,CAArC,CAAf;;EAEA,UAAI,KAAKogB,aAAL,KAAuBjqB,MAA3B,EAAmC;EACjC,aAAKsrB,SAAL,CAAetrB,MAAf;EACD;;EACD;EACD;;EAED,QAAI,KAAKiqB,aAAL,IAAsBvN,SAAS,GAAG,KAAKqN,QAAL,CAAc,CAAd,CAAlC,IAAsD,KAAKA,QAAL,CAAc,CAAd,IAAmB,CAA7E,EAAgF;EAC9E,WAAKE,aAAL,GAAqB,IAArB;;EACA,WAAKsB,MAAL;;EACA;EACD;;EAED,SAAK,IAAI5hB,CAAC,GAAG,KAAKogB,QAAL,CAAclgB,MAA3B,EAAmCF,CAAC,EAApC,GAAyC;EACvC,UAAM6hB,cAAc,GAAG,KAAKvB,aAAL,KAAuB,KAAKD,QAAL,CAAcrgB,CAAd,CAAvB,IACnB+S,SAAS,IAAI,KAAKqN,QAAL,CAAcpgB,CAAd,CADM,KAElB,OAAO,KAAKogB,QAAL,CAAcpgB,CAAC,GAAG,CAAlB,CAAP,KAAgC,WAAhC,IACG+S,SAAS,GAAG,KAAKqN,QAAL,CAAcpgB,CAAC,GAAG,CAAlB,CAHG,CAAvB;;EAKA,UAAI6hB,cAAJ,EAAoB;EAClB,aAAKF,SAAL,CAAe,KAAKtB,QAAL,CAAcrgB,CAAd,CAAf;EACD;EACF;EACF;;WAED2hB,YAAA,mBAAUtrB,MAAV,EAAkB;EAChB,SAAKiqB,aAAL,GAAqBjqB,MAArB;;EAEA,SAAKurB,MAAL;;EAEA,QAAME,OAAO,GAAG,KAAKrY,SAAL,CACb7Q,KADa,CACP,GADO,EAEbooB,GAFa,CAET,UAACjpB,QAAD;EAAA,aAAiBA,QAAjB,uBAA0C1B,MAA1C,YAAsD0B,QAAtD,gBAAwE1B,MAAxE;EAAA,KAFS,CAAhB;;EAIA,QAAM0rB,KAAK,GAAG3rB,CAAC,CAAC,GAAG0J,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B+hB,OAAO,CAACnD,IAAR,CAAa,GAAb,CAA1B,CAAd,CAAD,CAAf;;EAEA,QAAIoD,KAAK,CAAC/kB,QAAN,CAAeuiB,wBAAf,CAAJ,EAA8C;EAC5CwC,MAAAA,KAAK,CAACnlB,OAAN,CAAcijB,iBAAd,EACG7B,IADH,CACQ+B,wBADR,EAEG1Y,QAFH,CAEYvJ,mBAFZ;EAGAikB,MAAAA,KAAK,CAAC1a,QAAN,CAAevJ,mBAAf;EACD,KALD,MAKO;EACL;EACAikB,MAAAA,KAAK,CAAC1a,QAAN,CAAevJ,mBAAf,EAFK;EAIL;;EACAikB,MAAAA,KAAK,CAACC,OAAN,CAAcvC,uBAAd,EACGlb,IADH,CACWmb,kBADX,UACkCE,mBADlC,EAEGvY,QAFH,CAEYvJ,mBAFZ,EALK;;EASLikB,MAAAA,KAAK,CAACC,OAAN,CAAcvC,uBAAd,EACGlb,IADH,CACQob,kBADR,EAEGvY,QAFH,CAEYsY,kBAFZ,EAGGrY,QAHH,CAGYvJ,mBAHZ;EAID;;EAED1H,IAAAA,CAAC,CAAC,KAAK+pB,cAAN,CAAD,CAAuBpnB,OAAvB,CAA+BsmB,cAA/B,EAA+C;EAC7C1Y,MAAAA,aAAa,EAAEtQ;EAD8B,KAA/C;EAGD;;WAEDurB,SAAA,kBAAS;EACP,OAAG9hB,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0B,KAAK0J,SAA/B,CAAd,EACGF,MADH,CACU,UAAC0Y,IAAD;EAAA,aAAUA,IAAI,CAAChjB,SAAL,CAAeC,QAAf,CAAwBpB,mBAAxB,CAAV;EAAA,KADV,EAEGqU,OAFH,CAEW,UAAC8P,IAAD;EAAA,aAAUA,IAAI,CAAChjB,SAAL,CAAe9B,MAAf,CAAsBW,mBAAtB,CAAV;EAAA,KAFX;EAGD;;;cAIMV,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAIE,IAAI,GAAGnH,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,CAAX;;EACA,UAAMoI,OAAO,GAAG,OAAOnK,MAAP,KAAkB,QAAlB,IAA8BA,MAA9C;;EAEA,UAAI,CAACiE,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAI2iB,SAAJ,CAAc,IAAd,EAAoBzc,OAApB,CAAP;EACArN,QAAAA,CAAC,CAAC,IAAD,CAAD,CAAQmH,IAAR,CAAalC,UAAb,EAAuBkC,IAAvB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAfM,CAAP;EAgBD;;;;0BA9MoB;EACnB,aAAO8B,SAAP;EACD;;;0BAEoB;EACnB,aAAOoF,SAAP;EACD;;;;;EA2MH;;;;;;;EAMApK,CAAC,CAACwJ,MAAD,CAAD,CAAUjC,EAAV,CAAac,qBAAb,EAAkC,YAAM;EACtC,MAAMyjB,UAAU,GAAG,GAAGpiB,KAAH,CAASlK,IAAT,CAAc+B,QAAQ,CAACoI,gBAAT,CAA0Byf,iBAA1B,CAAd,CAAnB;EACA,MAAM2C,gBAAgB,GAAGD,UAAU,CAAChiB,MAApC;;EAEA,OAAK,IAAIF,CAAC,GAAGmiB,gBAAb,EAA+BniB,CAAC,EAAhC,GAAqC;EACnC,QAAMoiB,IAAI,GAAGhsB,CAAC,CAAC8rB,UAAU,CAACliB,CAAD,CAAX,CAAd;;EACAkgB,IAAAA,SAAS,CAAC9iB,gBAAV,CAA2BxH,IAA3B,CAAgCwsB,IAAhC,EAAsCA,IAAI,CAAC7kB,IAAL,EAAtC;EACD;EACF,CARD;EAUA;;;;;;EAMAnH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAa+kB,SAAS,CAAC9iB,gBAAvB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyBsiB,SAAzB;;EACA9pB,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAO0kB,SAAS,CAAC9iB,gBAAjB;EACD,CAHD;;EChTA;;;;;;EAMA,IAAMjC,MAAI,GAAiB,KAA3B;EACA,IAAMC,SAAO,GAAc,OAA3B;EACA,IAAMC,UAAQ,GAAa,QAA3B;EACA,IAAMC,WAAS,SAAgBD,UAA/B;EACA,IAAME,cAAY,GAAS,WAA3B;EACA,IAAMC,oBAAkB,GAAGpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA3B;EAEA,IAAMqN,YAAU,YAAoBlN,WAApC;EACA,IAAMmN,cAAY,cAAoBnN,WAAtC;EACA,IAAMgN,YAAU,YAAoBhN,WAApC;EACA,IAAMiN,aAAW,aAAoBjN,WAArC;EACA,IAAMM,sBAAoB,aAAWN,WAAX,GAAuBC,cAAjD;EAEA,IAAM8mB,wBAAwB,GAAG,eAAjC;EACA,IAAMvkB,mBAAiB,GAAU,QAAjC;EACA,IAAMqO,qBAAmB,GAAQ,UAAjC;EACA,IAAMrQ,iBAAe,GAAY,MAAjC;EACA,IAAMC,iBAAe,GAAY,MAAjC;EAEA,IAAM8jB,mBAAiB,GAAgB,WAAvC;EACA,IAAMJ,yBAAuB,GAAU,mBAAvC;EACA,IAAMnhB,iBAAe,GAAkB,SAAvC;EACA,IAAMgkB,kBAAkB,GAAe,gBAAvC;EACA,IAAMnkB,sBAAoB,GAAa,iEAAvC;EACA,IAAM4hB,0BAAwB,GAAS,kBAAvC;EACA,IAAMwC,8BAA8B,GAAG,0BAAvC;EAEA;;;;;;MAMMC;EACJ,eAAY1qB,OAAZ,EAAqB;EACnB,SAAKmE,QAAL,GAAgBnE,OAAhB;EACD;;;;;EAQD;WAEAiS,OAAA,gBAAO;EAAA;;EACL,QAAI,KAAK9N,QAAL,CAAcxB,UAAd,IACA,KAAKwB,QAAL,CAAcxB,UAAd,CAAyBtB,QAAzB,KAAsCwZ,IAAI,CAACC,YAD3C,IAEAxc,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0Bc,mBAA1B,CAFA,IAGA1H,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBe,QAAjB,CAA0BmP,qBAA1B,CAHJ,EAGoD;EAClD;EACD;;EAED,QAAI9V,MAAJ;EACA,QAAIosB,QAAJ;EACA,QAAMC,WAAW,GAAGtsB,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBW,OAAjB,CAAyB6iB,yBAAzB,EAAkD,CAAlD,CAApB;EACA,QAAM1nB,QAAQ,GAAGf,IAAI,CAACa,sBAAL,CAA4B,KAAKoE,QAAjC,CAAjB;;EAEA,QAAIymB,WAAJ,EAAiB;EACf,UAAMC,YAAY,GAAGD,WAAW,CAAC9K,QAAZ,KAAyB,IAAzB,IAAiC8K,WAAW,CAAC9K,QAAZ,KAAyB,IAA1D,GAAiE0K,kBAAjE,GAAsFhkB,iBAA3G;EACAmkB,MAAAA,QAAQ,GAAGrsB,CAAC,CAACwsB,SAAF,CAAYxsB,CAAC,CAACssB,WAAD,CAAD,CAAe1E,IAAf,CAAoB2E,YAApB,CAAZ,CAAX;EACAF,MAAAA,QAAQ,GAAGA,QAAQ,CAACA,QAAQ,CAACviB,MAAT,GAAkB,CAAnB,CAAnB;EACD;;EAED,QAAMwO,SAAS,GAAGtY,CAAC,CAAC0G,KAAF,CAAQ0L,YAAR,EAAoB;EACpC7B,MAAAA,aAAa,EAAE,KAAK1K;EADgB,KAApB,CAAlB;EAIA,QAAMkS,SAAS,GAAG/X,CAAC,CAAC0G,KAAF,CAAQwL,YAAR,EAAoB;EACpC3B,MAAAA,aAAa,EAAE8b;EADqB,KAApB,CAAlB;;EAIA,QAAIA,QAAJ,EAAc;EACZrsB,MAAAA,CAAC,CAACqsB,QAAD,CAAD,CAAY1pB,OAAZ,CAAoB2V,SAApB;EACD;;EAEDtY,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBoV,SAAzB;;EAEA,QAAIA,SAAS,CAAC5R,kBAAV,MACAmS,SAAS,CAACnS,kBAAV,EADJ,EACoC;EAClC;EACD;;EAED,QAAIxE,QAAJ,EAAc;EACZ1B,MAAAA,MAAM,GAAGsB,QAAQ,CAACQ,aAAT,CAAuBJ,QAAvB,CAAT;EACD;;EAED,SAAK4pB,SAAL,CACE,KAAK1lB,QADP,EAEEymB,WAFF;;EAKA,QAAMjY,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrB,UAAMoY,WAAW,GAAGzsB,CAAC,CAAC0G,KAAF,CAAQ2L,cAAR,EAAsB;EACxC9B,QAAAA,aAAa,EAAE,KAAI,CAAC1K;EADoB,OAAtB,CAApB;EAIA,UAAMgX,UAAU,GAAG7c,CAAC,CAAC0G,KAAF,CAAQyL,aAAR,EAAqB;EACtC5B,QAAAA,aAAa,EAAE8b;EADuB,OAArB,CAAnB;EAIArsB,MAAAA,CAAC,CAACqsB,QAAD,CAAD,CAAY1pB,OAAZ,CAAoB8pB,WAApB;EACAzsB,MAAAA,CAAC,CAAC,KAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBka,UAAzB;EACD,KAXD;;EAaA,QAAI5c,MAAJ,EAAY;EACV,WAAKsrB,SAAL,CAAetrB,MAAf,EAAuBA,MAAM,CAACoE,UAA9B,EAA0CgQ,QAA1C;EACD,KAFD,MAEO;EACLA,MAAAA,QAAQ;EACT;EACF;;WAEDhO,UAAA,mBAAU;EACRrG,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EACA,SAAKY,QAAL,GAAgB,IAAhB;EACD;;;WAID0lB,YAAA,mBAAU7pB,OAAV,EAAmB2hB,SAAnB,EAA8BlG,QAA9B,EAAwC;EAAA;;EACtC,QAAMuP,cAAc,GAAGrJ,SAAS,KAAKA,SAAS,CAAC7B,QAAV,KAAuB,IAAvB,IAA+B6B,SAAS,CAAC7B,QAAV,KAAuB,IAA3D,CAAT,GACnBxhB,CAAC,CAACqjB,SAAD,CAAD,CAAauE,IAAb,CAAkBsE,kBAAlB,CADmB,GAEnBlsB,CAAC,CAACqjB,SAAD,CAAD,CAAarS,QAAb,CAAsB9I,iBAAtB,CAFJ;EAIA,QAAMykB,MAAM,GAAGD,cAAc,CAAC,CAAD,CAA7B;EACA,QAAM/X,eAAe,GAAGwI,QAAQ,IAAKwP,MAAM,IAAI3sB,CAAC,CAAC2sB,MAAD,CAAD,CAAU/lB,QAAV,CAAmBlB,iBAAnB,CAA/C;;EACA,QAAM2O,QAAQ,GAAG,SAAXA,QAAW;EAAA,aAAM,MAAI,CAACuY,mBAAL,CACrBlrB,OADqB,EAErBirB,MAFqB,EAGrBxP,QAHqB,CAAN;EAAA,KAAjB;;EAMA,QAAIwP,MAAM,IAAIhY,eAAd,EAA+B;EAC7B,UAAMzS,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC0qB,MAAtC,CAA3B;EAEA3sB,MAAAA,CAAC,CAAC2sB,MAAD,CAAD,CACGhmB,WADH,CACehB,iBADf,EAEGhF,GAFH,CAEOC,IAAI,CAAC1B,cAFZ,EAE4BmV,QAF5B,EAGGpT,oBAHH,CAGwBiB,kBAHxB;EAID,KAPD,MAOO;EACLmS,MAAAA,QAAQ;EACT;EACF;;WAEDuY,sBAAA,6BAAoBlrB,OAApB,EAA6BirB,MAA7B,EAAqCxP,QAArC,EAA+C;EAC7C,QAAIwP,MAAJ,EAAY;EACV3sB,MAAAA,CAAC,CAAC2sB,MAAD,CAAD,CAAUhmB,WAAV,CAAsBe,mBAAtB;EAEA,UAAMmlB,aAAa,GAAG7sB,CAAC,CAAC2sB,MAAM,CAACtoB,UAAR,CAAD,CAAqBujB,IAArB,CACpBuE,8BADoB,EAEpB,CAFoB,CAAtB;;EAIA,UAAIU,aAAJ,EAAmB;EACjB7sB,QAAAA,CAAC,CAAC6sB,aAAD,CAAD,CAAiBlmB,WAAjB,CAA6Be,mBAA7B;EACD;;EAED,UAAIilB,MAAM,CAAC/qB,YAAP,CAAoB,MAApB,MAAgC,KAApC,EAA2C;EACzC+qB,QAAAA,MAAM,CAACzjB,YAAP,CAAoB,eAApB,EAAqC,KAArC;EACD;EACF;;EAEDlJ,IAAAA,CAAC,CAAC0B,OAAD,CAAD,CAAWuP,QAAX,CAAoBvJ,mBAApB;;EACA,QAAIhG,OAAO,CAACE,YAAR,CAAqB,MAArB,MAAiC,KAArC,EAA4C;EAC1CF,MAAAA,OAAO,CAACwH,YAAR,CAAqB,eAArB,EAAsC,IAAtC;EACD;;EAEDtI,IAAAA,IAAI,CAAC6B,MAAL,CAAYf,OAAZ;;EAEA,QAAIA,OAAO,CAACmH,SAAR,CAAkBC,QAAlB,CAA2BpD,iBAA3B,CAAJ,EAAiD;EAC/ChE,MAAAA,OAAO,CAACmH,SAAR,CAAkBkB,GAAlB,CAAsBpE,iBAAtB;EACD;;EAED,QAAIjE,OAAO,CAAC2C,UAAR,IAAsBrE,CAAC,CAAC0B,OAAO,CAAC2C,UAAT,CAAD,CAAsBuC,QAAtB,CAA+BqlB,wBAA/B,CAA1B,EAAoF;EAClF,UAAMa,eAAe,GAAG9sB,CAAC,CAAC0B,OAAD,CAAD,CAAW8E,OAAX,CAAmBijB,mBAAnB,EAAsC,CAAtC,CAAxB;;EAEA,UAAIqD,eAAJ,EAAqB;EACnB,YAAMC,kBAAkB,GAAG,GAAGrjB,KAAH,CAASlK,IAAT,CAAcstB,eAAe,CAACnjB,gBAAhB,CAAiCggB,0BAAjC,CAAd,CAA3B;EAEA3pB,QAAAA,CAAC,CAAC+sB,kBAAD,CAAD,CAAsB9b,QAAtB,CAA+BvJ,mBAA/B;EACD;;EAEDhG,MAAAA,OAAO,CAACwH,YAAR,CAAqB,eAArB,EAAsC,IAAtC;EACD;;EAED,QAAIiU,QAAJ,EAAc;EACZA,MAAAA,QAAQ;EACT;EACF;;;QAIMnW,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAM+N,KAAK,GAAGhV,CAAC,CAAC,IAAD,CAAf;EACA,UAAImH,IAAI,GAAG6N,KAAK,CAAC7N,IAAN,CAAWlC,UAAX,CAAX;;EAEA,UAAI,CAACkC,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAIilB,GAAJ,CAAQ,IAAR,CAAP;EACApX,QAAAA,KAAK,CAAC7N,IAAN,CAAWlC,UAAX,EAAqBkC,IAArB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EACDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ;EACD;EACF,KAfM,CAAP;EAgBD;;;;0BAzKoB;EACnB,aAAO8B,SAAP;EACD;;;;;EA0KH;;;;;;;EAMAhF,CAAC,CAACuB,QAAD,CAAD,CACGgG,EADH,CACM/B,sBADN,EAC4BuC,sBAD5B,EACkD,UAAUhI,KAAV,EAAiB;EAC/DA,EAAAA,KAAK,CAACuH,cAAN;;EACA8kB,EAAAA,GAAG,CAACplB,gBAAJ,CAAqBxH,IAArB,CAA0BQ,CAAC,CAAC,IAAD,CAA3B,EAAmC,MAAnC;EACD,CAJH;EAMA;;;;;;EAMAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaqnB,GAAG,CAACplB,gBAAjB;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyB4kB,GAAzB;;EACApsB,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAwB,YAAM;EAC5BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAOgnB,GAAG,CAACplB,gBAAX;EACD,CAHD;;EC9OA;;;;;;EAMA,IAAMjC,MAAI,GAAiB,OAA3B;EACA,IAAMC,SAAO,GAAc,OAA3B;EACA,IAAMC,UAAQ,GAAa,UAA3B;EACA,IAAMC,WAAS,SAAgBD,UAA/B;EACA,IAAMG,oBAAkB,GAAGpF,CAAC,CAACgB,EAAF,CAAK+D,MAAL,CAA3B;EAEA,IAAMkV,qBAAmB,qBAAmB/U,WAA5C;EACA,IAAMkN,YAAU,YAAmBlN,WAAnC;EACA,IAAMmN,cAAY,cAAmBnN,WAArC;EACA,IAAMgN,YAAU,YAAmBhN,WAAnC;EACA,IAAMiN,aAAW,aAAmBjN,WAApC;EAEA,IAAMQ,iBAAe,GAAM,MAA3B;EACA,IAAMsnB,eAAe,GAAM,MAA3B;EACA,IAAMrnB,iBAAe,GAAM,MAA3B;EACA,IAAMsnB,kBAAkB,GAAG,SAA3B;EAEA,IAAMtiB,aAAW,GAAG;EAClBqY,EAAAA,SAAS,EAAG,SADM;EAElBkK,EAAAA,QAAQ,EAAI,SAFM;EAGlB/J,EAAAA,KAAK,EAAO;EAHM,CAApB;EAMA,IAAM/Y,SAAO,GAAG;EACd4Y,EAAAA,SAAS,EAAG,IADE;EAEdkK,EAAAA,QAAQ,EAAI,IAFE;EAGd/J,EAAAA,KAAK,EAAO;EAHE,CAAhB;EAMA,IAAMvI,uBAAqB,GAAG,wBAA9B;EAEA;;;;;;MAMMuS;EACJ,iBAAYzrB,OAAZ,EAAqBwB,MAArB,EAA6B;EAC3B,SAAK2C,QAAL,GAAgBnE,OAAhB;EACA,SAAK2L,OAAL,GAAgB,KAAKC,UAAL,CAAgBpK,MAAhB,CAAhB;EACA,SAAKgiB,QAAL,GAAgB,IAAhB;;EACA,SAAKI,aAAL;EACD;;;;;EAgBD;WAEA3R,OAAA,gBAAO;EAAA;;EACL,QAAMoE,SAAS,GAAG/X,CAAC,CAAC0G,KAAF,CAAQwL,YAAR,CAAlB;EAEAlS,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBoV,SAAzB;;EACA,QAAIA,SAAS,CAAC5R,kBAAV,EAAJ,EAAoC;EAClC;EACD;;EAED,QAAI,KAAKkH,OAAL,CAAa2V,SAAjB,EAA4B;EAC1B,WAAKnd,QAAL,CAAcgD,SAAd,CAAwBkB,GAAxB,CAA4BrE,iBAA5B;EACD;;EAED,QAAM2O,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrB,MAAA,KAAI,CAACxO,QAAL,CAAcgD,SAAd,CAAwB9B,MAAxB,CAA+BkmB,kBAA/B;;EACA,MAAA,KAAI,CAACpnB,QAAL,CAAcgD,SAAd,CAAwBkB,GAAxB,CAA4BpE,iBAA5B;;EAEA3F,MAAAA,CAAC,CAAC,KAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyBwP,aAAzB;;EAEA,UAAI,KAAI,CAAC9E,OAAL,CAAa6f,QAAjB,EAA2B;EACzB,QAAA,KAAI,CAAChI,QAAL,GAAgBrkB,UAAU,CAAC,YAAM;EAC/B,UAAA,KAAI,CAAC6S,IAAL;EACD,SAFyB,EAEvB,KAAI,CAACrG,OAAL,CAAa8V,KAFU,CAA1B;EAGD;EACF,KAXD;;EAaA,SAAKtd,QAAL,CAAcgD,SAAd,CAAwB9B,MAAxB,CAA+BimB,eAA/B;;EACApsB,IAAAA,IAAI,CAAC6B,MAAL,CAAY,KAAKoD,QAAjB;;EACA,SAAKA,QAAL,CAAcgD,SAAd,CAAwBkB,GAAxB,CAA4BkjB,kBAA5B;;EACA,QAAI,KAAK5f,OAAL,CAAa2V,SAAjB,EAA4B;EAC1B,UAAM9gB,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC,KAAK4D,QAA3C,CAA3B;EAEA7F,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGlF,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4BmV,QAD5B,EAEGpT,oBAFH,CAEwBiB,kBAFxB;EAGD,KAND,MAMO;EACLmS,MAAAA,QAAQ;EACT;EACF;;WAEDX,OAAA,gBAAO;EACL,QAAI,CAAC,KAAK7N,QAAL,CAAcgD,SAAd,CAAwBC,QAAxB,CAAiCnD,iBAAjC,CAAL,EAAwD;EACtD;EACD;;EAED,QAAM2S,SAAS,GAAGtY,CAAC,CAAC0G,KAAF,CAAQ0L,YAAR,CAAlB;EAEApS,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyB2V,SAAzB;;EACA,QAAIA,SAAS,CAACnS,kBAAV,EAAJ,EAAoC;EAClC;EACD;;EAED,SAAKinB,MAAL;EACD;;WAED/mB,UAAA,mBAAU;EACRsJ,IAAAA,YAAY,CAAC,KAAKuV,QAAN,CAAZ;EACA,SAAKA,QAAL,GAAgB,IAAhB;;EAEA,QAAI,KAAKrf,QAAL,CAAcgD,SAAd,CAAwBC,QAAxB,CAAiCnD,iBAAjC,CAAJ,EAAuD;EACrD,WAAKE,QAAL,CAAcgD,SAAd,CAAwB9B,MAAxB,CAA+BpB,iBAA/B;EACD;;EAED3F,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBiJ,GAAjB,CAAqBmL,qBAArB;EAEAja,IAAAA,CAAC,CAACsG,UAAF,CAAa,KAAKT,QAAlB,EAA4BZ,UAA5B;EACA,SAAKY,QAAL,GAAgB,IAAhB;EACA,SAAKwH,OAAL,GAAgB,IAAhB;EACD;;;WAIDC,aAAA,oBAAWpK,MAAX,EAAmB;EACjBA,IAAAA,MAAM,oDACDkH,SADC,GAEDpK,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiBsB,IAAjB,EAFC,GAGD,OAAOjE,MAAP,KAAkB,QAAlB,IAA8BA,MAA9B,GAAuCA,MAAvC,GAAgD,EAH/C,CAAN;EAMAtC,IAAAA,IAAI,CAACoC,eAAL,CACE+B,MADF,EAEE7B,MAFF,EAGE,KAAKyV,WAAL,CAAiBhO,WAHnB;EAMA,WAAOzH,MAAP;EACD;;WAEDoiB,gBAAA,yBAAgB;EAAA;;EACdtlB,IAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CAAiB0B,EAAjB,CAAoB0S,qBAApB,EAAyCW,uBAAzC,EAAgE;EAAA,aAAM,MAAI,CAAClH,IAAL,EAAN;EAAA,KAAhE;EACD;;WAED0Z,SAAA,kBAAS;EAAA;;EACP,QAAM/Y,QAAQ,GAAG,SAAXA,QAAW,GAAM;EACrB,MAAA,MAAI,CAACxO,QAAL,CAAcgD,SAAd,CAAwBkB,GAAxB,CAA4BijB,eAA5B;;EACAhtB,MAAAA,CAAC,CAAC,MAAI,CAAC6F,QAAN,CAAD,CAAiBlD,OAAjB,CAAyB0P,cAAzB;EACD,KAHD;;EAKA,SAAKxM,QAAL,CAAcgD,SAAd,CAAwB9B,MAAxB,CAA+BpB,iBAA/B;;EACA,QAAI,KAAK0H,OAAL,CAAa2V,SAAjB,EAA4B;EAC1B,UAAM9gB,kBAAkB,GAAGtB,IAAI,CAACqB,gCAAL,CAAsC,KAAK4D,QAA3C,CAA3B;EAEA7F,MAAAA,CAAC,CAAC,KAAK6F,QAAN,CAAD,CACGlF,GADH,CACOC,IAAI,CAAC1B,cADZ,EAC4BmV,QAD5B,EAEGpT,oBAFH,CAEwBiB,kBAFxB;EAGD,KAND,MAMO;EACLmS,MAAAA,QAAQ;EACT;EACF;;;UAIMrN,mBAAP,0BAAwB9D,MAAxB,EAAgC;EAC9B,WAAO,KAAK+D,IAAL,CAAU,YAAY;EAC3B,UAAMC,QAAQ,GAAGlH,CAAC,CAAC,IAAD,CAAlB;EACA,UAAImH,IAAI,GAASD,QAAQ,CAACC,IAAT,CAAclC,UAAd,CAAjB;;EACA,UAAMoI,OAAO,GAAI,OAAOnK,MAAP,KAAkB,QAAlB,IAA8BA,MAA/C;;EAEA,UAAI,CAACiE,IAAL,EAAW;EACTA,QAAAA,IAAI,GAAG,IAAIgmB,KAAJ,CAAU,IAAV,EAAgB9f,OAAhB,CAAP;EACAnG,QAAAA,QAAQ,CAACC,IAAT,CAAclC,UAAd,EAAwBkC,IAAxB;EACD;;EAED,UAAI,OAAOjE,MAAP,KAAkB,QAAtB,EAAgC;EAC9B,YAAI,OAAOiE,IAAI,CAACjE,MAAD,CAAX,KAAwB,WAA5B,EAAyC;EACvC,gBAAM,IAAIqB,SAAJ,wBAAkCrB,MAAlC,QAAN;EACD;;EAEDiE,QAAAA,IAAI,CAACjE,MAAD,CAAJ,CAAa,IAAb;EACD;EACF,KAjBM,CAAP;EAkBD;;;;0BAhJoB;EACnB,aAAO8B,SAAP;EACD;;;0BAEwB;EACvB,aAAO2F,aAAP;EACD;;;0BAEoB;EACnB,aAAOP,SAAP;EACD;;;;;EAyIH;;;;;;;EAMApK,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAyBooB,KAAK,CAACnmB,gBAA/B;EACAhH,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAWyC,WAAX,GAAyB2lB,KAAzB;;EACAntB,CAAC,CAACgB,EAAF,CAAK+D,MAAL,EAAW0C,UAAX,GAAyB,YAAM;EAC7BzH,EAAAA,CAAC,CAACgB,EAAF,CAAK+D,MAAL,IAAaK,oBAAb;EACA,SAAO+nB,KAAK,CAACnmB,gBAAb;EACD,CAHD;;;;;;;;;;;;;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/web/skins/classic/js/bootstrap.bundle.min.js b/web/skins/classic/js/bootstrap.bundle.min.js
new file mode 120000
index 000000000..02634181e
--- /dev/null
+++ b/web/skins/classic/js/bootstrap.bundle.min.js
@@ -0,0 +1 @@
+bootstrap.min.js
\ No newline at end of file
diff --git a/web/skins/classic/js/bootstrap.js b/web/skins/classic/js/bootstrap.js
index 01fbbcbaa..363e0013b 100644
--- a/web/skins/classic/js/bootstrap.js
+++ b/web/skins/classic/js/bootstrap.js
@@ -1,2363 +1,4420 @@
 /*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under the MIT license
- */
+  * Bootstrap v4.5.0 (https://getbootstrap.com/)
+  * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+  */
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('jquery'), require('popper.js')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'jquery', 'popper.js'], factory) :
+  (global = global || self, factory(global.bootstrap = {}, global.jQuery, global.Popper));
+}(this, (function (exports, $, Popper) { 'use strict';
 
-if (typeof jQuery === 'undefined') {
-  throw new Error('Bootstrap\'s JavaScript requires jQuery')
-}
+  $ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
+  Popper = Popper && Object.prototype.hasOwnProperty.call(Popper, 'default') ? Popper['default'] : Popper;
 
-+function ($) {
-  'use strict';
-  var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {
-    throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')
-  }
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: transition.js v3.3.6
- * http://getbootstrap.com/javascript/#transitions
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      WebkitTransition : 'webkitTransitionEnd',
-      MozTransition    : 'transitionend',
-      OTransition      : 'oTransitionEnd otransitionend',
-      transition       : 'transitionend'
+  function _defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
     }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
   }
 
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false
-    var $el = this
-    $(this).one('bsTransitionEnd', function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
+  function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
   }
 
-  $(function () {
-    $.support.transition = transitionEnd()
-
-    if (!$.support.transition) return
-
-    $.event.special.bsTransitionEnd = {
-      bindType: $.support.transition.end,
-      delegateType: $.support.transition.end,
-      handle: function (e) {
-        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
-      }
-    }
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: alert.js v3.3.6
- * http://getbootstrap.com/javascript/#alerts
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // ALERT CLASS DEFINITION
-  // ======================
-
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-
-  Alert.VERSION = '3.3.6'
-
-  Alert.TRANSITION_DURATION = 150
-
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = $(selector)
-
-    if (e) e.preventDefault()
-
-    if (!$parent.length) {
-      $parent = $this.closest('.alert')
-    }
-
-    $parent.trigger(e = $.Event('close.bs.alert'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      // detach from parent, fire event then clean up data
-      $parent.detach().trigger('closed.bs.alert').remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one('bsTransitionEnd', removeElement)
-        .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
-      removeElement()
-  }
-
-
-  // ALERT PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.alert
-
-  $.fn.alert             = Plugin
-  $.fn.alert.Constructor = Alert
-
-
-  // ALERT NO CONFLICT
-  // =================
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
-  // ALERT DATA-API
-  // ==============
-
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: button.js v3.3.6
- * http://getbootstrap.com/javascript/#buttons
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
-  }
-
-  Button.VERSION  = '3.3.6'
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state += 'Text'
-
-    if (data.resetText == null) $el.data('resetText', $el[val]())
-
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      $el[val](data[state] == null ? this.options[state] : data[state])
-
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d)
-      }
-    }, this), 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked')) changed = false
-        $parent.find('.active').removeClass('active')
-        this.$element.addClass('active')
-      } else if ($input.prop('type') == 'checkbox') {
-        if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false
-        this.$element.toggleClass('active')
-      }
-      $input.prop('checked', this.$element.hasClass('active'))
-      if (changed) $input.trigger('change')
+  function _defineProperty(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
     } else {
-      this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
-      this.$element.toggleClass('active')
+      obj[key] = value;
     }
+
+    return obj;
   }
 
+  function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
 
-  // BUTTON PLUGIN DEFINITION
-  // ========================
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(object);
+      if (enumerableOnly) symbols = symbols.filter(function (sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+      keys.push.apply(keys, symbols);
+    }
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
+    return keys;
   }
 
-  var old = $.fn.button
+  function _objectSpread2(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i] != null ? arguments[i] : {};
 
-  $.fn.button             = Plugin
-  $.fn.button.Constructor = Button
+      if (i % 2) {
+        ownKeys(Object(source), true).forEach(function (key) {
+          _defineProperty(target, key, source[key]);
+        });
+      } else if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+      } else {
+        ownKeys(Object(source)).forEach(function (key) {
+          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+      }
+    }
 
-
-  // BUTTON NO CONFLICT
-  // ==================
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
+    return target;
   }
 
-
-  // BUTTON DATA-API
-  // ===============
-
-  $(document)
-    .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      var $btn = $(e.target)
-      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-      Plugin.call($btn, 'toggle')
-      if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
-    })
-    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
-    })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: carousel.js v3.3.6
- * http://getbootstrap.com/javascript/#carousel
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CAROUSEL CLASS DEFINITION
-  // =========================
-
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      = null
-    this.sliding     = null
-    this.interval    = null
-    this.$active     = null
-    this.$items      = null
-
-    this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
-
-    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
-      .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
-      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
+  function _inheritsLoose(subClass, superClass) {
+    subClass.prototype = Object.create(superClass.prototype);
+    subClass.prototype.constructor = subClass;
+    subClass.__proto__ = superClass;
   }
 
-  Carousel.VERSION  = '3.3.6'
+  /**
+   * --------------------------------------------------------------------------
+   * Bootstrap (v4.5.0): util.js
+   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+   * --------------------------------------------------------------------------
+   */
+  /**
+   * ------------------------------------------------------------------------
+   * Private TransitionEnd Helpers
+   * ------------------------------------------------------------------------
+   */
 
-  Carousel.TRANSITION_DURATION = 600
+  var TRANSITION_END = 'transitionend';
+  var MAX_UID = 1000000;
+  var MILLISECONDS_MULTIPLIER = 1000; // Shoutout AngusCroll (https://goo.gl/pxwQGp)
 
-  Carousel.DEFAULTS = {
+  function toType(obj) {
+    if (obj === null || typeof obj === 'undefined') {
+      return "" + obj;
+    }
+
+    return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase();
+  }
+
+  function getSpecialTransitionEndEvent() {
+    return {
+      bindType: TRANSITION_END,
+      delegateType: TRANSITION_END,
+      handle: function handle(event) {
+        if ($(event.target).is(this)) {
+          return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
+        }
+
+        return undefined;
+      }
+    };
+  }
+
+  function transitionEndEmulator(duration) {
+    var _this = this;
+
+    var called = false;
+    $(this).one(Util.TRANSITION_END, function () {
+      called = true;
+    });
+    setTimeout(function () {
+      if (!called) {
+        Util.triggerTransitionEnd(_this);
+      }
+    }, duration);
+    return this;
+  }
+
+  function setTransitionEndSupport() {
+    $.fn.emulateTransitionEnd = transitionEndEmulator;
+    $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
+  }
+  /**
+   * --------------------------------------------------------------------------
+   * Public Util Api
+   * --------------------------------------------------------------------------
+   */
+
+
+  var Util = {
+    TRANSITION_END: 'bsTransitionEnd',
+    getUID: function getUID(prefix) {
+      do {
+        // eslint-disable-next-line no-bitwise
+        prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here
+      } while (document.getElementById(prefix));
+
+      return prefix;
+    },
+    getSelectorFromElement: function getSelectorFromElement(element) {
+      var selector = element.getAttribute('data-target');
+
+      if (!selector || selector === '#') {
+        var hrefAttr = element.getAttribute('href');
+        selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
+      }
+
+      try {
+        return document.querySelector(selector) ? selector : null;
+      } catch (err) {
+        return null;
+      }
+    },
+    getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
+      if (!element) {
+        return 0;
+      } // Get transition-duration of the element
+
+
+      var transitionDuration = $(element).css('transition-duration');
+      var transitionDelay = $(element).css('transition-delay');
+      var floatTransitionDuration = parseFloat(transitionDuration);
+      var floatTransitionDelay = parseFloat(transitionDelay); // Return 0 if element or transition duration is not found
+
+      if (!floatTransitionDuration && !floatTransitionDelay) {
+        return 0;
+      } // If multiple durations are defined, take the first
+
+
+      transitionDuration = transitionDuration.split(',')[0];
+      transitionDelay = transitionDelay.split(',')[0];
+      return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER;
+    },
+    reflow: function reflow(element) {
+      return element.offsetHeight;
+    },
+    triggerTransitionEnd: function triggerTransitionEnd(element) {
+      $(element).trigger(TRANSITION_END);
+    },
+    // TODO: Remove in v5
+    supportsTransitionEnd: function supportsTransitionEnd() {
+      return Boolean(TRANSITION_END);
+    },
+    isElement: function isElement(obj) {
+      return (obj[0] || obj).nodeType;
+    },
+    typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) {
+      for (var property in configTypes) {
+        if (Object.prototype.hasOwnProperty.call(configTypes, property)) {
+          var expectedTypes = configTypes[property];
+          var value = config[property];
+          var valueType = value && Util.isElement(value) ? 'element' : toType(value);
+
+          if (!new RegExp(expectedTypes).test(valueType)) {
+            throw new Error(componentName.toUpperCase() + ": " + ("Option \"" + property + "\" provided type \"" + valueType + "\" ") + ("but expected type \"" + expectedTypes + "\"."));
+          }
+        }
+      }
+    },
+    findShadowRoot: function findShadowRoot(element) {
+      if (!document.documentElement.attachShadow) {
+        return null;
+      } // Can find the shadow root otherwise it'll return the document
+
+
+      if (typeof element.getRootNode === 'function') {
+        var root = element.getRootNode();
+        return root instanceof ShadowRoot ? root : null;
+      }
+
+      if (element instanceof ShadowRoot) {
+        return element;
+      } // when we don't find a shadow root
+
+
+      if (!element.parentNode) {
+        return null;
+      }
+
+      return Util.findShadowRoot(element.parentNode);
+    },
+    jQueryDetection: function jQueryDetection() {
+      if (typeof $ === 'undefined') {
+        throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.');
+      }
+
+      var version = $.fn.jquery.split(' ')[0].split('.');
+      var minMajor = 1;
+      var ltMajor = 2;
+      var minMinor = 9;
+      var minPatch = 1;
+      var maxMajor = 4;
+
+      if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
+        throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0');
+      }
+    }
+  };
+  Util.jQueryDetection();
+  setTransitionEndSupport();
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME = 'alert';
+  var VERSION = '4.5.0';
+  var DATA_KEY = 'bs.alert';
+  var EVENT_KEY = "." + DATA_KEY;
+  var DATA_API_KEY = '.data-api';
+  var JQUERY_NO_CONFLICT = $.fn[NAME];
+  var SELECTOR_DISMISS = '[data-dismiss="alert"]';
+  var EVENT_CLOSE = "close" + EVENT_KEY;
+  var EVENT_CLOSED = "closed" + EVENT_KEY;
+  var EVENT_CLICK_DATA_API = "click" + EVENT_KEY + DATA_API_KEY;
+  var CLASS_NAME_ALERT = 'alert';
+  var CLASS_NAME_FADE = 'fade';
+  var CLASS_NAME_SHOW = 'show';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Alert = /*#__PURE__*/function () {
+    function Alert(element) {
+      this._element = element;
+    } // Getters
+
+
+    var _proto = Alert.prototype;
+
+    // Public
+    _proto.close = function close(element) {
+      var rootElement = this._element;
+
+      if (element) {
+        rootElement = this._getRootElement(element);
+      }
+
+      var customEvent = this._triggerCloseEvent(rootElement);
+
+      if (customEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._removeElement(rootElement);
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY);
+      this._element = null;
+    } // Private
+    ;
+
+    _proto._getRootElement = function _getRootElement(element) {
+      var selector = Util.getSelectorFromElement(element);
+      var parent = false;
+
+      if (selector) {
+        parent = document.querySelector(selector);
+      }
+
+      if (!parent) {
+        parent = $(element).closest("." + CLASS_NAME_ALERT)[0];
+      }
+
+      return parent;
+    };
+
+    _proto._triggerCloseEvent = function _triggerCloseEvent(element) {
+      var closeEvent = $.Event(EVENT_CLOSE);
+      $(element).trigger(closeEvent);
+      return closeEvent;
+    };
+
+    _proto._removeElement = function _removeElement(element) {
+      var _this = this;
+
+      $(element).removeClass(CLASS_NAME_SHOW);
+
+      if (!$(element).hasClass(CLASS_NAME_FADE)) {
+        this._destroyElement(element);
+
+        return;
+      }
+
+      var transitionDuration = Util.getTransitionDurationFromElement(element);
+      $(element).one(Util.TRANSITION_END, function (event) {
+        return _this._destroyElement(element, event);
+      }).emulateTransitionEnd(transitionDuration);
+    };
+
+    _proto._destroyElement = function _destroyElement(element) {
+      $(element).detach().trigger(EVENT_CLOSED).remove();
+    } // Static
+    ;
+
+    Alert._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $element = $(this);
+        var data = $element.data(DATA_KEY);
+
+        if (!data) {
+          data = new Alert(this);
+          $element.data(DATA_KEY, data);
+        }
+
+        if (config === 'close') {
+          data[config](this);
+        }
+      });
+    };
+
+    Alert._handleDismiss = function _handleDismiss(alertInstance) {
+      return function (event) {
+        if (event) {
+          event.preventDefault();
+        }
+
+        alertInstance.close(this);
+      };
+    };
+
+    _createClass(Alert, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION;
+      }
+    }]);
+
+    return Alert;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API, SELECTOR_DISMISS, Alert._handleDismiss(new Alert()));
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME] = Alert._jQueryInterface;
+  $.fn[NAME].Constructor = Alert;
+
+  $.fn[NAME].noConflict = function () {
+    $.fn[NAME] = JQUERY_NO_CONFLICT;
+    return Alert._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$1 = 'button';
+  var VERSION$1 = '4.5.0';
+  var DATA_KEY$1 = 'bs.button';
+  var EVENT_KEY$1 = "." + DATA_KEY$1;
+  var DATA_API_KEY$1 = '.data-api';
+  var JQUERY_NO_CONFLICT$1 = $.fn[NAME$1];
+  var CLASS_NAME_ACTIVE = 'active';
+  var CLASS_NAME_BUTTON = 'btn';
+  var CLASS_NAME_FOCUS = 'focus';
+  var SELECTOR_DATA_TOGGLE_CARROT = '[data-toggle^="button"]';
+  var SELECTOR_DATA_TOGGLES = '[data-toggle="buttons"]';
+  var SELECTOR_DATA_TOGGLE = '[data-toggle="button"]';
+  var SELECTOR_DATA_TOGGLES_BUTTONS = '[data-toggle="buttons"] .btn';
+  var SELECTOR_INPUT = 'input:not([type="hidden"])';
+  var SELECTOR_ACTIVE = '.active';
+  var SELECTOR_BUTTON = '.btn';
+  var EVENT_CLICK_DATA_API$1 = "click" + EVENT_KEY$1 + DATA_API_KEY$1;
+  var EVENT_FOCUS_BLUR_DATA_API = "focus" + EVENT_KEY$1 + DATA_API_KEY$1 + " " + ("blur" + EVENT_KEY$1 + DATA_API_KEY$1);
+  var EVENT_LOAD_DATA_API = "load" + EVENT_KEY$1 + DATA_API_KEY$1;
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Button = /*#__PURE__*/function () {
+    function Button(element) {
+      this._element = element;
+    } // Getters
+
+
+    var _proto = Button.prototype;
+
+    // Public
+    _proto.toggle = function toggle() {
+      var triggerChangeEvent = true;
+      var addAriaPressed = true;
+      var rootElement = $(this._element).closest(SELECTOR_DATA_TOGGLES)[0];
+
+      if (rootElement) {
+        var input = this._element.querySelector(SELECTOR_INPUT);
+
+        if (input) {
+          if (input.type === 'radio') {
+            if (input.checked && this._element.classList.contains(CLASS_NAME_ACTIVE)) {
+              triggerChangeEvent = false;
+            } else {
+              var activeElement = rootElement.querySelector(SELECTOR_ACTIVE);
+
+              if (activeElement) {
+                $(activeElement).removeClass(CLASS_NAME_ACTIVE);
+              }
+            }
+          }
+
+          if (triggerChangeEvent) {
+            // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input
+            if (input.type === 'checkbox' || input.type === 'radio') {
+              input.checked = !this._element.classList.contains(CLASS_NAME_ACTIVE);
+            }
+
+            $(input).trigger('change');
+          }
+
+          input.focus();
+          addAriaPressed = false;
+        }
+      }
+
+      if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {
+        if (addAriaPressed) {
+          this._element.setAttribute('aria-pressed', !this._element.classList.contains(CLASS_NAME_ACTIVE));
+        }
+
+        if (triggerChangeEvent) {
+          $(this._element).toggleClass(CLASS_NAME_ACTIVE);
+        }
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$1);
+      this._element = null;
+    } // Static
+    ;
+
+    Button._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$1);
+
+        if (!data) {
+          data = new Button(this);
+          $(this).data(DATA_KEY$1, data);
+        }
+
+        if (config === 'toggle') {
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Button, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$1;
+      }
+    }]);
+
+    return Button;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$1, SELECTOR_DATA_TOGGLE_CARROT, function (event) {
+    var button = event.target;
+    var initialButton = button;
+
+    if (!$(button).hasClass(CLASS_NAME_BUTTON)) {
+      button = $(button).closest(SELECTOR_BUTTON)[0];
+    }
+
+    if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {
+      event.preventDefault(); // work around Firefox bug #1540995
+    } else {
+      var inputBtn = button.querySelector(SELECTOR_INPUT);
+
+      if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {
+        event.preventDefault(); // work around Firefox bug #1540995
+
+        return;
+      }
+
+      if (initialButton.tagName === 'LABEL' && inputBtn && inputBtn.type === 'checkbox') {
+        event.preventDefault(); // work around event sent to label and input
+      }
+
+      Button._jQueryInterface.call($(button), 'toggle');
+    }
+  }).on(EVENT_FOCUS_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, function (event) {
+    var button = $(event.target).closest(SELECTOR_BUTTON)[0];
+    $(button).toggleClass(CLASS_NAME_FOCUS, /^focus(in)?$/.test(event.type));
+  });
+  $(window).on(EVENT_LOAD_DATA_API, function () {
+    // ensure correct active class is set to match the controls' actual values/states
+    // find all checkboxes/readio buttons inside data-toggle groups
+    var buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLES_BUTTONS));
+
+    for (var i = 0, len = buttons.length; i < len; i++) {
+      var button = buttons[i];
+      var input = button.querySelector(SELECTOR_INPUT);
+
+      if (input.checked || input.hasAttribute('checked')) {
+        button.classList.add(CLASS_NAME_ACTIVE);
+      } else {
+        button.classList.remove(CLASS_NAME_ACTIVE);
+      }
+    } // find all button toggles
+
+
+    buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE));
+
+    for (var _i = 0, _len = buttons.length; _i < _len; _i++) {
+      var _button = buttons[_i];
+
+      if (_button.getAttribute('aria-pressed') === 'true') {
+        _button.classList.add(CLASS_NAME_ACTIVE);
+      } else {
+        _button.classList.remove(CLASS_NAME_ACTIVE);
+      }
+    }
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$1] = Button._jQueryInterface;
+  $.fn[NAME$1].Constructor = Button;
+
+  $.fn[NAME$1].noConflict = function () {
+    $.fn[NAME$1] = JQUERY_NO_CONFLICT$1;
+    return Button._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$2 = 'carousel';
+  var VERSION$2 = '4.5.0';
+  var DATA_KEY$2 = 'bs.carousel';
+  var EVENT_KEY$2 = "." + DATA_KEY$2;
+  var DATA_API_KEY$2 = '.data-api';
+  var JQUERY_NO_CONFLICT$2 = $.fn[NAME$2];
+  var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
+
+  var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
+
+  var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
+
+  var SWIPE_THRESHOLD = 40;
+  var Default = {
     interval: 5000,
+    keyboard: true,
+    slide: false,
     pause: 'hover',
     wrap: true,
-    keyboard: true
-  }
-
-  Carousel.prototype.keydown = function (e) {
-    if (/input|textarea/i.test(e.target.tagName)) return
-    switch (e.which) {
-      case 37: this.prev(); break
-      case 39: this.next(); break
-      default: return
-    }
-
-    e.preventDefault()
-  }
-
-  Carousel.prototype.cycle = function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getItemIndex = function (item) {
-    this.$items = item.parent().children('.item')
-    return this.$items.index(item || this.$active)
-  }
-
-  Carousel.prototype.getItemForDirection = function (direction, active) {
-    var activeIndex = this.getItemIndex(active)
-    var willWrap = (direction == 'prev' && activeIndex === 0)
-                || (direction == 'next' && activeIndex == (this.$items.length - 1))
-    if (willWrap && !this.options.wrap) return active
-    var delta = direction == 'prev' ? -1 : 1
-    var itemIndex = (activeIndex + delta) % this.$items.length
-    return this.$items.eq(itemIndex)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || this.getItemForDirection(type, $active)
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var that      = this
-
-    if ($next.hasClass('active')) return (this.sliding = false)
-
-    var relatedTarget = $next[0]
-    var slideEvent = $.Event('slide.bs.carousel', {
-      relatedTarget: relatedTarget,
-      direction: direction
-    })
-    this.$element.trigger(slideEvent)
-    if (slideEvent.isDefaultPrevented()) return
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
-      $nextIndicator && $nextIndicator.addClass('active')
-    }
-
-    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one('bsTransitionEnd', function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () {
-            that.$element.trigger(slidEvent)
-          }, 0)
-        })
-        .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
-    } else {
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger(slidEvent)
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  var old = $.fn.carousel
-
-  $.fn.carousel             = Plugin
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  var clickHandler = function (e) {
-    var href
-    var $this   = $(this)
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
-    if (!$target.hasClass('carousel')) return
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    Plugin.call($target, options)
-
-    if (slideIndex) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  }
-
-  $(document)
-    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
-    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      Plugin.call($carousel, $carousel.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: collapse.js v3.3.6
- * http://getbootstrap.com/javascript/#collapse
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
-
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.$trigger      = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
-                           '[data-toggle="collapse"][data-target="#' + element.id + '"]')
-    this.transitioning = null
-
-    if (this.options.parent) {
-      this.$parent = this.getParent()
-    } else {
-      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
-    }
-
-    if (this.options.toggle) this.toggle()
-  }
-
-  Collapse.VERSION  = '3.3.6'
-
-  Collapse.TRANSITION_DURATION = 350
-
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
-
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
-
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
-
-    var activesData
-    var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
-
-    if (actives && actives.length) {
-      activesData = actives.data('bs.collapse')
-      if (activesData && activesData.transitioning) return
-    }
-
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    if (actives && actives.length) {
-      Plugin.call(actives, 'hide')
-      activesData || actives.data('bs.collapse', null)
-    }
-
-    var dimension = this.dimension()
-
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')[dimension](0)
-      .attr('aria-expanded', true)
-
-    this.$trigger
-      .removeClass('collapsed')
-      .attr('aria-expanded', true)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse in')[dimension]('')
-      this.transitioning = 0
-      this.$element
-        .trigger('shown.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-    this.$element
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
-  }
-
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var dimension = this.dimension()
-
-    this.$element[dimension](this.$element[dimension]())[0].offsetHeight
-
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse in')
-      .attr('aria-expanded', false)
-
-    this.$trigger
-      .addClass('collapsed')
-      .attr('aria-expanded', false)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse')
-        .trigger('hidden.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    this.$element
-      [dimension](0)
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
-  }
-
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
-
-  Collapse.prototype.getParent = function () {
-    return $(this.options.parent)
-      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
-      .each($.proxy(function (i, element) {
-        var $element = $(element)
-        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
-      }, this))
-      .end()
-  }
-
-  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
-    var isOpen = $element.hasClass('in')
-
-    $element.attr('aria-expanded', isOpen)
-    $trigger
-      .toggleClass('collapsed', !isOpen)
-      .attr('aria-expanded', isOpen)
-  }
-
-  function getTargetFromTrigger($trigger) {
-    var href
-    var target = $trigger.attr('data-target')
-      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-
-    return $(target)
-  }
-
-
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.collapse
-
-  $.fn.collapse             = Plugin
-  $.fn.collapse.Constructor = Collapse
-
-
-  // COLLAPSE NO CONFLICT
-  // ====================
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
-  // COLLAPSE DATA-API
-  // =================
-
-  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var $this   = $(this)
-
-    if (!$this.attr('data-target')) e.preventDefault()
-
-    var $target = getTargetFromTrigger($this)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-
-    Plugin.call($target, option)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: dropdown.js v3.3.6
- * http://getbootstrap.com/javascript/#dropdowns
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // DROPDOWN CLASS DEFINITION
-  // =========================
-
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle="dropdown"]'
-  var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
-  }
-
-  Dropdown.VERSION = '3.3.6'
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
-  function clearMenus(e) {
-    if (e && e.which === 3) return
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $this         = $(this)
-      var $parent       = getParent($this)
-      var relatedTarget = { relatedTarget: this }
-
-      if (!$parent.hasClass('open')) return
-
-      if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
-
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this.attr('aria-expanded', 'false')
-      $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
-    })
-  }
-
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    clearMenus()
-
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we use a backdrop because click events don't delegate
-        $(document.createElement('div'))
-          .addClass('dropdown-backdrop')
-          .insertAfter($(this))
-          .on('click', clearMenus)
+    touch: true
+  };
+  var DefaultType = {
+    interval: '(number|boolean)',
+    keyboard: 'boolean',
+    slide: '(boolean|string)',
+    pause: '(string|boolean)',
+    wrap: 'boolean',
+    touch: 'boolean'
+  };
+  var DIRECTION_NEXT = 'next';
+  var DIRECTION_PREV = 'prev';
+  var DIRECTION_LEFT = 'left';
+  var DIRECTION_RIGHT = 'right';
+  var EVENT_SLIDE = "slide" + EVENT_KEY$2;
+  var EVENT_SLID = "slid" + EVENT_KEY$2;
+  var EVENT_KEYDOWN = "keydown" + EVENT_KEY$2;
+  var EVENT_MOUSEENTER = "mouseenter" + EVENT_KEY$2;
+  var EVENT_MOUSELEAVE = "mouseleave" + EVENT_KEY$2;
+  var EVENT_TOUCHSTART = "touchstart" + EVENT_KEY$2;
+  var EVENT_TOUCHMOVE = "touchmove" + EVENT_KEY$2;
+  var EVENT_TOUCHEND = "touchend" + EVENT_KEY$2;
+  var EVENT_POINTERDOWN = "pointerdown" + EVENT_KEY$2;
+  var EVENT_POINTERUP = "pointerup" + EVENT_KEY$2;
+  var EVENT_DRAG_START = "dragstart" + EVENT_KEY$2;
+  var EVENT_LOAD_DATA_API$1 = "load" + EVENT_KEY$2 + DATA_API_KEY$2;
+  var EVENT_CLICK_DATA_API$2 = "click" + EVENT_KEY$2 + DATA_API_KEY$2;
+  var CLASS_NAME_CAROUSEL = 'carousel';
+  var CLASS_NAME_ACTIVE$1 = 'active';
+  var CLASS_NAME_SLIDE = 'slide';
+  var CLASS_NAME_RIGHT = 'carousel-item-right';
+  var CLASS_NAME_LEFT = 'carousel-item-left';
+  var CLASS_NAME_NEXT = 'carousel-item-next';
+  var CLASS_NAME_PREV = 'carousel-item-prev';
+  var CLASS_NAME_POINTER_EVENT = 'pointer-event';
+  var SELECTOR_ACTIVE$1 = '.active';
+  var SELECTOR_ACTIVE_ITEM = '.active.carousel-item';
+  var SELECTOR_ITEM = '.carousel-item';
+  var SELECTOR_ITEM_IMG = '.carousel-item img';
+  var SELECTOR_NEXT_PREV = '.carousel-item-next, .carousel-item-prev';
+  var SELECTOR_INDICATORS = '.carousel-indicators';
+  var SELECTOR_DATA_SLIDE = '[data-slide], [data-slide-to]';
+  var SELECTOR_DATA_RIDE = '[data-ride="carousel"]';
+  var PointerType = {
+    TOUCH: 'touch',
+    PEN: 'pen'
+  };
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Carousel = /*#__PURE__*/function () {
+    function Carousel(element, config) {
+      this._items = null;
+      this._interval = null;
+      this._activeElement = null;
+      this._isPaused = false;
+      this._isSliding = false;
+      this.touchTimeout = null;
+      this.touchStartX = 0;
+      this.touchDeltaX = 0;
+      this._config = this._getConfig(config);
+      this._element = element;
+      this._indicatorsElement = this._element.querySelector(SELECTOR_INDICATORS);
+      this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0;
+      this._pointerEvent = Boolean(window.PointerEvent || window.MSPointerEvent);
+
+      this._addEventListeners();
+    } // Getters
+
+
+    var _proto = Carousel.prototype;
+
+    // Public
+    _proto.next = function next() {
+      if (!this._isSliding) {
+        this._slide(DIRECTION_NEXT);
+      }
+    };
+
+    _proto.nextWhenVisible = function nextWhenVisible() {
+      // Don't call next when the page isn't visible
+      // or the carousel or its parent isn't visible
+      if (!document.hidden && $(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden') {
+        this.next();
+      }
+    };
+
+    _proto.prev = function prev() {
+      if (!this._isSliding) {
+        this._slide(DIRECTION_PREV);
+      }
+    };
+
+    _proto.pause = function pause(event) {
+      if (!event) {
+        this._isPaused = true;
       }
 
-      var relatedTarget = { relatedTarget: this }
-      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
+      if (this._element.querySelector(SELECTOR_NEXT_PREV)) {
+        Util.triggerTransitionEnd(this._element);
+        this.cycle(true);
+      }
 
-      if (e.isDefaultPrevented()) return
+      clearInterval(this._interval);
+      this._interval = null;
+    };
 
-      $this
-        .trigger('focus')
-        .attr('aria-expanded', 'true')
+    _proto.cycle = function cycle(event) {
+      if (!event) {
+        this._isPaused = false;
+      }
 
-      $parent
-        .toggleClass('open')
-        .trigger($.Event('shown.bs.dropdown', relatedTarget))
+      if (this._interval) {
+        clearInterval(this._interval);
+        this._interval = null;
+      }
+
+      if (this._config.interval && !this._isPaused) {
+        this._interval = setInterval((document.visibilityState ? this.nextWhenVisible : this.next).bind(this), this._config.interval);
+      }
+    };
+
+    _proto.to = function to(index) {
+      var _this = this;
+
+      this._activeElement = this._element.querySelector(SELECTOR_ACTIVE_ITEM);
+
+      var activeIndex = this._getItemIndex(this._activeElement);
+
+      if (index > this._items.length - 1 || index < 0) {
+        return;
+      }
+
+      if (this._isSliding) {
+        $(this._element).one(EVENT_SLID, function () {
+          return _this.to(index);
+        });
+        return;
+      }
+
+      if (activeIndex === index) {
+        this.pause();
+        this.cycle();
+        return;
+      }
+
+      var direction = index > activeIndex ? DIRECTION_NEXT : DIRECTION_PREV;
+
+      this._slide(direction, this._items[index]);
+    };
+
+    _proto.dispose = function dispose() {
+      $(this._element).off(EVENT_KEY$2);
+      $.removeData(this._element, DATA_KEY$2);
+      this._items = null;
+      this._config = null;
+      this._element = null;
+      this._interval = null;
+      this._isPaused = null;
+      this._isSliding = null;
+      this._activeElement = null;
+      this._indicatorsElement = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default), config);
+      Util.typeCheckConfig(NAME$2, config, DefaultType);
+      return config;
+    };
+
+    _proto._handleSwipe = function _handleSwipe() {
+      var absDeltax = Math.abs(this.touchDeltaX);
+
+      if (absDeltax <= SWIPE_THRESHOLD) {
+        return;
+      }
+
+      var direction = absDeltax / this.touchDeltaX;
+      this.touchDeltaX = 0; // swipe left
+
+      if (direction > 0) {
+        this.prev();
+      } // swipe right
+
+
+      if (direction < 0) {
+        this.next();
+      }
+    };
+
+    _proto._addEventListeners = function _addEventListeners() {
+      var _this2 = this;
+
+      if (this._config.keyboard) {
+        $(this._element).on(EVENT_KEYDOWN, function (event) {
+          return _this2._keydown(event);
+        });
+      }
+
+      if (this._config.pause === 'hover') {
+        $(this._element).on(EVENT_MOUSEENTER, function (event) {
+          return _this2.pause(event);
+        }).on(EVENT_MOUSELEAVE, function (event) {
+          return _this2.cycle(event);
+        });
+      }
+
+      if (this._config.touch) {
+        this._addTouchEventListeners();
+      }
+    };
+
+    _proto._addTouchEventListeners = function _addTouchEventListeners() {
+      var _this3 = this;
+
+      if (!this._touchSupported) {
+        return;
+      }
+
+      var start = function start(event) {
+        if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+          _this3.touchStartX = event.originalEvent.clientX;
+        } else if (!_this3._pointerEvent) {
+          _this3.touchStartX = event.originalEvent.touches[0].clientX;
+        }
+      };
+
+      var move = function move(event) {
+        // ensure swiping with one touch and not pinching
+        if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
+          _this3.touchDeltaX = 0;
+        } else {
+          _this3.touchDeltaX = event.originalEvent.touches[0].clientX - _this3.touchStartX;
+        }
+      };
+
+      var end = function end(event) {
+        if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+          _this3.touchDeltaX = event.originalEvent.clientX - _this3.touchStartX;
+        }
+
+        _this3._handleSwipe();
+
+        if (_this3._config.pause === 'hover') {
+          // If it's a touch-enabled device, mouseenter/leave are fired as
+          // part of the mouse compatibility events on first tap - the carousel
+          // would stop cycling until user tapped out of it;
+          // here, we listen for touchend, explicitly pause the carousel
+          // (as if it's the second time we tap on it, mouseenter compat event
+          // is NOT fired) and after a timeout (to allow for mouse compatibility
+          // events to fire) we explicitly restart cycling
+          _this3.pause();
+
+          if (_this3.touchTimeout) {
+            clearTimeout(_this3.touchTimeout);
+          }
+
+          _this3.touchTimeout = setTimeout(function (event) {
+            return _this3.cycle(event);
+          }, TOUCHEVENT_COMPAT_WAIT + _this3._config.interval);
+        }
+      };
+
+      $(this._element.querySelectorAll(SELECTOR_ITEM_IMG)).on(EVENT_DRAG_START, function (e) {
+        return e.preventDefault();
+      });
+
+      if (this._pointerEvent) {
+        $(this._element).on(EVENT_POINTERDOWN, function (event) {
+          return start(event);
+        });
+        $(this._element).on(EVENT_POINTERUP, function (event) {
+          return end(event);
+        });
+
+        this._element.classList.add(CLASS_NAME_POINTER_EVENT);
+      } else {
+        $(this._element).on(EVENT_TOUCHSTART, function (event) {
+          return start(event);
+        });
+        $(this._element).on(EVENT_TOUCHMOVE, function (event) {
+          return move(event);
+        });
+        $(this._element).on(EVENT_TOUCHEND, function (event) {
+          return end(event);
+        });
+      }
+    };
+
+    _proto._keydown = function _keydown(event) {
+      if (/input|textarea/i.test(event.target.tagName)) {
+        return;
+      }
+
+      switch (event.which) {
+        case ARROW_LEFT_KEYCODE:
+          event.preventDefault();
+          this.prev();
+          break;
+
+        case ARROW_RIGHT_KEYCODE:
+          event.preventDefault();
+          this.next();
+          break;
+      }
+    };
+
+    _proto._getItemIndex = function _getItemIndex(element) {
+      this._items = element && element.parentNode ? [].slice.call(element.parentNode.querySelectorAll(SELECTOR_ITEM)) : [];
+      return this._items.indexOf(element);
+    };
+
+    _proto._getItemByDirection = function _getItemByDirection(direction, activeElement) {
+      var isNextDirection = direction === DIRECTION_NEXT;
+      var isPrevDirection = direction === DIRECTION_PREV;
+
+      var activeIndex = this._getItemIndex(activeElement);
+
+      var lastItemIndex = this._items.length - 1;
+      var isGoingToWrap = isPrevDirection && activeIndex === 0 || isNextDirection && activeIndex === lastItemIndex;
+
+      if (isGoingToWrap && !this._config.wrap) {
+        return activeElement;
+      }
+
+      var delta = direction === DIRECTION_PREV ? -1 : 1;
+      var itemIndex = (activeIndex + delta) % this._items.length;
+      return itemIndex === -1 ? this._items[this._items.length - 1] : this._items[itemIndex];
+    };
+
+    _proto._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
+      var targetIndex = this._getItemIndex(relatedTarget);
+
+      var fromIndex = this._getItemIndex(this._element.querySelector(SELECTOR_ACTIVE_ITEM));
+
+      var slideEvent = $.Event(EVENT_SLIDE, {
+        relatedTarget: relatedTarget,
+        direction: eventDirectionName,
+        from: fromIndex,
+        to: targetIndex
+      });
+      $(this._element).trigger(slideEvent);
+      return slideEvent;
+    };
+
+    _proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) {
+      if (this._indicatorsElement) {
+        var indicators = [].slice.call(this._indicatorsElement.querySelectorAll(SELECTOR_ACTIVE$1));
+        $(indicators).removeClass(CLASS_NAME_ACTIVE$1);
+
+        var nextIndicator = this._indicatorsElement.children[this._getItemIndex(element)];
+
+        if (nextIndicator) {
+          $(nextIndicator).addClass(CLASS_NAME_ACTIVE$1);
+        }
+      }
+    };
+
+    _proto._slide = function _slide(direction, element) {
+      var _this4 = this;
+
+      var activeElement = this._element.querySelector(SELECTOR_ACTIVE_ITEM);
+
+      var activeElementIndex = this._getItemIndex(activeElement);
+
+      var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
+
+      var nextElementIndex = this._getItemIndex(nextElement);
+
+      var isCycling = Boolean(this._interval);
+      var directionalClassName;
+      var orderClassName;
+      var eventDirectionName;
+
+      if (direction === DIRECTION_NEXT) {
+        directionalClassName = CLASS_NAME_LEFT;
+        orderClassName = CLASS_NAME_NEXT;
+        eventDirectionName = DIRECTION_LEFT;
+      } else {
+        directionalClassName = CLASS_NAME_RIGHT;
+        orderClassName = CLASS_NAME_PREV;
+        eventDirectionName = DIRECTION_RIGHT;
+      }
+
+      if (nextElement && $(nextElement).hasClass(CLASS_NAME_ACTIVE$1)) {
+        this._isSliding = false;
+        return;
+      }
+
+      var slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName);
+
+      if (slideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (!activeElement || !nextElement) {
+        // Some weirdness is happening, so we bail
+        return;
+      }
+
+      this._isSliding = true;
+
+      if (isCycling) {
+        this.pause();
+      }
+
+      this._setActiveIndicatorElement(nextElement);
+
+      var slidEvent = $.Event(EVENT_SLID, {
+        relatedTarget: nextElement,
+        direction: eventDirectionName,
+        from: activeElementIndex,
+        to: nextElementIndex
+      });
+
+      if ($(this._element).hasClass(CLASS_NAME_SLIDE)) {
+        $(nextElement).addClass(orderClassName);
+        Util.reflow(nextElement);
+        $(activeElement).addClass(directionalClassName);
+        $(nextElement).addClass(directionalClassName);
+        var nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10);
+
+        if (nextElementInterval) {
+          this._config.defaultInterval = this._config.defaultInterval || this._config.interval;
+          this._config.interval = nextElementInterval;
+        } else {
+          this._config.interval = this._config.defaultInterval || this._config.interval;
+        }
+
+        var transitionDuration = Util.getTransitionDurationFromElement(activeElement);
+        $(activeElement).one(Util.TRANSITION_END, function () {
+          $(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(CLASS_NAME_ACTIVE$1);
+          $(activeElement).removeClass(CLASS_NAME_ACTIVE$1 + " " + orderClassName + " " + directionalClassName);
+          _this4._isSliding = false;
+          setTimeout(function () {
+            return $(_this4._element).trigger(slidEvent);
+          }, 0);
+        }).emulateTransitionEnd(transitionDuration);
+      } else {
+        $(activeElement).removeClass(CLASS_NAME_ACTIVE$1);
+        $(nextElement).addClass(CLASS_NAME_ACTIVE$1);
+        this._isSliding = false;
+        $(this._element).trigger(slidEvent);
+      }
+
+      if (isCycling) {
+        this.cycle();
+      }
+    } // Static
+    ;
+
+    Carousel._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$2);
+
+        var _config = _objectSpread2(_objectSpread2({}, Default), $(this).data());
+
+        if (typeof config === 'object') {
+          _config = _objectSpread2(_objectSpread2({}, _config), config);
+        }
+
+        var action = typeof config === 'string' ? config : _config.slide;
+
+        if (!data) {
+          data = new Carousel(this, _config);
+          $(this).data(DATA_KEY$2, data);
+        }
+
+        if (typeof config === 'number') {
+          data.to(config);
+        } else if (typeof action === 'string') {
+          if (typeof data[action] === 'undefined') {
+            throw new TypeError("No method named \"" + action + "\"");
+          }
+
+          data[action]();
+        } else if (_config.interval && _config.ride) {
+          data.pause();
+          data.cycle();
+        }
+      });
+    };
+
+    Carousel._dataApiClickHandler = function _dataApiClickHandler(event) {
+      var selector = Util.getSelectorFromElement(this);
+
+      if (!selector) {
+        return;
+      }
+
+      var target = $(selector)[0];
+
+      if (!target || !$(target).hasClass(CLASS_NAME_CAROUSEL)) {
+        return;
+      }
+
+      var config = _objectSpread2(_objectSpread2({}, $(target).data()), $(this).data());
+
+      var slideIndex = this.getAttribute('data-slide-to');
+
+      if (slideIndex) {
+        config.interval = false;
+      }
+
+      Carousel._jQueryInterface.call($(target), config);
+
+      if (slideIndex) {
+        $(target).data(DATA_KEY$2).to(slideIndex);
+      }
+
+      event.preventDefault();
+    };
+
+    _createClass(Carousel, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$2;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default;
+      }
+    }]);
+
+    return Carousel;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$2, SELECTOR_DATA_SLIDE, Carousel._dataApiClickHandler);
+  $(window).on(EVENT_LOAD_DATA_API$1, function () {
+    var carousels = [].slice.call(document.querySelectorAll(SELECTOR_DATA_RIDE));
+
+    for (var i = 0, len = carousels.length; i < len; i++) {
+      var $carousel = $(carousels[i]);
+
+      Carousel._jQueryInterface.call($carousel, $carousel.data());
+    }
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$2] = Carousel._jQueryInterface;
+  $.fn[NAME$2].Constructor = Carousel;
+
+  $.fn[NAME$2].noConflict = function () {
+    $.fn[NAME$2] = JQUERY_NO_CONFLICT$2;
+    return Carousel._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$3 = 'collapse';
+  var VERSION$3 = '4.5.0';
+  var DATA_KEY$3 = 'bs.collapse';
+  var EVENT_KEY$3 = "." + DATA_KEY$3;
+  var DATA_API_KEY$3 = '.data-api';
+  var JQUERY_NO_CONFLICT$3 = $.fn[NAME$3];
+  var Default$1 = {
+    toggle: true,
+    parent: ''
+  };
+  var DefaultType$1 = {
+    toggle: 'boolean',
+    parent: '(string|element)'
+  };
+  var EVENT_SHOW = "show" + EVENT_KEY$3;
+  var EVENT_SHOWN = "shown" + EVENT_KEY$3;
+  var EVENT_HIDE = "hide" + EVENT_KEY$3;
+  var EVENT_HIDDEN = "hidden" + EVENT_KEY$3;
+  var EVENT_CLICK_DATA_API$3 = "click" + EVENT_KEY$3 + DATA_API_KEY$3;
+  var CLASS_NAME_SHOW$1 = 'show';
+  var CLASS_NAME_COLLAPSE = 'collapse';
+  var CLASS_NAME_COLLAPSING = 'collapsing';
+  var CLASS_NAME_COLLAPSED = 'collapsed';
+  var DIMENSION_WIDTH = 'width';
+  var DIMENSION_HEIGHT = 'height';
+  var SELECTOR_ACTIVES = '.show, .collapsing';
+  var SELECTOR_DATA_TOGGLE$1 = '[data-toggle="collapse"]';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Collapse = /*#__PURE__*/function () {
+    function Collapse(element, config) {
+      this._isTransitioning = false;
+      this._element = element;
+      this._config = this._getConfig(config);
+      this._triggerArray = [].slice.call(document.querySelectorAll("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]")));
+      var toggleList = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE$1));
+
+      for (var i = 0, len = toggleList.length; i < len; i++) {
+        var elem = toggleList[i];
+        var selector = Util.getSelectorFromElement(elem);
+        var filterElement = [].slice.call(document.querySelectorAll(selector)).filter(function (foundElem) {
+          return foundElem === element;
+        });
+
+        if (selector !== null && filterElement.length > 0) {
+          this._selector = selector;
+
+          this._triggerArray.push(elem);
+        }
+      }
+
+      this._parent = this._config.parent ? this._getParent() : null;
+
+      if (!this._config.parent) {
+        this._addAriaAndCollapsedClass(this._element, this._triggerArray);
+      }
+
+      if (this._config.toggle) {
+        this.toggle();
+      }
+    } // Getters
+
+
+    var _proto = Collapse.prototype;
+
+    // Public
+    _proto.toggle = function toggle() {
+      if ($(this._element).hasClass(CLASS_NAME_SHOW$1)) {
+        this.hide();
+      } else {
+        this.show();
+      }
+    };
+
+    _proto.show = function show() {
+      var _this = this;
+
+      if (this._isTransitioning || $(this._element).hasClass(CLASS_NAME_SHOW$1)) {
+        return;
+      }
+
+      var actives;
+      var activesData;
+
+      if (this._parent) {
+        actives = [].slice.call(this._parent.querySelectorAll(SELECTOR_ACTIVES)).filter(function (elem) {
+          if (typeof _this._config.parent === 'string') {
+            return elem.getAttribute('data-parent') === _this._config.parent;
+          }
+
+          return elem.classList.contains(CLASS_NAME_COLLAPSE);
+        });
+
+        if (actives.length === 0) {
+          actives = null;
+        }
+      }
+
+      if (actives) {
+        activesData = $(actives).not(this._selector).data(DATA_KEY$3);
+
+        if (activesData && activesData._isTransitioning) {
+          return;
+        }
+      }
+
+      var startEvent = $.Event(EVENT_SHOW);
+      $(this._element).trigger(startEvent);
+
+      if (startEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (actives) {
+        Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide');
+
+        if (!activesData) {
+          $(actives).data(DATA_KEY$3, null);
+        }
+      }
+
+      var dimension = this._getDimension();
+
+      $(this._element).removeClass(CLASS_NAME_COLLAPSE).addClass(CLASS_NAME_COLLAPSING);
+      this._element.style[dimension] = 0;
+
+      if (this._triggerArray.length) {
+        $(this._triggerArray).removeClass(CLASS_NAME_COLLAPSED).attr('aria-expanded', true);
+      }
+
+      this.setTransitioning(true);
+
+      var complete = function complete() {
+        $(_this._element).removeClass(CLASS_NAME_COLLAPSING).addClass(CLASS_NAME_COLLAPSE + " " + CLASS_NAME_SHOW$1);
+        _this._element.style[dimension] = '';
+
+        _this.setTransitioning(false);
+
+        $(_this._element).trigger(EVENT_SHOWN);
+      };
+
+      var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
+      var scrollSize = "scroll" + capitalizedDimension;
+      var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+      $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      this._element.style[dimension] = this._element[scrollSize] + "px";
+    };
+
+    _proto.hide = function hide() {
+      var _this2 = this;
+
+      if (this._isTransitioning || !$(this._element).hasClass(CLASS_NAME_SHOW$1)) {
+        return;
+      }
+
+      var startEvent = $.Event(EVENT_HIDE);
+      $(this._element).trigger(startEvent);
+
+      if (startEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      var dimension = this._getDimension();
+
+      this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + "px";
+      Util.reflow(this._element);
+      $(this._element).addClass(CLASS_NAME_COLLAPSING).removeClass(CLASS_NAME_COLLAPSE + " " + CLASS_NAME_SHOW$1);
+      var triggerArrayLength = this._triggerArray.length;
+
+      if (triggerArrayLength > 0) {
+        for (var i = 0; i < triggerArrayLength; i++) {
+          var trigger = this._triggerArray[i];
+          var selector = Util.getSelectorFromElement(trigger);
+
+          if (selector !== null) {
+            var $elem = $([].slice.call(document.querySelectorAll(selector)));
+
+            if (!$elem.hasClass(CLASS_NAME_SHOW$1)) {
+              $(trigger).addClass(CLASS_NAME_COLLAPSED).attr('aria-expanded', false);
+            }
+          }
+        }
+      }
+
+      this.setTransitioning(true);
+
+      var complete = function complete() {
+        _this2.setTransitioning(false);
+
+        $(_this2._element).removeClass(CLASS_NAME_COLLAPSING).addClass(CLASS_NAME_COLLAPSE).trigger(EVENT_HIDDEN);
+      };
+
+      this._element.style[dimension] = '';
+      var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+      $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+    };
+
+    _proto.setTransitioning = function setTransitioning(isTransitioning) {
+      this._isTransitioning = isTransitioning;
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$3);
+      this._config = null;
+      this._parent = null;
+      this._element = null;
+      this._triggerArray = null;
+      this._isTransitioning = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default$1), config);
+      config.toggle = Boolean(config.toggle); // Coerce string values
+
+      Util.typeCheckConfig(NAME$3, config, DefaultType$1);
+      return config;
+    };
+
+    _proto._getDimension = function _getDimension() {
+      var hasWidth = $(this._element).hasClass(DIMENSION_WIDTH);
+      return hasWidth ? DIMENSION_WIDTH : DIMENSION_HEIGHT;
+    };
+
+    _proto._getParent = function _getParent() {
+      var _this3 = this;
+
+      var parent;
+
+      if (Util.isElement(this._config.parent)) {
+        parent = this._config.parent; // It's a jQuery object
+
+        if (typeof this._config.parent.jquery !== 'undefined') {
+          parent = this._config.parent[0];
+        }
+      } else {
+        parent = document.querySelector(this._config.parent);
+      }
+
+      var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]";
+      var children = [].slice.call(parent.querySelectorAll(selector));
+      $(children).each(function (i, element) {
+        _this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]);
+      });
+      return parent;
+    };
+
+    _proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
+      var isOpen = $(element).hasClass(CLASS_NAME_SHOW$1);
+
+      if (triggerArray.length) {
+        $(triggerArray).toggleClass(CLASS_NAME_COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
+      }
+    } // Static
+    ;
+
+    Collapse._getTargetFromElement = function _getTargetFromElement(element) {
+      var selector = Util.getSelectorFromElement(element);
+      return selector ? document.querySelector(selector) : null;
+    };
+
+    Collapse._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $this = $(this);
+        var data = $this.data(DATA_KEY$3);
+
+        var _config = _objectSpread2(_objectSpread2(_objectSpread2({}, Default$1), $this.data()), typeof config === 'object' && config ? config : {});
+
+        if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {
+          _config.toggle = false;
+        }
+
+        if (!data) {
+          data = new Collapse(this, _config);
+          $this.data(DATA_KEY$3, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Collapse, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$3;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$1;
+      }
+    }]);
+
+    return Collapse;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$3, SELECTOR_DATA_TOGGLE$1, function (event) {
+    // preventDefault only for <a> elements (which change the URL) not inside the collapsible element
+    if (event.currentTarget.tagName === 'A') {
+      event.preventDefault();
     }
 
-    return false
-  }
+    var $trigger = $(this);
+    var selector = Util.getSelectorFromElement(this);
+    var selectors = [].slice.call(document.querySelectorAll(selector));
+    $(selectors).each(function () {
+      var $target = $(this);
+      var data = $target.data(DATA_KEY$3);
+      var config = data ? 'toggle' : $trigger.data();
 
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
+      Collapse._jQueryInterface.call($target, config);
+    });
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
 
-    var $this = $(this)
+  $.fn[NAME$3] = Collapse._jQueryInterface;
+  $.fn[NAME$3].Constructor = Collapse;
 
-    e.preventDefault()
-    e.stopPropagation()
+  $.fn[NAME$3].noConflict = function () {
+    $.fn[NAME$3] = JQUERY_NO_CONFLICT$3;
+    return Collapse._jQueryInterface;
+  };
 
-    if ($this.is('.disabled, :disabled')) return
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
 
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
+  var NAME$4 = 'dropdown';
+  var VERSION$4 = '4.5.0';
+  var DATA_KEY$4 = 'bs.dropdown';
+  var EVENT_KEY$4 = "." + DATA_KEY$4;
+  var DATA_API_KEY$4 = '.data-api';
+  var JQUERY_NO_CONFLICT$4 = $.fn[NAME$4];
+  var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key
 
-    if (!isActive && e.which != 27 || isActive && e.which == 27) {
-      if (e.which == 27) $parent.find(toggle).trigger('focus')
-      return $this.trigger('click')
-    }
+  var SPACE_KEYCODE = 32; // KeyboardEvent.which value for space key
 
-    var desc = ' li:not(.disabled):visible a'
-    var $items = $parent.find('.dropdown-menu' + desc)
+  var TAB_KEYCODE = 9; // KeyboardEvent.which value for tab key
 
-    if (!$items.length) return
+  var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key
 
-    var index = $items.index(e.target)
+  var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key
 
-    if (e.which == 38 && index > 0)                 index--         // up
-    if (e.which == 40 && index < $items.length - 1) index++         // down
-    if (!~index)                                    index = 0
+  var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse)
 
-    $items.eq(index).trigger('focus')
-  }
+  var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + "|" + ARROW_DOWN_KEYCODE + "|" + ESCAPE_KEYCODE);
+  var EVENT_HIDE$1 = "hide" + EVENT_KEY$4;
+  var EVENT_HIDDEN$1 = "hidden" + EVENT_KEY$4;
+  var EVENT_SHOW$1 = "show" + EVENT_KEY$4;
+  var EVENT_SHOWN$1 = "shown" + EVENT_KEY$4;
+  var EVENT_CLICK = "click" + EVENT_KEY$4;
+  var EVENT_CLICK_DATA_API$4 = "click" + EVENT_KEY$4 + DATA_API_KEY$4;
+  var EVENT_KEYDOWN_DATA_API = "keydown" + EVENT_KEY$4 + DATA_API_KEY$4;
+  var EVENT_KEYUP_DATA_API = "keyup" + EVENT_KEY$4 + DATA_API_KEY$4;
+  var CLASS_NAME_DISABLED = 'disabled';
+  var CLASS_NAME_SHOW$2 = 'show';
+  var CLASS_NAME_DROPUP = 'dropup';
+  var CLASS_NAME_DROPRIGHT = 'dropright';
+  var CLASS_NAME_DROPLEFT = 'dropleft';
+  var CLASS_NAME_MENURIGHT = 'dropdown-menu-right';
+  var CLASS_NAME_POSITION_STATIC = 'position-static';
+  var SELECTOR_DATA_TOGGLE$2 = '[data-toggle="dropdown"]';
+  var SELECTOR_FORM_CHILD = '.dropdown form';
+  var SELECTOR_MENU = '.dropdown-menu';
+  var SELECTOR_NAVBAR_NAV = '.navbar-nav';
+  var SELECTOR_VISIBLE_ITEMS = '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)';
+  var PLACEMENT_TOP = 'top-start';
+  var PLACEMENT_TOPEND = 'top-end';
+  var PLACEMENT_BOTTOM = 'bottom-start';
+  var PLACEMENT_BOTTOMEND = 'bottom-end';
+  var PLACEMENT_RIGHT = 'right-start';
+  var PLACEMENT_LEFT = 'left-start';
+  var Default$2 = {
+    offset: 0,
+    flip: true,
+    boundary: 'scrollParent',
+    reference: 'toggle',
+    display: 'dynamic',
+    popperConfig: null
+  };
+  var DefaultType$2 = {
+    offset: '(number|string|function)',
+    flip: 'boolean',
+    boundary: '(string|element)',
+    reference: '(string|element)',
+    display: 'string',
+    popperConfig: '(null|object)'
+  };
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Dropdown = /*#__PURE__*/function () {
+    function Dropdown(element, config) {
+      this._element = element;
+      this._popper = null;
+      this._config = this._getConfig(config);
+      this._menu = this._getMenuElement();
+      this._inNavbar = this._detectNavbar();
+
+      this._addEventListeners();
+    } // Getters
 
 
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
+    var _proto = Dropdown.prototype;
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.dropdown')
+    // Public
+    _proto.toggle = function toggle() {
+      if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED)) {
+        return;
+      }
 
-      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
+      var isActive = $(this._menu).hasClass(CLASS_NAME_SHOW$2);
 
-  var old = $.fn.dropdown
+      Dropdown._clearMenus();
 
-  $.fn.dropdown             = Plugin
-  $.fn.dropdown.Constructor = Dropdown
+      if (isActive) {
+        return;
+      }
+
+      this.show(true);
+    };
+
+    _proto.show = function show(usePopper) {
+      if (usePopper === void 0) {
+        usePopper = false;
+      }
+
+      if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED) || $(this._menu).hasClass(CLASS_NAME_SHOW$2)) {
+        return;
+      }
+
+      var relatedTarget = {
+        relatedTarget: this._element
+      };
+      var showEvent = $.Event(EVENT_SHOW$1, relatedTarget);
+
+      var parent = Dropdown._getParentFromElement(this._element);
+
+      $(parent).trigger(showEvent);
+
+      if (showEvent.isDefaultPrevented()) {
+        return;
+      } // Disable totally Popper.js for Dropdown in Navbar
 
 
-  // DROPDOWN NO CONFLICT
-  // ====================
+      if (!this._inNavbar && usePopper) {
+        /**
+         * Check for Popper dependency
+         * Popper - https://popper.js.org
+         */
+        if (typeof Popper === 'undefined') {
+          throw new TypeError('Bootstrap\'s dropdowns require Popper.js (https://popper.js.org/)');
+        }
 
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
+        var referenceElement = this._element;
+
+        if (this._config.reference === 'parent') {
+          referenceElement = parent;
+        } else if (Util.isElement(this._config.reference)) {
+          referenceElement = this._config.reference; // Check if it's jQuery element
+
+          if (typeof this._config.reference.jquery !== 'undefined') {
+            referenceElement = this._config.reference[0];
+          }
+        } // If boundary is not `scrollParent`, then set position to `static`
+        // to allow the menu to "escape" the scroll parent's boundaries
+        // https://github.com/twbs/bootstrap/issues/24251
 
 
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
+        if (this._config.boundary !== 'scrollParent') {
+          $(parent).addClass(CLASS_NAME_POSITION_STATIC);
+        }
 
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-    .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: modal.js v3.3.6
- * http://getbootstrap.com/javascript/#modals
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
+        this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig());
+      } // If this is a touch-enabled device we add extra
+      // empty mouseover listeners to the body's immediate children;
+      // only needed because of broken event delegation on iOS
+      // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
 
 
-+function ($) {
-  'use strict';
+      if ('ontouchstart' in document.documentElement && $(parent).closest(SELECTOR_NAVBAR_NAV).length === 0) {
+        $(document.body).children().on('mouseover', null, $.noop);
+      }
 
-  // MODAL CLASS DEFINITION
-  // ======================
+      this._element.focus();
 
-  var Modal = function (element, options) {
-    this.options             = options
-    this.$body               = $(document.body)
-    this.$element            = $(element)
-    this.$dialog             = this.$element.find('.modal-dialog')
-    this.$backdrop           = null
-    this.isShown             = null
-    this.originalBodyPad     = null
-    this.scrollbarWidth      = 0
-    this.ignoreBackdropClick = false
+      this._element.setAttribute('aria-expanded', true);
 
-    if (this.options.remote) {
-      this.$element
-        .find('.modal-content')
-        .load(this.options.remote, $.proxy(function () {
-          this.$element.trigger('loaded.bs.modal')
-        }, this))
-    }
-  }
+      $(this._menu).toggleClass(CLASS_NAME_SHOW$2);
+      $(parent).toggleClass(CLASS_NAME_SHOW$2).trigger($.Event(EVENT_SHOWN$1, relatedTarget));
+    };
 
-  Modal.VERSION  = '3.3.6'
+    _proto.hide = function hide() {
+      if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED) || !$(this._menu).hasClass(CLASS_NAME_SHOW$2)) {
+        return;
+      }
 
-  Modal.TRANSITION_DURATION = 300
-  Modal.BACKDROP_TRANSITION_DURATION = 150
+      var relatedTarget = {
+        relatedTarget: this._element
+      };
+      var hideEvent = $.Event(EVENT_HIDE$1, relatedTarget);
 
-  Modal.DEFAULTS = {
+      var parent = Dropdown._getParentFromElement(this._element);
+
+      $(parent).trigger(hideEvent);
+
+      if (hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (this._popper) {
+        this._popper.destroy();
+      }
+
+      $(this._menu).toggleClass(CLASS_NAME_SHOW$2);
+      $(parent).toggleClass(CLASS_NAME_SHOW$2).trigger($.Event(EVENT_HIDDEN$1, relatedTarget));
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$4);
+      $(this._element).off(EVENT_KEY$4);
+      this._element = null;
+      this._menu = null;
+
+      if (this._popper !== null) {
+        this._popper.destroy();
+
+        this._popper = null;
+      }
+    };
+
+    _proto.update = function update() {
+      this._inNavbar = this._detectNavbar();
+
+      if (this._popper !== null) {
+        this._popper.scheduleUpdate();
+      }
+    } // Private
+    ;
+
+    _proto._addEventListeners = function _addEventListeners() {
+      var _this = this;
+
+      $(this._element).on(EVENT_CLICK, function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        _this.toggle();
+      });
+    };
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2(_objectSpread2({}, this.constructor.Default), $(this._element).data()), config);
+      Util.typeCheckConfig(NAME$4, config, this.constructor.DefaultType);
+      return config;
+    };
+
+    _proto._getMenuElement = function _getMenuElement() {
+      if (!this._menu) {
+        var parent = Dropdown._getParentFromElement(this._element);
+
+        if (parent) {
+          this._menu = parent.querySelector(SELECTOR_MENU);
+        }
+      }
+
+      return this._menu;
+    };
+
+    _proto._getPlacement = function _getPlacement() {
+      var $parentDropdown = $(this._element.parentNode);
+      var placement = PLACEMENT_BOTTOM; // Handle dropup
+
+      if ($parentDropdown.hasClass(CLASS_NAME_DROPUP)) {
+        placement = $(this._menu).hasClass(CLASS_NAME_MENURIGHT) ? PLACEMENT_TOPEND : PLACEMENT_TOP;
+      } else if ($parentDropdown.hasClass(CLASS_NAME_DROPRIGHT)) {
+        placement = PLACEMENT_RIGHT;
+      } else if ($parentDropdown.hasClass(CLASS_NAME_DROPLEFT)) {
+        placement = PLACEMENT_LEFT;
+      } else if ($(this._menu).hasClass(CLASS_NAME_MENURIGHT)) {
+        placement = PLACEMENT_BOTTOMEND;
+      }
+
+      return placement;
+    };
+
+    _proto._detectNavbar = function _detectNavbar() {
+      return $(this._element).closest('.navbar').length > 0;
+    };
+
+    _proto._getOffset = function _getOffset() {
+      var _this2 = this;
+
+      var offset = {};
+
+      if (typeof this._config.offset === 'function') {
+        offset.fn = function (data) {
+          data.offsets = _objectSpread2(_objectSpread2({}, data.offsets), _this2._config.offset(data.offsets, _this2._element) || {});
+          return data;
+        };
+      } else {
+        offset.offset = this._config.offset;
+      }
+
+      return offset;
+    };
+
+    _proto._getPopperConfig = function _getPopperConfig() {
+      var popperConfig = {
+        placement: this._getPlacement(),
+        modifiers: {
+          offset: this._getOffset(),
+          flip: {
+            enabled: this._config.flip
+          },
+          preventOverflow: {
+            boundariesElement: this._config.boundary
+          }
+        }
+      }; // Disable Popper.js if we have a static display
+
+      if (this._config.display === 'static') {
+        popperConfig.modifiers.applyStyle = {
+          enabled: false
+        };
+      }
+
+      return _objectSpread2(_objectSpread2({}, popperConfig), this._config.popperConfig);
+    } // Static
+    ;
+
+    Dropdown._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$4);
+
+        var _config = typeof config === 'object' ? config : null;
+
+        if (!data) {
+          data = new Dropdown(this, _config);
+          $(this).data(DATA_KEY$4, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    Dropdown._clearMenus = function _clearMenus(event) {
+      if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH || event.type === 'keyup' && event.which !== TAB_KEYCODE)) {
+        return;
+      }
+
+      var toggles = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE$2));
+
+      for (var i = 0, len = toggles.length; i < len; i++) {
+        var parent = Dropdown._getParentFromElement(toggles[i]);
+
+        var context = $(toggles[i]).data(DATA_KEY$4);
+        var relatedTarget = {
+          relatedTarget: toggles[i]
+        };
+
+        if (event && event.type === 'click') {
+          relatedTarget.clickEvent = event;
+        }
+
+        if (!context) {
+          continue;
+        }
+
+        var dropdownMenu = context._menu;
+
+        if (!$(parent).hasClass(CLASS_NAME_SHOW$2)) {
+          continue;
+        }
+
+        if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) && $.contains(parent, event.target)) {
+          continue;
+        }
+
+        var hideEvent = $.Event(EVENT_HIDE$1, relatedTarget);
+        $(parent).trigger(hideEvent);
+
+        if (hideEvent.isDefaultPrevented()) {
+          continue;
+        } // If this is a touch-enabled device we remove the extra
+        // empty mouseover listeners we added for iOS support
+
+
+        if ('ontouchstart' in document.documentElement) {
+          $(document.body).children().off('mouseover', null, $.noop);
+        }
+
+        toggles[i].setAttribute('aria-expanded', 'false');
+
+        if (context._popper) {
+          context._popper.destroy();
+        }
+
+        $(dropdownMenu).removeClass(CLASS_NAME_SHOW$2);
+        $(parent).removeClass(CLASS_NAME_SHOW$2).trigger($.Event(EVENT_HIDDEN$1, relatedTarget));
+      }
+    };
+
+    Dropdown._getParentFromElement = function _getParentFromElement(element) {
+      var parent;
+      var selector = Util.getSelectorFromElement(element);
+
+      if (selector) {
+        parent = document.querySelector(selector);
+      }
+
+      return parent || element.parentNode;
+    } // eslint-disable-next-line complexity
+    ;
+
+    Dropdown._dataApiKeydownHandler = function _dataApiKeydownHandler(event) {
+      // If not input/textarea:
+      //  - And not a key in REGEXP_KEYDOWN => not a dropdown command
+      // If input/textarea:
+      //  - If space key => not a dropdown command
+      //  - If key is other than escape
+      //    - If key is not up or down => not a dropdown command
+      //    - If trigger inside the menu => not a dropdown command
+      if (/input|textarea/i.test(event.target.tagName) ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || $(event.target).closest(SELECTOR_MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {
+        return;
+      }
+
+      if (this.disabled || $(this).hasClass(CLASS_NAME_DISABLED)) {
+        return;
+      }
+
+      var parent = Dropdown._getParentFromElement(this);
+
+      var isActive = $(parent).hasClass(CLASS_NAME_SHOW$2);
+
+      if (!isActive && event.which === ESCAPE_KEYCODE) {
+        return;
+      }
+
+      event.preventDefault();
+      event.stopPropagation();
+
+      if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
+        if (event.which === ESCAPE_KEYCODE) {
+          $(parent.querySelector(SELECTOR_DATA_TOGGLE$2)).trigger('focus');
+        }
+
+        $(this).trigger('click');
+        return;
+      }
+
+      var items = [].slice.call(parent.querySelectorAll(SELECTOR_VISIBLE_ITEMS)).filter(function (item) {
+        return $(item).is(':visible');
+      });
+
+      if (items.length === 0) {
+        return;
+      }
+
+      var index = items.indexOf(event.target);
+
+      if (event.which === ARROW_UP_KEYCODE && index > 0) {
+        // Up
+        index--;
+      }
+
+      if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) {
+        // Down
+        index++;
+      }
+
+      if (index < 0) {
+        index = 0;
+      }
+
+      items[index].focus();
+    };
+
+    _createClass(Dropdown, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$4;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$2;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$2;
+      }
+    }]);
+
+    return Dropdown;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_KEYDOWN_DATA_API, SELECTOR_DATA_TOGGLE$2, Dropdown._dataApiKeydownHandler).on(EVENT_KEYDOWN_DATA_API, SELECTOR_MENU, Dropdown._dataApiKeydownHandler).on(EVENT_CLICK_DATA_API$4 + " " + EVENT_KEYUP_DATA_API, Dropdown._clearMenus).on(EVENT_CLICK_DATA_API$4, SELECTOR_DATA_TOGGLE$2, function (event) {
+    event.preventDefault();
+    event.stopPropagation();
+
+    Dropdown._jQueryInterface.call($(this), 'toggle');
+  }).on(EVENT_CLICK_DATA_API$4, SELECTOR_FORM_CHILD, function (e) {
+    e.stopPropagation();
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$4] = Dropdown._jQueryInterface;
+  $.fn[NAME$4].Constructor = Dropdown;
+
+  $.fn[NAME$4].noConflict = function () {
+    $.fn[NAME$4] = JQUERY_NO_CONFLICT$4;
+    return Dropdown._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$5 = 'modal';
+  var VERSION$5 = '4.5.0';
+  var DATA_KEY$5 = 'bs.modal';
+  var EVENT_KEY$5 = "." + DATA_KEY$5;
+  var DATA_API_KEY$5 = '.data-api';
+  var JQUERY_NO_CONFLICT$5 = $.fn[NAME$5];
+  var ESCAPE_KEYCODE$1 = 27; // KeyboardEvent.which value for Escape (Esc) key
+
+  var Default$3 = {
     backdrop: true,
     keyboard: true,
+    focus: true,
     show: true
-  }
+  };
+  var DefaultType$3 = {
+    backdrop: '(boolean|string)',
+    keyboard: 'boolean',
+    focus: 'boolean',
+    show: 'boolean'
+  };
+  var EVENT_HIDE$2 = "hide" + EVENT_KEY$5;
+  var EVENT_HIDE_PREVENTED = "hidePrevented" + EVENT_KEY$5;
+  var EVENT_HIDDEN$2 = "hidden" + EVENT_KEY$5;
+  var EVENT_SHOW$2 = "show" + EVENT_KEY$5;
+  var EVENT_SHOWN$2 = "shown" + EVENT_KEY$5;
+  var EVENT_FOCUSIN = "focusin" + EVENT_KEY$5;
+  var EVENT_RESIZE = "resize" + EVENT_KEY$5;
+  var EVENT_CLICK_DISMISS = "click.dismiss" + EVENT_KEY$5;
+  var EVENT_KEYDOWN_DISMISS = "keydown.dismiss" + EVENT_KEY$5;
+  var EVENT_MOUSEUP_DISMISS = "mouseup.dismiss" + EVENT_KEY$5;
+  var EVENT_MOUSEDOWN_DISMISS = "mousedown.dismiss" + EVENT_KEY$5;
+  var EVENT_CLICK_DATA_API$5 = "click" + EVENT_KEY$5 + DATA_API_KEY$5;
+  var CLASS_NAME_SCROLLABLE = 'modal-dialog-scrollable';
+  var CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure';
+  var CLASS_NAME_BACKDROP = 'modal-backdrop';
+  var CLASS_NAME_OPEN = 'modal-open';
+  var CLASS_NAME_FADE$1 = 'fade';
+  var CLASS_NAME_SHOW$3 = 'show';
+  var CLASS_NAME_STATIC = 'modal-static';
+  var SELECTOR_DIALOG = '.modal-dialog';
+  var SELECTOR_MODAL_BODY = '.modal-body';
+  var SELECTOR_DATA_TOGGLE$3 = '[data-toggle="modal"]';
+  var SELECTOR_DATA_DISMISS = '[data-dismiss="modal"]';
+  var SELECTOR_FIXED_CONTENT = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top';
+  var SELECTOR_STICKY_CONTENT = '.sticky-top';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
 
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this.isShown ? this.hide() : this.show(_relatedTarget)
-  }
+  var Modal = /*#__PURE__*/function () {
+    function Modal(element, config) {
+      this._config = this._getConfig(config);
+      this._element = element;
+      this._dialog = element.querySelector(SELECTOR_DIALOG);
+      this._backdrop = null;
+      this._isShown = false;
+      this._isBodyOverflowing = false;
+      this._ignoreBackdropClick = false;
+      this._isTransitioning = false;
+      this._scrollbarWidth = 0;
+    } // Getters
 
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
 
-    this.$element.trigger(e)
+    var _proto = Modal.prototype;
 
-    if (this.isShown || e.isDefaultPrevented()) return
+    // Public
+    _proto.toggle = function toggle(relatedTarget) {
+      return this._isShown ? this.hide() : this.show(relatedTarget);
+    };
 
-    this.isShown = true
+    _proto.show = function show(relatedTarget) {
+      var _this = this;
 
-    this.checkScrollbar()
-    this.setScrollbar()
-    this.$body.addClass('modal-open')
-
-    this.escape()
-    this.resize()
-
-    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
-      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
-        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
-      })
-    })
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(that.$body) // don't move modals dom position
+      if (this._isShown || this._isTransitioning) {
+        return;
       }
 
-      that.$element
-        .show()
-        .scrollTop(0)
+      if ($(this._element).hasClass(CLASS_NAME_FADE$1)) {
+        this._isTransitioning = true;
+      }
 
-      that.adjustDialog()
+      var showEvent = $.Event(EVENT_SHOW$2, {
+        relatedTarget: relatedTarget
+      });
+      $(this._element).trigger(showEvent);
+
+      if (this._isShown || showEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._isShown = true;
+
+      this._checkScrollbar();
+
+      this._setScrollbar();
+
+      this._adjustDialog();
+
+      this._setEscapeEvent();
+
+      this._setResizeEvent();
+
+      $(this._element).on(EVENT_CLICK_DISMISS, SELECTOR_DATA_DISMISS, function (event) {
+        return _this.hide(event);
+      });
+      $(this._dialog).on(EVENT_MOUSEDOWN_DISMISS, function () {
+        $(_this._element).one(EVENT_MOUSEUP_DISMISS, function (event) {
+          if ($(event.target).is(_this._element)) {
+            _this._ignoreBackdropClick = true;
+          }
+        });
+      });
+
+      this._showBackdrop(function () {
+        return _this._showElement(relatedTarget);
+      });
+    };
+
+    _proto.hide = function hide(event) {
+      var _this2 = this;
+
+      if (event) {
+        event.preventDefault();
+      }
+
+      if (!this._isShown || this._isTransitioning) {
+        return;
+      }
+
+      var hideEvent = $.Event(EVENT_HIDE$2);
+      $(this._element).trigger(hideEvent);
+
+      if (!this._isShown || hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._isShown = false;
+      var transition = $(this._element).hasClass(CLASS_NAME_FADE$1);
 
       if (transition) {
-        that.$element[0].offsetWidth // force reflow
+        this._isTransitioning = true;
       }
 
-      that.$element.addClass('in')
+      this._setEscapeEvent();
 
-      that.enforceFocus()
+      this._setResizeEvent();
 
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+      $(document).off(EVENT_FOCUSIN);
+      $(this._element).removeClass(CLASS_NAME_SHOW$3);
+      $(this._element).off(EVENT_CLICK_DISMISS);
+      $(this._dialog).off(EVENT_MOUSEDOWN_DISMISS);
 
-      transition ?
-        that.$dialog // wait for modal to slide in
-          .one('bsTransitionEnd', function () {
-            that.$element.trigger('focus').trigger(e)
-          })
-          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-        that.$element.trigger('focus').trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
-
-    this.$element.trigger(e)
-
-    if (!this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = false
-
-    this.escape()
-    this.resize()
-
-    $(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')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-      this.hideModal()
-  }
-
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-          this.$element.trigger('focus')
-        }
-      }, this))
-  }
-
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keydown.dismiss.bs.modal')
-    }
-  }
-
-  Modal.prototype.resize = function () {
-    if (this.isShown) {
-      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
-    } else {
-      $(window).off('resize.bs.modal')
-    }
-  }
-
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.$body.removeClass('modal-open')
-      that.resetAdjustments()
-      that.resetScrollbar()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
-
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  Modal.prototype.backdrop = function (callback) {
-    var that = this
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $(document.createElement('div'))
-        .addClass('modal-backdrop ' + animate)
-        .appendTo(this.$body)
-
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (this.ignoreBackdropClick) {
-          this.ignoreBackdropClick = false
-          return
-        }
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus()
-          : this.hide()
-      }, this))
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      if (!callback) return
-
-      doAnimate ?
-        this.$backdrop
-          .one('bsTransitionEnd', callback)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      var callbackRemove = function () {
-        that.removeBackdrop()
-        callback && callback()
+      if (transition) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, function (event) {
+          return _this2._hideModal(event);
+        }).emulateTransitionEnd(transitionDuration);
+      } else {
+        this._hideModal();
       }
-      $.support.transition && this.$element.hasClass('fade') ?
-        this.$backdrop
-          .one('bsTransitionEnd', callbackRemove)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callbackRemove()
+    };
 
-    } else if (callback) {
-      callback()
+    _proto.dispose = function dispose() {
+      [window, this._element, this._dialog].forEach(function (htmlElement) {
+        return $(htmlElement).off(EVENT_KEY$5);
+      });
+      /**
+       * `document` has 2 events `EVENT_FOCUSIN` and `EVENT_CLICK_DATA_API`
+       * Do not move `document` in `htmlElements` array
+       * It will remove `EVENT_CLICK_DATA_API` event that should remain
+       */
+
+      $(document).off(EVENT_FOCUSIN);
+      $.removeData(this._element, DATA_KEY$5);
+      this._config = null;
+      this._element = null;
+      this._dialog = null;
+      this._backdrop = null;
+      this._isShown = null;
+      this._isBodyOverflowing = null;
+      this._ignoreBackdropClick = null;
+      this._isTransitioning = null;
+      this._scrollbarWidth = null;
+    };
+
+    _proto.handleUpdate = function handleUpdate() {
+      this._adjustDialog();
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default$3), config);
+      Util.typeCheckConfig(NAME$5, config, DefaultType$3);
+      return config;
+    };
+
+    _proto._triggerBackdropTransition = function _triggerBackdropTransition() {
+      var _this3 = this;
+
+      if (this._config.backdrop === 'static') {
+        var hideEventPrevented = $.Event(EVENT_HIDE_PREVENTED);
+        $(this._element).trigger(hideEventPrevented);
+
+        if (hideEventPrevented.defaultPrevented) {
+          return;
+        }
+
+        this._element.classList.add(CLASS_NAME_STATIC);
+
+        var modalTransitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, function () {
+          _this3._element.classList.remove(CLASS_NAME_STATIC);
+        }).emulateTransitionEnd(modalTransitionDuration);
+
+        this._element.focus();
+      } else {
+        this.hide();
+      }
+    };
+
+    _proto._showElement = function _showElement(relatedTarget) {
+      var _this4 = this;
+
+      var transition = $(this._element).hasClass(CLASS_NAME_FADE$1);
+      var modalBody = this._dialog ? this._dialog.querySelector(SELECTOR_MODAL_BODY) : null;
+
+      if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
+        // Don't move modal's DOM position
+        document.body.appendChild(this._element);
+      }
+
+      this._element.style.display = 'block';
+
+      this._element.removeAttribute('aria-hidden');
+
+      this._element.setAttribute('aria-modal', true);
+
+      if ($(this._dialog).hasClass(CLASS_NAME_SCROLLABLE) && modalBody) {
+        modalBody.scrollTop = 0;
+      } else {
+        this._element.scrollTop = 0;
+      }
+
+      if (transition) {
+        Util.reflow(this._element);
+      }
+
+      $(this._element).addClass(CLASS_NAME_SHOW$3);
+
+      if (this._config.focus) {
+        this._enforceFocus();
+      }
+
+      var shownEvent = $.Event(EVENT_SHOWN$2, {
+        relatedTarget: relatedTarget
+      });
+
+      var transitionComplete = function transitionComplete() {
+        if (_this4._config.focus) {
+          _this4._element.focus();
+        }
+
+        _this4._isTransitioning = false;
+        $(_this4._element).trigger(shownEvent);
+      };
+
+      if (transition) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._dialog);
+        $(this._dialog).one(Util.TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration);
+      } else {
+        transitionComplete();
+      }
+    };
+
+    _proto._enforceFocus = function _enforceFocus() {
+      var _this5 = this;
+
+      $(document).off(EVENT_FOCUSIN) // Guard against infinite focus loop
+      .on(EVENT_FOCUSIN, function (event) {
+        if (document !== event.target && _this5._element !== event.target && $(_this5._element).has(event.target).length === 0) {
+          _this5._element.focus();
+        }
+      });
+    };
+
+    _proto._setEscapeEvent = function _setEscapeEvent() {
+      var _this6 = this;
+
+      if (this._isShown) {
+        $(this._element).on(EVENT_KEYDOWN_DISMISS, function (event) {
+          if (_this6._config.keyboard && event.which === ESCAPE_KEYCODE$1) {
+            event.preventDefault();
+
+            _this6.hide();
+          } else if (!_this6._config.keyboard && event.which === ESCAPE_KEYCODE$1) {
+            _this6._triggerBackdropTransition();
+          }
+        });
+      } else if (!this._isShown) {
+        $(this._element).off(EVENT_KEYDOWN_DISMISS);
+      }
+    };
+
+    _proto._setResizeEvent = function _setResizeEvent() {
+      var _this7 = this;
+
+      if (this._isShown) {
+        $(window).on(EVENT_RESIZE, function (event) {
+          return _this7.handleUpdate(event);
+        });
+      } else {
+        $(window).off(EVENT_RESIZE);
+      }
+    };
+
+    _proto._hideModal = function _hideModal() {
+      var _this8 = this;
+
+      this._element.style.display = 'none';
+
+      this._element.setAttribute('aria-hidden', true);
+
+      this._element.removeAttribute('aria-modal');
+
+      this._isTransitioning = false;
+
+      this._showBackdrop(function () {
+        $(document.body).removeClass(CLASS_NAME_OPEN);
+
+        _this8._resetAdjustments();
+
+        _this8._resetScrollbar();
+
+        $(_this8._element).trigger(EVENT_HIDDEN$2);
+      });
+    };
+
+    _proto._removeBackdrop = function _removeBackdrop() {
+      if (this._backdrop) {
+        $(this._backdrop).remove();
+        this._backdrop = null;
+      }
+    };
+
+    _proto._showBackdrop = function _showBackdrop(callback) {
+      var _this9 = this;
+
+      var animate = $(this._element).hasClass(CLASS_NAME_FADE$1) ? CLASS_NAME_FADE$1 : '';
+
+      if (this._isShown && this._config.backdrop) {
+        this._backdrop = document.createElement('div');
+        this._backdrop.className = CLASS_NAME_BACKDROP;
+
+        if (animate) {
+          this._backdrop.classList.add(animate);
+        }
+
+        $(this._backdrop).appendTo(document.body);
+        $(this._element).on(EVENT_CLICK_DISMISS, function (event) {
+          if (_this9._ignoreBackdropClick) {
+            _this9._ignoreBackdropClick = false;
+            return;
+          }
+
+          if (event.target !== event.currentTarget) {
+            return;
+          }
+
+          _this9._triggerBackdropTransition();
+        });
+
+        if (animate) {
+          Util.reflow(this._backdrop);
+        }
+
+        $(this._backdrop).addClass(CLASS_NAME_SHOW$3);
+
+        if (!callback) {
+          return;
+        }
+
+        if (!animate) {
+          callback();
+          return;
+        }
+
+        var backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
+        $(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration);
+      } else if (!this._isShown && this._backdrop) {
+        $(this._backdrop).removeClass(CLASS_NAME_SHOW$3);
+
+        var callbackRemove = function callbackRemove() {
+          _this9._removeBackdrop();
+
+          if (callback) {
+            callback();
+          }
+        };
+
+        if ($(this._element).hasClass(CLASS_NAME_FADE$1)) {
+          var _backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
+
+          $(this._backdrop).one(Util.TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration);
+        } else {
+          callbackRemove();
+        }
+      } else if (callback) {
+        callback();
+      }
+    } // ----------------------------------------------------------------------
+    // the following methods are used to handle overflowing modals
+    // todo (fat): these should probably be refactored out of modal.js
+    // ----------------------------------------------------------------------
+    ;
+
+    _proto._adjustDialog = function _adjustDialog() {
+      var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;
+
+      if (!this._isBodyOverflowing && isModalOverflowing) {
+        this._element.style.paddingLeft = this._scrollbarWidth + "px";
+      }
+
+      if (this._isBodyOverflowing && !isModalOverflowing) {
+        this._element.style.paddingRight = this._scrollbarWidth + "px";
+      }
+    };
+
+    _proto._resetAdjustments = function _resetAdjustments() {
+      this._element.style.paddingLeft = '';
+      this._element.style.paddingRight = '';
+    };
+
+    _proto._checkScrollbar = function _checkScrollbar() {
+      var rect = document.body.getBoundingClientRect();
+      this._isBodyOverflowing = Math.round(rect.left + rect.right) < window.innerWidth;
+      this._scrollbarWidth = this._getScrollbarWidth();
+    };
+
+    _proto._setScrollbar = function _setScrollbar() {
+      var _this10 = this;
+
+      if (this._isBodyOverflowing) {
+        // Note: DOMNode.style.paddingRight returns the actual value or '' if not set
+        //   while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set
+        var fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT));
+        var stickyContent = [].slice.call(document.querySelectorAll(SELECTOR_STICKY_CONTENT)); // Adjust fixed content padding
+
+        $(fixedContent).each(function (index, element) {
+          var actualPadding = element.style.paddingRight;
+          var calculatedPadding = $(element).css('padding-right');
+          $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this10._scrollbarWidth + "px");
+        }); // Adjust sticky content margin
+
+        $(stickyContent).each(function (index, element) {
+          var actualMargin = element.style.marginRight;
+          var calculatedMargin = $(element).css('margin-right');
+          $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this10._scrollbarWidth + "px");
+        }); // Adjust body padding
+
+        var actualPadding = document.body.style.paddingRight;
+        var calculatedPadding = $(document.body).css('padding-right');
+        $(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
+      }
+
+      $(document.body).addClass(CLASS_NAME_OPEN);
+    };
+
+    _proto._resetScrollbar = function _resetScrollbar() {
+      // Restore fixed content padding
+      var fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT));
+      $(fixedContent).each(function (index, element) {
+        var padding = $(element).data('padding-right');
+        $(element).removeData('padding-right');
+        element.style.paddingRight = padding ? padding : '';
+      }); // Restore sticky content
+
+      var elements = [].slice.call(document.querySelectorAll("" + SELECTOR_STICKY_CONTENT));
+      $(elements).each(function (index, element) {
+        var margin = $(element).data('margin-right');
+
+        if (typeof margin !== 'undefined') {
+          $(element).css('margin-right', margin).removeData('margin-right');
+        }
+      }); // Restore body padding
+
+      var padding = $(document.body).data('padding-right');
+      $(document.body).removeData('padding-right');
+      document.body.style.paddingRight = padding ? padding : '';
+    };
+
+    _proto._getScrollbarWidth = function _getScrollbarWidth() {
+      // thx d.walsh
+      var scrollDiv = document.createElement('div');
+      scrollDiv.className = CLASS_NAME_SCROLLBAR_MEASURER;
+      document.body.appendChild(scrollDiv);
+      var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth;
+      document.body.removeChild(scrollDiv);
+      return scrollbarWidth;
+    } // Static
+    ;
+
+    Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$5);
+
+        var _config = _objectSpread2(_objectSpread2(_objectSpread2({}, Default$3), $(this).data()), typeof config === 'object' && config ? config : {});
+
+        if (!data) {
+          data = new Modal(this, _config);
+          $(this).data(DATA_KEY$5, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config](relatedTarget);
+        } else if (_config.show) {
+          data.show(relatedTarget);
+        }
+      });
+    };
+
+    _createClass(Modal, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$5;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$3;
+      }
+    }]);
+
+    return Modal;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$5, SELECTOR_DATA_TOGGLE$3, function (event) {
+    var _this11 = this;
+
+    var target;
+    var selector = Util.getSelectorFromElement(this);
+
+    if (selector) {
+      target = document.querySelector(selector);
     }
-  }
 
-  // these following methods are used to handle overflowing modals
+    var config = $(target).data(DATA_KEY$5) ? 'toggle' : _objectSpread2(_objectSpread2({}, $(target).data()), $(this).data());
 
-  Modal.prototype.handleUpdate = function () {
-    this.adjustDialog()
-  }
-
-  Modal.prototype.adjustDialog = function () {
-    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
-
-    this.$element.css({
-      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
-      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
-    })
-  }
-
-  Modal.prototype.resetAdjustments = function () {
-    this.$element.css({
-      paddingLeft: '',
-      paddingRight: ''
-    })
-  }
-
-  Modal.prototype.checkScrollbar = function () {
-    var fullWindowWidth = window.innerWidth
-    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
-      var documentElementRect = document.documentElement.getBoundingClientRect()
-      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
+    if (this.tagName === 'A' || this.tagName === 'AREA') {
+      event.preventDefault();
     }
-    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
-    this.scrollbarWidth = this.measureScrollbar()
+
+    var $target = $(target).one(EVENT_SHOW$2, function (showEvent) {
+      if (showEvent.isDefaultPrevented()) {
+        // Only register focus restorer if modal will actually get shown
+        return;
+      }
+
+      $target.one(EVENT_HIDDEN$2, function () {
+        if ($(_this11).is(':visible')) {
+          _this11.focus();
+        }
+      });
+    });
+
+    Modal._jQueryInterface.call($(target), config, this);
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$5] = Modal._jQueryInterface;
+  $.fn[NAME$5].Constructor = Modal;
+
+  $.fn[NAME$5].noConflict = function () {
+    $.fn[NAME$5] = JQUERY_NO_CONFLICT$5;
+    return Modal._jQueryInterface;
+  };
+
+  /**
+   * --------------------------------------------------------------------------
+   * Bootstrap (v4.5.0): tools/sanitizer.js
+   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+   * --------------------------------------------------------------------------
+   */
+  var uriAttrs = ['background', 'cite', 'href', 'itemtype', 'longdesc', 'poster', 'src', 'xlink:href'];
+  var ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i;
+  var DefaultWhitelist = {
+    // Global attributes allowed on any supplied element below.
+    '*': ['class', 'dir', 'id', 'lang', 'role', ARIA_ATTRIBUTE_PATTERN],
+    a: ['target', 'href', 'title', 'rel'],
+    area: [],
+    b: [],
+    br: [],
+    col: [],
+    code: [],
+    div: [],
+    em: [],
+    hr: [],
+    h1: [],
+    h2: [],
+    h3: [],
+    h4: [],
+    h5: [],
+    h6: [],
+    i: [],
+    img: ['src', 'srcset', 'alt', 'title', 'width', 'height'],
+    li: [],
+    ol: [],
+    p: [],
+    pre: [],
+    s: [],
+    small: [],
+    span: [],
+    sub: [],
+    sup: [],
+    strong: [],
+    u: [],
+    ul: []
+  };
+  /**
+   * A pattern that recognizes a commonly useful subset of URLs that are safe.
+   *
+   * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
+   */
+
+  var SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/gi;
+  /**
+   * A pattern that matches safe data URLs. Only matches image, video and audio types.
+   *
+   * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
+   */
+
+  var DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i;
+
+  function allowedAttribute(attr, allowedAttributeList) {
+    var attrName = attr.nodeName.toLowerCase();
+
+    if (allowedAttributeList.indexOf(attrName) !== -1) {
+      if (uriAttrs.indexOf(attrName) !== -1) {
+        return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN));
+      }
+
+      return true;
+    }
+
+    var regExp = allowedAttributeList.filter(function (attrRegex) {
+      return attrRegex instanceof RegExp;
+    }); // Check if a regular expression validates the attribute.
+
+    for (var i = 0, len = regExp.length; i < len; i++) {
+      if (attrName.match(regExp[i])) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
-  Modal.prototype.setScrollbar = function () {
-    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
-    this.originalBodyPad = document.body.style.paddingRight || ''
-    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+  function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) {
+    if (unsafeHtml.length === 0) {
+      return unsafeHtml;
+    }
+
+    if (sanitizeFn && typeof sanitizeFn === 'function') {
+      return sanitizeFn(unsafeHtml);
+    }
+
+    var domParser = new window.DOMParser();
+    var createdDocument = domParser.parseFromString(unsafeHtml, 'text/html');
+    var whitelistKeys = Object.keys(whiteList);
+    var elements = [].slice.call(createdDocument.body.querySelectorAll('*'));
+
+    var _loop = function _loop(i, len) {
+      var el = elements[i];
+      var elName = el.nodeName.toLowerCase();
+
+      if (whitelistKeys.indexOf(el.nodeName.toLowerCase()) === -1) {
+        el.parentNode.removeChild(el);
+        return "continue";
+      }
+
+      var attributeList = [].slice.call(el.attributes);
+      var whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || []);
+      attributeList.forEach(function (attr) {
+        if (!allowedAttribute(attr, whitelistedAttributes)) {
+          el.removeAttribute(attr.nodeName);
+        }
+      });
+    };
+
+    for (var i = 0, len = elements.length; i < len; i++) {
+      var _ret = _loop(i);
+
+      if (_ret === "continue") continue;
+    }
+
+    return createdDocument.body.innerHTML;
   }
 
-  Modal.prototype.resetScrollbar = function () {
-    this.$body.css('padding-right', this.originalBodyPad)
-  }
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
 
-  Modal.prototype.measureScrollbar = function () { // thx walsh
-    var scrollDiv = document.createElement('div')
-    scrollDiv.className = 'modal-scrollbar-measure'
-    this.$body.append(scrollDiv)
-    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
-    this.$body[0].removeChild(scrollDiv)
-    return scrollbarWidth
-  }
-
-
-  // MODAL PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  var old = $.fn.modal
-
-  $.fn.modal             = Plugin
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
-  // MODAL DATA-API
-  // ==============
-
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-    if ($this.is('a')) e.preventDefault()
-
-    $target.one('show.bs.modal', function (showEvent) {
-      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
-      $target.one('hidden.bs.modal', function () {
-        $this.is(':visible') && $this.trigger('focus')
-      })
-    })
-    Plugin.call($target, option, this)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.3.6
- * http://getbootstrap.com/javascript/#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       = null
-    this.options    = null
-    this.enabled    = null
-    this.timeout    = null
-    this.hoverState = null
-    this.$element   = null
-    this.inState    = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.VERSION  = '3.3.6'
-
-  Tooltip.TRANSITION_DURATION = 150
-
-  Tooltip.DEFAULTS = {
+  var NAME$6 = 'tooltip';
+  var VERSION$6 = '4.5.0';
+  var DATA_KEY$6 = 'bs.tooltip';
+  var EVENT_KEY$6 = "." + DATA_KEY$6;
+  var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
+  var CLASS_PREFIX = 'bs-tooltip';
+  var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g');
+  var DISALLOWED_ATTRIBUTES = ['sanitize', 'whiteList', 'sanitizeFn'];
+  var DefaultType$4 = {
+    animation: 'boolean',
+    template: 'string',
+    title: '(string|element|function)',
+    trigger: 'string',
+    delay: '(number|object)',
+    html: 'boolean',
+    selector: '(string|boolean)',
+    placement: '(string|function)',
+    offset: '(number|string|function)',
+    container: '(string|element|boolean)',
+    fallbackPlacement: '(string|array)',
+    boundary: '(string|element)',
+    sanitize: 'boolean',
+    sanitizeFn: '(null|function)',
+    whiteList: 'object',
+    popperConfig: '(null|object)'
+  };
+  var AttachmentMap = {
+    AUTO: 'auto',
+    TOP: 'top',
+    RIGHT: 'right',
+    BOTTOM: 'bottom',
+    LEFT: 'left'
+  };
+  var Default$4 = {
     animation: true,
-    placement: 'top',
-    selector: false,
-    template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+    template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
     trigger: 'hover focus',
     title: '',
     delay: 0,
     html: false,
+    selector: false,
+    placement: 'top',
+    offset: 0,
     container: false,
-    viewport: {
-      selector: 'body',
-      padding: 0
-    }
-  }
+    fallbackPlacement: 'flip',
+    boundary: 'scrollParent',
+    sanitize: true,
+    sanitizeFn: null,
+    whiteList: DefaultWhitelist,
+    popperConfig: null
+  };
+  var HOVER_STATE_SHOW = 'show';
+  var HOVER_STATE_OUT = 'out';
+  var Event = {
+    HIDE: "hide" + EVENT_KEY$6,
+    HIDDEN: "hidden" + EVENT_KEY$6,
+    SHOW: "show" + EVENT_KEY$6,
+    SHOWN: "shown" + EVENT_KEY$6,
+    INSERTED: "inserted" + EVENT_KEY$6,
+    CLICK: "click" + EVENT_KEY$6,
+    FOCUSIN: "focusin" + EVENT_KEY$6,
+    FOCUSOUT: "focusout" + EVENT_KEY$6,
+    MOUSEENTER: "mouseenter" + EVENT_KEY$6,
+    MOUSELEAVE: "mouseleave" + EVENT_KEY$6
+  };
+  var CLASS_NAME_FADE$2 = 'fade';
+  var CLASS_NAME_SHOW$4 = 'show';
+  var SELECTOR_TOOLTIP_INNER = '.tooltip-inner';
+  var SELECTOR_ARROW = '.arrow';
+  var TRIGGER_HOVER = 'hover';
+  var TRIGGER_FOCUS = 'focus';
+  var TRIGGER_CLICK = 'click';
+  var TRIGGER_MANUAL = 'manual';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
 
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled   = true
-    this.type      = type
-    this.$element  = $(element)
-    this.options   = this.getOptions(options)
-    this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
-    this.inState   = { click: false, hover: false, focus: false }
+  var Tooltip = /*#__PURE__*/function () {
+    function Tooltip(element, config) {
+      if (typeof Popper === 'undefined') {
+        throw new TypeError('Bootstrap\'s tooltips require Popper.js (https://popper.js.org/)');
+      } // private
 
-    if (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!')
-    }
 
-    var triggers = this.options.trigger.split(' ')
+      this._isEnabled = true;
+      this._timeout = 0;
+      this._hoverState = '';
+      this._activeTrigger = {};
+      this._popper = null; // Protected
 
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
+      this.element = element;
+      this.config = this._getConfig(config);
+      this.tip = null;
 
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
+      this._setListeners();
+    } // Getters
 
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
 
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
+    var _proto = Tooltip.prototype;
 
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
+    // Public
+    _proto.enable = function enable() {
+      this._isEnabled = true;
+    };
 
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+    _proto.disable = function disable() {
+      this._isEnabled = false;
+    };
 
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
+    _proto.toggleEnabled = function toggleEnabled() {
+      this._isEnabled = !this._isEnabled;
+    };
 
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
-    }
-
-    if (self.tip().hasClass('in') || self.hoverState == 'in') {
-      self.hoverState = 'in'
-      return
-    }
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.isInStateTrue = function () {
-    for (var key in this.inState) {
-      if (this.inState[key]) return true
-    }
-
-    return false
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
-    }
-
-    if (self.isInStateTrue()) return
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0])
-      if (e.isDefaultPrevented() || !inDom) return
-      var that = this
-
-      var $tip = this.tip()
-
-      var tipId = this.getUID(this.type)
-
-      this.setContent()
-      $tip.attr('id', tipId)
-      this.$element.attr('aria-describedby', tipId)
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-        .data('bs.' + this.type, this)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-      this.$element.trigger('inserted.bs.' + this.type)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var orgPlacement = placement
-        var viewportDim = this.getPosition(this.$viewport)
-
-        placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top'    :
-                    placement == 'top'    && pos.top    - actualHeight < viewportDim.top    ? 'bottom' :
-                    placement == 'right'  && pos.right  + actualWidth  > viewportDim.width  ? 'left'   :
-                    placement == 'left'   && pos.left   - actualWidth  < viewportDim.left   ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
+    _proto.toggle = function toggle(event) {
+      if (!this._isEnabled) {
+        return;
       }
 
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+      if (event) {
+        var dataKey = this.constructor.DATA_KEY;
+        var context = $(event.currentTarget).data(dataKey);
 
-      this.applyPlacement(calculatedOffset, placement)
+        if (!context) {
+          context = new this.constructor(event.currentTarget, this._getDelegateConfig());
+          $(event.currentTarget).data(dataKey, context);
+        }
 
-      var complete = function () {
-        var prevHoverState = that.hoverState
-        that.$element.trigger('shown.bs.' + that.type)
-        that.hoverState = null
+        context._activeTrigger.click = !context._activeTrigger.click;
 
-        if (prevHoverState == 'out') that.leave(that)
+        if (context._isWithActiveTrigger()) {
+          context._enter(null, context);
+        } else {
+          context._leave(null, context);
+        }
+      } else {
+        if ($(this.getTipElement()).hasClass(CLASS_NAME_SHOW$4)) {
+          this._leave(null, this);
+
+          return;
+        }
+
+        this._enter(null, this);
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      clearTimeout(this._timeout);
+      $.removeData(this.element, this.constructor.DATA_KEY);
+      $(this.element).off(this.constructor.EVENT_KEY);
+      $(this.element).closest('.modal').off('hide.bs.modal', this._hideModalHandler);
+
+      if (this.tip) {
+        $(this.tip).remove();
       }
 
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one('bsTransitionEnd', complete)
-          .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-        complete()
-    }
-  }
+      this._isEnabled = null;
+      this._timeout = null;
+      this._hoverState = null;
+      this._activeTrigger = null;
 
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  += marginTop
-    offset.left += marginLeft
-
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
+      if (this._popper) {
+        this._popper.destroy();
       }
-    }, offset), 0)
 
-    $tip.addClass('in')
+      this._popper = null;
+      this.element = null;
+      this.config = null;
+      this.tip = null;
+    };
 
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
+    _proto.show = function show() {
+      var _this = this;
 
-    if (placement == 'top' && actualHeight != height) {
-      offset.top = offset.top + height - actualHeight
-    }
-
-    var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
-
-    if (delta.left) offset.left += delta.left
-    else offset.top += delta.top
-
-    var isVertical          = /top|bottom/.test(placement)
-    var arrowDelta          = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
-    var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
-
-    $tip.offset(offset)
-    this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
-    this.arrow()
-      .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
-      .css(isVertical ? 'top' : 'left', '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function (callback) {
-    var that = this
-    var $tip = $(this.$tip)
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      that.$element
-        .removeAttr('aria-describedby')
-        .trigger('hidden.bs.' + that.type)
-      callback && callback()
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && $tip.hasClass('fade') ?
-      $tip
-        .one('bsTransitionEnd', complete)
-        .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function ($element) {
-    $element   = $element || this.$element
-
-    var el     = $element[0]
-    var isBody = el.tagName == 'BODY'
-
-    var elRect    = el.getBoundingClientRect()
-    if (elRect.width == null) {
-      // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
-      elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
-    }
-    var elOffset  = isBody ? { top: 0, left: 0 } : $element.offset()
-    var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
-    var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
-
-    return $.extend({}, elRect, scroll, outerDims, elOffset)
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
-
-  }
-
-  Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
-    var delta = { top: 0, left: 0 }
-    if (!this.$viewport) return delta
-
-    var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
-    var viewportDimensions = this.getPosition(this.$viewport)
-
-    if (/right|left/.test(placement)) {
-      var topEdgeOffset    = pos.top - viewportPadding - viewportDimensions.scroll
-      var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
-      if (topEdgeOffset < viewportDimensions.top) { // top overflow
-        delta.top = viewportDimensions.top - topEdgeOffset
-      } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
-        delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
+      if ($(this.element).css('display') === 'none') {
+        throw new Error('Please use show on visible elements');
       }
-    } else {
-      var leftEdgeOffset  = pos.left - viewportPadding
-      var rightEdgeOffset = pos.left + viewportPadding + actualWidth
-      if (leftEdgeOffset < viewportDimensions.left) { // left overflow
-        delta.left = viewportDimensions.left - leftEdgeOffset
-      } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
-        delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
+
+      var showEvent = $.Event(this.constructor.Event.SHOW);
+
+      if (this.isWithContent() && this._isEnabled) {
+        $(this.element).trigger(showEvent);
+        var shadowRoot = Util.findShadowRoot(this.element);
+        var isInTheDom = $.contains(shadowRoot !== null ? shadowRoot : this.element.ownerDocument.documentElement, this.element);
+
+        if (showEvent.isDefaultPrevented() || !isInTheDom) {
+          return;
+        }
+
+        var tip = this.getTipElement();
+        var tipId = Util.getUID(this.constructor.NAME);
+        tip.setAttribute('id', tipId);
+        this.element.setAttribute('aria-describedby', tipId);
+        this.setContent();
+
+        if (this.config.animation) {
+          $(tip).addClass(CLASS_NAME_FADE$2);
+        }
+
+        var placement = typeof this.config.placement === 'function' ? this.config.placement.call(this, tip, this.element) : this.config.placement;
+
+        var attachment = this._getAttachment(placement);
+
+        this.addAttachmentClass(attachment);
+
+        var container = this._getContainer();
+
+        $(tip).data(this.constructor.DATA_KEY, this);
+
+        if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {
+          $(tip).appendTo(container);
+        }
+
+        $(this.element).trigger(this.constructor.Event.INSERTED);
+        this._popper = new Popper(this.element, tip, this._getPopperConfig(attachment));
+        $(tip).addClass(CLASS_NAME_SHOW$4); // If this is a touch-enabled device we add extra
+        // empty mouseover listeners to the body's immediate children;
+        // only needed because of broken event delegation on iOS
+        // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
+
+        if ('ontouchstart' in document.documentElement) {
+          $(document.body).children().on('mouseover', null, $.noop);
+        }
+
+        var complete = function complete() {
+          if (_this.config.animation) {
+            _this._fixTransition();
+          }
+
+          var prevHoverState = _this._hoverState;
+          _this._hoverState = null;
+          $(_this.element).trigger(_this.constructor.Event.SHOWN);
+
+          if (prevHoverState === HOVER_STATE_OUT) {
+            _this._leave(null, _this);
+          }
+        };
+
+        if ($(this.tip).hasClass(CLASS_NAME_FADE$2)) {
+          var transitionDuration = Util.getTransitionDurationFromElement(this.tip);
+          $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+        } else {
+          complete();
+        }
       }
-    }
+    };
 
-    return delta
-  }
+    _proto.hide = function hide(callback) {
+      var _this2 = this;
 
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
+      var tip = this.getTipElement();
+      var hideEvent = $.Event(this.constructor.Event.HIDE);
 
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+      var complete = function complete() {
+        if (_this2._hoverState !== HOVER_STATE_SHOW && tip.parentNode) {
+          tip.parentNode.removeChild(tip);
+        }
 
-    return title
-  }
+        _this2._cleanTipClass();
 
-  Tooltip.prototype.getUID = function (prefix) {
-    do prefix += ~~(Math.random() * 1000000)
-    while (document.getElementById(prefix))
-    return prefix
-  }
+        _this2.element.removeAttribute('aria-describedby');
 
-  Tooltip.prototype.tip = function () {
-    if (!this.$tip) {
-      this.$tip = $(this.options.template)
-      if (this.$tip.length != 1) {
-        throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!')
+        $(_this2.element).trigger(_this2.constructor.Event.HIDDEN);
+
+        if (_this2._popper !== null) {
+          _this2._popper.destroy();
+        }
+
+        if (callback) {
+          callback();
+        }
+      };
+
+      $(this.element).trigger(hideEvent);
+
+      if (hideEvent.isDefaultPrevented()) {
+        return;
       }
-    }
-    return this.$tip
-  }
 
-  Tooltip.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
-  }
+      $(tip).removeClass(CLASS_NAME_SHOW$4); // If this is a touch-enabled device we remove the extra
+      // empty mouseover listeners we added for iOS support
 
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = this
-    if (e) {
-      self = $(e.currentTarget).data('bs.' + this.type)
-      if (!self) {
-        self = new this.constructor(e.currentTarget, this.getDelegateOptions())
-        $(e.currentTarget).data('bs.' + this.type, self)
+      if ('ontouchstart' in document.documentElement) {
+        $(document.body).children().off('mouseover', null, $.noop);
       }
-    }
 
-    if (e) {
-      self.inState.click = !self.inState.click
-      if (self.isInStateTrue()) self.enter(self)
-      else self.leave(self)
-    } else {
-      self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-    }
-  }
+      this._activeTrigger[TRIGGER_CLICK] = false;
+      this._activeTrigger[TRIGGER_FOCUS] = false;
+      this._activeTrigger[TRIGGER_HOVER] = false;
 
-  Tooltip.prototype.destroy = function () {
-    var that = this
-    clearTimeout(this.timeout)
-    this.hide(function () {
-      that.$element.off('.' + that.type).removeData('bs.' + that.type)
-      if (that.$tip) {
-        that.$tip.detach()
+      if ($(this.tip).hasClass(CLASS_NAME_FADE$2)) {
+        var transitionDuration = Util.getTransitionDurationFromElement(tip);
+        $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
       }
-      that.$tip = null
-      that.$arrow = null
-      that.$viewport = null
-    })
-  }
+
+      this._hoverState = '';
+    };
+
+    _proto.update = function update() {
+      if (this._popper !== null) {
+        this._popper.scheduleUpdate();
+      }
+    } // Protected
+    ;
+
+    _proto.isWithContent = function isWithContent() {
+      return Boolean(this.getTitle());
+    };
+
+    _proto.addAttachmentClass = function addAttachmentClass(attachment) {
+      $(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment);
+    };
+
+    _proto.getTipElement = function getTipElement() {
+      this.tip = this.tip || $(this.config.template)[0];
+      return this.tip;
+    };
+
+    _proto.setContent = function setContent() {
+      var tip = this.getTipElement();
+      this.setElementContent($(tip.querySelectorAll(SELECTOR_TOOLTIP_INNER)), this.getTitle());
+      $(tip).removeClass(CLASS_NAME_FADE$2 + " " + CLASS_NAME_SHOW$4);
+    };
+
+    _proto.setElementContent = function setElementContent($element, content) {
+      if (typeof content === 'object' && (content.nodeType || content.jquery)) {
+        // Content is a DOM node or a jQuery
+        if (this.config.html) {
+          if (!$(content).parent().is($element)) {
+            $element.empty().append(content);
+          }
+        } else {
+          $element.text($(content).text());
+        }
+
+        return;
+      }
+
+      if (this.config.html) {
+        if (this.config.sanitize) {
+          content = sanitizeHtml(content, this.config.whiteList, this.config.sanitizeFn);
+        }
+
+        $element.html(content);
+      } else {
+        $element.text(content);
+      }
+    };
+
+    _proto.getTitle = function getTitle() {
+      var title = this.element.getAttribute('data-original-title');
+
+      if (!title) {
+        title = typeof this.config.title === 'function' ? this.config.title.call(this.element) : this.config.title;
+      }
+
+      return title;
+    } // Private
+    ;
+
+    _proto._getPopperConfig = function _getPopperConfig(attachment) {
+      var _this3 = this;
+
+      var defaultBsConfig = {
+        placement: attachment,
+        modifiers: {
+          offset: this._getOffset(),
+          flip: {
+            behavior: this.config.fallbackPlacement
+          },
+          arrow: {
+            element: SELECTOR_ARROW
+          },
+          preventOverflow: {
+            boundariesElement: this.config.boundary
+          }
+        },
+        onCreate: function onCreate(data) {
+          if (data.originalPlacement !== data.placement) {
+            _this3._handlePopperPlacementChange(data);
+          }
+        },
+        onUpdate: function onUpdate(data) {
+          return _this3._handlePopperPlacementChange(data);
+        }
+      };
+      return _objectSpread2(_objectSpread2({}, defaultBsConfig), this.config.popperConfig);
+    };
+
+    _proto._getOffset = function _getOffset() {
+      var _this4 = this;
+
+      var offset = {};
+
+      if (typeof this.config.offset === 'function') {
+        offset.fn = function (data) {
+          data.offsets = _objectSpread2(_objectSpread2({}, data.offsets), _this4.config.offset(data.offsets, _this4.element) || {});
+          return data;
+        };
+      } else {
+        offset.offset = this.config.offset;
+      }
+
+      return offset;
+    };
+
+    _proto._getContainer = function _getContainer() {
+      if (this.config.container === false) {
+        return document.body;
+      }
+
+      if (Util.isElement(this.config.container)) {
+        return $(this.config.container);
+      }
+
+      return $(document).find(this.config.container);
+    };
+
+    _proto._getAttachment = function _getAttachment(placement) {
+      return AttachmentMap[placement.toUpperCase()];
+    };
+
+    _proto._setListeners = function _setListeners() {
+      var _this5 = this;
+
+      var triggers = this.config.trigger.split(' ');
+      triggers.forEach(function (trigger) {
+        if (trigger === 'click') {
+          $(_this5.element).on(_this5.constructor.Event.CLICK, _this5.config.selector, function (event) {
+            return _this5.toggle(event);
+          });
+        } else if (trigger !== TRIGGER_MANUAL) {
+          var eventIn = trigger === TRIGGER_HOVER ? _this5.constructor.Event.MOUSEENTER : _this5.constructor.Event.FOCUSIN;
+          var eventOut = trigger === TRIGGER_HOVER ? _this5.constructor.Event.MOUSELEAVE : _this5.constructor.Event.FOCUSOUT;
+          $(_this5.element).on(eventIn, _this5.config.selector, function (event) {
+            return _this5._enter(event);
+          }).on(eventOut, _this5.config.selector, function (event) {
+            return _this5._leave(event);
+          });
+        }
+      });
+
+      this._hideModalHandler = function () {
+        if (_this5.element) {
+          _this5.hide();
+        }
+      };
+
+      $(this.element).closest('.modal').on('hide.bs.modal', this._hideModalHandler);
+
+      if (this.config.selector) {
+        this.config = _objectSpread2(_objectSpread2({}, this.config), {}, {
+          trigger: 'manual',
+          selector: ''
+        });
+      } else {
+        this._fixTitle();
+      }
+    };
+
+    _proto._fixTitle = function _fixTitle() {
+      var titleType = typeof this.element.getAttribute('data-original-title');
+
+      if (this.element.getAttribute('title') || titleType !== 'string') {
+        this.element.setAttribute('data-original-title', this.element.getAttribute('title') || '');
+        this.element.setAttribute('title', '');
+      }
+    };
+
+    _proto._enter = function _enter(event, context) {
+      var dataKey = this.constructor.DATA_KEY;
+      context = context || $(event.currentTarget).data(dataKey);
+
+      if (!context) {
+        context = new this.constructor(event.currentTarget, this._getDelegateConfig());
+        $(event.currentTarget).data(dataKey, context);
+      }
+
+      if (event) {
+        context._activeTrigger[event.type === 'focusin' ? TRIGGER_FOCUS : TRIGGER_HOVER] = true;
+      }
+
+      if ($(context.getTipElement()).hasClass(CLASS_NAME_SHOW$4) || context._hoverState === HOVER_STATE_SHOW) {
+        context._hoverState = HOVER_STATE_SHOW;
+        return;
+      }
+
+      clearTimeout(context._timeout);
+      context._hoverState = HOVER_STATE_SHOW;
+
+      if (!context.config.delay || !context.config.delay.show) {
+        context.show();
+        return;
+      }
+
+      context._timeout = setTimeout(function () {
+        if (context._hoverState === HOVER_STATE_SHOW) {
+          context.show();
+        }
+      }, context.config.delay.show);
+    };
+
+    _proto._leave = function _leave(event, context) {
+      var dataKey = this.constructor.DATA_KEY;
+      context = context || $(event.currentTarget).data(dataKey);
+
+      if (!context) {
+        context = new this.constructor(event.currentTarget, this._getDelegateConfig());
+        $(event.currentTarget).data(dataKey, context);
+      }
+
+      if (event) {
+        context._activeTrigger[event.type === 'focusout' ? TRIGGER_FOCUS : TRIGGER_HOVER] = false;
+      }
+
+      if (context._isWithActiveTrigger()) {
+        return;
+      }
+
+      clearTimeout(context._timeout);
+      context._hoverState = HOVER_STATE_OUT;
+
+      if (!context.config.delay || !context.config.delay.hide) {
+        context.hide();
+        return;
+      }
+
+      context._timeout = setTimeout(function () {
+        if (context._hoverState === HOVER_STATE_OUT) {
+          context.hide();
+        }
+      }, context.config.delay.hide);
+    };
+
+    _proto._isWithActiveTrigger = function _isWithActiveTrigger() {
+      for (var trigger in this._activeTrigger) {
+        if (this._activeTrigger[trigger]) {
+          return true;
+        }
+      }
+
+      return false;
+    };
+
+    _proto._getConfig = function _getConfig(config) {
+      var dataAttributes = $(this.element).data();
+      Object.keys(dataAttributes).forEach(function (dataAttr) {
+        if (DISALLOWED_ATTRIBUTES.indexOf(dataAttr) !== -1) {
+          delete dataAttributes[dataAttr];
+        }
+      });
+      config = _objectSpread2(_objectSpread2(_objectSpread2({}, this.constructor.Default), dataAttributes), typeof config === 'object' && config ? config : {});
+
+      if (typeof config.delay === 'number') {
+        config.delay = {
+          show: config.delay,
+          hide: config.delay
+        };
+      }
+
+      if (typeof config.title === 'number') {
+        config.title = config.title.toString();
+      }
+
+      if (typeof config.content === 'number') {
+        config.content = config.content.toString();
+      }
+
+      Util.typeCheckConfig(NAME$6, config, this.constructor.DefaultType);
+
+      if (config.sanitize) {
+        config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn);
+      }
+
+      return config;
+    };
+
+    _proto._getDelegateConfig = function _getDelegateConfig() {
+      var config = {};
+
+      if (this.config) {
+        for (var key in this.config) {
+          if (this.constructor.Default[key] !== this.config[key]) {
+            config[key] = this.config[key];
+          }
+        }
+      }
+
+      return config;
+    };
+
+    _proto._cleanTipClass = function _cleanTipClass() {
+      var $tip = $(this.getTipElement());
+      var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX);
+
+      if (tabClass !== null && tabClass.length) {
+        $tip.removeClass(tabClass.join(''));
+      }
+    };
+
+    _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(popperData) {
+      this.tip = popperData.instance.popper;
+
+      this._cleanTipClass();
+
+      this.addAttachmentClass(this._getAttachment(popperData.placement));
+    };
+
+    _proto._fixTransition = function _fixTransition() {
+      var tip = this.getTipElement();
+      var initConfigAnimation = this.config.animation;
+
+      if (tip.getAttribute('x-placement') !== null) {
+        return;
+      }
+
+      $(tip).removeClass(CLASS_NAME_FADE$2);
+      this.config.animation = false;
+      this.hide();
+      this.show();
+      this.config.animation = initConfigAnimation;
+    } // Static
+    ;
+
+    Tooltip._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$6);
+
+        var _config = typeof config === 'object' && config;
+
+        if (!data && /dispose|hide/.test(config)) {
+          return;
+        }
+
+        if (!data) {
+          data = new Tooltip(this, _config);
+          $(this).data(DATA_KEY$6, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Tooltip, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$6;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$4;
+      }
+    }, {
+      key: "NAME",
+      get: function get() {
+        return NAME$6;
+      }
+    }, {
+      key: "DATA_KEY",
+      get: function get() {
+        return DATA_KEY$6;
+      }
+    }, {
+      key: "Event",
+      get: function get() {
+        return Event;
+      }
+    }, {
+      key: "EVENT_KEY",
+      get: function get() {
+        return EVENT_KEY$6;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$4;
+      }
+    }]);
+
+    return Tooltip;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
 
 
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
+  $.fn[NAME$6] = Tooltip._jQueryInterface;
+  $.fn[NAME$6].Constructor = Tooltip;
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
+  $.fn[NAME$6].noConflict = function () {
+    $.fn[NAME$6] = JQUERY_NO_CONFLICT$6;
+    return Tooltip._jQueryInterface;
+  };
 
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
 
-  var old = $.fn.tooltip
+  var NAME$7 = 'popover';
+  var VERSION$7 = '4.5.0';
+  var DATA_KEY$7 = 'bs.popover';
+  var EVENT_KEY$7 = "." + DATA_KEY$7;
+  var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
+  var CLASS_PREFIX$1 = 'bs-popover';
+  var BSCLS_PREFIX_REGEX$1 = new RegExp("(^|\\s)" + CLASS_PREFIX$1 + "\\S+", 'g');
 
-  $.fn.tooltip             = Plugin
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.3.6
- * http://getbootstrap.com/javascript/#popovers
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.VERSION  = '3.3.6'
-
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+  var Default$5 = _objectSpread2(_objectSpread2({}, Tooltip.Default), {}, {
     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>'
-  })
+    template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div></div>'
+  });
 
+  var DefaultType$5 = _objectSpread2(_objectSpread2({}, Tooltip.DefaultType), {}, {
+    content: '(string|element|function)'
+  });
 
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
+  var CLASS_NAME_FADE$3 = 'fade';
+  var CLASS_NAME_SHOW$5 = 'show';
+  var SELECTOR_TITLE = '.popover-header';
+  var SELECTOR_CONTENT = '.popover-body';
+  var Event$1 = {
+    HIDE: "hide" + EVENT_KEY$7,
+    HIDDEN: "hidden" + EVENT_KEY$7,
+    SHOW: "show" + EVENT_KEY$7,
+    SHOWN: "shown" + EVENT_KEY$7,
+    INSERTED: "inserted" + EVENT_KEY$7,
+    CLICK: "click" + EVENT_KEY$7,
+    FOCUSIN: "focusin" + EVENT_KEY$7,
+    FOCUSOUT: "focusout" + EVENT_KEY$7,
+    MOUSEENTER: "mouseenter" + EVENT_KEY$7,
+    MOUSELEAVE: "mouseleave" + EVENT_KEY$7
+  };
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
 
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+  var Popover = /*#__PURE__*/function (_Tooltip) {
+    _inheritsLoose(Popover, _Tooltip);
 
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.popover
-
-  $.fn.popover             = Plugin
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.6
- * http://getbootstrap.com/javascript/#scrollspy
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    this.$body          = $(document.body)
-    this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target || '') + ' .nav li > a'
-    this.offsets        = []
-    this.targets        = []
-    this.activeTarget   = null
-    this.scrollHeight   = 0
-
-    this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.VERSION  = '3.3.6'
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.getScrollHeight = function () {
-    return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var that          = this
-    var offsetMethod  = 'offset'
-    var offsetBase    = 0
-
-    this.offsets      = []
-    this.targets      = []
-    this.scrollHeight = this.getScrollHeight()
-
-    if (!$.isWindow(this.$scrollElement[0])) {
-      offsetMethod = 'position'
-      offsetBase   = this.$scrollElement.scrollTop()
+    function Popover() {
+      return _Tooltip.apply(this, arguments) || this;
     }
 
-    this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#./.test(href) && $(href)
+    var _proto = Popover.prototype;
 
-        return ($href
-          && $href.length
-          && $href.is(':visible')
-          && [[$href[offsetMethod]().top + offsetBase, href]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        that.offsets.push(this[0])
-        that.targets.push(this[1])
-      })
-  }
+    // Overrides
+    _proto.isWithContent = function isWithContent() {
+      return this.getTitle() || this._getContent();
+    };
 
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.getScrollHeight()
-    var maxScroll    = this.options.offset + scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
+    _proto.addAttachmentClass = function addAttachmentClass(attachment) {
+      $(this.getTipElement()).addClass(CLASS_PREFIX$1 + "-" + attachment);
+    };
 
-    if (this.scrollHeight != scrollHeight) {
-      this.refresh()
-    }
+    _proto.getTipElement = function getTipElement() {
+      this.tip = this.tip || $(this.config.template)[0];
+      return this.tip;
+    };
 
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
-    }
+    _proto.setContent = function setContent() {
+      var $tip = $(this.getTipElement()); // We use append for html objects to maintain js events
 
-    if (activeTarget && scrollTop < offsets[0]) {
-      this.activeTarget = null
-      return this.clear()
-    }
+      this.setElementContent($tip.find(SELECTOR_TITLE), this.getTitle());
 
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
-        && this.activate(targets[i])
-    }
-  }
+      var content = this._getContent();
 
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
+      if (typeof content === 'function') {
+        content = content.call(this.element);
+      }
 
-    this.clear()
+      this.setElementContent($tip.find(SELECTOR_CONTENT), content);
+      $tip.removeClass(CLASS_NAME_FADE$3 + " " + CLASS_NAME_SHOW$5);
+    } // Private
+    ;
 
-    var selector = this.selector +
-      '[data-target="' + target + '"],' +
-      this.selector + '[href="' + target + '"]'
+    _proto._getContent = function _getContent() {
+      return this.element.getAttribute('data-content') || this.config.content;
+    };
 
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
+    _proto._cleanTipClass = function _cleanTipClass() {
+      var $tip = $(this.getTipElement());
+      var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX$1);
 
-    if (active.parent('.dropdown-menu').length) {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
+      if (tabClass !== null && tabClass.length > 0) {
+        $tip.removeClass(tabClass.join(''));
+      }
+    } // Static
+    ;
 
-    active.trigger('activate.bs.scrollspy')
-  }
+    Popover._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$7);
 
-  ScrollSpy.prototype.clear = function () {
-    $(this.selector)
-      .parentsUntil(this.options.target, '.active')
-      .removeClass('active')
-  }
+        var _config = typeof config === 'object' ? config : null;
+
+        if (!data && /dispose|hide/.test(config)) {
+          return;
+        }
+
+        if (!data) {
+          data = new Popover(this, _config);
+          $(this).data(DATA_KEY$7, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Popover, null, [{
+      key: "VERSION",
+      // Getters
+      get: function get() {
+        return VERSION$7;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$5;
+      }
+    }, {
+      key: "NAME",
+      get: function get() {
+        return NAME$7;
+      }
+    }, {
+      key: "DATA_KEY",
+      get: function get() {
+        return DATA_KEY$7;
+      }
+    }, {
+      key: "Event",
+      get: function get() {
+        return Event$1;
+      }
+    }, {
+      key: "EVENT_KEY",
+      get: function get() {
+        return EVENT_KEY$7;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$5;
+      }
+    }]);
+
+    return Popover;
+  }(Tooltip);
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
 
 
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
+  $.fn[NAME$7] = Popover._jQueryInterface;
+  $.fn[NAME$7].Constructor = Popover;
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
+  $.fn[NAME$7].noConflict = function () {
+    $.fn[NAME$7] = JQUERY_NO_CONFLICT$7;
+    return Popover._jQueryInterface;
+  };
 
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
 
-  var old = $.fn.scrollspy
+  var NAME$8 = 'scrollspy';
+  var VERSION$8 = '4.5.0';
+  var DATA_KEY$8 = 'bs.scrollspy';
+  var EVENT_KEY$8 = "." + DATA_KEY$8;
+  var DATA_API_KEY$6 = '.data-api';
+  var JQUERY_NO_CONFLICT$8 = $.fn[NAME$8];
+  var Default$6 = {
+    offset: 10,
+    method: 'auto',
+    target: ''
+  };
+  var DefaultType$6 = {
+    offset: 'number',
+    method: 'string',
+    target: '(string|element)'
+  };
+  var EVENT_ACTIVATE = "activate" + EVENT_KEY$8;
+  var EVENT_SCROLL = "scroll" + EVENT_KEY$8;
+  var EVENT_LOAD_DATA_API$2 = "load" + EVENT_KEY$8 + DATA_API_KEY$6;
+  var CLASS_NAME_DROPDOWN_ITEM = 'dropdown-item';
+  var CLASS_NAME_ACTIVE$2 = 'active';
+  var SELECTOR_DATA_SPY = '[data-spy="scroll"]';
+  var SELECTOR_NAV_LIST_GROUP = '.nav, .list-group';
+  var SELECTOR_NAV_LINKS = '.nav-link';
+  var SELECTOR_NAV_ITEMS = '.nav-item';
+  var SELECTOR_LIST_ITEMS = '.list-group-item';
+  var SELECTOR_DROPDOWN = '.dropdown';
+  var SELECTOR_DROPDOWN_ITEMS = '.dropdown-item';
+  var SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle';
+  var METHOD_OFFSET = 'offset';
+  var METHOD_POSITION = 'position';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
 
-  $.fn.scrollspy             = Plugin
-  $.fn.scrollspy.Constructor = ScrollSpy
+  var ScrollSpy = /*#__PURE__*/function () {
+    function ScrollSpy(element, config) {
+      var _this = this;
+
+      this._element = element;
+      this._scrollElement = element.tagName === 'BODY' ? window : element;
+      this._config = this._getConfig(config);
+      this._selector = this._config.target + " " + SELECTOR_NAV_LINKS + "," + (this._config.target + " " + SELECTOR_LIST_ITEMS + ",") + (this._config.target + " " + SELECTOR_DROPDOWN_ITEMS);
+      this._offsets = [];
+      this._targets = [];
+      this._activeTarget = null;
+      this._scrollHeight = 0;
+      $(this._scrollElement).on(EVENT_SCROLL, function (event) {
+        return _this._process(event);
+      });
+      this.refresh();
+
+      this._process();
+    } // Getters
 
 
-  // SCROLLSPY NO CONFLICT
-  // =====================
+    var _proto = ScrollSpy.prototype;
 
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
+    // Public
+    _proto.refresh = function refresh() {
+      var _this2 = this;
 
+      var autoMethod = this._scrollElement === this._scrollElement.window ? METHOD_OFFSET : METHOD_POSITION;
+      var offsetMethod = this._config.method === 'auto' ? autoMethod : this._config.method;
+      var offsetBase = offsetMethod === METHOD_POSITION ? this._getScrollTop() : 0;
+      this._offsets = [];
+      this._targets = [];
+      this._scrollHeight = this._getScrollHeight();
+      var targets = [].slice.call(document.querySelectorAll(this._selector));
+      targets.map(function (element) {
+        var target;
+        var targetSelector = Util.getSelectorFromElement(element);
 
-  // SCROLLSPY DATA-API
-  // ==================
+        if (targetSelector) {
+          target = document.querySelector(targetSelector);
+        }
 
-  $(window).on('load.bs.scrollspy.data-api', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      Plugin.call($spy, $spy.data())
-    })
-  })
+        if (target) {
+          var targetBCR = target.getBoundingClientRect();
 
-}(jQuery);
+          if (targetBCR.width || targetBCR.height) {
+            // TODO (fat): remove sketch reliance on jQuery position/offset
+            return [$(target)[offsetMethod]().top + offsetBase, targetSelector];
+          }
+        }
 
-/* ========================================================================
- * Bootstrap: tab.js v3.3.6
- * http://getbootstrap.com/javascript/#tabs
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
+        return null;
+      }).filter(function (item) {
+        return item;
+      }).sort(function (a, b) {
+        return a[0] - b[0];
+      }).forEach(function (item) {
+        _this2._offsets.push(item[0]);
 
+        _this2._targets.push(item[1]);
+      });
+    };
 
-+function ($) {
-  'use strict';
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$8);
+      $(this._scrollElement).off(EVENT_KEY$8);
+      this._element = null;
+      this._scrollElement = null;
+      this._config = null;
+      this._selector = null;
+      this._offsets = null;
+      this._targets = null;
+      this._activeTarget = null;
+      this._scrollHeight = null;
+    } // Private
+    ;
 
-  // TAB CLASS DEFINITION
-  // ====================
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default$6), typeof config === 'object' && config ? config : {});
 
-  var Tab = function (element) {
-    // jscs:disable requireDollarBeforejQueryAssignment
-    this.element = $(element)
-    // jscs:enable requireDollarBeforejQueryAssignment
-  }
+      if (typeof config.target !== 'string' && Util.isElement(config.target)) {
+        var id = $(config.target).attr('id');
 
-  Tab.VERSION = '3.3.6'
+        if (!id) {
+          id = Util.getUID(NAME$8);
+          $(config.target).attr('id', id);
+        }
 
-  Tab.TRANSITION_DURATION = 150
+        config.target = "#" + id;
+      }
 
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.data('target')
+      Util.typeCheckConfig(NAME$8, config, DefaultType$6);
+      return config;
+    };
 
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
+    _proto._getScrollTop = function _getScrollTop() {
+      return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop;
+    };
 
-    if ($this.parent('li').hasClass('active')) return
+    _proto._getScrollHeight = function _getScrollHeight() {
+      return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);
+    };
 
-    var $previous = $ul.find('.active:last a')
-    var hideEvent = $.Event('hide.bs.tab', {
-      relatedTarget: $this[0]
-    })
-    var showEvent = $.Event('show.bs.tab', {
-      relatedTarget: $previous[0]
-    })
+    _proto._getOffsetHeight = function _getOffsetHeight() {
+      return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height;
+    };
 
-    $previous.trigger(hideEvent)
-    $this.trigger(showEvent)
+    _proto._process = function _process() {
+      var scrollTop = this._getScrollTop() + this._config.offset;
 
-    if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
+      var scrollHeight = this._getScrollHeight();
 
-    var $target = $(selector)
+      var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight();
 
-    this.activate($this.closest('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $previous.trigger({
-        type: 'hidden.bs.tab',
-        relatedTarget: $this[0]
-      })
-      $this.trigger({
-        type: 'shown.bs.tab',
-        relatedTarget: $previous[0]
-      })
-    })
-  }
+      if (this._scrollHeight !== scrollHeight) {
+        this.refresh();
+      }
 
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
+      if (scrollTop >= maxScroll) {
+        var target = this._targets[this._targets.length - 1];
 
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-          .removeClass('active')
-        .end()
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', false)
+        if (this._activeTarget !== target) {
+          this._activate(target);
+        }
 
-      element
-        .addClass('active')
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', true)
+        return;
+      }
 
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
+      if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) {
+        this._activeTarget = null;
+
+        this._clear();
+
+        return;
+      }
+
+      for (var i = this._offsets.length; i--;) {
+        var isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]);
+
+        if (isActiveTarget) {
+          this._activate(this._targets[i]);
+        }
+      }
+    };
+
+    _proto._activate = function _activate(target) {
+      this._activeTarget = target;
+
+      this._clear();
+
+      var queries = this._selector.split(',').map(function (selector) {
+        return selector + "[data-target=\"" + target + "\"]," + selector + "[href=\"" + target + "\"]";
+      });
+
+      var $link = $([].slice.call(document.querySelectorAll(queries.join(','))));
+
+      if ($link.hasClass(CLASS_NAME_DROPDOWN_ITEM)) {
+        $link.closest(SELECTOR_DROPDOWN).find(SELECTOR_DROPDOWN_TOGGLE).addClass(CLASS_NAME_ACTIVE$2);
+        $link.addClass(CLASS_NAME_ACTIVE$2);
       } else {
-        element.removeClass('fade')
+        // Set triggered link as active
+        $link.addClass(CLASS_NAME_ACTIVE$2); // Set triggered links parents as active
+        // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
+
+        $link.parents(SELECTOR_NAV_LIST_GROUP).prev(SELECTOR_NAV_LINKS + ", " + SELECTOR_LIST_ITEMS).addClass(CLASS_NAME_ACTIVE$2); // Handle special case when .nav-link is inside .nav-item
+
+        $link.parents(SELECTOR_NAV_LIST_GROUP).prev(SELECTOR_NAV_ITEMS).children(SELECTOR_NAV_LINKS).addClass(CLASS_NAME_ACTIVE$2);
       }
 
-      if (element.parent('.dropdown-menu').length) {
-        element
-          .closest('li.dropdown')
-            .addClass('active')
-          .end()
-          .find('[data-toggle="tab"]')
-            .attr('aria-expanded', true)
+      $(this._scrollElement).trigger(EVENT_ACTIVATE, {
+        relatedTarget: target
+      });
+    };
+
+    _proto._clear = function _clear() {
+      [].slice.call(document.querySelectorAll(this._selector)).filter(function (node) {
+        return node.classList.contains(CLASS_NAME_ACTIVE$2);
+      }).forEach(function (node) {
+        return node.classList.remove(CLASS_NAME_ACTIVE$2);
+      });
+    } // Static
+    ;
+
+    ScrollSpy._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$8);
+
+        var _config = typeof config === 'object' && config;
+
+        if (!data) {
+          data = new ScrollSpy(this, _config);
+          $(this).data(DATA_KEY$8, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(ScrollSpy, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$8;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$6;
+      }
+    }]);
+
+    return ScrollSpy;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(window).on(EVENT_LOAD_DATA_API$2, function () {
+    var scrollSpys = [].slice.call(document.querySelectorAll(SELECTOR_DATA_SPY));
+    var scrollSpysLength = scrollSpys.length;
+
+    for (var i = scrollSpysLength; i--;) {
+      var $spy = $(scrollSpys[i]);
+
+      ScrollSpy._jQueryInterface.call($spy, $spy.data());
+    }
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$8] = ScrollSpy._jQueryInterface;
+  $.fn[NAME$8].Constructor = ScrollSpy;
+
+  $.fn[NAME$8].noConflict = function () {
+    $.fn[NAME$8] = JQUERY_NO_CONFLICT$8;
+    return ScrollSpy._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$9 = 'tab';
+  var VERSION$9 = '4.5.0';
+  var DATA_KEY$9 = 'bs.tab';
+  var EVENT_KEY$9 = "." + DATA_KEY$9;
+  var DATA_API_KEY$7 = '.data-api';
+  var JQUERY_NO_CONFLICT$9 = $.fn[NAME$9];
+  var EVENT_HIDE$3 = "hide" + EVENT_KEY$9;
+  var EVENT_HIDDEN$3 = "hidden" + EVENT_KEY$9;
+  var EVENT_SHOW$3 = "show" + EVENT_KEY$9;
+  var EVENT_SHOWN$3 = "shown" + EVENT_KEY$9;
+  var EVENT_CLICK_DATA_API$6 = "click" + EVENT_KEY$9 + DATA_API_KEY$7;
+  var CLASS_NAME_DROPDOWN_MENU = 'dropdown-menu';
+  var CLASS_NAME_ACTIVE$3 = 'active';
+  var CLASS_NAME_DISABLED$1 = 'disabled';
+  var CLASS_NAME_FADE$4 = 'fade';
+  var CLASS_NAME_SHOW$6 = 'show';
+  var SELECTOR_DROPDOWN$1 = '.dropdown';
+  var SELECTOR_NAV_LIST_GROUP$1 = '.nav, .list-group';
+  var SELECTOR_ACTIVE$2 = '.active';
+  var SELECTOR_ACTIVE_UL = '> li > .active';
+  var SELECTOR_DATA_TOGGLE$4 = '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]';
+  var SELECTOR_DROPDOWN_TOGGLE$1 = '.dropdown-toggle';
+  var SELECTOR_DROPDOWN_ACTIVE_CHILD = '> .dropdown-menu .active';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Tab = /*#__PURE__*/function () {
+    function Tab(element) {
+      this._element = element;
+    } // Getters
+
+
+    var _proto = Tab.prototype;
+
+    // Public
+    _proto.show = function show() {
+      var _this = this;
+
+      if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(CLASS_NAME_ACTIVE$3) || $(this._element).hasClass(CLASS_NAME_DISABLED$1)) {
+        return;
       }
 
-      callback && callback()
-    }
+      var target;
+      var previous;
+      var listElement = $(this._element).closest(SELECTOR_NAV_LIST_GROUP$1)[0];
+      var selector = Util.getSelectorFromElement(this._element);
 
-    $active.length && transition ?
-      $active
-        .one('bsTransitionEnd', next)
-        .emulateTransitionEnd(Tab.TRANSITION_DURATION) :
-      next()
+      if (listElement) {
+        var itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? SELECTOR_ACTIVE_UL : SELECTOR_ACTIVE$2;
+        previous = $.makeArray($(listElement).find(itemSelector));
+        previous = previous[previous.length - 1];
+      }
 
-    $active.removeClass('in')
-  }
+      var hideEvent = $.Event(EVENT_HIDE$3, {
+        relatedTarget: this._element
+      });
+      var showEvent = $.Event(EVENT_SHOW$3, {
+        relatedTarget: previous
+      });
+
+      if (previous) {
+        $(previous).trigger(hideEvent);
+      }
+
+      $(this._element).trigger(showEvent);
+
+      if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (selector) {
+        target = document.querySelector(selector);
+      }
+
+      this._activate(this._element, listElement);
+
+      var complete = function complete() {
+        var hiddenEvent = $.Event(EVENT_HIDDEN$3, {
+          relatedTarget: _this._element
+        });
+        var shownEvent = $.Event(EVENT_SHOWN$3, {
+          relatedTarget: previous
+        });
+        $(previous).trigger(hiddenEvent);
+        $(_this._element).trigger(shownEvent);
+      };
+
+      if (target) {
+        this._activate(target, target.parentNode, complete);
+      } else {
+        complete();
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$9);
+      this._element = null;
+    } // Private
+    ;
+
+    _proto._activate = function _activate(element, container, callback) {
+      var _this2 = this;
+
+      var activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL') ? $(container).find(SELECTOR_ACTIVE_UL) : $(container).children(SELECTOR_ACTIVE$2);
+      var active = activeElements[0];
+      var isTransitioning = callback && active && $(active).hasClass(CLASS_NAME_FADE$4);
+
+      var complete = function complete() {
+        return _this2._transitionComplete(element, active, callback);
+      };
+
+      if (active && isTransitioning) {
+        var transitionDuration = Util.getTransitionDurationFromElement(active);
+        $(active).removeClass(CLASS_NAME_SHOW$6).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+    };
+
+    _proto._transitionComplete = function _transitionComplete(element, active, callback) {
+      if (active) {
+        $(active).removeClass(CLASS_NAME_ACTIVE$3);
+        var dropdownChild = $(active.parentNode).find(SELECTOR_DROPDOWN_ACTIVE_CHILD)[0];
+
+        if (dropdownChild) {
+          $(dropdownChild).removeClass(CLASS_NAME_ACTIVE$3);
+        }
+
+        if (active.getAttribute('role') === 'tab') {
+          active.setAttribute('aria-selected', false);
+        }
+      }
+
+      $(element).addClass(CLASS_NAME_ACTIVE$3);
+
+      if (element.getAttribute('role') === 'tab') {
+        element.setAttribute('aria-selected', true);
+      }
+
+      Util.reflow(element);
+
+      if (element.classList.contains(CLASS_NAME_FADE$4)) {
+        element.classList.add(CLASS_NAME_SHOW$6);
+      }
+
+      if (element.parentNode && $(element.parentNode).hasClass(CLASS_NAME_DROPDOWN_MENU)) {
+        var dropdownElement = $(element).closest(SELECTOR_DROPDOWN$1)[0];
+
+        if (dropdownElement) {
+          var dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(SELECTOR_DROPDOWN_TOGGLE$1));
+          $(dropdownToggleList).addClass(CLASS_NAME_ACTIVE$3);
+        }
+
+        element.setAttribute('aria-expanded', true);
+      }
+
+      if (callback) {
+        callback();
+      }
+    } // Static
+    ;
+
+    Tab._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $this = $(this);
+        var data = $this.data(DATA_KEY$9);
+
+        if (!data) {
+          data = new Tab(this);
+          $this.data(DATA_KEY$9, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Tab, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$9;
+      }
+    }]);
+
+    return Tab;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
 
 
-  // TAB PLUGIN DEFINITION
-  // =====================
+  $(document).on(EVENT_CLICK_DATA_API$6, SELECTOR_DATA_TOGGLE$4, function (event) {
+    event.preventDefault();
 
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
+    Tab._jQueryInterface.call($(this), 'show');
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
 
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+  $.fn[NAME$9] = Tab._jQueryInterface;
+  $.fn[NAME$9].Constructor = Tab;
 
-  var old = $.fn.tab
+  $.fn[NAME$9].noConflict = function () {
+    $.fn[NAME$9] = JQUERY_NO_CONFLICT$9;
+    return Tab._jQueryInterface;
+  };
 
-  $.fn.tab             = Plugin
-  $.fn.tab.Constructor = Tab
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$a = 'toast';
+  var VERSION$a = '4.5.0';
+  var DATA_KEY$a = 'bs.toast';
+  var EVENT_KEY$a = "." + DATA_KEY$a;
+  var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
+  var EVENT_CLICK_DISMISS$1 = "click.dismiss" + EVENT_KEY$a;
+  var EVENT_HIDE$4 = "hide" + EVENT_KEY$a;
+  var EVENT_HIDDEN$4 = "hidden" + EVENT_KEY$a;
+  var EVENT_SHOW$4 = "show" + EVENT_KEY$a;
+  var EVENT_SHOWN$4 = "shown" + EVENT_KEY$a;
+  var CLASS_NAME_FADE$5 = 'fade';
+  var CLASS_NAME_HIDE = 'hide';
+  var CLASS_NAME_SHOW$7 = 'show';
+  var CLASS_NAME_SHOWING = 'showing';
+  var DefaultType$7 = {
+    animation: 'boolean',
+    autohide: 'boolean',
+    delay: 'number'
+  };
+  var Default$7 = {
+    animation: true,
+    autohide: true,
+    delay: 500
+  };
+  var SELECTOR_DATA_DISMISS$1 = '[data-dismiss="toast"]';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Toast = /*#__PURE__*/function () {
+    function Toast(element, config) {
+      this._element = element;
+      this._config = this._getConfig(config);
+      this._timeout = null;
+
+      this._setListeners();
+    } // Getters
 
 
-  // TAB NO CONFLICT
-  // ===============
+    var _proto = Toast.prototype;
 
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
+    // Public
+    _proto.show = function show() {
+      var _this = this;
+
+      var showEvent = $.Event(EVENT_SHOW$4);
+      $(this._element).trigger(showEvent);
+
+      if (showEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (this._config.animation) {
+        this._element.classList.add(CLASS_NAME_FADE$5);
+      }
+
+      var complete = function complete() {
+        _this._element.classList.remove(CLASS_NAME_SHOWING);
+
+        _this._element.classList.add(CLASS_NAME_SHOW$7);
+
+        $(_this._element).trigger(EVENT_SHOWN$4);
+
+        if (_this._config.autohide) {
+          _this._timeout = setTimeout(function () {
+            _this.hide();
+          }, _this._config.delay);
+        }
+      };
+
+      this._element.classList.remove(CLASS_NAME_HIDE);
+
+      Util.reflow(this._element);
+
+      this._element.classList.add(CLASS_NAME_SHOWING);
+
+      if (this._config.animation) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+    };
+
+    _proto.hide = function hide() {
+      if (!this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+        return;
+      }
+
+      var hideEvent = $.Event(EVENT_HIDE$4);
+      $(this._element).trigger(hideEvent);
+
+      if (hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._close();
+    };
+
+    _proto.dispose = function dispose() {
+      clearTimeout(this._timeout);
+      this._timeout = null;
+
+      if (this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+        this._element.classList.remove(CLASS_NAME_SHOW$7);
+      }
+
+      $(this._element).off(EVENT_CLICK_DISMISS$1);
+      $.removeData(this._element, DATA_KEY$a);
+      this._element = null;
+      this._config = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2(_objectSpread2({}, Default$7), $(this._element).data()), typeof config === 'object' && config ? config : {});
+      Util.typeCheckConfig(NAME$a, config, this.constructor.DefaultType);
+      return config;
+    };
+
+    _proto._setListeners = function _setListeners() {
+      var _this2 = this;
+
+      $(this._element).on(EVENT_CLICK_DISMISS$1, SELECTOR_DATA_DISMISS$1, function () {
+        return _this2.hide();
+      });
+    };
+
+    _proto._close = function _close() {
+      var _this3 = this;
+
+      var complete = function complete() {
+        _this3._element.classList.add(CLASS_NAME_HIDE);
+
+        $(_this3._element).trigger(EVENT_HIDDEN$4);
+      };
+
+      this._element.classList.remove(CLASS_NAME_SHOW$7);
+
+      if (this._config.animation) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+    } // Static
+    ;
+
+    Toast._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $element = $(this);
+        var data = $element.data(DATA_KEY$a);
+
+        var _config = typeof config === 'object' && config;
+
+        if (!data) {
+          data = new Toast(this, _config);
+          $element.data(DATA_KEY$a, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config](this);
+        }
+      });
+    };
+
+    _createClass(Toast, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$a;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$7;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$7;
+      }
+    }]);
+
+    return Toast;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
 
 
-  // TAB DATA-API
-  // ============
+  $.fn[NAME$a] = Toast._jQueryInterface;
+  $.fn[NAME$a].Constructor = Toast;
 
-  var clickHandler = function (e) {
-    e.preventDefault()
-    Plugin.call($(this), 'show')
-  }
+  $.fn[NAME$a].noConflict = function () {
+    $.fn[NAME$a] = JQUERY_NO_CONFLICT$a;
+    return Toast._jQueryInterface;
+  };
 
-  $(document)
-    .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
-    .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
+  exports.Alert = Alert;
+  exports.Button = Button;
+  exports.Carousel = Carousel;
+  exports.Collapse = Collapse;
+  exports.Dropdown = Dropdown;
+  exports.Modal = Modal;
+  exports.Popover = Popover;
+  exports.Scrollspy = ScrollSpy;
+  exports.Tab = Tab;
+  exports.Toast = Toast;
+  exports.Tooltip = Tooltip;
+  exports.Util = Util;
 
-}(jQuery);
+  Object.defineProperty(exports, '__esModule', { value: true });
 
-/* ========================================================================
- * Bootstrap: affix.js v3.3.6
- * http://getbootstrap.com/javascript/#affix
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // AFFIX CLASS DEFINITION
-  // ======================
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-
-    this.$target = $(this.options.target)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-
-    this.$element     = $(element)
-    this.affixed      = null
-    this.unpin        = null
-    this.pinnedOffset = null
-
-    this.checkPosition()
-  }
-
-  Affix.VERSION  = '3.3.6'
-
-  Affix.RESET    = 'affix affix-top affix-bottom'
-
-  Affix.DEFAULTS = {
-    offset: 0,
-    target: window
-  }
-
-  Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
-    var scrollTop    = this.$target.scrollTop()
-    var position     = this.$element.offset()
-    var targetHeight = this.$target.height()
-
-    if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
-
-    if (this.affixed == 'bottom') {
-      if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
-      return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
-    }
-
-    var initializing   = this.affixed == null
-    var colliderTop    = initializing ? scrollTop : position.top
-    var colliderHeight = initializing ? targetHeight : height
-
-    if (offsetTop != null && scrollTop <= offsetTop) return 'top'
-    if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
-
-    return false
-  }
-
-  Affix.prototype.getPinnedOffset = function () {
-    if (this.pinnedOffset) return this.pinnedOffset
-    this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$target.scrollTop()
-    var position  = this.$element.offset()
-    return (this.pinnedOffset = position.top - scrollTop)
-  }
-
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var height       = this.$element.height()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-    var scrollHeight = Math.max($(document).height(), $(document.body).height())
-
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
-
-    var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
-
-    if (this.affixed != affix) {
-      if (this.unpin != null) this.$element.css('top', '')
-
-      var affixType = 'affix' + (affix ? '-' + affix : '')
-      var e         = $.Event(affixType + '.bs.affix')
-
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      this.affixed = affix
-      this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
-
-      this.$element
-        .removeClass(Affix.RESET)
-        .addClass(affixType)
-        .trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
-    }
-
-    if (affix == 'bottom') {
-      this.$element.offset({
-        top: scrollHeight - height - offsetBottom
-      })
-    }
-  }
-
-
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.affix
-
-  $.fn.affix             = Plugin
-  $.fn.affix.Constructor = Affix
-
-
-  // AFFIX NO CONFLICT
-  // =================
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
-  // AFFIX DATA-API
-  // ==============
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop    != null) data.offset.top    = data.offsetTop
-
-      Plugin.call($spy, data)
-    })
-  })
-
-}(jQuery);
+})));
+//# sourceMappingURL=bootstrap.js.map
diff --git a/web/skins/classic/js/bootstrap.js.URL b/web/skins/classic/js/bootstrap.js.URL
index f374e4610..3b0b7c6f8 100644
--- a/web/skins/classic/js/bootstrap.js.URL
+++ b/web/skins/classic/js/bootstrap.js.URL
@@ -1 +1 @@
-https://github.com/twbs/bootstrap/releases/download/v3.3.6/bootstrap-3.3.6-dist.zip
+https://github.com/twbs/bootstrap/releases/download/v4.5.0/bootstrap-4.5.0-dist.zip
diff --git a/web/skins/classic/js/bootstrap.min.js b/web/skins/classic/js/bootstrap.min.js
index e79c06513..d9236dace 100644
--- a/web/skins/classic/js/bootstrap.min.js
+++ b/web/skins/classic/js/bootstrap.min.js
@@ -1,7 +1,7033 @@
 /*!
- * Bootstrap v3.3.6 (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||b[0]>2)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3")}(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.6",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.6",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.6",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.6",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(a.Event("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.6",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(a.Event("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.6",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.6",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.6",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.6",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.6",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.6",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
+  * Bootstrap v4.5.0 (https://getbootstrap.com/)
+  * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+  */
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('jquery')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'jquery'], factory) :
+  (global = global || self, factory(global.bootstrap = {}, global.jQuery));
+}(this, (function (exports, $) { 'use strict';
+
+  $ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
+
+  function _defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+  }
+
+  function _defineProperty(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+
+    return obj;
+  }
+
+  function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(object);
+      if (enumerableOnly) symbols = symbols.filter(function (sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+      keys.push.apply(keys, symbols);
+    }
+
+    return keys;
+  }
+
+  function _objectSpread2(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i] != null ? arguments[i] : {};
+
+      if (i % 2) {
+        ownKeys(Object(source), true).forEach(function (key) {
+          _defineProperty(target, key, source[key]);
+        });
+      } else if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+      } else {
+        ownKeys(Object(source)).forEach(function (key) {
+          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+      }
+    }
+
+    return target;
+  }
+
+  function _inheritsLoose(subClass, superClass) {
+    subClass.prototype = Object.create(superClass.prototype);
+    subClass.prototype.constructor = subClass;
+    subClass.__proto__ = superClass;
+  }
+
+  /**
+   * --------------------------------------------------------------------------
+   * Bootstrap (v4.5.0): util.js
+   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+   * --------------------------------------------------------------------------
+   */
+  /**
+   * ------------------------------------------------------------------------
+   * Private TransitionEnd Helpers
+   * ------------------------------------------------------------------------
+   */
+
+  var TRANSITION_END = 'transitionend';
+  var MAX_UID = 1000000;
+  var MILLISECONDS_MULTIPLIER = 1000; // Shoutout AngusCroll (https://goo.gl/pxwQGp)
+
+  function toType(obj) {
+    if (obj === null || typeof obj === 'undefined') {
+      return "" + obj;
+    }
+
+    return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase();
+  }
+
+  function getSpecialTransitionEndEvent() {
+    return {
+      bindType: TRANSITION_END,
+      delegateType: TRANSITION_END,
+      handle: function handle(event) {
+        if ($(event.target).is(this)) {
+          return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params
+        }
+
+        return undefined;
+      }
+    };
+  }
+
+  function transitionEndEmulator(duration) {
+    var _this = this;
+
+    var called = false;
+    $(this).one(Util.TRANSITION_END, function () {
+      called = true;
+    });
+    setTimeout(function () {
+      if (!called) {
+        Util.triggerTransitionEnd(_this);
+      }
+    }, duration);
+    return this;
+  }
+
+  function setTransitionEndSupport() {
+    $.fn.emulateTransitionEnd = transitionEndEmulator;
+    $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent();
+  }
+  /**
+   * --------------------------------------------------------------------------
+   * Public Util Api
+   * --------------------------------------------------------------------------
+   */
+
+
+  var Util = {
+    TRANSITION_END: 'bsTransitionEnd',
+    getUID: function getUID(prefix) {
+      do {
+        // eslint-disable-next-line no-bitwise
+        prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here
+      } while (document.getElementById(prefix));
+
+      return prefix;
+    },
+    getSelectorFromElement: function getSelectorFromElement(element) {
+      var selector = element.getAttribute('data-target');
+
+      if (!selector || selector === '#') {
+        var hrefAttr = element.getAttribute('href');
+        selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : '';
+      }
+
+      try {
+        return document.querySelector(selector) ? selector : null;
+      } catch (err) {
+        return null;
+      }
+    },
+    getTransitionDurationFromElement: function getTransitionDurationFromElement(element) {
+      if (!element) {
+        return 0;
+      } // Get transition-duration of the element
+
+
+      var transitionDuration = $(element).css('transition-duration');
+      var transitionDelay = $(element).css('transition-delay');
+      var floatTransitionDuration = parseFloat(transitionDuration);
+      var floatTransitionDelay = parseFloat(transitionDelay); // Return 0 if element or transition duration is not found
+
+      if (!floatTransitionDuration && !floatTransitionDelay) {
+        return 0;
+      } // If multiple durations are defined, take the first
+
+
+      transitionDuration = transitionDuration.split(',')[0];
+      transitionDelay = transitionDelay.split(',')[0];
+      return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER;
+    },
+    reflow: function reflow(element) {
+      return element.offsetHeight;
+    },
+    triggerTransitionEnd: function triggerTransitionEnd(element) {
+      $(element).trigger(TRANSITION_END);
+    },
+    // TODO: Remove in v5
+    supportsTransitionEnd: function supportsTransitionEnd() {
+      return Boolean(TRANSITION_END);
+    },
+    isElement: function isElement(obj) {
+      return (obj[0] || obj).nodeType;
+    },
+    typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) {
+      for (var property in configTypes) {
+        if (Object.prototype.hasOwnProperty.call(configTypes, property)) {
+          var expectedTypes = configTypes[property];
+          var value = config[property];
+          var valueType = value && Util.isElement(value) ? 'element' : toType(value);
+
+          if (!new RegExp(expectedTypes).test(valueType)) {
+            throw new Error(componentName.toUpperCase() + ": " + ("Option \"" + property + "\" provided type \"" + valueType + "\" ") + ("but expected type \"" + expectedTypes + "\"."));
+          }
+        }
+      }
+    },
+    findShadowRoot: function findShadowRoot(element) {
+      if (!document.documentElement.attachShadow) {
+        return null;
+      } // Can find the shadow root otherwise it'll return the document
+
+
+      if (typeof element.getRootNode === 'function') {
+        var root = element.getRootNode();
+        return root instanceof ShadowRoot ? root : null;
+      }
+
+      if (element instanceof ShadowRoot) {
+        return element;
+      } // when we don't find a shadow root
+
+
+      if (!element.parentNode) {
+        return null;
+      }
+
+      return Util.findShadowRoot(element.parentNode);
+    },
+    jQueryDetection: function jQueryDetection() {
+      if (typeof $ === 'undefined') {
+        throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.');
+      }
+
+      var version = $.fn.jquery.split(' ')[0].split('.');
+      var minMajor = 1;
+      var ltMajor = 2;
+      var minMinor = 9;
+      var minPatch = 1;
+      var maxMajor = 4;
+
+      if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
+        throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0');
+      }
+    }
+  };
+  Util.jQueryDetection();
+  setTransitionEndSupport();
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME = 'alert';
+  var VERSION = '4.5.0';
+  var DATA_KEY = 'bs.alert';
+  var EVENT_KEY = "." + DATA_KEY;
+  var DATA_API_KEY = '.data-api';
+  var JQUERY_NO_CONFLICT = $.fn[NAME];
+  var SELECTOR_DISMISS = '[data-dismiss="alert"]';
+  var EVENT_CLOSE = "close" + EVENT_KEY;
+  var EVENT_CLOSED = "closed" + EVENT_KEY;
+  var EVENT_CLICK_DATA_API = "click" + EVENT_KEY + DATA_API_KEY;
+  var CLASS_NAME_ALERT = 'alert';
+  var CLASS_NAME_FADE = 'fade';
+  var CLASS_NAME_SHOW = 'show';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Alert = /*#__PURE__*/function () {
+    function Alert(element) {
+      this._element = element;
+    } // Getters
+
+
+    var _proto = Alert.prototype;
+
+    // Public
+    _proto.close = function close(element) {
+      var rootElement = this._element;
+
+      if (element) {
+        rootElement = this._getRootElement(element);
+      }
+
+      var customEvent = this._triggerCloseEvent(rootElement);
+
+      if (customEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._removeElement(rootElement);
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY);
+      this._element = null;
+    } // Private
+    ;
+
+    _proto._getRootElement = function _getRootElement(element) {
+      var selector = Util.getSelectorFromElement(element);
+      var parent = false;
+
+      if (selector) {
+        parent = document.querySelector(selector);
+      }
+
+      if (!parent) {
+        parent = $(element).closest("." + CLASS_NAME_ALERT)[0];
+      }
+
+      return parent;
+    };
+
+    _proto._triggerCloseEvent = function _triggerCloseEvent(element) {
+      var closeEvent = $.Event(EVENT_CLOSE);
+      $(element).trigger(closeEvent);
+      return closeEvent;
+    };
+
+    _proto._removeElement = function _removeElement(element) {
+      var _this = this;
+
+      $(element).removeClass(CLASS_NAME_SHOW);
+
+      if (!$(element).hasClass(CLASS_NAME_FADE)) {
+        this._destroyElement(element);
+
+        return;
+      }
+
+      var transitionDuration = Util.getTransitionDurationFromElement(element);
+      $(element).one(Util.TRANSITION_END, function (event) {
+        return _this._destroyElement(element, event);
+      }).emulateTransitionEnd(transitionDuration);
+    };
+
+    _proto._destroyElement = function _destroyElement(element) {
+      $(element).detach().trigger(EVENT_CLOSED).remove();
+    } // Static
+    ;
+
+    Alert._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $element = $(this);
+        var data = $element.data(DATA_KEY);
+
+        if (!data) {
+          data = new Alert(this);
+          $element.data(DATA_KEY, data);
+        }
+
+        if (config === 'close') {
+          data[config](this);
+        }
+      });
+    };
+
+    Alert._handleDismiss = function _handleDismiss(alertInstance) {
+      return function (event) {
+        if (event) {
+          event.preventDefault();
+        }
+
+        alertInstance.close(this);
+      };
+    };
+
+    _createClass(Alert, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION;
+      }
+    }]);
+
+    return Alert;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API, SELECTOR_DISMISS, Alert._handleDismiss(new Alert()));
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME] = Alert._jQueryInterface;
+  $.fn[NAME].Constructor = Alert;
+
+  $.fn[NAME].noConflict = function () {
+    $.fn[NAME] = JQUERY_NO_CONFLICT;
+    return Alert._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$1 = 'button';
+  var VERSION$1 = '4.5.0';
+  var DATA_KEY$1 = 'bs.button';
+  var EVENT_KEY$1 = "." + DATA_KEY$1;
+  var DATA_API_KEY$1 = '.data-api';
+  var JQUERY_NO_CONFLICT$1 = $.fn[NAME$1];
+  var CLASS_NAME_ACTIVE = 'active';
+  var CLASS_NAME_BUTTON = 'btn';
+  var CLASS_NAME_FOCUS = 'focus';
+  var SELECTOR_DATA_TOGGLE_CARROT = '[data-toggle^="button"]';
+  var SELECTOR_DATA_TOGGLES = '[data-toggle="buttons"]';
+  var SELECTOR_DATA_TOGGLE = '[data-toggle="button"]';
+  var SELECTOR_DATA_TOGGLES_BUTTONS = '[data-toggle="buttons"] .btn';
+  var SELECTOR_INPUT = 'input:not([type="hidden"])';
+  var SELECTOR_ACTIVE = '.active';
+  var SELECTOR_BUTTON = '.btn';
+  var EVENT_CLICK_DATA_API$1 = "click" + EVENT_KEY$1 + DATA_API_KEY$1;
+  var EVENT_FOCUS_BLUR_DATA_API = "focus" + EVENT_KEY$1 + DATA_API_KEY$1 + " " + ("blur" + EVENT_KEY$1 + DATA_API_KEY$1);
+  var EVENT_LOAD_DATA_API = "load" + EVENT_KEY$1 + DATA_API_KEY$1;
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Button = /*#__PURE__*/function () {
+    function Button(element) {
+      this._element = element;
+    } // Getters
+
+
+    var _proto = Button.prototype;
+
+    // Public
+    _proto.toggle = function toggle() {
+      var triggerChangeEvent = true;
+      var addAriaPressed = true;
+      var rootElement = $(this._element).closest(SELECTOR_DATA_TOGGLES)[0];
+
+      if (rootElement) {
+        var input = this._element.querySelector(SELECTOR_INPUT);
+
+        if (input) {
+          if (input.type === 'radio') {
+            if (input.checked && this._element.classList.contains(CLASS_NAME_ACTIVE)) {
+              triggerChangeEvent = false;
+            } else {
+              var activeElement = rootElement.querySelector(SELECTOR_ACTIVE);
+
+              if (activeElement) {
+                $(activeElement).removeClass(CLASS_NAME_ACTIVE);
+              }
+            }
+          }
+
+          if (triggerChangeEvent) {
+            // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input
+            if (input.type === 'checkbox' || input.type === 'radio') {
+              input.checked = !this._element.classList.contains(CLASS_NAME_ACTIVE);
+            }
+
+            $(input).trigger('change');
+          }
+
+          input.focus();
+          addAriaPressed = false;
+        }
+      }
+
+      if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {
+        if (addAriaPressed) {
+          this._element.setAttribute('aria-pressed', !this._element.classList.contains(CLASS_NAME_ACTIVE));
+        }
+
+        if (triggerChangeEvent) {
+          $(this._element).toggleClass(CLASS_NAME_ACTIVE);
+        }
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$1);
+      this._element = null;
+    } // Static
+    ;
+
+    Button._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$1);
+
+        if (!data) {
+          data = new Button(this);
+          $(this).data(DATA_KEY$1, data);
+        }
+
+        if (config === 'toggle') {
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Button, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$1;
+      }
+    }]);
+
+    return Button;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$1, SELECTOR_DATA_TOGGLE_CARROT, function (event) {
+    var button = event.target;
+    var initialButton = button;
+
+    if (!$(button).hasClass(CLASS_NAME_BUTTON)) {
+      button = $(button).closest(SELECTOR_BUTTON)[0];
+    }
+
+    if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {
+      event.preventDefault(); // work around Firefox bug #1540995
+    } else {
+      var inputBtn = button.querySelector(SELECTOR_INPUT);
+
+      if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {
+        event.preventDefault(); // work around Firefox bug #1540995
+
+        return;
+      }
+
+      if (initialButton.tagName === 'LABEL' && inputBtn && inputBtn.type === 'checkbox') {
+        event.preventDefault(); // work around event sent to label and input
+      }
+
+      Button._jQueryInterface.call($(button), 'toggle');
+    }
+  }).on(EVENT_FOCUS_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, function (event) {
+    var button = $(event.target).closest(SELECTOR_BUTTON)[0];
+    $(button).toggleClass(CLASS_NAME_FOCUS, /^focus(in)?$/.test(event.type));
+  });
+  $(window).on(EVENT_LOAD_DATA_API, function () {
+    // ensure correct active class is set to match the controls' actual values/states
+    // find all checkboxes/readio buttons inside data-toggle groups
+    var buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLES_BUTTONS));
+
+    for (var i = 0, len = buttons.length; i < len; i++) {
+      var button = buttons[i];
+      var input = button.querySelector(SELECTOR_INPUT);
+
+      if (input.checked || input.hasAttribute('checked')) {
+        button.classList.add(CLASS_NAME_ACTIVE);
+      } else {
+        button.classList.remove(CLASS_NAME_ACTIVE);
+      }
+    } // find all button toggles
+
+
+    buttons = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE));
+
+    for (var _i = 0, _len = buttons.length; _i < _len; _i++) {
+      var _button = buttons[_i];
+
+      if (_button.getAttribute('aria-pressed') === 'true') {
+        _button.classList.add(CLASS_NAME_ACTIVE);
+      } else {
+        _button.classList.remove(CLASS_NAME_ACTIVE);
+      }
+    }
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$1] = Button._jQueryInterface;
+  $.fn[NAME$1].Constructor = Button;
+
+  $.fn[NAME$1].noConflict = function () {
+    $.fn[NAME$1] = JQUERY_NO_CONFLICT$1;
+    return Button._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$2 = 'carousel';
+  var VERSION$2 = '4.5.0';
+  var DATA_KEY$2 = 'bs.carousel';
+  var EVENT_KEY$2 = "." + DATA_KEY$2;
+  var DATA_API_KEY$2 = '.data-api';
+  var JQUERY_NO_CONFLICT$2 = $.fn[NAME$2];
+  var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
+
+  var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
+
+  var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
+
+  var SWIPE_THRESHOLD = 40;
+  var Default = {
+    interval: 5000,
+    keyboard: true,
+    slide: false,
+    pause: 'hover',
+    wrap: true,
+    touch: true
+  };
+  var DefaultType = {
+    interval: '(number|boolean)',
+    keyboard: 'boolean',
+    slide: '(boolean|string)',
+    pause: '(string|boolean)',
+    wrap: 'boolean',
+    touch: 'boolean'
+  };
+  var DIRECTION_NEXT = 'next';
+  var DIRECTION_PREV = 'prev';
+  var DIRECTION_LEFT = 'left';
+  var DIRECTION_RIGHT = 'right';
+  var EVENT_SLIDE = "slide" + EVENT_KEY$2;
+  var EVENT_SLID = "slid" + EVENT_KEY$2;
+  var EVENT_KEYDOWN = "keydown" + EVENT_KEY$2;
+  var EVENT_MOUSEENTER = "mouseenter" + EVENT_KEY$2;
+  var EVENT_MOUSELEAVE = "mouseleave" + EVENT_KEY$2;
+  var EVENT_TOUCHSTART = "touchstart" + EVENT_KEY$2;
+  var EVENT_TOUCHMOVE = "touchmove" + EVENT_KEY$2;
+  var EVENT_TOUCHEND = "touchend" + EVENT_KEY$2;
+  var EVENT_POINTERDOWN = "pointerdown" + EVENT_KEY$2;
+  var EVENT_POINTERUP = "pointerup" + EVENT_KEY$2;
+  var EVENT_DRAG_START = "dragstart" + EVENT_KEY$2;
+  var EVENT_LOAD_DATA_API$1 = "load" + EVENT_KEY$2 + DATA_API_KEY$2;
+  var EVENT_CLICK_DATA_API$2 = "click" + EVENT_KEY$2 + DATA_API_KEY$2;
+  var CLASS_NAME_CAROUSEL = 'carousel';
+  var CLASS_NAME_ACTIVE$1 = 'active';
+  var CLASS_NAME_SLIDE = 'slide';
+  var CLASS_NAME_RIGHT = 'carousel-item-right';
+  var CLASS_NAME_LEFT = 'carousel-item-left';
+  var CLASS_NAME_NEXT = 'carousel-item-next';
+  var CLASS_NAME_PREV = 'carousel-item-prev';
+  var CLASS_NAME_POINTER_EVENT = 'pointer-event';
+  var SELECTOR_ACTIVE$1 = '.active';
+  var SELECTOR_ACTIVE_ITEM = '.active.carousel-item';
+  var SELECTOR_ITEM = '.carousel-item';
+  var SELECTOR_ITEM_IMG = '.carousel-item img';
+  var SELECTOR_NEXT_PREV = '.carousel-item-next, .carousel-item-prev';
+  var SELECTOR_INDICATORS = '.carousel-indicators';
+  var SELECTOR_DATA_SLIDE = '[data-slide], [data-slide-to]';
+  var SELECTOR_DATA_RIDE = '[data-ride="carousel"]';
+  var PointerType = {
+    TOUCH: 'touch',
+    PEN: 'pen'
+  };
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Carousel = /*#__PURE__*/function () {
+    function Carousel(element, config) {
+      this._items = null;
+      this._interval = null;
+      this._activeElement = null;
+      this._isPaused = false;
+      this._isSliding = false;
+      this.touchTimeout = null;
+      this.touchStartX = 0;
+      this.touchDeltaX = 0;
+      this._config = this._getConfig(config);
+      this._element = element;
+      this._indicatorsElement = this._element.querySelector(SELECTOR_INDICATORS);
+      this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0;
+      this._pointerEvent = Boolean(window.PointerEvent || window.MSPointerEvent);
+
+      this._addEventListeners();
+    } // Getters
+
+
+    var _proto = Carousel.prototype;
+
+    // Public
+    _proto.next = function next() {
+      if (!this._isSliding) {
+        this._slide(DIRECTION_NEXT);
+      }
+    };
+
+    _proto.nextWhenVisible = function nextWhenVisible() {
+      // Don't call next when the page isn't visible
+      // or the carousel or its parent isn't visible
+      if (!document.hidden && $(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden') {
+        this.next();
+      }
+    };
+
+    _proto.prev = function prev() {
+      if (!this._isSliding) {
+        this._slide(DIRECTION_PREV);
+      }
+    };
+
+    _proto.pause = function pause(event) {
+      if (!event) {
+        this._isPaused = true;
+      }
+
+      if (this._element.querySelector(SELECTOR_NEXT_PREV)) {
+        Util.triggerTransitionEnd(this._element);
+        this.cycle(true);
+      }
+
+      clearInterval(this._interval);
+      this._interval = null;
+    };
+
+    _proto.cycle = function cycle(event) {
+      if (!event) {
+        this._isPaused = false;
+      }
+
+      if (this._interval) {
+        clearInterval(this._interval);
+        this._interval = null;
+      }
+
+      if (this._config.interval && !this._isPaused) {
+        this._interval = setInterval((document.visibilityState ? this.nextWhenVisible : this.next).bind(this), this._config.interval);
+      }
+    };
+
+    _proto.to = function to(index) {
+      var _this = this;
+
+      this._activeElement = this._element.querySelector(SELECTOR_ACTIVE_ITEM);
+
+      var activeIndex = this._getItemIndex(this._activeElement);
+
+      if (index > this._items.length - 1 || index < 0) {
+        return;
+      }
+
+      if (this._isSliding) {
+        $(this._element).one(EVENT_SLID, function () {
+          return _this.to(index);
+        });
+        return;
+      }
+
+      if (activeIndex === index) {
+        this.pause();
+        this.cycle();
+        return;
+      }
+
+      var direction = index > activeIndex ? DIRECTION_NEXT : DIRECTION_PREV;
+
+      this._slide(direction, this._items[index]);
+    };
+
+    _proto.dispose = function dispose() {
+      $(this._element).off(EVENT_KEY$2);
+      $.removeData(this._element, DATA_KEY$2);
+      this._items = null;
+      this._config = null;
+      this._element = null;
+      this._interval = null;
+      this._isPaused = null;
+      this._isSliding = null;
+      this._activeElement = null;
+      this._indicatorsElement = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default), config);
+      Util.typeCheckConfig(NAME$2, config, DefaultType);
+      return config;
+    };
+
+    _proto._handleSwipe = function _handleSwipe() {
+      var absDeltax = Math.abs(this.touchDeltaX);
+
+      if (absDeltax <= SWIPE_THRESHOLD) {
+        return;
+      }
+
+      var direction = absDeltax / this.touchDeltaX;
+      this.touchDeltaX = 0; // swipe left
+
+      if (direction > 0) {
+        this.prev();
+      } // swipe right
+
+
+      if (direction < 0) {
+        this.next();
+      }
+    };
+
+    _proto._addEventListeners = function _addEventListeners() {
+      var _this2 = this;
+
+      if (this._config.keyboard) {
+        $(this._element).on(EVENT_KEYDOWN, function (event) {
+          return _this2._keydown(event);
+        });
+      }
+
+      if (this._config.pause === 'hover') {
+        $(this._element).on(EVENT_MOUSEENTER, function (event) {
+          return _this2.pause(event);
+        }).on(EVENT_MOUSELEAVE, function (event) {
+          return _this2.cycle(event);
+        });
+      }
+
+      if (this._config.touch) {
+        this._addTouchEventListeners();
+      }
+    };
+
+    _proto._addTouchEventListeners = function _addTouchEventListeners() {
+      var _this3 = this;
+
+      if (!this._touchSupported) {
+        return;
+      }
+
+      var start = function start(event) {
+        if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+          _this3.touchStartX = event.originalEvent.clientX;
+        } else if (!_this3._pointerEvent) {
+          _this3.touchStartX = event.originalEvent.touches[0].clientX;
+        }
+      };
+
+      var move = function move(event) {
+        // ensure swiping with one touch and not pinching
+        if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
+          _this3.touchDeltaX = 0;
+        } else {
+          _this3.touchDeltaX = event.originalEvent.touches[0].clientX - _this3.touchStartX;
+        }
+      };
+
+      var end = function end(event) {
+        if (_this3._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+          _this3.touchDeltaX = event.originalEvent.clientX - _this3.touchStartX;
+        }
+
+        _this3._handleSwipe();
+
+        if (_this3._config.pause === 'hover') {
+          // If it's a touch-enabled device, mouseenter/leave are fired as
+          // part of the mouse compatibility events on first tap - the carousel
+          // would stop cycling until user tapped out of it;
+          // here, we listen for touchend, explicitly pause the carousel
+          // (as if it's the second time we tap on it, mouseenter compat event
+          // is NOT fired) and after a timeout (to allow for mouse compatibility
+          // events to fire) we explicitly restart cycling
+          _this3.pause();
+
+          if (_this3.touchTimeout) {
+            clearTimeout(_this3.touchTimeout);
+          }
+
+          _this3.touchTimeout = setTimeout(function (event) {
+            return _this3.cycle(event);
+          }, TOUCHEVENT_COMPAT_WAIT + _this3._config.interval);
+        }
+      };
+
+      $(this._element.querySelectorAll(SELECTOR_ITEM_IMG)).on(EVENT_DRAG_START, function (e) {
+        return e.preventDefault();
+      });
+
+      if (this._pointerEvent) {
+        $(this._element).on(EVENT_POINTERDOWN, function (event) {
+          return start(event);
+        });
+        $(this._element).on(EVENT_POINTERUP, function (event) {
+          return end(event);
+        });
+
+        this._element.classList.add(CLASS_NAME_POINTER_EVENT);
+      } else {
+        $(this._element).on(EVENT_TOUCHSTART, function (event) {
+          return start(event);
+        });
+        $(this._element).on(EVENT_TOUCHMOVE, function (event) {
+          return move(event);
+        });
+        $(this._element).on(EVENT_TOUCHEND, function (event) {
+          return end(event);
+        });
+      }
+    };
+
+    _proto._keydown = function _keydown(event) {
+      if (/input|textarea/i.test(event.target.tagName)) {
+        return;
+      }
+
+      switch (event.which) {
+        case ARROW_LEFT_KEYCODE:
+          event.preventDefault();
+          this.prev();
+          break;
+
+        case ARROW_RIGHT_KEYCODE:
+          event.preventDefault();
+          this.next();
+          break;
+      }
+    };
+
+    _proto._getItemIndex = function _getItemIndex(element) {
+      this._items = element && element.parentNode ? [].slice.call(element.parentNode.querySelectorAll(SELECTOR_ITEM)) : [];
+      return this._items.indexOf(element);
+    };
+
+    _proto._getItemByDirection = function _getItemByDirection(direction, activeElement) {
+      var isNextDirection = direction === DIRECTION_NEXT;
+      var isPrevDirection = direction === DIRECTION_PREV;
+
+      var activeIndex = this._getItemIndex(activeElement);
+
+      var lastItemIndex = this._items.length - 1;
+      var isGoingToWrap = isPrevDirection && activeIndex === 0 || isNextDirection && activeIndex === lastItemIndex;
+
+      if (isGoingToWrap && !this._config.wrap) {
+        return activeElement;
+      }
+
+      var delta = direction === DIRECTION_PREV ? -1 : 1;
+      var itemIndex = (activeIndex + delta) % this._items.length;
+      return itemIndex === -1 ? this._items[this._items.length - 1] : this._items[itemIndex];
+    };
+
+    _proto._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
+      var targetIndex = this._getItemIndex(relatedTarget);
+
+      var fromIndex = this._getItemIndex(this._element.querySelector(SELECTOR_ACTIVE_ITEM));
+
+      var slideEvent = $.Event(EVENT_SLIDE, {
+        relatedTarget: relatedTarget,
+        direction: eventDirectionName,
+        from: fromIndex,
+        to: targetIndex
+      });
+      $(this._element).trigger(slideEvent);
+      return slideEvent;
+    };
+
+    _proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) {
+      if (this._indicatorsElement) {
+        var indicators = [].slice.call(this._indicatorsElement.querySelectorAll(SELECTOR_ACTIVE$1));
+        $(indicators).removeClass(CLASS_NAME_ACTIVE$1);
+
+        var nextIndicator = this._indicatorsElement.children[this._getItemIndex(element)];
+
+        if (nextIndicator) {
+          $(nextIndicator).addClass(CLASS_NAME_ACTIVE$1);
+        }
+      }
+    };
+
+    _proto._slide = function _slide(direction, element) {
+      var _this4 = this;
+
+      var activeElement = this._element.querySelector(SELECTOR_ACTIVE_ITEM);
+
+      var activeElementIndex = this._getItemIndex(activeElement);
+
+      var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
+
+      var nextElementIndex = this._getItemIndex(nextElement);
+
+      var isCycling = Boolean(this._interval);
+      var directionalClassName;
+      var orderClassName;
+      var eventDirectionName;
+
+      if (direction === DIRECTION_NEXT) {
+        directionalClassName = CLASS_NAME_LEFT;
+        orderClassName = CLASS_NAME_NEXT;
+        eventDirectionName = DIRECTION_LEFT;
+      } else {
+        directionalClassName = CLASS_NAME_RIGHT;
+        orderClassName = CLASS_NAME_PREV;
+        eventDirectionName = DIRECTION_RIGHT;
+      }
+
+      if (nextElement && $(nextElement).hasClass(CLASS_NAME_ACTIVE$1)) {
+        this._isSliding = false;
+        return;
+      }
+
+      var slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName);
+
+      if (slideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (!activeElement || !nextElement) {
+        // Some weirdness is happening, so we bail
+        return;
+      }
+
+      this._isSliding = true;
+
+      if (isCycling) {
+        this.pause();
+      }
+
+      this._setActiveIndicatorElement(nextElement);
+
+      var slidEvent = $.Event(EVENT_SLID, {
+        relatedTarget: nextElement,
+        direction: eventDirectionName,
+        from: activeElementIndex,
+        to: nextElementIndex
+      });
+
+      if ($(this._element).hasClass(CLASS_NAME_SLIDE)) {
+        $(nextElement).addClass(orderClassName);
+        Util.reflow(nextElement);
+        $(activeElement).addClass(directionalClassName);
+        $(nextElement).addClass(directionalClassName);
+        var nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10);
+
+        if (nextElementInterval) {
+          this._config.defaultInterval = this._config.defaultInterval || this._config.interval;
+          this._config.interval = nextElementInterval;
+        } else {
+          this._config.interval = this._config.defaultInterval || this._config.interval;
+        }
+
+        var transitionDuration = Util.getTransitionDurationFromElement(activeElement);
+        $(activeElement).one(Util.TRANSITION_END, function () {
+          $(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(CLASS_NAME_ACTIVE$1);
+          $(activeElement).removeClass(CLASS_NAME_ACTIVE$1 + " " + orderClassName + " " + directionalClassName);
+          _this4._isSliding = false;
+          setTimeout(function () {
+            return $(_this4._element).trigger(slidEvent);
+          }, 0);
+        }).emulateTransitionEnd(transitionDuration);
+      } else {
+        $(activeElement).removeClass(CLASS_NAME_ACTIVE$1);
+        $(nextElement).addClass(CLASS_NAME_ACTIVE$1);
+        this._isSliding = false;
+        $(this._element).trigger(slidEvent);
+      }
+
+      if (isCycling) {
+        this.cycle();
+      }
+    } // Static
+    ;
+
+    Carousel._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$2);
+
+        var _config = _objectSpread2(_objectSpread2({}, Default), $(this).data());
+
+        if (typeof config === 'object') {
+          _config = _objectSpread2(_objectSpread2({}, _config), config);
+        }
+
+        var action = typeof config === 'string' ? config : _config.slide;
+
+        if (!data) {
+          data = new Carousel(this, _config);
+          $(this).data(DATA_KEY$2, data);
+        }
+
+        if (typeof config === 'number') {
+          data.to(config);
+        } else if (typeof action === 'string') {
+          if (typeof data[action] === 'undefined') {
+            throw new TypeError("No method named \"" + action + "\"");
+          }
+
+          data[action]();
+        } else if (_config.interval && _config.ride) {
+          data.pause();
+          data.cycle();
+        }
+      });
+    };
+
+    Carousel._dataApiClickHandler = function _dataApiClickHandler(event) {
+      var selector = Util.getSelectorFromElement(this);
+
+      if (!selector) {
+        return;
+      }
+
+      var target = $(selector)[0];
+
+      if (!target || !$(target).hasClass(CLASS_NAME_CAROUSEL)) {
+        return;
+      }
+
+      var config = _objectSpread2(_objectSpread2({}, $(target).data()), $(this).data());
+
+      var slideIndex = this.getAttribute('data-slide-to');
+
+      if (slideIndex) {
+        config.interval = false;
+      }
+
+      Carousel._jQueryInterface.call($(target), config);
+
+      if (slideIndex) {
+        $(target).data(DATA_KEY$2).to(slideIndex);
+      }
+
+      event.preventDefault();
+    };
+
+    _createClass(Carousel, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$2;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default;
+      }
+    }]);
+
+    return Carousel;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$2, SELECTOR_DATA_SLIDE, Carousel._dataApiClickHandler);
+  $(window).on(EVENT_LOAD_DATA_API$1, function () {
+    var carousels = [].slice.call(document.querySelectorAll(SELECTOR_DATA_RIDE));
+
+    for (var i = 0, len = carousels.length; i < len; i++) {
+      var $carousel = $(carousels[i]);
+
+      Carousel._jQueryInterface.call($carousel, $carousel.data());
+    }
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$2] = Carousel._jQueryInterface;
+  $.fn[NAME$2].Constructor = Carousel;
+
+  $.fn[NAME$2].noConflict = function () {
+    $.fn[NAME$2] = JQUERY_NO_CONFLICT$2;
+    return Carousel._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$3 = 'collapse';
+  var VERSION$3 = '4.5.0';
+  var DATA_KEY$3 = 'bs.collapse';
+  var EVENT_KEY$3 = "." + DATA_KEY$3;
+  var DATA_API_KEY$3 = '.data-api';
+  var JQUERY_NO_CONFLICT$3 = $.fn[NAME$3];
+  var Default$1 = {
+    toggle: true,
+    parent: ''
+  };
+  var DefaultType$1 = {
+    toggle: 'boolean',
+    parent: '(string|element)'
+  };
+  var EVENT_SHOW = "show" + EVENT_KEY$3;
+  var EVENT_SHOWN = "shown" + EVENT_KEY$3;
+  var EVENT_HIDE = "hide" + EVENT_KEY$3;
+  var EVENT_HIDDEN = "hidden" + EVENT_KEY$3;
+  var EVENT_CLICK_DATA_API$3 = "click" + EVENT_KEY$3 + DATA_API_KEY$3;
+  var CLASS_NAME_SHOW$1 = 'show';
+  var CLASS_NAME_COLLAPSE = 'collapse';
+  var CLASS_NAME_COLLAPSING = 'collapsing';
+  var CLASS_NAME_COLLAPSED = 'collapsed';
+  var DIMENSION_WIDTH = 'width';
+  var DIMENSION_HEIGHT = 'height';
+  var SELECTOR_ACTIVES = '.show, .collapsing';
+  var SELECTOR_DATA_TOGGLE$1 = '[data-toggle="collapse"]';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Collapse = /*#__PURE__*/function () {
+    function Collapse(element, config) {
+      this._isTransitioning = false;
+      this._element = element;
+      this._config = this._getConfig(config);
+      this._triggerArray = [].slice.call(document.querySelectorAll("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]")));
+      var toggleList = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE$1));
+
+      for (var i = 0, len = toggleList.length; i < len; i++) {
+        var elem = toggleList[i];
+        var selector = Util.getSelectorFromElement(elem);
+        var filterElement = [].slice.call(document.querySelectorAll(selector)).filter(function (foundElem) {
+          return foundElem === element;
+        });
+
+        if (selector !== null && filterElement.length > 0) {
+          this._selector = selector;
+
+          this._triggerArray.push(elem);
+        }
+      }
+
+      this._parent = this._config.parent ? this._getParent() : null;
+
+      if (!this._config.parent) {
+        this._addAriaAndCollapsedClass(this._element, this._triggerArray);
+      }
+
+      if (this._config.toggle) {
+        this.toggle();
+      }
+    } // Getters
+
+
+    var _proto = Collapse.prototype;
+
+    // Public
+    _proto.toggle = function toggle() {
+      if ($(this._element).hasClass(CLASS_NAME_SHOW$1)) {
+        this.hide();
+      } else {
+        this.show();
+      }
+    };
+
+    _proto.show = function show() {
+      var _this = this;
+
+      if (this._isTransitioning || $(this._element).hasClass(CLASS_NAME_SHOW$1)) {
+        return;
+      }
+
+      var actives;
+      var activesData;
+
+      if (this._parent) {
+        actives = [].slice.call(this._parent.querySelectorAll(SELECTOR_ACTIVES)).filter(function (elem) {
+          if (typeof _this._config.parent === 'string') {
+            return elem.getAttribute('data-parent') === _this._config.parent;
+          }
+
+          return elem.classList.contains(CLASS_NAME_COLLAPSE);
+        });
+
+        if (actives.length === 0) {
+          actives = null;
+        }
+      }
+
+      if (actives) {
+        activesData = $(actives).not(this._selector).data(DATA_KEY$3);
+
+        if (activesData && activesData._isTransitioning) {
+          return;
+        }
+      }
+
+      var startEvent = $.Event(EVENT_SHOW);
+      $(this._element).trigger(startEvent);
+
+      if (startEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (actives) {
+        Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide');
+
+        if (!activesData) {
+          $(actives).data(DATA_KEY$3, null);
+        }
+      }
+
+      var dimension = this._getDimension();
+
+      $(this._element).removeClass(CLASS_NAME_COLLAPSE).addClass(CLASS_NAME_COLLAPSING);
+      this._element.style[dimension] = 0;
+
+      if (this._triggerArray.length) {
+        $(this._triggerArray).removeClass(CLASS_NAME_COLLAPSED).attr('aria-expanded', true);
+      }
+
+      this.setTransitioning(true);
+
+      var complete = function complete() {
+        $(_this._element).removeClass(CLASS_NAME_COLLAPSING).addClass(CLASS_NAME_COLLAPSE + " " + CLASS_NAME_SHOW$1);
+        _this._element.style[dimension] = '';
+
+        _this.setTransitioning(false);
+
+        $(_this._element).trigger(EVENT_SHOWN);
+      };
+
+      var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
+      var scrollSize = "scroll" + capitalizedDimension;
+      var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+      $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      this._element.style[dimension] = this._element[scrollSize] + "px";
+    };
+
+    _proto.hide = function hide() {
+      var _this2 = this;
+
+      if (this._isTransitioning || !$(this._element).hasClass(CLASS_NAME_SHOW$1)) {
+        return;
+      }
+
+      var startEvent = $.Event(EVENT_HIDE);
+      $(this._element).trigger(startEvent);
+
+      if (startEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      var dimension = this._getDimension();
+
+      this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + "px";
+      Util.reflow(this._element);
+      $(this._element).addClass(CLASS_NAME_COLLAPSING).removeClass(CLASS_NAME_COLLAPSE + " " + CLASS_NAME_SHOW$1);
+      var triggerArrayLength = this._triggerArray.length;
+
+      if (triggerArrayLength > 0) {
+        for (var i = 0; i < triggerArrayLength; i++) {
+          var trigger = this._triggerArray[i];
+          var selector = Util.getSelectorFromElement(trigger);
+
+          if (selector !== null) {
+            var $elem = $([].slice.call(document.querySelectorAll(selector)));
+
+            if (!$elem.hasClass(CLASS_NAME_SHOW$1)) {
+              $(trigger).addClass(CLASS_NAME_COLLAPSED).attr('aria-expanded', false);
+            }
+          }
+        }
+      }
+
+      this.setTransitioning(true);
+
+      var complete = function complete() {
+        _this2.setTransitioning(false);
+
+        $(_this2._element).removeClass(CLASS_NAME_COLLAPSING).addClass(CLASS_NAME_COLLAPSE).trigger(EVENT_HIDDEN);
+      };
+
+      this._element.style[dimension] = '';
+      var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+      $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+    };
+
+    _proto.setTransitioning = function setTransitioning(isTransitioning) {
+      this._isTransitioning = isTransitioning;
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$3);
+      this._config = null;
+      this._parent = null;
+      this._element = null;
+      this._triggerArray = null;
+      this._isTransitioning = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default$1), config);
+      config.toggle = Boolean(config.toggle); // Coerce string values
+
+      Util.typeCheckConfig(NAME$3, config, DefaultType$1);
+      return config;
+    };
+
+    _proto._getDimension = function _getDimension() {
+      var hasWidth = $(this._element).hasClass(DIMENSION_WIDTH);
+      return hasWidth ? DIMENSION_WIDTH : DIMENSION_HEIGHT;
+    };
+
+    _proto._getParent = function _getParent() {
+      var _this3 = this;
+
+      var parent;
+
+      if (Util.isElement(this._config.parent)) {
+        parent = this._config.parent; // It's a jQuery object
+
+        if (typeof this._config.parent.jquery !== 'undefined') {
+          parent = this._config.parent[0];
+        }
+      } else {
+        parent = document.querySelector(this._config.parent);
+      }
+
+      var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]";
+      var children = [].slice.call(parent.querySelectorAll(selector));
+      $(children).each(function (i, element) {
+        _this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]);
+      });
+      return parent;
+    };
+
+    _proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) {
+      var isOpen = $(element).hasClass(CLASS_NAME_SHOW$1);
+
+      if (triggerArray.length) {
+        $(triggerArray).toggleClass(CLASS_NAME_COLLAPSED, !isOpen).attr('aria-expanded', isOpen);
+      }
+    } // Static
+    ;
+
+    Collapse._getTargetFromElement = function _getTargetFromElement(element) {
+      var selector = Util.getSelectorFromElement(element);
+      return selector ? document.querySelector(selector) : null;
+    };
+
+    Collapse._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $this = $(this);
+        var data = $this.data(DATA_KEY$3);
+
+        var _config = _objectSpread2(_objectSpread2(_objectSpread2({}, Default$1), $this.data()), typeof config === 'object' && config ? config : {});
+
+        if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {
+          _config.toggle = false;
+        }
+
+        if (!data) {
+          data = new Collapse(this, _config);
+          $this.data(DATA_KEY$3, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Collapse, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$3;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$1;
+      }
+    }]);
+
+    return Collapse;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$3, SELECTOR_DATA_TOGGLE$1, function (event) {
+    // preventDefault only for <a> elements (which change the URL) not inside the collapsible element
+    if (event.currentTarget.tagName === 'A') {
+      event.preventDefault();
+    }
+
+    var $trigger = $(this);
+    var selector = Util.getSelectorFromElement(this);
+    var selectors = [].slice.call(document.querySelectorAll(selector));
+    $(selectors).each(function () {
+      var $target = $(this);
+      var data = $target.data(DATA_KEY$3);
+      var config = data ? 'toggle' : $trigger.data();
+
+      Collapse._jQueryInterface.call($target, config);
+    });
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$3] = Collapse._jQueryInterface;
+  $.fn[NAME$3].Constructor = Collapse;
+
+  $.fn[NAME$3].noConflict = function () {
+    $.fn[NAME$3] = JQUERY_NO_CONFLICT$3;
+    return Collapse._jQueryInterface;
+  };
+
+  /**!
+   * @fileOverview Kickass library to create and place poppers near their reference elements.
+   * @version 1.16.0
+   * @license
+   * Copyright (c) 2016 Federico Zivolo and 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.
+   */
+  var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && typeof navigator !== 'undefined';
+
+  var timeoutDuration = function () {
+    var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];
+    for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) {
+      if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) {
+        return 1;
+      }
+    }
+    return 0;
+  }();
+
+  function microtaskDebounce(fn) {
+    var called = false;
+    return function () {
+      if (called) {
+        return;
+      }
+      called = true;
+      window.Promise.resolve().then(function () {
+        called = false;
+        fn();
+      });
+    };
+  }
+
+  function taskDebounce(fn) {
+    var scheduled = false;
+    return function () {
+      if (!scheduled) {
+        scheduled = true;
+        setTimeout(function () {
+          scheduled = false;
+          fn();
+        }, timeoutDuration);
+      }
+    };
+  }
+
+  var supportsMicroTasks = isBrowser && window.Promise;
+
+  /**
+  * Create a debounced version of a method, that's asynchronously deferred
+  * but called in the minimum time possible.
+  *
+  * @method
+  * @memberof Popper.Utils
+  * @argument {Function} fn
+  * @returns {Function}
+  */
+  var debounce = supportsMicroTasks ? microtaskDebounce : taskDebounce;
+
+  /**
+   * Check if the given variable is a function
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Any} functionToCheck - variable to check
+   * @returns {Boolean} answer to: is a function?
+   */
+  function isFunction(functionToCheck) {
+    var getType = {};
+    return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
+  }
+
+  /**
+   * Get CSS computed property of the given element
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Eement} element
+   * @argument {String} property
+   */
+  function getStyleComputedProperty(element, property) {
+    if (element.nodeType !== 1) {
+      return [];
+    }
+    // NOTE: 1 DOM access here
+    var window = element.ownerDocument.defaultView;
+    var css = window.getComputedStyle(element, null);
+    return property ? css[property] : css;
+  }
+
+  /**
+   * Returns the parentNode or the host of the element
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @returns {Element} parent
+   */
+  function getParentNode(element) {
+    if (element.nodeName === 'HTML') {
+      return element;
+    }
+    return element.parentNode || element.host;
+  }
+
+  /**
+   * Returns the scrolling parent of the given element
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @returns {Element} scroll parent
+   */
+  function getScrollParent(element) {
+    // Return body, `getScroll` will take care to get the correct `scrollTop` from it
+    if (!element) {
+      return document.body;
+    }
+
+    switch (element.nodeName) {
+      case 'HTML':
+      case 'BODY':
+        return element.ownerDocument.body;
+      case '#document':
+        return element.body;
+    }
+
+    // Firefox want us to check `-x` and `-y` variations as well
+
+    var _getStyleComputedProp = getStyleComputedProperty(element),
+        overflow = _getStyleComputedProp.overflow,
+        overflowX = _getStyleComputedProp.overflowX,
+        overflowY = _getStyleComputedProp.overflowY;
+
+    if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
+      return element;
+    }
+
+    return getScrollParent(getParentNode(element));
+  }
+
+  /**
+   * Returns the reference node of the reference object, or the reference object itself.
+   * @method
+   * @memberof Popper.Utils
+   * @param {Element|Object} reference - the reference element (the popper will be relative to this)
+   * @returns {Element} parent
+   */
+  function getReferenceNode(reference) {
+    return reference && reference.referenceNode ? reference.referenceNode : reference;
+  }
+
+  var isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);
+  var isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);
+
+  /**
+   * Determines if the browser is Internet Explorer
+   * @method
+   * @memberof Popper.Utils
+   * @param {Number} version to check
+   * @returns {Boolean} isIE
+   */
+  function isIE(version) {
+    if (version === 11) {
+      return isIE11;
+    }
+    if (version === 10) {
+      return isIE10;
+    }
+    return isIE11 || isIE10;
+  }
+
+  /**
+   * Returns the offset parent of the given element
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @returns {Element} offset parent
+   */
+  function getOffsetParent(element) {
+    if (!element) {
+      return document.documentElement;
+    }
+
+    var noOffsetParent = isIE(10) ? document.body : null;
+
+    // NOTE: 1 DOM access here
+    var offsetParent = element.offsetParent || null;
+    // Skip hidden elements which don't have an offsetParent
+    while (offsetParent === noOffsetParent && element.nextElementSibling) {
+      offsetParent = (element = element.nextElementSibling).offsetParent;
+    }
+
+    var nodeName = offsetParent && offsetParent.nodeName;
+
+    if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
+      return element ? element.ownerDocument.documentElement : document.documentElement;
+    }
+
+    // .offsetParent will return the closest TH, TD or TABLE in case
+    // no offsetParent is present, I hate this job...
+    if (['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') {
+      return getOffsetParent(offsetParent);
+    }
+
+    return offsetParent;
+  }
+
+  function isOffsetContainer(element) {
+    var nodeName = element.nodeName;
+
+    if (nodeName === 'BODY') {
+      return false;
+    }
+    return nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element;
+  }
+
+  /**
+   * Finds the root node (document, shadowDOM root) of the given element
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} node
+   * @returns {Element} root node
+   */
+  function getRoot(node) {
+    if (node.parentNode !== null) {
+      return getRoot(node.parentNode);
+    }
+
+    return node;
+  }
+
+  /**
+   * Finds the offset parent common to the two provided nodes
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element1
+   * @argument {Element} element2
+   * @returns {Element} common offset parent
+   */
+  function findCommonOffsetParent(element1, element2) {
+    // This check is needed to avoid errors in case one of the elements isn't defined for any reason
+    if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) {
+      return document.documentElement;
+    }
+
+    // Here we make sure to give as "start" the element that comes first in the DOM
+    var order = element1.compareDocumentPosition(element2) & Node.DOCUMENT_POSITION_FOLLOWING;
+    var start = order ? element1 : element2;
+    var end = order ? element2 : element1;
+
+    // Get common ancestor container
+    var range = document.createRange();
+    range.setStart(start, 0);
+    range.setEnd(end, 0);
+    var commonAncestorContainer = range.commonAncestorContainer;
+
+    // Both nodes are inside #document
+
+    if (element1 !== commonAncestorContainer && element2 !== commonAncestorContainer || start.contains(end)) {
+      if (isOffsetContainer(commonAncestorContainer)) {
+        return commonAncestorContainer;
+      }
+
+      return getOffsetParent(commonAncestorContainer);
+    }
+
+    // one of the nodes is inside shadowDOM, find which one
+    var element1root = getRoot(element1);
+    if (element1root.host) {
+      return findCommonOffsetParent(element1root.host, element2);
+    } else {
+      return findCommonOffsetParent(element1, getRoot(element2).host);
+    }
+  }
+
+  /**
+   * Gets the scroll value of the given element in the given side (top and left)
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @argument {String} side `top` or `left`
+   * @returns {number} amount of scrolled pixels
+   */
+  function getScroll(element) {
+    var side = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'top';
+
+    var upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft';
+    var nodeName = element.nodeName;
+
+    if (nodeName === 'BODY' || nodeName === 'HTML') {
+      var html = element.ownerDocument.documentElement;
+      var scrollingElement = element.ownerDocument.scrollingElement || html;
+      return scrollingElement[upperSide];
+    }
+
+    return element[upperSide];
+  }
+
+  /*
+   * Sum or subtract the element scroll values (left and top) from a given rect object
+   * @method
+   * @memberof Popper.Utils
+   * @param {Object} rect - Rect object you want to change
+   * @param {HTMLElement} element - The element from the function reads the scroll values
+   * @param {Boolean} subtract - set to true if you want to subtract the scroll values
+   * @return {Object} rect - The modifier rect object
+   */
+  function includeScroll(rect, element) {
+    var subtract = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+    var scrollTop = getScroll(element, 'top');
+    var scrollLeft = getScroll(element, 'left');
+    var modifier = subtract ? -1 : 1;
+    rect.top += scrollTop * modifier;
+    rect.bottom += scrollTop * modifier;
+    rect.left += scrollLeft * modifier;
+    rect.right += scrollLeft * modifier;
+    return rect;
+  }
+
+  /*
+   * Helper to detect borders of a given element
+   * @method
+   * @memberof Popper.Utils
+   * @param {CSSStyleDeclaration} styles
+   * Result of `getStyleComputedProperty` on the given element
+   * @param {String} axis - `x` or `y`
+   * @return {number} borders - The borders size of the given axis
+   */
+
+  function getBordersSize(styles, axis) {
+    var sideA = axis === 'x' ? 'Left' : 'Top';
+    var sideB = sideA === 'Left' ? 'Right' : 'Bottom';
+
+    return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
+  }
+
+  function getSize(axis, body, html, computedStyle) {
+    return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? parseInt(html['offset' + axis]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')]) : 0);
+  }
+
+  function getWindowSizes(document) {
+    var body = document.body;
+    var html = document.documentElement;
+    var computedStyle = isIE(10) && getComputedStyle(html);
+
+    return {
+      height: getSize('Height', body, html, computedStyle),
+      width: getSize('Width', body, html, computedStyle)
+    };
+  }
+
+  var classCallCheck = function (instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  };
+
+  var createClass = function () {
+    function defineProperties(target, props) {
+      for (var i = 0; i < props.length; i++) {
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+      }
+    }
+
+    return function (Constructor, protoProps, staticProps) {
+      if (protoProps) defineProperties(Constructor.prototype, protoProps);
+      if (staticProps) defineProperties(Constructor, staticProps);
+      return Constructor;
+    };
+  }();
+
+
+
+
+
+  var defineProperty = function (obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+
+    return obj;
+  };
+
+  var _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  /**
+   * Given element offsets, generate an output similar to getBoundingClientRect
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Object} offsets
+   * @returns {Object} ClientRect like output
+   */
+  function getClientRect(offsets) {
+    return _extends({}, offsets, {
+      right: offsets.left + offsets.width,
+      bottom: offsets.top + offsets.height
+    });
+  }
+
+  /**
+   * Get bounding client rect of given element
+   * @method
+   * @memberof Popper.Utils
+   * @param {HTMLElement} element
+   * @return {Object} client rect
+   */
+  function getBoundingClientRect(element) {
+    var rect = {};
+
+    // IE10 10 FIX: Please, don't ask, the element isn't
+    // considered in DOM in some circumstances...
+    // This isn't reproducible in IE10 compatibility mode of IE11
+    try {
+      if (isIE(10)) {
+        rect = element.getBoundingClientRect();
+        var scrollTop = getScroll(element, 'top');
+        var scrollLeft = getScroll(element, 'left');
+        rect.top += scrollTop;
+        rect.left += scrollLeft;
+        rect.bottom += scrollTop;
+        rect.right += scrollLeft;
+      } else {
+        rect = element.getBoundingClientRect();
+      }
+    } catch (e) {}
+
+    var result = {
+      left: rect.left,
+      top: rect.top,
+      width: rect.right - rect.left,
+      height: rect.bottom - rect.top
+    };
+
+    // subtract scrollbar size from sizes
+    var sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};
+    var width = sizes.width || element.clientWidth || result.width;
+    var height = sizes.height || element.clientHeight || result.height;
+
+    var horizScrollbar = element.offsetWidth - width;
+    var vertScrollbar = element.offsetHeight - height;
+
+    // if an hypothetical scrollbar is detected, we must be sure it's not a `border`
+    // we make this check conditional for performance reasons
+    if (horizScrollbar || vertScrollbar) {
+      var styles = getStyleComputedProperty(element);
+      horizScrollbar -= getBordersSize(styles, 'x');
+      vertScrollbar -= getBordersSize(styles, 'y');
+
+      result.width -= horizScrollbar;
+      result.height -= vertScrollbar;
+    }
+
+    return getClientRect(result);
+  }
+
+  function getOffsetRectRelativeToArbitraryNode(children, parent) {
+    var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+    var isIE10 = isIE(10);
+    var isHTML = parent.nodeName === 'HTML';
+    var childrenRect = getBoundingClientRect(children);
+    var parentRect = getBoundingClientRect(parent);
+    var scrollParent = getScrollParent(children);
+
+    var styles = getStyleComputedProperty(parent);
+    var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
+    var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);
+
+    // In cases where the parent is fixed, we must ignore negative scroll in offset calc
+    if (fixedPosition && isHTML) {
+      parentRect.top = Math.max(parentRect.top, 0);
+      parentRect.left = Math.max(parentRect.left, 0);
+    }
+    var offsets = getClientRect({
+      top: childrenRect.top - parentRect.top - borderTopWidth,
+      left: childrenRect.left - parentRect.left - borderLeftWidth,
+      width: childrenRect.width,
+      height: childrenRect.height
+    });
+    offsets.marginTop = 0;
+    offsets.marginLeft = 0;
+
+    // Subtract margins of documentElement in case it's being used as parent
+    // we do this only on HTML because it's the only element that behaves
+    // differently when margins are applied to it. The margins are included in
+    // the box of the documentElement, in the other cases not.
+    if (!isIE10 && isHTML) {
+      var marginTop = parseFloat(styles.marginTop, 10);
+      var marginLeft = parseFloat(styles.marginLeft, 10);
+
+      offsets.top -= borderTopWidth - marginTop;
+      offsets.bottom -= borderTopWidth - marginTop;
+      offsets.left -= borderLeftWidth - marginLeft;
+      offsets.right -= borderLeftWidth - marginLeft;
+
+      // Attach marginTop and marginLeft because in some circumstances we may need them
+      offsets.marginTop = marginTop;
+      offsets.marginLeft = marginLeft;
+    }
+
+    if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
+      offsets = includeScroll(offsets, parent);
+    }
+
+    return offsets;
+  }
+
+  function getViewportOffsetRectRelativeToArtbitraryNode(element) {
+    var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+    var html = element.ownerDocument.documentElement;
+    var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
+    var width = Math.max(html.clientWidth, window.innerWidth || 0);
+    var height = Math.max(html.clientHeight, window.innerHeight || 0);
+
+    var scrollTop = !excludeScroll ? getScroll(html) : 0;
+    var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
+
+    var offset = {
+      top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
+      left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft,
+      width: width,
+      height: height
+    };
+
+    return getClientRect(offset);
+  }
+
+  /**
+   * Check if the given element is fixed or is inside a fixed parent
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @argument {Element} customContainer
+   * @returns {Boolean} answer to "isFixed?"
+   */
+  function isFixed(element) {
+    var nodeName = element.nodeName;
+    if (nodeName === 'BODY' || nodeName === 'HTML') {
+      return false;
+    }
+    if (getStyleComputedProperty(element, 'position') === 'fixed') {
+      return true;
+    }
+    var parentNode = getParentNode(element);
+    if (!parentNode) {
+      return false;
+    }
+    return isFixed(parentNode);
+  }
+
+  /**
+   * Finds the first parent of an element that has a transformed property defined
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @returns {Element} first transformed parent or documentElement
+   */
+
+  function getFixedPositionOffsetParent(element) {
+    // This check is needed to avoid errors in case one of the elements isn't defined for any reason
+    if (!element || !element.parentElement || isIE()) {
+      return document.documentElement;
+    }
+    var el = element.parentElement;
+    while (el && getStyleComputedProperty(el, 'transform') === 'none') {
+      el = el.parentElement;
+    }
+    return el || document.documentElement;
+  }
+
+  /**
+   * Computed the boundaries limits and return them
+   * @method
+   * @memberof Popper.Utils
+   * @param {HTMLElement} popper
+   * @param {HTMLElement} reference
+   * @param {number} padding
+   * @param {HTMLElement} boundariesElement - Element used to define the boundaries
+   * @param {Boolean} fixedPosition - Is in fixed position mode
+   * @returns {Object} Coordinates of the boundaries
+   */
+  function getBoundaries(popper, reference, padding, boundariesElement) {
+    var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+
+    // NOTE: 1 DOM access here
+
+    var boundaries = { top: 0, left: 0 };
+    var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));
+
+    // Handle viewport case
+    if (boundariesElement === 'viewport') {
+      boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
+    } else {
+      // Handle other cases based on DOM element used as boundaries
+      var boundariesNode = void 0;
+      if (boundariesElement === 'scrollParent') {
+        boundariesNode = getScrollParent(getParentNode(reference));
+        if (boundariesNode.nodeName === 'BODY') {
+          boundariesNode = popper.ownerDocument.documentElement;
+        }
+      } else if (boundariesElement === 'window') {
+        boundariesNode = popper.ownerDocument.documentElement;
+      } else {
+        boundariesNode = boundariesElement;
+      }
+
+      var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
+
+      // In case of HTML, we need a different computation
+      if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
+        var _getWindowSizes = getWindowSizes(popper.ownerDocument),
+            height = _getWindowSizes.height,
+            width = _getWindowSizes.width;
+
+        boundaries.top += offsets.top - offsets.marginTop;
+        boundaries.bottom = height + offsets.top;
+        boundaries.left += offsets.left - offsets.marginLeft;
+        boundaries.right = width + offsets.left;
+      } else {
+        // for all the other DOM elements, this one is good
+        boundaries = offsets;
+      }
+    }
+
+    // Add paddings
+    padding = padding || 0;
+    var isPaddingNumber = typeof padding === 'number';
+    boundaries.left += isPaddingNumber ? padding : padding.left || 0;
+    boundaries.top += isPaddingNumber ? padding : padding.top || 0;
+    boundaries.right -= isPaddingNumber ? padding : padding.right || 0;
+    boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0;
+
+    return boundaries;
+  }
+
+  function getArea(_ref) {
+    var width = _ref.width,
+        height = _ref.height;
+
+    return width * height;
+  }
+
+  /**
+   * Utility used to transform the `auto` placement to the placement with more
+   * available space.
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Object} data - The data object generated by update method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function computeAutoPlacement(placement, refRect, popper, reference, boundariesElement) {
+    var padding = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+
+    if (placement.indexOf('auto') === -1) {
+      return placement;
+    }
+
+    var boundaries = getBoundaries(popper, reference, padding, boundariesElement);
+
+    var rects = {
+      top: {
+        width: boundaries.width,
+        height: refRect.top - boundaries.top
+      },
+      right: {
+        width: boundaries.right - refRect.right,
+        height: boundaries.height
+      },
+      bottom: {
+        width: boundaries.width,
+        height: boundaries.bottom - refRect.bottom
+      },
+      left: {
+        width: refRect.left - boundaries.left,
+        height: boundaries.height
+      }
+    };
+
+    var sortedAreas = Object.keys(rects).map(function (key) {
+      return _extends({
+        key: key
+      }, rects[key], {
+        area: getArea(rects[key])
+      });
+    }).sort(function (a, b) {
+      return b.area - a.area;
+    });
+
+    var filteredAreas = sortedAreas.filter(function (_ref2) {
+      var width = _ref2.width,
+          height = _ref2.height;
+      return width >= popper.clientWidth && height >= popper.clientHeight;
+    });
+
+    var computedPlacement = filteredAreas.length > 0 ? filteredAreas[0].key : sortedAreas[0].key;
+
+    var variation = placement.split('-')[1];
+
+    return computedPlacement + (variation ? '-' + variation : '');
+  }
+
+  /**
+   * Get offsets to the reference element
+   * @method
+   * @memberof Popper.Utils
+   * @param {Object} state
+   * @param {Element} popper - the popper element
+   * @param {Element} reference - the reference element (the popper will be relative to this)
+   * @param {Element} fixedPosition - is in fixed position mode
+   * @returns {Object} An object containing the offsets which will be applied to the popper
+   */
+  function getReferenceOffsets(state, popper, reference) {
+    var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+
+    var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));
+    return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
+  }
+
+  /**
+   * Get the outer sizes of the given element (offset size + margins)
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element
+   * @returns {Object} object containing width and height properties
+   */
+  function getOuterSizes(element) {
+    var window = element.ownerDocument.defaultView;
+    var styles = window.getComputedStyle(element);
+    var x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);
+    var y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);
+    var result = {
+      width: element.offsetWidth + y,
+      height: element.offsetHeight + x
+    };
+    return result;
+  }
+
+  /**
+   * Get the opposite placement of the given one
+   * @method
+   * @memberof Popper.Utils
+   * @argument {String} placement
+   * @returns {String} flipped placement
+   */
+  function getOppositePlacement(placement) {
+    var hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };
+    return placement.replace(/left|right|bottom|top/g, function (matched) {
+      return hash[matched];
+    });
+  }
+
+  /**
+   * Get offsets to the popper
+   * @method
+   * @memberof Popper.Utils
+   * @param {Object} position - CSS position the Popper will get applied
+   * @param {HTMLElement} popper - the popper element
+   * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this)
+   * @param {String} placement - one of the valid placement options
+   * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper
+   */
+  function getPopperOffsets(popper, referenceOffsets, placement) {
+    placement = placement.split('-')[0];
+
+    // Get popper node sizes
+    var popperRect = getOuterSizes(popper);
+
+    // Add position, width and height to our offsets object
+    var popperOffsets = {
+      width: popperRect.width,
+      height: popperRect.height
+    };
+
+    // depending by the popper placement we have to compute its offsets slightly differently
+    var isHoriz = ['right', 'left'].indexOf(placement) !== -1;
+    var mainSide = isHoriz ? 'top' : 'left';
+    var secondarySide = isHoriz ? 'left' : 'top';
+    var measurement = isHoriz ? 'height' : 'width';
+    var secondaryMeasurement = !isHoriz ? 'height' : 'width';
+
+    popperOffsets[mainSide] = referenceOffsets[mainSide] + referenceOffsets[measurement] / 2 - popperRect[measurement] / 2;
+    if (placement === secondarySide) {
+      popperOffsets[secondarySide] = referenceOffsets[secondarySide] - popperRect[secondaryMeasurement];
+    } else {
+      popperOffsets[secondarySide] = referenceOffsets[getOppositePlacement(secondarySide)];
+    }
+
+    return popperOffsets;
+  }
+
+  /**
+   * Mimics the `find` method of Array
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Array} arr
+   * @argument prop
+   * @argument value
+   * @returns index or -1
+   */
+  function find(arr, check) {
+    // use native find if supported
+    if (Array.prototype.find) {
+      return arr.find(check);
+    }
+
+    // use `filter` to obtain the same behavior of `find`
+    return arr.filter(check)[0];
+  }
+
+  /**
+   * Return the index of the matching object
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Array} arr
+   * @argument prop
+   * @argument value
+   * @returns index or -1
+   */
+  function findIndex(arr, prop, value) {
+    // use native findIndex if supported
+    if (Array.prototype.findIndex) {
+      return arr.findIndex(function (cur) {
+        return cur[prop] === value;
+      });
+    }
+
+    // use `find` + `indexOf` if `findIndex` isn't supported
+    var match = find(arr, function (obj) {
+      return obj[prop] === value;
+    });
+    return arr.indexOf(match);
+  }
+
+  /**
+   * Loop trough the list of modifiers and run them in order,
+   * each of them will then edit the data object.
+   * @method
+   * @memberof Popper.Utils
+   * @param {dataObject} data
+   * @param {Array} modifiers
+   * @param {String} ends - Optional modifier name used as stopper
+   * @returns {dataObject}
+   */
+  function runModifiers(modifiers, data, ends) {
+    var modifiersToRun = ends === undefined ? modifiers : modifiers.slice(0, findIndex(modifiers, 'name', ends));
+
+    modifiersToRun.forEach(function (modifier) {
+      if (modifier['function']) {
+        // eslint-disable-line dot-notation
+        console.warn('`modifier.function` is deprecated, use `modifier.fn`!');
+      }
+      var fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation
+      if (modifier.enabled && isFunction(fn)) {
+        // Add properties to offsets to make them a complete clientRect object
+        // we do this before each modifier to make sure the previous one doesn't
+        // mess with these values
+        data.offsets.popper = getClientRect(data.offsets.popper);
+        data.offsets.reference = getClientRect(data.offsets.reference);
+
+        data = fn(data, modifier);
+      }
+    });
+
+    return data;
+  }
+
+  /**
+   * Updates the position of the popper, computing the new offsets and applying
+   * the new style.<br />
+   * Prefer `scheduleUpdate` over `update` because of performance reasons.
+   * @method
+   * @memberof Popper
+   */
+  function update() {
+    // if popper is destroyed, don't perform any further update
+    if (this.state.isDestroyed) {
+      return;
+    }
+
+    var data = {
+      instance: this,
+      styles: {},
+      arrowStyles: {},
+      attributes: {},
+      flipped: false,
+      offsets: {}
+    };
+
+    // compute reference element offsets
+    data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);
+
+    // compute auto placement, store placement inside the data object,
+    // modifiers will be able to edit `placement` if needed
+    // and refer to originalPlacement to know the original value
+    data.placement = computeAutoPlacement(this.options.placement, data.offsets.reference, this.popper, this.reference, this.options.modifiers.flip.boundariesElement, this.options.modifiers.flip.padding);
+
+    // store the computed placement inside `originalPlacement`
+    data.originalPlacement = data.placement;
+
+    data.positionFixed = this.options.positionFixed;
+
+    // compute the popper offsets
+    data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);
+
+    data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';
+
+    // run the modifiers
+    data = runModifiers(this.modifiers, data);
+
+    // the first `update` will call `onCreate` callback
+    // the other ones will call `onUpdate` callback
+    if (!this.state.isCreated) {
+      this.state.isCreated = true;
+      this.options.onCreate(data);
+    } else {
+      this.options.onUpdate(data);
+    }
+  }
+
+  /**
+   * Helper used to know if the given modifier is enabled.
+   * @method
+   * @memberof Popper.Utils
+   * @returns {Boolean}
+   */
+  function isModifierEnabled(modifiers, modifierName) {
+    return modifiers.some(function (_ref) {
+      var name = _ref.name,
+          enabled = _ref.enabled;
+      return enabled && name === modifierName;
+    });
+  }
+
+  /**
+   * Get the prefixed supported property name
+   * @method
+   * @memberof Popper.Utils
+   * @argument {String} property (camelCase)
+   * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix)
+   */
+  function getSupportedPropertyName(property) {
+    var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
+    var upperProp = property.charAt(0).toUpperCase() + property.slice(1);
+
+    for (var i = 0; i < prefixes.length; i++) {
+      var prefix = prefixes[i];
+      var toCheck = prefix ? '' + prefix + upperProp : property;
+      if (typeof document.body.style[toCheck] !== 'undefined') {
+        return toCheck;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Destroys the popper.
+   * @method
+   * @memberof Popper
+   */
+  function destroy() {
+    this.state.isDestroyed = true;
+
+    // touch DOM only if `applyStyle` modifier is enabled
+    if (isModifierEnabled(this.modifiers, 'applyStyle')) {
+      this.popper.removeAttribute('x-placement');
+      this.popper.style.position = '';
+      this.popper.style.top = '';
+      this.popper.style.left = '';
+      this.popper.style.right = '';
+      this.popper.style.bottom = '';
+      this.popper.style.willChange = '';
+      this.popper.style[getSupportedPropertyName('transform')] = '';
+    }
+
+    this.disableEventListeners();
+
+    // remove the popper if user explicitly asked for the deletion on destroy
+    // do not use `remove` because IE11 doesn't support it
+    if (this.options.removeOnDestroy) {
+      this.popper.parentNode.removeChild(this.popper);
+    }
+    return this;
+  }
+
+  /**
+   * Get the window associated with the element
+   * @argument {Element} element
+   * @returns {Window}
+   */
+  function getWindow(element) {
+    var ownerDocument = element.ownerDocument;
+    return ownerDocument ? ownerDocument.defaultView : window;
+  }
+
+  function attachToScrollParents(scrollParent, event, callback, scrollParents) {
+    var isBody = scrollParent.nodeName === 'BODY';
+    var target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent;
+    target.addEventListener(event, callback, { passive: true });
+
+    if (!isBody) {
+      attachToScrollParents(getScrollParent(target.parentNode), event, callback, scrollParents);
+    }
+    scrollParents.push(target);
+  }
+
+  /**
+   * Setup needed event listeners used to update the popper position
+   * @method
+   * @memberof Popper.Utils
+   * @private
+   */
+  function setupEventListeners(reference, options, state, updateBound) {
+    // Resize event listener on window
+    state.updateBound = updateBound;
+    getWindow(reference).addEventListener('resize', state.updateBound, { passive: true });
+
+    // Scroll event listener on scroll parents
+    var scrollElement = getScrollParent(reference);
+    attachToScrollParents(scrollElement, 'scroll', state.updateBound, state.scrollParents);
+    state.scrollElement = scrollElement;
+    state.eventsEnabled = true;
+
+    return state;
+  }
+
+  /**
+   * It will add resize/scroll events and start recalculating
+   * position of the popper element when they are triggered.
+   * @method
+   * @memberof Popper
+   */
+  function enableEventListeners() {
+    if (!this.state.eventsEnabled) {
+      this.state = setupEventListeners(this.reference, this.options, this.state, this.scheduleUpdate);
+    }
+  }
+
+  /**
+   * Remove event listeners used to update the popper position
+   * @method
+   * @memberof Popper.Utils
+   * @private
+   */
+  function removeEventListeners(reference, state) {
+    // Remove resize event listener on window
+    getWindow(reference).removeEventListener('resize', state.updateBound);
+
+    // Remove scroll event listener on scroll parents
+    state.scrollParents.forEach(function (target) {
+      target.removeEventListener('scroll', state.updateBound);
+    });
+
+    // Reset state
+    state.updateBound = null;
+    state.scrollParents = [];
+    state.scrollElement = null;
+    state.eventsEnabled = false;
+    return state;
+  }
+
+  /**
+   * It will remove resize/scroll events and won't recalculate popper position
+   * when they are triggered. It also won't trigger `onUpdate` callback anymore,
+   * unless you call `update` method manually.
+   * @method
+   * @memberof Popper
+   */
+  function disableEventListeners() {
+    if (this.state.eventsEnabled) {
+      cancelAnimationFrame(this.scheduleUpdate);
+      this.state = removeEventListeners(this.reference, this.state);
+    }
+  }
+
+  /**
+   * Tells if a given input is a number
+   * @method
+   * @memberof Popper.Utils
+   * @param {*} input to check
+   * @return {Boolean}
+   */
+  function isNumeric(n) {
+    return n !== '' && !isNaN(parseFloat(n)) && isFinite(n);
+  }
+
+  /**
+   * Set the style to the given popper
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element - Element to apply the style to
+   * @argument {Object} styles
+   * Object with a list of properties and values which will be applied to the element
+   */
+  function setStyles(element, styles) {
+    Object.keys(styles).forEach(function (prop) {
+      var unit = '';
+      // add unit if the value is numeric and is one of the following
+      if (['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !== -1 && isNumeric(styles[prop])) {
+        unit = 'px';
+      }
+      element.style[prop] = styles[prop] + unit;
+    });
+  }
+
+  /**
+   * Set the attributes to the given popper
+   * @method
+   * @memberof Popper.Utils
+   * @argument {Element} element - Element to apply the attributes to
+   * @argument {Object} styles
+   * Object with a list of properties and values which will be applied to the element
+   */
+  function setAttributes(element, attributes) {
+    Object.keys(attributes).forEach(function (prop) {
+      var value = attributes[prop];
+      if (value !== false) {
+        element.setAttribute(prop, attributes[prop]);
+      } else {
+        element.removeAttribute(prop);
+      }
+    });
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by `update` method
+   * @argument {Object} data.styles - List of style properties - values to apply to popper element
+   * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The same data object
+   */
+  function applyStyle(data) {
+    // any property present in `data.styles` will be applied to the popper,
+    // in this way we can make the 3rd party modifiers add custom styles to it
+    // Be aware, modifiers could override the properties defined in the previous
+    // lines of this modifier!
+    setStyles(data.instance.popper, data.styles);
+
+    // any property present in `data.attributes` will be applied to the popper,
+    // they will be set as HTML attributes of the element
+    setAttributes(data.instance.popper, data.attributes);
+
+    // if arrowElement is defined and arrowStyles has some properties
+    if (data.arrowElement && Object.keys(data.arrowStyles).length) {
+      setStyles(data.arrowElement, data.arrowStyles);
+    }
+
+    return data;
+  }
+
+  /**
+   * Set the x-placement attribute before everything else because it could be used
+   * to add margins to the popper margins needs to be calculated to get the
+   * correct popper offsets.
+   * @method
+   * @memberof Popper.modifiers
+   * @param {HTMLElement} reference - The reference element used to position the popper
+   * @param {HTMLElement} popper - The HTML element used as popper
+   * @param {Object} options - Popper.js options
+   */
+  function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {
+    // compute reference element offsets
+    var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);
+
+    // compute auto placement, store placement inside the data object,
+    // modifiers will be able to edit `placement` if needed
+    // and refer to originalPlacement to know the original value
+    var placement = computeAutoPlacement(options.placement, referenceOffsets, popper, reference, options.modifiers.flip.boundariesElement, options.modifiers.flip.padding);
+
+    popper.setAttribute('x-placement', placement);
+
+    // Apply `position` to popper before anything else because
+    // without the position applied we can't guarantee correct computations
+    setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });
+
+    return options;
+  }
+
+  /**
+   * @function
+   * @memberof Popper.Utils
+   * @argument {Object} data - The data object generated by `update` method
+   * @argument {Boolean} shouldRound - If the offsets should be rounded at all
+   * @returns {Object} The popper's position offsets rounded
+   *
+   * The tale of pixel-perfect positioning. It's still not 100% perfect, but as
+   * good as it can be within reason.
+   * Discussion here: https://github.com/FezVrasta/popper.js/pull/715
+   *
+   * Low DPI screens cause a popper to be blurry if not using full pixels (Safari
+   * as well on High DPI screens).
+   *
+   * Firefox prefers no rounding for positioning and does not have blurriness on
+   * high DPI screens.
+   *
+   * Only horizontal placement and left/right values need to be considered.
+   */
+  function getRoundedOffsets(data, shouldRound) {
+    var _data$offsets = data.offsets,
+        popper = _data$offsets.popper,
+        reference = _data$offsets.reference;
+    var round = Math.round,
+        floor = Math.floor;
+
+    var noRound = function noRound(v) {
+      return v;
+    };
+
+    var referenceWidth = round(reference.width);
+    var popperWidth = round(popper.width);
+
+    var isVertical = ['left', 'right'].indexOf(data.placement) !== -1;
+    var isVariation = data.placement.indexOf('-') !== -1;
+    var sameWidthParity = referenceWidth % 2 === popperWidth % 2;
+    var bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;
+
+    var horizontalToInteger = !shouldRound ? noRound : isVertical || isVariation || sameWidthParity ? round : floor;
+    var verticalToInteger = !shouldRound ? noRound : round;
+
+    return {
+      left: horizontalToInteger(bothOddWidth && !isVariation && shouldRound ? popper.left - 1 : popper.left),
+      top: verticalToInteger(popper.top),
+      bottom: verticalToInteger(popper.bottom),
+      right: horizontalToInteger(popper.right)
+    };
+  }
+
+  var isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by `update` method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function computeStyle(data, options) {
+    var x = options.x,
+        y = options.y;
+    var popper = data.offsets.popper;
+
+    // Remove this legacy support in Popper.js v2
+
+    var legacyGpuAccelerationOption = find(data.instance.modifiers, function (modifier) {
+      return modifier.name === 'applyStyle';
+    }).gpuAcceleration;
+    if (legacyGpuAccelerationOption !== undefined) {
+      console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');
+    }
+    var gpuAcceleration = legacyGpuAccelerationOption !== undefined ? legacyGpuAccelerationOption : options.gpuAcceleration;
+
+    var offsetParent = getOffsetParent(data.instance.popper);
+    var offsetParentRect = getBoundingClientRect(offsetParent);
+
+    // Styles
+    var styles = {
+      position: popper.position
+    };
+
+    var offsets = getRoundedOffsets(data, window.devicePixelRatio < 2 || !isFirefox);
+
+    var sideA = x === 'bottom' ? 'top' : 'bottom';
+    var sideB = y === 'right' ? 'left' : 'right';
+
+    // if gpuAcceleration is set to `true` and transform is supported,
+    //  we use `translate3d` to apply the position to the popper we
+    // automatically use the supported prefixed version if needed
+    var prefixedProperty = getSupportedPropertyName('transform');
+
+    // now, let's make a step back and look at this code closely (wtf?)
+    // If the content of the popper grows once it's been positioned, it
+    // may happen that the popper gets misplaced because of the new content
+    // overflowing its reference element
+    // To avoid this problem, we provide two options (x and y), which allow
+    // the consumer to define the offset origin.
+    // If we position a popper on top of a reference element, we can set
+    // `x` to `top` to make the popper grow towards its top instead of
+    // its bottom.
+    var left = void 0,
+        top = void 0;
+    if (sideA === 'bottom') {
+      // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)
+      // and not the bottom of the html element
+      if (offsetParent.nodeName === 'HTML') {
+        top = -offsetParent.clientHeight + offsets.bottom;
+      } else {
+        top = -offsetParentRect.height + offsets.bottom;
+      }
+    } else {
+      top = offsets.top;
+    }
+    if (sideB === 'right') {
+      if (offsetParent.nodeName === 'HTML') {
+        left = -offsetParent.clientWidth + offsets.right;
+      } else {
+        left = -offsetParentRect.width + offsets.right;
+      }
+    } else {
+      left = offsets.left;
+    }
+    if (gpuAcceleration && prefixedProperty) {
+      styles[prefixedProperty] = 'translate3d(' + left + 'px, ' + top + 'px, 0)';
+      styles[sideA] = 0;
+      styles[sideB] = 0;
+      styles.willChange = 'transform';
+    } else {
+      // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties
+      var invertTop = sideA === 'bottom' ? -1 : 1;
+      var invertLeft = sideB === 'right' ? -1 : 1;
+      styles[sideA] = top * invertTop;
+      styles[sideB] = left * invertLeft;
+      styles.willChange = sideA + ', ' + sideB;
+    }
+
+    // Attributes
+    var attributes = {
+      'x-placement': data.placement
+    };
+
+    // Update `data` attributes, styles and arrowStyles
+    data.attributes = _extends({}, attributes, data.attributes);
+    data.styles = _extends({}, styles, data.styles);
+    data.arrowStyles = _extends({}, data.offsets.arrow, data.arrowStyles);
+
+    return data;
+  }
+
+  /**
+   * Helper used to know if the given modifier depends from another one.<br />
+   * It checks if the needed modifier is listed and enabled.
+   * @method
+   * @memberof Popper.Utils
+   * @param {Array} modifiers - list of modifiers
+   * @param {String} requestingName - name of requesting modifier
+   * @param {String} requestedName - name of requested modifier
+   * @returns {Boolean}
+   */
+  function isModifierRequired(modifiers, requestingName, requestedName) {
+    var requesting = find(modifiers, function (_ref) {
+      var name = _ref.name;
+      return name === requestingName;
+    });
+
+    var isRequired = !!requesting && modifiers.some(function (modifier) {
+      return modifier.name === requestedName && modifier.enabled && modifier.order < requesting.order;
+    });
+
+    if (!isRequired) {
+      var _requesting = '`' + requestingName + '`';
+      var requested = '`' + requestedName + '`';
+      console.warn(requested + ' modifier is required by ' + _requesting + ' modifier in order to work, be sure to include it before ' + _requesting + '!');
+    }
+    return isRequired;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by update method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function arrow(data, options) {
+    var _data$offsets$arrow;
+
+    // arrow depends on keepTogether in order to work
+    if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) {
+      return data;
+    }
+
+    var arrowElement = options.element;
+
+    // if arrowElement is a string, suppose it's a CSS selector
+    if (typeof arrowElement === 'string') {
+      arrowElement = data.instance.popper.querySelector(arrowElement);
+
+      // if arrowElement is not found, don't run the modifier
+      if (!arrowElement) {
+        return data;
+      }
+    } else {
+      // if the arrowElement isn't a query selector we must check that the
+      // provided DOM node is child of its popper node
+      if (!data.instance.popper.contains(arrowElement)) {
+        console.warn('WARNING: `arrow.element` must be child of its popper element!');
+        return data;
+      }
+    }
+
+    var placement = data.placement.split('-')[0];
+    var _data$offsets = data.offsets,
+        popper = _data$offsets.popper,
+        reference = _data$offsets.reference;
+
+    var isVertical = ['left', 'right'].indexOf(placement) !== -1;
+
+    var len = isVertical ? 'height' : 'width';
+    var sideCapitalized = isVertical ? 'Top' : 'Left';
+    var side = sideCapitalized.toLowerCase();
+    var altSide = isVertical ? 'left' : 'top';
+    var opSide = isVertical ? 'bottom' : 'right';
+    var arrowElementSize = getOuterSizes(arrowElement)[len];
+
+    //
+    // extends keepTogether behavior making sure the popper and its
+    // reference have enough pixels in conjunction
+    //
+
+    // top/left side
+    if (reference[opSide] - arrowElementSize < popper[side]) {
+      data.offsets.popper[side] -= popper[side] - (reference[opSide] - arrowElementSize);
+    }
+    // bottom/right side
+    if (reference[side] + arrowElementSize > popper[opSide]) {
+      data.offsets.popper[side] += reference[side] + arrowElementSize - popper[opSide];
+    }
+    data.offsets.popper = getClientRect(data.offsets.popper);
+
+    // compute center of the popper
+    var center = reference[side] + reference[len] / 2 - arrowElementSize / 2;
+
+    // Compute the sideValue using the updated popper offsets
+    // take popper margin in account because we don't have this info available
+    var css = getStyleComputedProperty(data.instance.popper);
+    var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10);
+    var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10);
+    var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;
+
+    // prevent arrowElement from being placed not contiguously to its popper
+    sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0);
+
+    data.arrowElement = arrowElement;
+    data.offsets.arrow = (_data$offsets$arrow = {}, defineProperty(_data$offsets$arrow, side, Math.round(sideValue)), defineProperty(_data$offsets$arrow, altSide, ''), _data$offsets$arrow);
+
+    return data;
+  }
+
+  /**
+   * Get the opposite placement variation of the given one
+   * @method
+   * @memberof Popper.Utils
+   * @argument {String} placement variation
+   * @returns {String} flipped placement variation
+   */
+  function getOppositeVariation(variation) {
+    if (variation === 'end') {
+      return 'start';
+    } else if (variation === 'start') {
+      return 'end';
+    }
+    return variation;
+  }
+
+  /**
+   * List of accepted placements to use as values of the `placement` option.<br />
+   * Valid placements are:
+   * - `auto`
+   * - `top`
+   * - `right`
+   * - `bottom`
+   * - `left`
+   *
+   * Each placement can have a variation from this list:
+   * - `-start`
+   * - `-end`
+   *
+   * Variations are interpreted easily if you think of them as the left to right
+   * written languages. Horizontally (`top` and `bottom`), `start` is left and `end`
+   * is right.<br />
+   * Vertically (`left` and `right`), `start` is top and `end` is bottom.
+   *
+   * Some valid examples are:
+   * - `top-end` (on top of reference, right aligned)
+   * - `right-start` (on right of reference, top aligned)
+   * - `bottom` (on bottom, centered)
+   * - `auto-end` (on the side with more space available, alignment depends by placement)
+   *
+   * @static
+   * @type {Array}
+   * @enum {String}
+   * @readonly
+   * @method placements
+   * @memberof Popper
+   */
+  var placements = ['auto-start', 'auto', 'auto-end', 'top-start', 'top', 'top-end', 'right-start', 'right', 'right-end', 'bottom-end', 'bottom', 'bottom-start', 'left-end', 'left', 'left-start'];
+
+  // Get rid of `auto` `auto-start` and `auto-end`
+  var validPlacements = placements.slice(3);
+
+  /**
+   * Given an initial placement, returns all the subsequent placements
+   * clockwise (or counter-clockwise).
+   *
+   * @method
+   * @memberof Popper.Utils
+   * @argument {String} placement - A valid placement (it accepts variations)
+   * @argument {Boolean} counter - Set to true to walk the placements counterclockwise
+   * @returns {Array} placements including their variations
+   */
+  function clockwise(placement) {
+    var counter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+    var index = validPlacements.indexOf(placement);
+    var arr = validPlacements.slice(index + 1).concat(validPlacements.slice(0, index));
+    return counter ? arr.reverse() : arr;
+  }
+
+  var BEHAVIORS = {
+    FLIP: 'flip',
+    CLOCKWISE: 'clockwise',
+    COUNTERCLOCKWISE: 'counterclockwise'
+  };
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by update method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function flip(data, options) {
+    // if `inner` modifier is enabled, we can't use the `flip` modifier
+    if (isModifierEnabled(data.instance.modifiers, 'inner')) {
+      return data;
+    }
+
+    if (data.flipped && data.placement === data.originalPlacement) {
+      // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides
+      return data;
+    }
+
+    var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);
+
+    var placement = data.placement.split('-')[0];
+    var placementOpposite = getOppositePlacement(placement);
+    var variation = data.placement.split('-')[1] || '';
+
+    var flipOrder = [];
+
+    switch (options.behavior) {
+      case BEHAVIORS.FLIP:
+        flipOrder = [placement, placementOpposite];
+        break;
+      case BEHAVIORS.CLOCKWISE:
+        flipOrder = clockwise(placement);
+        break;
+      case BEHAVIORS.COUNTERCLOCKWISE:
+        flipOrder = clockwise(placement, true);
+        break;
+      default:
+        flipOrder = options.behavior;
+    }
+
+    flipOrder.forEach(function (step, index) {
+      if (placement !== step || flipOrder.length === index + 1) {
+        return data;
+      }
+
+      placement = data.placement.split('-')[0];
+      placementOpposite = getOppositePlacement(placement);
+
+      var popperOffsets = data.offsets.popper;
+      var refOffsets = data.offsets.reference;
+
+      // using floor because the reference offsets may contain decimals we are not going to consider here
+      var floor = Math.floor;
+      var overlapsRef = placement === 'left' && floor(popperOffsets.right) > floor(refOffsets.left) || placement === 'right' && floor(popperOffsets.left) < floor(refOffsets.right) || placement === 'top' && floor(popperOffsets.bottom) > floor(refOffsets.top) || placement === 'bottom' && floor(popperOffsets.top) < floor(refOffsets.bottom);
+
+      var overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left);
+      var overflowsRight = floor(popperOffsets.right) > floor(boundaries.right);
+      var overflowsTop = floor(popperOffsets.top) < floor(boundaries.top);
+      var overflowsBottom = floor(popperOffsets.bottom) > floor(boundaries.bottom);
+
+      var overflowsBoundaries = placement === 'left' && overflowsLeft || placement === 'right' && overflowsRight || placement === 'top' && overflowsTop || placement === 'bottom' && overflowsBottom;
+
+      // flip the variation if required
+      var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;
+
+      // flips variation if reference element overflows boundaries
+      var flippedVariationByRef = !!options.flipVariations && (isVertical && variation === 'start' && overflowsLeft || isVertical && variation === 'end' && overflowsRight || !isVertical && variation === 'start' && overflowsTop || !isVertical && variation === 'end' && overflowsBottom);
+
+      // flips variation if popper content overflows boundaries
+      var flippedVariationByContent = !!options.flipVariationsByContent && (isVertical && variation === 'start' && overflowsRight || isVertical && variation === 'end' && overflowsLeft || !isVertical && variation === 'start' && overflowsBottom || !isVertical && variation === 'end' && overflowsTop);
+
+      var flippedVariation = flippedVariationByRef || flippedVariationByContent;
+
+      if (overlapsRef || overflowsBoundaries || flippedVariation) {
+        // this boolean to detect any flip loop
+        data.flipped = true;
+
+        if (overlapsRef || overflowsBoundaries) {
+          placement = flipOrder[index + 1];
+        }
+
+        if (flippedVariation) {
+          variation = getOppositeVariation(variation);
+        }
+
+        data.placement = placement + (variation ? '-' + variation : '');
+
+        // this object contains `position`, we want to preserve it along with
+        // any additional property we may add in the future
+        data.offsets.popper = _extends({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement));
+
+        data = runModifiers(data.instance.modifiers, data, 'flip');
+      }
+    });
+    return data;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by update method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function keepTogether(data) {
+    var _data$offsets = data.offsets,
+        popper = _data$offsets.popper,
+        reference = _data$offsets.reference;
+
+    var placement = data.placement.split('-')[0];
+    var floor = Math.floor;
+    var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;
+    var side = isVertical ? 'right' : 'bottom';
+    var opSide = isVertical ? 'left' : 'top';
+    var measurement = isVertical ? 'width' : 'height';
+
+    if (popper[side] < floor(reference[opSide])) {
+      data.offsets.popper[opSide] = floor(reference[opSide]) - popper[measurement];
+    }
+    if (popper[opSide] > floor(reference[side])) {
+      data.offsets.popper[opSide] = floor(reference[side]);
+    }
+
+    return data;
+  }
+
+  /**
+   * Converts a string containing value + unit into a px value number
+   * @function
+   * @memberof {modifiers~offset}
+   * @private
+   * @argument {String} str - Value + unit string
+   * @argument {String} measurement - `height` or `width`
+   * @argument {Object} popperOffsets
+   * @argument {Object} referenceOffsets
+   * @returns {Number|String}
+   * Value in pixels, or original string if no values were extracted
+   */
+  function toValue(str, measurement, popperOffsets, referenceOffsets) {
+    // separate value from unit
+    var split = str.match(/((?:\-|\+)?\d*\.?\d*)(.*)/);
+    var value = +split[1];
+    var unit = split[2];
+
+    // If it's not a number it's an operator, I guess
+    if (!value) {
+      return str;
+    }
+
+    if (unit.indexOf('%') === 0) {
+      var element = void 0;
+      switch (unit) {
+        case '%p':
+          element = popperOffsets;
+          break;
+        case '%':
+        case '%r':
+        default:
+          element = referenceOffsets;
+      }
+
+      var rect = getClientRect(element);
+      return rect[measurement] / 100 * value;
+    } else if (unit === 'vh' || unit === 'vw') {
+      // if is a vh or vw, we calculate the size based on the viewport
+      var size = void 0;
+      if (unit === 'vh') {
+        size = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
+      } else {
+        size = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
+      }
+      return size / 100 * value;
+    } else {
+      // if is an explicit pixel unit, we get rid of the unit and keep the value
+      // if is an implicit unit, it's px, and we return just the value
+      return value;
+    }
+  }
+
+  /**
+   * Parse an `offset` string to extrapolate `x` and `y` numeric offsets.
+   * @function
+   * @memberof {modifiers~offset}
+   * @private
+   * @argument {String} offset
+   * @argument {Object} popperOffsets
+   * @argument {Object} referenceOffsets
+   * @argument {String} basePlacement
+   * @returns {Array} a two cells array with x and y offsets in numbers
+   */
+  function parseOffset(offset, popperOffsets, referenceOffsets, basePlacement) {
+    var offsets = [0, 0];
+
+    // Use height if placement is left or right and index is 0 otherwise use width
+    // in this way the first offset will use an axis and the second one
+    // will use the other one
+    var useHeight = ['right', 'left'].indexOf(basePlacement) !== -1;
+
+    // Split the offset string to obtain a list of values and operands
+    // The regex addresses values with the plus or minus sign in front (+10, -20, etc)
+    var fragments = offset.split(/(\+|\-)/).map(function (frag) {
+      return frag.trim();
+    });
+
+    // Detect if the offset string contains a pair of values or a single one
+    // they could be separated by comma or space
+    var divider = fragments.indexOf(find(fragments, function (frag) {
+      return frag.search(/,|\s/) !== -1;
+    }));
+
+    if (fragments[divider] && fragments[divider].indexOf(',') === -1) {
+      console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');
+    }
+
+    // If divider is found, we divide the list of values and operands to divide
+    // them by ofset X and Y.
+    var splitRegex = /\s*,\s*|\s+/;
+    var ops = divider !== -1 ? [fragments.slice(0, divider).concat([fragments[divider].split(splitRegex)[0]]), [fragments[divider].split(splitRegex)[1]].concat(fragments.slice(divider + 1))] : [fragments];
+
+    // Convert the values with units to absolute pixels to allow our computations
+    ops = ops.map(function (op, index) {
+      // Most of the units rely on the orientation of the popper
+      var measurement = (index === 1 ? !useHeight : useHeight) ? 'height' : 'width';
+      var mergeWithPrevious = false;
+      return op
+      // This aggregates any `+` or `-` sign that aren't considered operators
+      // e.g.: 10 + +5 => [10, +, +5]
+      .reduce(function (a, b) {
+        if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) {
+          a[a.length - 1] = b;
+          mergeWithPrevious = true;
+          return a;
+        } else if (mergeWithPrevious) {
+          a[a.length - 1] += b;
+          mergeWithPrevious = false;
+          return a;
+        } else {
+          return a.concat(b);
+        }
+      }, [])
+      // Here we convert the string values into number values (in px)
+      .map(function (str) {
+        return toValue(str, measurement, popperOffsets, referenceOffsets);
+      });
+    });
+
+    // Loop trough the offsets arrays and execute the operations
+    ops.forEach(function (op, index) {
+      op.forEach(function (frag, index2) {
+        if (isNumeric(frag)) {
+          offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1);
+        }
+      });
+    });
+    return offsets;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by update method
+   * @argument {Object} options - Modifiers configuration and options
+   * @argument {Number|String} options.offset=0
+   * The offset value as described in the modifier description
+   * @returns {Object} The data object, properly modified
+   */
+  function offset(data, _ref) {
+    var offset = _ref.offset;
+    var placement = data.placement,
+        _data$offsets = data.offsets,
+        popper = _data$offsets.popper,
+        reference = _data$offsets.reference;
+
+    var basePlacement = placement.split('-')[0];
+
+    var offsets = void 0;
+    if (isNumeric(+offset)) {
+      offsets = [+offset, 0];
+    } else {
+      offsets = parseOffset(offset, popper, reference, basePlacement);
+    }
+
+    if (basePlacement === 'left') {
+      popper.top += offsets[0];
+      popper.left -= offsets[1];
+    } else if (basePlacement === 'right') {
+      popper.top += offsets[0];
+      popper.left += offsets[1];
+    } else if (basePlacement === 'top') {
+      popper.left += offsets[0];
+      popper.top -= offsets[1];
+    } else if (basePlacement === 'bottom') {
+      popper.left += offsets[0];
+      popper.top += offsets[1];
+    }
+
+    data.popper = popper;
+    return data;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by `update` method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function preventOverflow(data, options) {
+    var boundariesElement = options.boundariesElement || getOffsetParent(data.instance.popper);
+
+    // If offsetParent is the reference element, we really want to
+    // go one step up and use the next offsetParent as reference to
+    // avoid to make this modifier completely useless and look like broken
+    if (data.instance.reference === boundariesElement) {
+      boundariesElement = getOffsetParent(boundariesElement);
+    }
+
+    // NOTE: DOM access here
+    // resets the popper's position so that the document size can be calculated excluding
+    // the size of the popper element itself
+    var transformProp = getSupportedPropertyName('transform');
+    var popperStyles = data.instance.popper.style; // assignment to help minification
+    var top = popperStyles.top,
+        left = popperStyles.left,
+        transform = popperStyles[transformProp];
+
+    popperStyles.top = '';
+    popperStyles.left = '';
+    popperStyles[transformProp] = '';
+
+    var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);
+
+    // NOTE: DOM access here
+    // restores the original style properties after the offsets have been computed
+    popperStyles.top = top;
+    popperStyles.left = left;
+    popperStyles[transformProp] = transform;
+
+    options.boundaries = boundaries;
+
+    var order = options.priority;
+    var popper = data.offsets.popper;
+
+    var check = {
+      primary: function primary(placement) {
+        var value = popper[placement];
+        if (popper[placement] < boundaries[placement] && !options.escapeWithReference) {
+          value = Math.max(popper[placement], boundaries[placement]);
+        }
+        return defineProperty({}, placement, value);
+      },
+      secondary: function secondary(placement) {
+        var mainSide = placement === 'right' ? 'left' : 'top';
+        var value = popper[mainSide];
+        if (popper[placement] > boundaries[placement] && !options.escapeWithReference) {
+          value = Math.min(popper[mainSide], boundaries[placement] - (placement === 'right' ? popper.width : popper.height));
+        }
+        return defineProperty({}, mainSide, value);
+      }
+    };
+
+    order.forEach(function (placement) {
+      var side = ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary';
+      popper = _extends({}, popper, check[side](placement));
+    });
+
+    data.offsets.popper = popper;
+
+    return data;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by `update` method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function shift(data) {
+    var placement = data.placement;
+    var basePlacement = placement.split('-')[0];
+    var shiftvariation = placement.split('-')[1];
+
+    // if shift shiftvariation is specified, run the modifier
+    if (shiftvariation) {
+      var _data$offsets = data.offsets,
+          reference = _data$offsets.reference,
+          popper = _data$offsets.popper;
+
+      var isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1;
+      var side = isVertical ? 'left' : 'top';
+      var measurement = isVertical ? 'width' : 'height';
+
+      var shiftOffsets = {
+        start: defineProperty({}, side, reference[side]),
+        end: defineProperty({}, side, reference[side] + reference[measurement] - popper[measurement])
+      };
+
+      data.offsets.popper = _extends({}, popper, shiftOffsets[shiftvariation]);
+    }
+
+    return data;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by update method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function hide(data) {
+    if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) {
+      return data;
+    }
+
+    var refRect = data.offsets.reference;
+    var bound = find(data.instance.modifiers, function (modifier) {
+      return modifier.name === 'preventOverflow';
+    }).boundaries;
+
+    if (refRect.bottom < bound.top || refRect.left > bound.right || refRect.top > bound.bottom || refRect.right < bound.left) {
+      // Avoid unnecessary DOM access if visibility hasn't changed
+      if (data.hide === true) {
+        return data;
+      }
+
+      data.hide = true;
+      data.attributes['x-out-of-boundaries'] = '';
+    } else {
+      // Avoid unnecessary DOM access if visibility hasn't changed
+      if (data.hide === false) {
+        return data;
+      }
+
+      data.hide = false;
+      data.attributes['x-out-of-boundaries'] = false;
+    }
+
+    return data;
+  }
+
+  /**
+   * @function
+   * @memberof Modifiers
+   * @argument {Object} data - The data object generated by `update` method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {Object} The data object, properly modified
+   */
+  function inner(data) {
+    var placement = data.placement;
+    var basePlacement = placement.split('-')[0];
+    var _data$offsets = data.offsets,
+        popper = _data$offsets.popper,
+        reference = _data$offsets.reference;
+
+    var isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1;
+
+    var subtractLength = ['top', 'left'].indexOf(basePlacement) === -1;
+
+    popper[isHoriz ? 'left' : 'top'] = reference[basePlacement] - (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0);
+
+    data.placement = getOppositePlacement(placement);
+    data.offsets.popper = getClientRect(popper);
+
+    return data;
+  }
+
+  /**
+   * Modifier function, each modifier can have a function of this type assigned
+   * to its `fn` property.<br />
+   * These functions will be called on each update, this means that you must
+   * make sure they are performant enough to avoid performance bottlenecks.
+   *
+   * @function ModifierFn
+   * @argument {dataObject} data - The data object generated by `update` method
+   * @argument {Object} options - Modifiers configuration and options
+   * @returns {dataObject} The data object, properly modified
+   */
+
+  /**
+   * Modifiers are plugins used to alter the behavior of your poppers.<br />
+   * Popper.js uses a set of 9 modifiers to provide all the basic functionalities
+   * needed by the library.
+   *
+   * Usually you don't want to override the `order`, `fn` and `onLoad` props.
+   * All the other properties are configurations that could be tweaked.
+   * @namespace modifiers
+   */
+  var modifiers = {
+    /**
+     * Modifier used to shift the popper on the start or end of its reference
+     * element.<br />
+     * It will read the variation of the `placement` property.<br />
+     * It can be one either `-end` or `-start`.
+     * @memberof modifiers
+     * @inner
+     */
+    shift: {
+      /** @prop {number} order=100 - Index used to define the order of execution */
+      order: 100,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: shift
+    },
+
+    /**
+     * The `offset` modifier can shift your popper on both its axis.
+     *
+     * It accepts the following units:
+     * - `px` or unit-less, interpreted as pixels
+     * - `%` or `%r`, percentage relative to the length of the reference element
+     * - `%p`, percentage relative to the length of the popper element
+     * - `vw`, CSS viewport width unit
+     * - `vh`, CSS viewport height unit
+     *
+     * For length is intended the main axis relative to the placement of the popper.<br />
+     * This means that if the placement is `top` or `bottom`, the length will be the
+     * `width`. In case of `left` or `right`, it will be the `height`.
+     *
+     * You can provide a single value (as `Number` or `String`), or a pair of values
+     * as `String` divided by a comma or one (or more) white spaces.<br />
+     * The latter is a deprecated method because it leads to confusion and will be
+     * removed in v2.<br />
+     * Additionally, it accepts additions and subtractions between different units.
+     * Note that multiplications and divisions aren't supported.
+     *
+     * Valid examples are:
+     * ```
+     * 10
+     * '10%'
+     * '10, 10'
+     * '10%, 10'
+     * '10 + 10%'
+     * '10 - 5vh + 3%'
+     * '-10px + 5vh, 5px - 6%'
+     * ```
+     * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap
+     * > with their reference element, unfortunately, you will have to disable the `flip` modifier.
+     * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).
+     *
+     * @memberof modifiers
+     * @inner
+     */
+    offset: {
+      /** @prop {number} order=200 - Index used to define the order of execution */
+      order: 200,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: offset,
+      /** @prop {Number|String} offset=0
+       * The offset value as described in the modifier description
+       */
+      offset: 0
+    },
+
+    /**
+     * Modifier used to prevent the popper from being positioned outside the boundary.
+     *
+     * A scenario exists where the reference itself is not within the boundaries.<br />
+     * We can say it has "escaped the boundaries" — or just "escaped".<br />
+     * In this case we need to decide whether the popper should either:
+     *
+     * - detach from the reference and remain "trapped" in the boundaries, or
+     * - if it should ignore the boundary and "escape with its reference"
+     *
+     * When `escapeWithReference` is set to`true` and reference is completely
+     * outside its boundaries, the popper will overflow (or completely leave)
+     * the boundaries in order to remain attached to the edge of the reference.
+     *
+     * @memberof modifiers
+     * @inner
+     */
+    preventOverflow: {
+      /** @prop {number} order=300 - Index used to define the order of execution */
+      order: 300,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: preventOverflow,
+      /**
+       * @prop {Array} [priority=['left','right','top','bottom']]
+       * Popper will try to prevent overflow following these priorities by default,
+       * then, it could overflow on the left and on top of the `boundariesElement`
+       */
+      priority: ['left', 'right', 'top', 'bottom'],
+      /**
+       * @prop {number} padding=5
+       * Amount of pixel used to define a minimum distance between the boundaries
+       * and the popper. This makes sure the popper always has a little padding
+       * between the edges of its container
+       */
+      padding: 5,
+      /**
+       * @prop {String|HTMLElement} boundariesElement='scrollParent'
+       * Boundaries used by the modifier. Can be `scrollParent`, `window`,
+       * `viewport` or any DOM element.
+       */
+      boundariesElement: 'scrollParent'
+    },
+
+    /**
+     * Modifier used to make sure the reference and its popper stay near each other
+     * without leaving any gap between the two. Especially useful when the arrow is
+     * enabled and you want to ensure that it points to its reference element.
+     * It cares only about the first axis. You can still have poppers with margin
+     * between the popper and its reference element.
+     * @memberof modifiers
+     * @inner
+     */
+    keepTogether: {
+      /** @prop {number} order=400 - Index used to define the order of execution */
+      order: 400,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: keepTogether
+    },
+
+    /**
+     * This modifier is used to move the `arrowElement` of the popper to make
+     * sure it is positioned between the reference element and its popper element.
+     * It will read the outer size of the `arrowElement` node to detect how many
+     * pixels of conjunction are needed.
+     *
+     * It has no effect if no `arrowElement` is provided.
+     * @memberof modifiers
+     * @inner
+     */
+    arrow: {
+      /** @prop {number} order=500 - Index used to define the order of execution */
+      order: 500,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: arrow,
+      /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */
+      element: '[x-arrow]'
+    },
+
+    /**
+     * Modifier used to flip the popper's placement when it starts to overlap its
+     * reference element.
+     *
+     * Requires the `preventOverflow` modifier before it in order to work.
+     *
+     * **NOTE:** this modifier will interrupt the current update cycle and will
+     * restart it if it detects the need to flip the placement.
+     * @memberof modifiers
+     * @inner
+     */
+    flip: {
+      /** @prop {number} order=600 - Index used to define the order of execution */
+      order: 600,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: flip,
+      /**
+       * @prop {String|Array} behavior='flip'
+       * The behavior used to change the popper's placement. It can be one of
+       * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid
+       * placements (with optional variations)
+       */
+      behavior: 'flip',
+      /**
+       * @prop {number} padding=5
+       * The popper will flip if it hits the edges of the `boundariesElement`
+       */
+      padding: 5,
+      /**
+       * @prop {String|HTMLElement} boundariesElement='viewport'
+       * The element which will define the boundaries of the popper position.
+       * The popper will never be placed outside of the defined boundaries
+       * (except if `keepTogether` is enabled)
+       */
+      boundariesElement: 'viewport',
+      /**
+       * @prop {Boolean} flipVariations=false
+       * The popper will switch placement variation between `-start` and `-end` when
+       * the reference element overlaps its boundaries.
+       *
+       * The original placement should have a set variation.
+       */
+      flipVariations: false,
+      /**
+       * @prop {Boolean} flipVariationsByContent=false
+       * The popper will switch placement variation between `-start` and `-end` when
+       * the popper element overlaps its reference boundaries.
+       *
+       * The original placement should have a set variation.
+       */
+      flipVariationsByContent: false
+    },
+
+    /**
+     * Modifier used to make the popper flow toward the inner of the reference element.
+     * By default, when this modifier is disabled, the popper will be placed outside
+     * the reference element.
+     * @memberof modifiers
+     * @inner
+     */
+    inner: {
+      /** @prop {number} order=700 - Index used to define the order of execution */
+      order: 700,
+      /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */
+      enabled: false,
+      /** @prop {ModifierFn} */
+      fn: inner
+    },
+
+    /**
+     * Modifier used to hide the popper when its reference element is outside of the
+     * popper boundaries. It will set a `x-out-of-boundaries` attribute which can
+     * be used to hide with a CSS selector the popper when its reference is
+     * out of boundaries.
+     *
+     * Requires the `preventOverflow` modifier before it in order to work.
+     * @memberof modifiers
+     * @inner
+     */
+    hide: {
+      /** @prop {number} order=800 - Index used to define the order of execution */
+      order: 800,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: hide
+    },
+
+    /**
+     * Computes the style that will be applied to the popper element to gets
+     * properly positioned.
+     *
+     * Note that this modifier will not touch the DOM, it just prepares the styles
+     * so that `applyStyle` modifier can apply it. This separation is useful
+     * in case you need to replace `applyStyle` with a custom implementation.
+     *
+     * This modifier has `850` as `order` value to maintain backward compatibility
+     * with previous versions of Popper.js. Expect the modifiers ordering method
+     * to change in future major versions of the library.
+     *
+     * @memberof modifiers
+     * @inner
+     */
+    computeStyle: {
+      /** @prop {number} order=850 - Index used to define the order of execution */
+      order: 850,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: computeStyle,
+      /**
+       * @prop {Boolean} gpuAcceleration=true
+       * If true, it uses the CSS 3D transformation to position the popper.
+       * Otherwise, it will use the `top` and `left` properties
+       */
+      gpuAcceleration: true,
+      /**
+       * @prop {string} [x='bottom']
+       * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin.
+       * Change this if your popper should grow in a direction different from `bottom`
+       */
+      x: 'bottom',
+      /**
+       * @prop {string} [x='left']
+       * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin.
+       * Change this if your popper should grow in a direction different from `right`
+       */
+      y: 'right'
+    },
+
+    /**
+     * Applies the computed styles to the popper element.
+     *
+     * All the DOM manipulations are limited to this modifier. This is useful in case
+     * you want to integrate Popper.js inside a framework or view library and you
+     * want to delegate all the DOM manipulations to it.
+     *
+     * Note that if you disable this modifier, you must make sure the popper element
+     * has its position set to `absolute` before Popper.js can do its work!
+     *
+     * Just disable this modifier and define your own to achieve the desired effect.
+     *
+     * @memberof modifiers
+     * @inner
+     */
+    applyStyle: {
+      /** @prop {number} order=900 - Index used to define the order of execution */
+      order: 900,
+      /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */
+      enabled: true,
+      /** @prop {ModifierFn} */
+      fn: applyStyle,
+      /** @prop {Function} */
+      onLoad: applyStyleOnLoad,
+      /**
+       * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier
+       * @prop {Boolean} gpuAcceleration=true
+       * If true, it uses the CSS 3D transformation to position the popper.
+       * Otherwise, it will use the `top` and `left` properties
+       */
+      gpuAcceleration: undefined
+    }
+  };
+
+  /**
+   * The `dataObject` is an object containing all the information used by Popper.js.
+   * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.
+   * @name dataObject
+   * @property {Object} data.instance The Popper.js instance
+   * @property {String} data.placement Placement applied to popper
+   * @property {String} data.originalPlacement Placement originally defined on init
+   * @property {Boolean} data.flipped True if popper has been flipped by flip modifier
+   * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper
+   * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier
+   * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)
+   * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)
+   * @property {Object} data.boundaries Offsets of the popper boundaries
+   * @property {Object} data.offsets The measurements of popper, reference and arrow elements
+   * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values
+   * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values
+   * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0
+   */
+
+  /**
+   * Default options provided to Popper.js constructor.<br />
+   * These can be overridden using the `options` argument of Popper.js.<br />
+   * To override an option, simply pass an object with the same
+   * structure of the `options` object, as the 3rd argument. For example:
+   * ```
+   * new Popper(ref, pop, {
+   *   modifiers: {
+   *     preventOverflow: { enabled: false }
+   *   }
+   * })
+   * ```
+   * @type {Object}
+   * @static
+   * @memberof Popper
+   */
+  var Defaults = {
+    /**
+     * Popper's placement.
+     * @prop {Popper.placements} placement='bottom'
+     */
+    placement: 'bottom',
+
+    /**
+     * Set this to true if you want popper to position it self in 'fixed' mode
+     * @prop {Boolean} positionFixed=false
+     */
+    positionFixed: false,
+
+    /**
+     * Whether events (resize, scroll) are initially enabled.
+     * @prop {Boolean} eventsEnabled=true
+     */
+    eventsEnabled: true,
+
+    /**
+     * Set to true if you want to automatically remove the popper when
+     * you call the `destroy` method.
+     * @prop {Boolean} removeOnDestroy=false
+     */
+    removeOnDestroy: false,
+
+    /**
+     * Callback called when the popper is created.<br />
+     * By default, it is set to no-op.<br />
+     * Access Popper.js instance with `data.instance`.
+     * @prop {onCreate}
+     */
+    onCreate: function onCreate() {},
+
+    /**
+     * Callback called when the popper is updated. This callback is not called
+     * on the initialization/creation of the popper, but only on subsequent
+     * updates.<br />
+     * By default, it is set to no-op.<br />
+     * Access Popper.js instance with `data.instance`.
+     * @prop {onUpdate}
+     */
+    onUpdate: function onUpdate() {},
+
+    /**
+     * List of modifiers used to modify the offsets before they are applied to the popper.
+     * They provide most of the functionalities of Popper.js.
+     * @prop {modifiers}
+     */
+    modifiers: modifiers
+  };
+
+  /**
+   * @callback onCreate
+   * @param {dataObject} data
+   */
+
+  /**
+   * @callback onUpdate
+   * @param {dataObject} data
+   */
+
+  // Utils
+  // Methods
+  var Popper = function () {
+    /**
+     * Creates a new Popper.js instance.
+     * @class Popper
+     * @param {Element|referenceObject} reference - The reference element used to position the popper
+     * @param {Element} popper - The HTML / XML element used as the popper
+     * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)
+     * @return {Object} instance - The generated Popper.js instance
+     */
+    function Popper(reference, popper) {
+      var _this = this;
+
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      classCallCheck(this, Popper);
+
+      this.scheduleUpdate = function () {
+        return requestAnimationFrame(_this.update);
+      };
+
+      // make update() debounced, so that it only runs at most once-per-tick
+      this.update = debounce(this.update.bind(this));
+
+      // with {} we create a new object with the options inside it
+      this.options = _extends({}, Popper.Defaults, options);
+
+      // init state
+      this.state = {
+        isDestroyed: false,
+        isCreated: false,
+        scrollParents: []
+      };
+
+      // get reference and popper elements (allow jQuery wrappers)
+      this.reference = reference && reference.jquery ? reference[0] : reference;
+      this.popper = popper && popper.jquery ? popper[0] : popper;
+
+      // Deep merge modifiers options
+      this.options.modifiers = {};
+      Object.keys(_extends({}, Popper.Defaults.modifiers, options.modifiers)).forEach(function (name) {
+        _this.options.modifiers[name] = _extends({}, Popper.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {});
+      });
+
+      // Refactoring modifiers' list (Object => Array)
+      this.modifiers = Object.keys(this.options.modifiers).map(function (name) {
+        return _extends({
+          name: name
+        }, _this.options.modifiers[name]);
+      })
+      // sort the modifiers by order
+      .sort(function (a, b) {
+        return a.order - b.order;
+      });
+
+      // modifiers have the ability to execute arbitrary code when Popper.js get inited
+      // such code is executed in the same order of its modifier
+      // they could add new properties to their options configuration
+      // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`!
+      this.modifiers.forEach(function (modifierOptions) {
+        if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) {
+          modifierOptions.onLoad(_this.reference, _this.popper, _this.options, modifierOptions, _this.state);
+        }
+      });
+
+      // fire the first update to position the popper in the right place
+      this.update();
+
+      var eventsEnabled = this.options.eventsEnabled;
+      if (eventsEnabled) {
+        // setup event listeners, they will take care of update the position in specific situations
+        this.enableEventListeners();
+      }
+
+      this.state.eventsEnabled = eventsEnabled;
+    }
+
+    // We can't use class properties because they don't get listed in the
+    // class prototype and break stuff like Sinon stubs
+
+
+    createClass(Popper, [{
+      key: 'update',
+      value: function update$$1() {
+        return update.call(this);
+      }
+    }, {
+      key: 'destroy',
+      value: function destroy$$1() {
+        return destroy.call(this);
+      }
+    }, {
+      key: 'enableEventListeners',
+      value: function enableEventListeners$$1() {
+        return enableEventListeners.call(this);
+      }
+    }, {
+      key: 'disableEventListeners',
+      value: function disableEventListeners$$1() {
+        return disableEventListeners.call(this);
+      }
+
+      /**
+       * Schedules an update. It will run on the next UI update available.
+       * @method scheduleUpdate
+       * @memberof Popper
+       */
+
+
+      /**
+       * Collection of utilities useful when writing custom modifiers.
+       * Starting from version 1.7, this method is available only if you
+       * include `popper-utils.js` before `popper.js`.
+       *
+       * **DEPRECATION**: This way to access PopperUtils is deprecated
+       * and will be removed in v2! Use the PopperUtils module directly instead.
+       * Due to the high instability of the methods contained in Utils, we can't
+       * guarantee them to follow semver. Use them at your own risk!
+       * @static
+       * @private
+       * @type {Object}
+       * @deprecated since version 1.8
+       * @member Utils
+       * @memberof Popper
+       */
+
+    }]);
+    return Popper;
+  }();
+
+  /**
+   * The `referenceObject` is an object that provides an interface compatible with Popper.js
+   * and lets you use it as replacement of a real DOM node.<br />
+   * You can use this method to position a popper relatively to a set of coordinates
+   * in case you don't have a DOM node to use as reference.
+   *
+   * ```
+   * new Popper(referenceObject, popperNode);
+   * ```
+   *
+   * NB: This feature isn't supported in Internet Explorer 10.
+   * @name referenceObject
+   * @property {Function} data.getBoundingClientRect
+   * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.
+   * @property {number} data.clientWidth
+   * An ES6 getter that will return the width of the virtual reference element.
+   * @property {number} data.clientHeight
+   * An ES6 getter that will return the height of the virtual reference element.
+   */
+
+
+  Popper.Utils = (typeof window !== 'undefined' ? window : global).PopperUtils;
+  Popper.placements = placements;
+  Popper.Defaults = Defaults;
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$4 = 'dropdown';
+  var VERSION$4 = '4.5.0';
+  var DATA_KEY$4 = 'bs.dropdown';
+  var EVENT_KEY$4 = "." + DATA_KEY$4;
+  var DATA_API_KEY$4 = '.data-api';
+  var JQUERY_NO_CONFLICT$4 = $.fn[NAME$4];
+  var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key
+
+  var SPACE_KEYCODE = 32; // KeyboardEvent.which value for space key
+
+  var TAB_KEYCODE = 9; // KeyboardEvent.which value for tab key
+
+  var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key
+
+  var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key
+
+  var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse)
+
+  var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + "|" + ARROW_DOWN_KEYCODE + "|" + ESCAPE_KEYCODE);
+  var EVENT_HIDE$1 = "hide" + EVENT_KEY$4;
+  var EVENT_HIDDEN$1 = "hidden" + EVENT_KEY$4;
+  var EVENT_SHOW$1 = "show" + EVENT_KEY$4;
+  var EVENT_SHOWN$1 = "shown" + EVENT_KEY$4;
+  var EVENT_CLICK = "click" + EVENT_KEY$4;
+  var EVENT_CLICK_DATA_API$4 = "click" + EVENT_KEY$4 + DATA_API_KEY$4;
+  var EVENT_KEYDOWN_DATA_API = "keydown" + EVENT_KEY$4 + DATA_API_KEY$4;
+  var EVENT_KEYUP_DATA_API = "keyup" + EVENT_KEY$4 + DATA_API_KEY$4;
+  var CLASS_NAME_DISABLED = 'disabled';
+  var CLASS_NAME_SHOW$2 = 'show';
+  var CLASS_NAME_DROPUP = 'dropup';
+  var CLASS_NAME_DROPRIGHT = 'dropright';
+  var CLASS_NAME_DROPLEFT = 'dropleft';
+  var CLASS_NAME_MENURIGHT = 'dropdown-menu-right';
+  var CLASS_NAME_POSITION_STATIC = 'position-static';
+  var SELECTOR_DATA_TOGGLE$2 = '[data-toggle="dropdown"]';
+  var SELECTOR_FORM_CHILD = '.dropdown form';
+  var SELECTOR_MENU = '.dropdown-menu';
+  var SELECTOR_NAVBAR_NAV = '.navbar-nav';
+  var SELECTOR_VISIBLE_ITEMS = '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)';
+  var PLACEMENT_TOP = 'top-start';
+  var PLACEMENT_TOPEND = 'top-end';
+  var PLACEMENT_BOTTOM = 'bottom-start';
+  var PLACEMENT_BOTTOMEND = 'bottom-end';
+  var PLACEMENT_RIGHT = 'right-start';
+  var PLACEMENT_LEFT = 'left-start';
+  var Default$2 = {
+    offset: 0,
+    flip: true,
+    boundary: 'scrollParent',
+    reference: 'toggle',
+    display: 'dynamic',
+    popperConfig: null
+  };
+  var DefaultType$2 = {
+    offset: '(number|string|function)',
+    flip: 'boolean',
+    boundary: '(string|element)',
+    reference: '(string|element)',
+    display: 'string',
+    popperConfig: '(null|object)'
+  };
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Dropdown = /*#__PURE__*/function () {
+    function Dropdown(element, config) {
+      this._element = element;
+      this._popper = null;
+      this._config = this._getConfig(config);
+      this._menu = this._getMenuElement();
+      this._inNavbar = this._detectNavbar();
+
+      this._addEventListeners();
+    } // Getters
+
+
+    var _proto = Dropdown.prototype;
+
+    // Public
+    _proto.toggle = function toggle() {
+      if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED)) {
+        return;
+      }
+
+      var isActive = $(this._menu).hasClass(CLASS_NAME_SHOW$2);
+
+      Dropdown._clearMenus();
+
+      if (isActive) {
+        return;
+      }
+
+      this.show(true);
+    };
+
+    _proto.show = function show(usePopper) {
+      if (usePopper === void 0) {
+        usePopper = false;
+      }
+
+      if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED) || $(this._menu).hasClass(CLASS_NAME_SHOW$2)) {
+        return;
+      }
+
+      var relatedTarget = {
+        relatedTarget: this._element
+      };
+      var showEvent = $.Event(EVENT_SHOW$1, relatedTarget);
+
+      var parent = Dropdown._getParentFromElement(this._element);
+
+      $(parent).trigger(showEvent);
+
+      if (showEvent.isDefaultPrevented()) {
+        return;
+      } // Disable totally Popper.js for Dropdown in Navbar
+
+
+      if (!this._inNavbar && usePopper) {
+        /**
+         * Check for Popper dependency
+         * Popper - https://popper.js.org
+         */
+        if (typeof Popper === 'undefined') {
+          throw new TypeError('Bootstrap\'s dropdowns require Popper.js (https://popper.js.org/)');
+        }
+
+        var referenceElement = this._element;
+
+        if (this._config.reference === 'parent') {
+          referenceElement = parent;
+        } else if (Util.isElement(this._config.reference)) {
+          referenceElement = this._config.reference; // Check if it's jQuery element
+
+          if (typeof this._config.reference.jquery !== 'undefined') {
+            referenceElement = this._config.reference[0];
+          }
+        } // If boundary is not `scrollParent`, then set position to `static`
+        // to allow the menu to "escape" the scroll parent's boundaries
+        // https://github.com/twbs/bootstrap/issues/24251
+
+
+        if (this._config.boundary !== 'scrollParent') {
+          $(parent).addClass(CLASS_NAME_POSITION_STATIC);
+        }
+
+        this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig());
+      } // If this is a touch-enabled device we add extra
+      // empty mouseover listeners to the body's immediate children;
+      // only needed because of broken event delegation on iOS
+      // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
+
+
+      if ('ontouchstart' in document.documentElement && $(parent).closest(SELECTOR_NAVBAR_NAV).length === 0) {
+        $(document.body).children().on('mouseover', null, $.noop);
+      }
+
+      this._element.focus();
+
+      this._element.setAttribute('aria-expanded', true);
+
+      $(this._menu).toggleClass(CLASS_NAME_SHOW$2);
+      $(parent).toggleClass(CLASS_NAME_SHOW$2).trigger($.Event(EVENT_SHOWN$1, relatedTarget));
+    };
+
+    _proto.hide = function hide() {
+      if (this._element.disabled || $(this._element).hasClass(CLASS_NAME_DISABLED) || !$(this._menu).hasClass(CLASS_NAME_SHOW$2)) {
+        return;
+      }
+
+      var relatedTarget = {
+        relatedTarget: this._element
+      };
+      var hideEvent = $.Event(EVENT_HIDE$1, relatedTarget);
+
+      var parent = Dropdown._getParentFromElement(this._element);
+
+      $(parent).trigger(hideEvent);
+
+      if (hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (this._popper) {
+        this._popper.destroy();
+      }
+
+      $(this._menu).toggleClass(CLASS_NAME_SHOW$2);
+      $(parent).toggleClass(CLASS_NAME_SHOW$2).trigger($.Event(EVENT_HIDDEN$1, relatedTarget));
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$4);
+      $(this._element).off(EVENT_KEY$4);
+      this._element = null;
+      this._menu = null;
+
+      if (this._popper !== null) {
+        this._popper.destroy();
+
+        this._popper = null;
+      }
+    };
+
+    _proto.update = function update() {
+      this._inNavbar = this._detectNavbar();
+
+      if (this._popper !== null) {
+        this._popper.scheduleUpdate();
+      }
+    } // Private
+    ;
+
+    _proto._addEventListeners = function _addEventListeners() {
+      var _this = this;
+
+      $(this._element).on(EVENT_CLICK, function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        _this.toggle();
+      });
+    };
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2(_objectSpread2({}, this.constructor.Default), $(this._element).data()), config);
+      Util.typeCheckConfig(NAME$4, config, this.constructor.DefaultType);
+      return config;
+    };
+
+    _proto._getMenuElement = function _getMenuElement() {
+      if (!this._menu) {
+        var parent = Dropdown._getParentFromElement(this._element);
+
+        if (parent) {
+          this._menu = parent.querySelector(SELECTOR_MENU);
+        }
+      }
+
+      return this._menu;
+    };
+
+    _proto._getPlacement = function _getPlacement() {
+      var $parentDropdown = $(this._element.parentNode);
+      var placement = PLACEMENT_BOTTOM; // Handle dropup
+
+      if ($parentDropdown.hasClass(CLASS_NAME_DROPUP)) {
+        placement = $(this._menu).hasClass(CLASS_NAME_MENURIGHT) ? PLACEMENT_TOPEND : PLACEMENT_TOP;
+      } else if ($parentDropdown.hasClass(CLASS_NAME_DROPRIGHT)) {
+        placement = PLACEMENT_RIGHT;
+      } else if ($parentDropdown.hasClass(CLASS_NAME_DROPLEFT)) {
+        placement = PLACEMENT_LEFT;
+      } else if ($(this._menu).hasClass(CLASS_NAME_MENURIGHT)) {
+        placement = PLACEMENT_BOTTOMEND;
+      }
+
+      return placement;
+    };
+
+    _proto._detectNavbar = function _detectNavbar() {
+      return $(this._element).closest('.navbar').length > 0;
+    };
+
+    _proto._getOffset = function _getOffset() {
+      var _this2 = this;
+
+      var offset = {};
+
+      if (typeof this._config.offset === 'function') {
+        offset.fn = function (data) {
+          data.offsets = _objectSpread2(_objectSpread2({}, data.offsets), _this2._config.offset(data.offsets, _this2._element) || {});
+          return data;
+        };
+      } else {
+        offset.offset = this._config.offset;
+      }
+
+      return offset;
+    };
+
+    _proto._getPopperConfig = function _getPopperConfig() {
+      var popperConfig = {
+        placement: this._getPlacement(),
+        modifiers: {
+          offset: this._getOffset(),
+          flip: {
+            enabled: this._config.flip
+          },
+          preventOverflow: {
+            boundariesElement: this._config.boundary
+          }
+        }
+      }; // Disable Popper.js if we have a static display
+
+      if (this._config.display === 'static') {
+        popperConfig.modifiers.applyStyle = {
+          enabled: false
+        };
+      }
+
+      return _objectSpread2(_objectSpread2({}, popperConfig), this._config.popperConfig);
+    } // Static
+    ;
+
+    Dropdown._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$4);
+
+        var _config = typeof config === 'object' ? config : null;
+
+        if (!data) {
+          data = new Dropdown(this, _config);
+          $(this).data(DATA_KEY$4, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    Dropdown._clearMenus = function _clearMenus(event) {
+      if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH || event.type === 'keyup' && event.which !== TAB_KEYCODE)) {
+        return;
+      }
+
+      var toggles = [].slice.call(document.querySelectorAll(SELECTOR_DATA_TOGGLE$2));
+
+      for (var i = 0, len = toggles.length; i < len; i++) {
+        var parent = Dropdown._getParentFromElement(toggles[i]);
+
+        var context = $(toggles[i]).data(DATA_KEY$4);
+        var relatedTarget = {
+          relatedTarget: toggles[i]
+        };
+
+        if (event && event.type === 'click') {
+          relatedTarget.clickEvent = event;
+        }
+
+        if (!context) {
+          continue;
+        }
+
+        var dropdownMenu = context._menu;
+
+        if (!$(parent).hasClass(CLASS_NAME_SHOW$2)) {
+          continue;
+        }
+
+        if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) && $.contains(parent, event.target)) {
+          continue;
+        }
+
+        var hideEvent = $.Event(EVENT_HIDE$1, relatedTarget);
+        $(parent).trigger(hideEvent);
+
+        if (hideEvent.isDefaultPrevented()) {
+          continue;
+        } // If this is a touch-enabled device we remove the extra
+        // empty mouseover listeners we added for iOS support
+
+
+        if ('ontouchstart' in document.documentElement) {
+          $(document.body).children().off('mouseover', null, $.noop);
+        }
+
+        toggles[i].setAttribute('aria-expanded', 'false');
+
+        if (context._popper) {
+          context._popper.destroy();
+        }
+
+        $(dropdownMenu).removeClass(CLASS_NAME_SHOW$2);
+        $(parent).removeClass(CLASS_NAME_SHOW$2).trigger($.Event(EVENT_HIDDEN$1, relatedTarget));
+      }
+    };
+
+    Dropdown._getParentFromElement = function _getParentFromElement(element) {
+      var parent;
+      var selector = Util.getSelectorFromElement(element);
+
+      if (selector) {
+        parent = document.querySelector(selector);
+      }
+
+      return parent || element.parentNode;
+    } // eslint-disable-next-line complexity
+    ;
+
+    Dropdown._dataApiKeydownHandler = function _dataApiKeydownHandler(event) {
+      // If not input/textarea:
+      //  - And not a key in REGEXP_KEYDOWN => not a dropdown command
+      // If input/textarea:
+      //  - If space key => not a dropdown command
+      //  - If key is other than escape
+      //    - If key is not up or down => not a dropdown command
+      //    - If trigger inside the menu => not a dropdown command
+      if (/input|textarea/i.test(event.target.tagName) ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || $(event.target).closest(SELECTOR_MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {
+        return;
+      }
+
+      if (this.disabled || $(this).hasClass(CLASS_NAME_DISABLED)) {
+        return;
+      }
+
+      var parent = Dropdown._getParentFromElement(this);
+
+      var isActive = $(parent).hasClass(CLASS_NAME_SHOW$2);
+
+      if (!isActive && event.which === ESCAPE_KEYCODE) {
+        return;
+      }
+
+      event.preventDefault();
+      event.stopPropagation();
+
+      if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {
+        if (event.which === ESCAPE_KEYCODE) {
+          $(parent.querySelector(SELECTOR_DATA_TOGGLE$2)).trigger('focus');
+        }
+
+        $(this).trigger('click');
+        return;
+      }
+
+      var items = [].slice.call(parent.querySelectorAll(SELECTOR_VISIBLE_ITEMS)).filter(function (item) {
+        return $(item).is(':visible');
+      });
+
+      if (items.length === 0) {
+        return;
+      }
+
+      var index = items.indexOf(event.target);
+
+      if (event.which === ARROW_UP_KEYCODE && index > 0) {
+        // Up
+        index--;
+      }
+
+      if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) {
+        // Down
+        index++;
+      }
+
+      if (index < 0) {
+        index = 0;
+      }
+
+      items[index].focus();
+    };
+
+    _createClass(Dropdown, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$4;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$2;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$2;
+      }
+    }]);
+
+    return Dropdown;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_KEYDOWN_DATA_API, SELECTOR_DATA_TOGGLE$2, Dropdown._dataApiKeydownHandler).on(EVENT_KEYDOWN_DATA_API, SELECTOR_MENU, Dropdown._dataApiKeydownHandler).on(EVENT_CLICK_DATA_API$4 + " " + EVENT_KEYUP_DATA_API, Dropdown._clearMenus).on(EVENT_CLICK_DATA_API$4, SELECTOR_DATA_TOGGLE$2, function (event) {
+    event.preventDefault();
+    event.stopPropagation();
+
+    Dropdown._jQueryInterface.call($(this), 'toggle');
+  }).on(EVENT_CLICK_DATA_API$4, SELECTOR_FORM_CHILD, function (e) {
+    e.stopPropagation();
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$4] = Dropdown._jQueryInterface;
+  $.fn[NAME$4].Constructor = Dropdown;
+
+  $.fn[NAME$4].noConflict = function () {
+    $.fn[NAME$4] = JQUERY_NO_CONFLICT$4;
+    return Dropdown._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$5 = 'modal';
+  var VERSION$5 = '4.5.0';
+  var DATA_KEY$5 = 'bs.modal';
+  var EVENT_KEY$5 = "." + DATA_KEY$5;
+  var DATA_API_KEY$5 = '.data-api';
+  var JQUERY_NO_CONFLICT$5 = $.fn[NAME$5];
+  var ESCAPE_KEYCODE$1 = 27; // KeyboardEvent.which value for Escape (Esc) key
+
+  var Default$3 = {
+    backdrop: true,
+    keyboard: true,
+    focus: true,
+    show: true
+  };
+  var DefaultType$3 = {
+    backdrop: '(boolean|string)',
+    keyboard: 'boolean',
+    focus: 'boolean',
+    show: 'boolean'
+  };
+  var EVENT_HIDE$2 = "hide" + EVENT_KEY$5;
+  var EVENT_HIDE_PREVENTED = "hidePrevented" + EVENT_KEY$5;
+  var EVENT_HIDDEN$2 = "hidden" + EVENT_KEY$5;
+  var EVENT_SHOW$2 = "show" + EVENT_KEY$5;
+  var EVENT_SHOWN$2 = "shown" + EVENT_KEY$5;
+  var EVENT_FOCUSIN = "focusin" + EVENT_KEY$5;
+  var EVENT_RESIZE = "resize" + EVENT_KEY$5;
+  var EVENT_CLICK_DISMISS = "click.dismiss" + EVENT_KEY$5;
+  var EVENT_KEYDOWN_DISMISS = "keydown.dismiss" + EVENT_KEY$5;
+  var EVENT_MOUSEUP_DISMISS = "mouseup.dismiss" + EVENT_KEY$5;
+  var EVENT_MOUSEDOWN_DISMISS = "mousedown.dismiss" + EVENT_KEY$5;
+  var EVENT_CLICK_DATA_API$5 = "click" + EVENT_KEY$5 + DATA_API_KEY$5;
+  var CLASS_NAME_SCROLLABLE = 'modal-dialog-scrollable';
+  var CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure';
+  var CLASS_NAME_BACKDROP = 'modal-backdrop';
+  var CLASS_NAME_OPEN = 'modal-open';
+  var CLASS_NAME_FADE$1 = 'fade';
+  var CLASS_NAME_SHOW$3 = 'show';
+  var CLASS_NAME_STATIC = 'modal-static';
+  var SELECTOR_DIALOG = '.modal-dialog';
+  var SELECTOR_MODAL_BODY = '.modal-body';
+  var SELECTOR_DATA_TOGGLE$3 = '[data-toggle="modal"]';
+  var SELECTOR_DATA_DISMISS = '[data-dismiss="modal"]';
+  var SELECTOR_FIXED_CONTENT = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top';
+  var SELECTOR_STICKY_CONTENT = '.sticky-top';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Modal = /*#__PURE__*/function () {
+    function Modal(element, config) {
+      this._config = this._getConfig(config);
+      this._element = element;
+      this._dialog = element.querySelector(SELECTOR_DIALOG);
+      this._backdrop = null;
+      this._isShown = false;
+      this._isBodyOverflowing = false;
+      this._ignoreBackdropClick = false;
+      this._isTransitioning = false;
+      this._scrollbarWidth = 0;
+    } // Getters
+
+
+    var _proto = Modal.prototype;
+
+    // Public
+    _proto.toggle = function toggle(relatedTarget) {
+      return this._isShown ? this.hide() : this.show(relatedTarget);
+    };
+
+    _proto.show = function show(relatedTarget) {
+      var _this = this;
+
+      if (this._isShown || this._isTransitioning) {
+        return;
+      }
+
+      if ($(this._element).hasClass(CLASS_NAME_FADE$1)) {
+        this._isTransitioning = true;
+      }
+
+      var showEvent = $.Event(EVENT_SHOW$2, {
+        relatedTarget: relatedTarget
+      });
+      $(this._element).trigger(showEvent);
+
+      if (this._isShown || showEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._isShown = true;
+
+      this._checkScrollbar();
+
+      this._setScrollbar();
+
+      this._adjustDialog();
+
+      this._setEscapeEvent();
+
+      this._setResizeEvent();
+
+      $(this._element).on(EVENT_CLICK_DISMISS, SELECTOR_DATA_DISMISS, function (event) {
+        return _this.hide(event);
+      });
+      $(this._dialog).on(EVENT_MOUSEDOWN_DISMISS, function () {
+        $(_this._element).one(EVENT_MOUSEUP_DISMISS, function (event) {
+          if ($(event.target).is(_this._element)) {
+            _this._ignoreBackdropClick = true;
+          }
+        });
+      });
+
+      this._showBackdrop(function () {
+        return _this._showElement(relatedTarget);
+      });
+    };
+
+    _proto.hide = function hide(event) {
+      var _this2 = this;
+
+      if (event) {
+        event.preventDefault();
+      }
+
+      if (!this._isShown || this._isTransitioning) {
+        return;
+      }
+
+      var hideEvent = $.Event(EVENT_HIDE$2);
+      $(this._element).trigger(hideEvent);
+
+      if (!this._isShown || hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._isShown = false;
+      var transition = $(this._element).hasClass(CLASS_NAME_FADE$1);
+
+      if (transition) {
+        this._isTransitioning = true;
+      }
+
+      this._setEscapeEvent();
+
+      this._setResizeEvent();
+
+      $(document).off(EVENT_FOCUSIN);
+      $(this._element).removeClass(CLASS_NAME_SHOW$3);
+      $(this._element).off(EVENT_CLICK_DISMISS);
+      $(this._dialog).off(EVENT_MOUSEDOWN_DISMISS);
+
+      if (transition) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, function (event) {
+          return _this2._hideModal(event);
+        }).emulateTransitionEnd(transitionDuration);
+      } else {
+        this._hideModal();
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      [window, this._element, this._dialog].forEach(function (htmlElement) {
+        return $(htmlElement).off(EVENT_KEY$5);
+      });
+      /**
+       * `document` has 2 events `EVENT_FOCUSIN` and `EVENT_CLICK_DATA_API`
+       * Do not move `document` in `htmlElements` array
+       * It will remove `EVENT_CLICK_DATA_API` event that should remain
+       */
+
+      $(document).off(EVENT_FOCUSIN);
+      $.removeData(this._element, DATA_KEY$5);
+      this._config = null;
+      this._element = null;
+      this._dialog = null;
+      this._backdrop = null;
+      this._isShown = null;
+      this._isBodyOverflowing = null;
+      this._ignoreBackdropClick = null;
+      this._isTransitioning = null;
+      this._scrollbarWidth = null;
+    };
+
+    _proto.handleUpdate = function handleUpdate() {
+      this._adjustDialog();
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default$3), config);
+      Util.typeCheckConfig(NAME$5, config, DefaultType$3);
+      return config;
+    };
+
+    _proto._triggerBackdropTransition = function _triggerBackdropTransition() {
+      var _this3 = this;
+
+      if (this._config.backdrop === 'static') {
+        var hideEventPrevented = $.Event(EVENT_HIDE_PREVENTED);
+        $(this._element).trigger(hideEventPrevented);
+
+        if (hideEventPrevented.defaultPrevented) {
+          return;
+        }
+
+        this._element.classList.add(CLASS_NAME_STATIC);
+
+        var modalTransitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, function () {
+          _this3._element.classList.remove(CLASS_NAME_STATIC);
+        }).emulateTransitionEnd(modalTransitionDuration);
+
+        this._element.focus();
+      } else {
+        this.hide();
+      }
+    };
+
+    _proto._showElement = function _showElement(relatedTarget) {
+      var _this4 = this;
+
+      var transition = $(this._element).hasClass(CLASS_NAME_FADE$1);
+      var modalBody = this._dialog ? this._dialog.querySelector(SELECTOR_MODAL_BODY) : null;
+
+      if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
+        // Don't move modal's DOM position
+        document.body.appendChild(this._element);
+      }
+
+      this._element.style.display = 'block';
+
+      this._element.removeAttribute('aria-hidden');
+
+      this._element.setAttribute('aria-modal', true);
+
+      if ($(this._dialog).hasClass(CLASS_NAME_SCROLLABLE) && modalBody) {
+        modalBody.scrollTop = 0;
+      } else {
+        this._element.scrollTop = 0;
+      }
+
+      if (transition) {
+        Util.reflow(this._element);
+      }
+
+      $(this._element).addClass(CLASS_NAME_SHOW$3);
+
+      if (this._config.focus) {
+        this._enforceFocus();
+      }
+
+      var shownEvent = $.Event(EVENT_SHOWN$2, {
+        relatedTarget: relatedTarget
+      });
+
+      var transitionComplete = function transitionComplete() {
+        if (_this4._config.focus) {
+          _this4._element.focus();
+        }
+
+        _this4._isTransitioning = false;
+        $(_this4._element).trigger(shownEvent);
+      };
+
+      if (transition) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._dialog);
+        $(this._dialog).one(Util.TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration);
+      } else {
+        transitionComplete();
+      }
+    };
+
+    _proto._enforceFocus = function _enforceFocus() {
+      var _this5 = this;
+
+      $(document).off(EVENT_FOCUSIN) // Guard against infinite focus loop
+      .on(EVENT_FOCUSIN, function (event) {
+        if (document !== event.target && _this5._element !== event.target && $(_this5._element).has(event.target).length === 0) {
+          _this5._element.focus();
+        }
+      });
+    };
+
+    _proto._setEscapeEvent = function _setEscapeEvent() {
+      var _this6 = this;
+
+      if (this._isShown) {
+        $(this._element).on(EVENT_KEYDOWN_DISMISS, function (event) {
+          if (_this6._config.keyboard && event.which === ESCAPE_KEYCODE$1) {
+            event.preventDefault();
+
+            _this6.hide();
+          } else if (!_this6._config.keyboard && event.which === ESCAPE_KEYCODE$1) {
+            _this6._triggerBackdropTransition();
+          }
+        });
+      } else if (!this._isShown) {
+        $(this._element).off(EVENT_KEYDOWN_DISMISS);
+      }
+    };
+
+    _proto._setResizeEvent = function _setResizeEvent() {
+      var _this7 = this;
+
+      if (this._isShown) {
+        $(window).on(EVENT_RESIZE, function (event) {
+          return _this7.handleUpdate(event);
+        });
+      } else {
+        $(window).off(EVENT_RESIZE);
+      }
+    };
+
+    _proto._hideModal = function _hideModal() {
+      var _this8 = this;
+
+      this._element.style.display = 'none';
+
+      this._element.setAttribute('aria-hidden', true);
+
+      this._element.removeAttribute('aria-modal');
+
+      this._isTransitioning = false;
+
+      this._showBackdrop(function () {
+        $(document.body).removeClass(CLASS_NAME_OPEN);
+
+        _this8._resetAdjustments();
+
+        _this8._resetScrollbar();
+
+        $(_this8._element).trigger(EVENT_HIDDEN$2);
+      });
+    };
+
+    _proto._removeBackdrop = function _removeBackdrop() {
+      if (this._backdrop) {
+        $(this._backdrop).remove();
+        this._backdrop = null;
+      }
+    };
+
+    _proto._showBackdrop = function _showBackdrop(callback) {
+      var _this9 = this;
+
+      var animate = $(this._element).hasClass(CLASS_NAME_FADE$1) ? CLASS_NAME_FADE$1 : '';
+
+      if (this._isShown && this._config.backdrop) {
+        this._backdrop = document.createElement('div');
+        this._backdrop.className = CLASS_NAME_BACKDROP;
+
+        if (animate) {
+          this._backdrop.classList.add(animate);
+        }
+
+        $(this._backdrop).appendTo(document.body);
+        $(this._element).on(EVENT_CLICK_DISMISS, function (event) {
+          if (_this9._ignoreBackdropClick) {
+            _this9._ignoreBackdropClick = false;
+            return;
+          }
+
+          if (event.target !== event.currentTarget) {
+            return;
+          }
+
+          _this9._triggerBackdropTransition();
+        });
+
+        if (animate) {
+          Util.reflow(this._backdrop);
+        }
+
+        $(this._backdrop).addClass(CLASS_NAME_SHOW$3);
+
+        if (!callback) {
+          return;
+        }
+
+        if (!animate) {
+          callback();
+          return;
+        }
+
+        var backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
+        $(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration);
+      } else if (!this._isShown && this._backdrop) {
+        $(this._backdrop).removeClass(CLASS_NAME_SHOW$3);
+
+        var callbackRemove = function callbackRemove() {
+          _this9._removeBackdrop();
+
+          if (callback) {
+            callback();
+          }
+        };
+
+        if ($(this._element).hasClass(CLASS_NAME_FADE$1)) {
+          var _backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop);
+
+          $(this._backdrop).one(Util.TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration);
+        } else {
+          callbackRemove();
+        }
+      } else if (callback) {
+        callback();
+      }
+    } // ----------------------------------------------------------------------
+    // the following methods are used to handle overflowing modals
+    // todo (fat): these should probably be refactored out of modal.js
+    // ----------------------------------------------------------------------
+    ;
+
+    _proto._adjustDialog = function _adjustDialog() {
+      var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;
+
+      if (!this._isBodyOverflowing && isModalOverflowing) {
+        this._element.style.paddingLeft = this._scrollbarWidth + "px";
+      }
+
+      if (this._isBodyOverflowing && !isModalOverflowing) {
+        this._element.style.paddingRight = this._scrollbarWidth + "px";
+      }
+    };
+
+    _proto._resetAdjustments = function _resetAdjustments() {
+      this._element.style.paddingLeft = '';
+      this._element.style.paddingRight = '';
+    };
+
+    _proto._checkScrollbar = function _checkScrollbar() {
+      var rect = document.body.getBoundingClientRect();
+      this._isBodyOverflowing = Math.round(rect.left + rect.right) < window.innerWidth;
+      this._scrollbarWidth = this._getScrollbarWidth();
+    };
+
+    _proto._setScrollbar = function _setScrollbar() {
+      var _this10 = this;
+
+      if (this._isBodyOverflowing) {
+        // Note: DOMNode.style.paddingRight returns the actual value or '' if not set
+        //   while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set
+        var fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT));
+        var stickyContent = [].slice.call(document.querySelectorAll(SELECTOR_STICKY_CONTENT)); // Adjust fixed content padding
+
+        $(fixedContent).each(function (index, element) {
+          var actualPadding = element.style.paddingRight;
+          var calculatedPadding = $(element).css('padding-right');
+          $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this10._scrollbarWidth + "px");
+        }); // Adjust sticky content margin
+
+        $(stickyContent).each(function (index, element) {
+          var actualMargin = element.style.marginRight;
+          var calculatedMargin = $(element).css('margin-right');
+          $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this10._scrollbarWidth + "px");
+        }); // Adjust body padding
+
+        var actualPadding = document.body.style.paddingRight;
+        var calculatedPadding = $(document.body).css('padding-right');
+        $(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
+      }
+
+      $(document.body).addClass(CLASS_NAME_OPEN);
+    };
+
+    _proto._resetScrollbar = function _resetScrollbar() {
+      // Restore fixed content padding
+      var fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT));
+      $(fixedContent).each(function (index, element) {
+        var padding = $(element).data('padding-right');
+        $(element).removeData('padding-right');
+        element.style.paddingRight = padding ? padding : '';
+      }); // Restore sticky content
+
+      var elements = [].slice.call(document.querySelectorAll("" + SELECTOR_STICKY_CONTENT));
+      $(elements).each(function (index, element) {
+        var margin = $(element).data('margin-right');
+
+        if (typeof margin !== 'undefined') {
+          $(element).css('margin-right', margin).removeData('margin-right');
+        }
+      }); // Restore body padding
+
+      var padding = $(document.body).data('padding-right');
+      $(document.body).removeData('padding-right');
+      document.body.style.paddingRight = padding ? padding : '';
+    };
+
+    _proto._getScrollbarWidth = function _getScrollbarWidth() {
+      // thx d.walsh
+      var scrollDiv = document.createElement('div');
+      scrollDiv.className = CLASS_NAME_SCROLLBAR_MEASURER;
+      document.body.appendChild(scrollDiv);
+      var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth;
+      document.body.removeChild(scrollDiv);
+      return scrollbarWidth;
+    } // Static
+    ;
+
+    Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$5);
+
+        var _config = _objectSpread2(_objectSpread2(_objectSpread2({}, Default$3), $(this).data()), typeof config === 'object' && config ? config : {});
+
+        if (!data) {
+          data = new Modal(this, _config);
+          $(this).data(DATA_KEY$5, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config](relatedTarget);
+        } else if (_config.show) {
+          data.show(relatedTarget);
+        }
+      });
+    };
+
+    _createClass(Modal, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$5;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$3;
+      }
+    }]);
+
+    return Modal;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$5, SELECTOR_DATA_TOGGLE$3, function (event) {
+    var _this11 = this;
+
+    var target;
+    var selector = Util.getSelectorFromElement(this);
+
+    if (selector) {
+      target = document.querySelector(selector);
+    }
+
+    var config = $(target).data(DATA_KEY$5) ? 'toggle' : _objectSpread2(_objectSpread2({}, $(target).data()), $(this).data());
+
+    if (this.tagName === 'A' || this.tagName === 'AREA') {
+      event.preventDefault();
+    }
+
+    var $target = $(target).one(EVENT_SHOW$2, function (showEvent) {
+      if (showEvent.isDefaultPrevented()) {
+        // Only register focus restorer if modal will actually get shown
+        return;
+      }
+
+      $target.one(EVENT_HIDDEN$2, function () {
+        if ($(_this11).is(':visible')) {
+          _this11.focus();
+        }
+      });
+    });
+
+    Modal._jQueryInterface.call($(target), config, this);
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$5] = Modal._jQueryInterface;
+  $.fn[NAME$5].Constructor = Modal;
+
+  $.fn[NAME$5].noConflict = function () {
+    $.fn[NAME$5] = JQUERY_NO_CONFLICT$5;
+    return Modal._jQueryInterface;
+  };
+
+  /**
+   * --------------------------------------------------------------------------
+   * Bootstrap (v4.5.0): tools/sanitizer.js
+   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+   * --------------------------------------------------------------------------
+   */
+  var uriAttrs = ['background', 'cite', 'href', 'itemtype', 'longdesc', 'poster', 'src', 'xlink:href'];
+  var ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i;
+  var DefaultWhitelist = {
+    // Global attributes allowed on any supplied element below.
+    '*': ['class', 'dir', 'id', 'lang', 'role', ARIA_ATTRIBUTE_PATTERN],
+    a: ['target', 'href', 'title', 'rel'],
+    area: [],
+    b: [],
+    br: [],
+    col: [],
+    code: [],
+    div: [],
+    em: [],
+    hr: [],
+    h1: [],
+    h2: [],
+    h3: [],
+    h4: [],
+    h5: [],
+    h6: [],
+    i: [],
+    img: ['src', 'srcset', 'alt', 'title', 'width', 'height'],
+    li: [],
+    ol: [],
+    p: [],
+    pre: [],
+    s: [],
+    small: [],
+    span: [],
+    sub: [],
+    sup: [],
+    strong: [],
+    u: [],
+    ul: []
+  };
+  /**
+   * A pattern that recognizes a commonly useful subset of URLs that are safe.
+   *
+   * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
+   */
+
+  var SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/gi;
+  /**
+   * A pattern that matches safe data URLs. Only matches image, video and audio types.
+   *
+   * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts
+   */
+
+  var DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i;
+
+  function allowedAttribute(attr, allowedAttributeList) {
+    var attrName = attr.nodeName.toLowerCase();
+
+    if (allowedAttributeList.indexOf(attrName) !== -1) {
+      if (uriAttrs.indexOf(attrName) !== -1) {
+        return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN));
+      }
+
+      return true;
+    }
+
+    var regExp = allowedAttributeList.filter(function (attrRegex) {
+      return attrRegex instanceof RegExp;
+    }); // Check if a regular expression validates the attribute.
+
+    for (var i = 0, len = regExp.length; i < len; i++) {
+      if (attrName.match(regExp[i])) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) {
+    if (unsafeHtml.length === 0) {
+      return unsafeHtml;
+    }
+
+    if (sanitizeFn && typeof sanitizeFn === 'function') {
+      return sanitizeFn(unsafeHtml);
+    }
+
+    var domParser = new window.DOMParser();
+    var createdDocument = domParser.parseFromString(unsafeHtml, 'text/html');
+    var whitelistKeys = Object.keys(whiteList);
+    var elements = [].slice.call(createdDocument.body.querySelectorAll('*'));
+
+    var _loop = function _loop(i, len) {
+      var el = elements[i];
+      var elName = el.nodeName.toLowerCase();
+
+      if (whitelistKeys.indexOf(el.nodeName.toLowerCase()) === -1) {
+        el.parentNode.removeChild(el);
+        return "continue";
+      }
+
+      var attributeList = [].slice.call(el.attributes);
+      var whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || []);
+      attributeList.forEach(function (attr) {
+        if (!allowedAttribute(attr, whitelistedAttributes)) {
+          el.removeAttribute(attr.nodeName);
+        }
+      });
+    };
+
+    for (var i = 0, len = elements.length; i < len; i++) {
+      var _ret = _loop(i);
+
+      if (_ret === "continue") continue;
+    }
+
+    return createdDocument.body.innerHTML;
+  }
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$6 = 'tooltip';
+  var VERSION$6 = '4.5.0';
+  var DATA_KEY$6 = 'bs.tooltip';
+  var EVENT_KEY$6 = "." + DATA_KEY$6;
+  var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
+  var CLASS_PREFIX = 'bs-tooltip';
+  var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g');
+  var DISALLOWED_ATTRIBUTES = ['sanitize', 'whiteList', 'sanitizeFn'];
+  var DefaultType$4 = {
+    animation: 'boolean',
+    template: 'string',
+    title: '(string|element|function)',
+    trigger: 'string',
+    delay: '(number|object)',
+    html: 'boolean',
+    selector: '(string|boolean)',
+    placement: '(string|function)',
+    offset: '(number|string|function)',
+    container: '(string|element|boolean)',
+    fallbackPlacement: '(string|array)',
+    boundary: '(string|element)',
+    sanitize: 'boolean',
+    sanitizeFn: '(null|function)',
+    whiteList: 'object',
+    popperConfig: '(null|object)'
+  };
+  var AttachmentMap = {
+    AUTO: 'auto',
+    TOP: 'top',
+    RIGHT: 'right',
+    BOTTOM: 'bottom',
+    LEFT: 'left'
+  };
+  var Default$4 = {
+    animation: true,
+    template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
+    trigger: 'hover focus',
+    title: '',
+    delay: 0,
+    html: false,
+    selector: false,
+    placement: 'top',
+    offset: 0,
+    container: false,
+    fallbackPlacement: 'flip',
+    boundary: 'scrollParent',
+    sanitize: true,
+    sanitizeFn: null,
+    whiteList: DefaultWhitelist,
+    popperConfig: null
+  };
+  var HOVER_STATE_SHOW = 'show';
+  var HOVER_STATE_OUT = 'out';
+  var Event = {
+    HIDE: "hide" + EVENT_KEY$6,
+    HIDDEN: "hidden" + EVENT_KEY$6,
+    SHOW: "show" + EVENT_KEY$6,
+    SHOWN: "shown" + EVENT_KEY$6,
+    INSERTED: "inserted" + EVENT_KEY$6,
+    CLICK: "click" + EVENT_KEY$6,
+    FOCUSIN: "focusin" + EVENT_KEY$6,
+    FOCUSOUT: "focusout" + EVENT_KEY$6,
+    MOUSEENTER: "mouseenter" + EVENT_KEY$6,
+    MOUSELEAVE: "mouseleave" + EVENT_KEY$6
+  };
+  var CLASS_NAME_FADE$2 = 'fade';
+  var CLASS_NAME_SHOW$4 = 'show';
+  var SELECTOR_TOOLTIP_INNER = '.tooltip-inner';
+  var SELECTOR_ARROW = '.arrow';
+  var TRIGGER_HOVER = 'hover';
+  var TRIGGER_FOCUS = 'focus';
+  var TRIGGER_CLICK = 'click';
+  var TRIGGER_MANUAL = 'manual';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Tooltip = /*#__PURE__*/function () {
+    function Tooltip(element, config) {
+      if (typeof Popper === 'undefined') {
+        throw new TypeError('Bootstrap\'s tooltips require Popper.js (https://popper.js.org/)');
+      } // private
+
+
+      this._isEnabled = true;
+      this._timeout = 0;
+      this._hoverState = '';
+      this._activeTrigger = {};
+      this._popper = null; // Protected
+
+      this.element = element;
+      this.config = this._getConfig(config);
+      this.tip = null;
+
+      this._setListeners();
+    } // Getters
+
+
+    var _proto = Tooltip.prototype;
+
+    // Public
+    _proto.enable = function enable() {
+      this._isEnabled = true;
+    };
+
+    _proto.disable = function disable() {
+      this._isEnabled = false;
+    };
+
+    _proto.toggleEnabled = function toggleEnabled() {
+      this._isEnabled = !this._isEnabled;
+    };
+
+    _proto.toggle = function toggle(event) {
+      if (!this._isEnabled) {
+        return;
+      }
+
+      if (event) {
+        var dataKey = this.constructor.DATA_KEY;
+        var context = $(event.currentTarget).data(dataKey);
+
+        if (!context) {
+          context = new this.constructor(event.currentTarget, this._getDelegateConfig());
+          $(event.currentTarget).data(dataKey, context);
+        }
+
+        context._activeTrigger.click = !context._activeTrigger.click;
+
+        if (context._isWithActiveTrigger()) {
+          context._enter(null, context);
+        } else {
+          context._leave(null, context);
+        }
+      } else {
+        if ($(this.getTipElement()).hasClass(CLASS_NAME_SHOW$4)) {
+          this._leave(null, this);
+
+          return;
+        }
+
+        this._enter(null, this);
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      clearTimeout(this._timeout);
+      $.removeData(this.element, this.constructor.DATA_KEY);
+      $(this.element).off(this.constructor.EVENT_KEY);
+      $(this.element).closest('.modal').off('hide.bs.modal', this._hideModalHandler);
+
+      if (this.tip) {
+        $(this.tip).remove();
+      }
+
+      this._isEnabled = null;
+      this._timeout = null;
+      this._hoverState = null;
+      this._activeTrigger = null;
+
+      if (this._popper) {
+        this._popper.destroy();
+      }
+
+      this._popper = null;
+      this.element = null;
+      this.config = null;
+      this.tip = null;
+    };
+
+    _proto.show = function show() {
+      var _this = this;
+
+      if ($(this.element).css('display') === 'none') {
+        throw new Error('Please use show on visible elements');
+      }
+
+      var showEvent = $.Event(this.constructor.Event.SHOW);
+
+      if (this.isWithContent() && this._isEnabled) {
+        $(this.element).trigger(showEvent);
+        var shadowRoot = Util.findShadowRoot(this.element);
+        var isInTheDom = $.contains(shadowRoot !== null ? shadowRoot : this.element.ownerDocument.documentElement, this.element);
+
+        if (showEvent.isDefaultPrevented() || !isInTheDom) {
+          return;
+        }
+
+        var tip = this.getTipElement();
+        var tipId = Util.getUID(this.constructor.NAME);
+        tip.setAttribute('id', tipId);
+        this.element.setAttribute('aria-describedby', tipId);
+        this.setContent();
+
+        if (this.config.animation) {
+          $(tip).addClass(CLASS_NAME_FADE$2);
+        }
+
+        var placement = typeof this.config.placement === 'function' ? this.config.placement.call(this, tip, this.element) : this.config.placement;
+
+        var attachment = this._getAttachment(placement);
+
+        this.addAttachmentClass(attachment);
+
+        var container = this._getContainer();
+
+        $(tip).data(this.constructor.DATA_KEY, this);
+
+        if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {
+          $(tip).appendTo(container);
+        }
+
+        $(this.element).trigger(this.constructor.Event.INSERTED);
+        this._popper = new Popper(this.element, tip, this._getPopperConfig(attachment));
+        $(tip).addClass(CLASS_NAME_SHOW$4); // If this is a touch-enabled device we add extra
+        // empty mouseover listeners to the body's immediate children;
+        // only needed because of broken event delegation on iOS
+        // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
+
+        if ('ontouchstart' in document.documentElement) {
+          $(document.body).children().on('mouseover', null, $.noop);
+        }
+
+        var complete = function complete() {
+          if (_this.config.animation) {
+            _this._fixTransition();
+          }
+
+          var prevHoverState = _this._hoverState;
+          _this._hoverState = null;
+          $(_this.element).trigger(_this.constructor.Event.SHOWN);
+
+          if (prevHoverState === HOVER_STATE_OUT) {
+            _this._leave(null, _this);
+          }
+        };
+
+        if ($(this.tip).hasClass(CLASS_NAME_FADE$2)) {
+          var transitionDuration = Util.getTransitionDurationFromElement(this.tip);
+          $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+        } else {
+          complete();
+        }
+      }
+    };
+
+    _proto.hide = function hide(callback) {
+      var _this2 = this;
+
+      var tip = this.getTipElement();
+      var hideEvent = $.Event(this.constructor.Event.HIDE);
+
+      var complete = function complete() {
+        if (_this2._hoverState !== HOVER_STATE_SHOW && tip.parentNode) {
+          tip.parentNode.removeChild(tip);
+        }
+
+        _this2._cleanTipClass();
+
+        _this2.element.removeAttribute('aria-describedby');
+
+        $(_this2.element).trigger(_this2.constructor.Event.HIDDEN);
+
+        if (_this2._popper !== null) {
+          _this2._popper.destroy();
+        }
+
+        if (callback) {
+          callback();
+        }
+      };
+
+      $(this.element).trigger(hideEvent);
+
+      if (hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      $(tip).removeClass(CLASS_NAME_SHOW$4); // If this is a touch-enabled device we remove the extra
+      // empty mouseover listeners we added for iOS support
+
+      if ('ontouchstart' in document.documentElement) {
+        $(document.body).children().off('mouseover', null, $.noop);
+      }
+
+      this._activeTrigger[TRIGGER_CLICK] = false;
+      this._activeTrigger[TRIGGER_FOCUS] = false;
+      this._activeTrigger[TRIGGER_HOVER] = false;
+
+      if ($(this.tip).hasClass(CLASS_NAME_FADE$2)) {
+        var transitionDuration = Util.getTransitionDurationFromElement(tip);
+        $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+
+      this._hoverState = '';
+    };
+
+    _proto.update = function update() {
+      if (this._popper !== null) {
+        this._popper.scheduleUpdate();
+      }
+    } // Protected
+    ;
+
+    _proto.isWithContent = function isWithContent() {
+      return Boolean(this.getTitle());
+    };
+
+    _proto.addAttachmentClass = function addAttachmentClass(attachment) {
+      $(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment);
+    };
+
+    _proto.getTipElement = function getTipElement() {
+      this.tip = this.tip || $(this.config.template)[0];
+      return this.tip;
+    };
+
+    _proto.setContent = function setContent() {
+      var tip = this.getTipElement();
+      this.setElementContent($(tip.querySelectorAll(SELECTOR_TOOLTIP_INNER)), this.getTitle());
+      $(tip).removeClass(CLASS_NAME_FADE$2 + " " + CLASS_NAME_SHOW$4);
+    };
+
+    _proto.setElementContent = function setElementContent($element, content) {
+      if (typeof content === 'object' && (content.nodeType || content.jquery)) {
+        // Content is a DOM node or a jQuery
+        if (this.config.html) {
+          if (!$(content).parent().is($element)) {
+            $element.empty().append(content);
+          }
+        } else {
+          $element.text($(content).text());
+        }
+
+        return;
+      }
+
+      if (this.config.html) {
+        if (this.config.sanitize) {
+          content = sanitizeHtml(content, this.config.whiteList, this.config.sanitizeFn);
+        }
+
+        $element.html(content);
+      } else {
+        $element.text(content);
+      }
+    };
+
+    _proto.getTitle = function getTitle() {
+      var title = this.element.getAttribute('data-original-title');
+
+      if (!title) {
+        title = typeof this.config.title === 'function' ? this.config.title.call(this.element) : this.config.title;
+      }
+
+      return title;
+    } // Private
+    ;
+
+    _proto._getPopperConfig = function _getPopperConfig(attachment) {
+      var _this3 = this;
+
+      var defaultBsConfig = {
+        placement: attachment,
+        modifiers: {
+          offset: this._getOffset(),
+          flip: {
+            behavior: this.config.fallbackPlacement
+          },
+          arrow: {
+            element: SELECTOR_ARROW
+          },
+          preventOverflow: {
+            boundariesElement: this.config.boundary
+          }
+        },
+        onCreate: function onCreate(data) {
+          if (data.originalPlacement !== data.placement) {
+            _this3._handlePopperPlacementChange(data);
+          }
+        },
+        onUpdate: function onUpdate(data) {
+          return _this3._handlePopperPlacementChange(data);
+        }
+      };
+      return _objectSpread2(_objectSpread2({}, defaultBsConfig), this.config.popperConfig);
+    };
+
+    _proto._getOffset = function _getOffset() {
+      var _this4 = this;
+
+      var offset = {};
+
+      if (typeof this.config.offset === 'function') {
+        offset.fn = function (data) {
+          data.offsets = _objectSpread2(_objectSpread2({}, data.offsets), _this4.config.offset(data.offsets, _this4.element) || {});
+          return data;
+        };
+      } else {
+        offset.offset = this.config.offset;
+      }
+
+      return offset;
+    };
+
+    _proto._getContainer = function _getContainer() {
+      if (this.config.container === false) {
+        return document.body;
+      }
+
+      if (Util.isElement(this.config.container)) {
+        return $(this.config.container);
+      }
+
+      return $(document).find(this.config.container);
+    };
+
+    _proto._getAttachment = function _getAttachment(placement) {
+      return AttachmentMap[placement.toUpperCase()];
+    };
+
+    _proto._setListeners = function _setListeners() {
+      var _this5 = this;
+
+      var triggers = this.config.trigger.split(' ');
+      triggers.forEach(function (trigger) {
+        if (trigger === 'click') {
+          $(_this5.element).on(_this5.constructor.Event.CLICK, _this5.config.selector, function (event) {
+            return _this5.toggle(event);
+          });
+        } else if (trigger !== TRIGGER_MANUAL) {
+          var eventIn = trigger === TRIGGER_HOVER ? _this5.constructor.Event.MOUSEENTER : _this5.constructor.Event.FOCUSIN;
+          var eventOut = trigger === TRIGGER_HOVER ? _this5.constructor.Event.MOUSELEAVE : _this5.constructor.Event.FOCUSOUT;
+          $(_this5.element).on(eventIn, _this5.config.selector, function (event) {
+            return _this5._enter(event);
+          }).on(eventOut, _this5.config.selector, function (event) {
+            return _this5._leave(event);
+          });
+        }
+      });
+
+      this._hideModalHandler = function () {
+        if (_this5.element) {
+          _this5.hide();
+        }
+      };
+
+      $(this.element).closest('.modal').on('hide.bs.modal', this._hideModalHandler);
+
+      if (this.config.selector) {
+        this.config = _objectSpread2(_objectSpread2({}, this.config), {}, {
+          trigger: 'manual',
+          selector: ''
+        });
+      } else {
+        this._fixTitle();
+      }
+    };
+
+    _proto._fixTitle = function _fixTitle() {
+      var titleType = typeof this.element.getAttribute('data-original-title');
+
+      if (this.element.getAttribute('title') || titleType !== 'string') {
+        this.element.setAttribute('data-original-title', this.element.getAttribute('title') || '');
+        this.element.setAttribute('title', '');
+      }
+    };
+
+    _proto._enter = function _enter(event, context) {
+      var dataKey = this.constructor.DATA_KEY;
+      context = context || $(event.currentTarget).data(dataKey);
+
+      if (!context) {
+        context = new this.constructor(event.currentTarget, this._getDelegateConfig());
+        $(event.currentTarget).data(dataKey, context);
+      }
+
+      if (event) {
+        context._activeTrigger[event.type === 'focusin' ? TRIGGER_FOCUS : TRIGGER_HOVER] = true;
+      }
+
+      if ($(context.getTipElement()).hasClass(CLASS_NAME_SHOW$4) || context._hoverState === HOVER_STATE_SHOW) {
+        context._hoverState = HOVER_STATE_SHOW;
+        return;
+      }
+
+      clearTimeout(context._timeout);
+      context._hoverState = HOVER_STATE_SHOW;
+
+      if (!context.config.delay || !context.config.delay.show) {
+        context.show();
+        return;
+      }
+
+      context._timeout = setTimeout(function () {
+        if (context._hoverState === HOVER_STATE_SHOW) {
+          context.show();
+        }
+      }, context.config.delay.show);
+    };
+
+    _proto._leave = function _leave(event, context) {
+      var dataKey = this.constructor.DATA_KEY;
+      context = context || $(event.currentTarget).data(dataKey);
+
+      if (!context) {
+        context = new this.constructor(event.currentTarget, this._getDelegateConfig());
+        $(event.currentTarget).data(dataKey, context);
+      }
+
+      if (event) {
+        context._activeTrigger[event.type === 'focusout' ? TRIGGER_FOCUS : TRIGGER_HOVER] = false;
+      }
+
+      if (context._isWithActiveTrigger()) {
+        return;
+      }
+
+      clearTimeout(context._timeout);
+      context._hoverState = HOVER_STATE_OUT;
+
+      if (!context.config.delay || !context.config.delay.hide) {
+        context.hide();
+        return;
+      }
+
+      context._timeout = setTimeout(function () {
+        if (context._hoverState === HOVER_STATE_OUT) {
+          context.hide();
+        }
+      }, context.config.delay.hide);
+    };
+
+    _proto._isWithActiveTrigger = function _isWithActiveTrigger() {
+      for (var trigger in this._activeTrigger) {
+        if (this._activeTrigger[trigger]) {
+          return true;
+        }
+      }
+
+      return false;
+    };
+
+    _proto._getConfig = function _getConfig(config) {
+      var dataAttributes = $(this.element).data();
+      Object.keys(dataAttributes).forEach(function (dataAttr) {
+        if (DISALLOWED_ATTRIBUTES.indexOf(dataAttr) !== -1) {
+          delete dataAttributes[dataAttr];
+        }
+      });
+      config = _objectSpread2(_objectSpread2(_objectSpread2({}, this.constructor.Default), dataAttributes), typeof config === 'object' && config ? config : {});
+
+      if (typeof config.delay === 'number') {
+        config.delay = {
+          show: config.delay,
+          hide: config.delay
+        };
+      }
+
+      if (typeof config.title === 'number') {
+        config.title = config.title.toString();
+      }
+
+      if (typeof config.content === 'number') {
+        config.content = config.content.toString();
+      }
+
+      Util.typeCheckConfig(NAME$6, config, this.constructor.DefaultType);
+
+      if (config.sanitize) {
+        config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn);
+      }
+
+      return config;
+    };
+
+    _proto._getDelegateConfig = function _getDelegateConfig() {
+      var config = {};
+
+      if (this.config) {
+        for (var key in this.config) {
+          if (this.constructor.Default[key] !== this.config[key]) {
+            config[key] = this.config[key];
+          }
+        }
+      }
+
+      return config;
+    };
+
+    _proto._cleanTipClass = function _cleanTipClass() {
+      var $tip = $(this.getTipElement());
+      var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX);
+
+      if (tabClass !== null && tabClass.length) {
+        $tip.removeClass(tabClass.join(''));
+      }
+    };
+
+    _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(popperData) {
+      this.tip = popperData.instance.popper;
+
+      this._cleanTipClass();
+
+      this.addAttachmentClass(this._getAttachment(popperData.placement));
+    };
+
+    _proto._fixTransition = function _fixTransition() {
+      var tip = this.getTipElement();
+      var initConfigAnimation = this.config.animation;
+
+      if (tip.getAttribute('x-placement') !== null) {
+        return;
+      }
+
+      $(tip).removeClass(CLASS_NAME_FADE$2);
+      this.config.animation = false;
+      this.hide();
+      this.show();
+      this.config.animation = initConfigAnimation;
+    } // Static
+    ;
+
+    Tooltip._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$6);
+
+        var _config = typeof config === 'object' && config;
+
+        if (!data && /dispose|hide/.test(config)) {
+          return;
+        }
+
+        if (!data) {
+          data = new Tooltip(this, _config);
+          $(this).data(DATA_KEY$6, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Tooltip, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$6;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$4;
+      }
+    }, {
+      key: "NAME",
+      get: function get() {
+        return NAME$6;
+      }
+    }, {
+      key: "DATA_KEY",
+      get: function get() {
+        return DATA_KEY$6;
+      }
+    }, {
+      key: "Event",
+      get: function get() {
+        return Event;
+      }
+    }, {
+      key: "EVENT_KEY",
+      get: function get() {
+        return EVENT_KEY$6;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$4;
+      }
+    }]);
+
+    return Tooltip;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+
+  $.fn[NAME$6] = Tooltip._jQueryInterface;
+  $.fn[NAME$6].Constructor = Tooltip;
+
+  $.fn[NAME$6].noConflict = function () {
+    $.fn[NAME$6] = JQUERY_NO_CONFLICT$6;
+    return Tooltip._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$7 = 'popover';
+  var VERSION$7 = '4.5.0';
+  var DATA_KEY$7 = 'bs.popover';
+  var EVENT_KEY$7 = "." + DATA_KEY$7;
+  var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
+  var CLASS_PREFIX$1 = 'bs-popover';
+  var BSCLS_PREFIX_REGEX$1 = new RegExp("(^|\\s)" + CLASS_PREFIX$1 + "\\S+", 'g');
+
+  var Default$5 = _objectSpread2(_objectSpread2({}, Tooltip.Default), {}, {
+    placement: 'right',
+    trigger: 'click',
+    content: '',
+    template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div></div>'
+  });
+
+  var DefaultType$5 = _objectSpread2(_objectSpread2({}, Tooltip.DefaultType), {}, {
+    content: '(string|element|function)'
+  });
+
+  var CLASS_NAME_FADE$3 = 'fade';
+  var CLASS_NAME_SHOW$5 = 'show';
+  var SELECTOR_TITLE = '.popover-header';
+  var SELECTOR_CONTENT = '.popover-body';
+  var Event$1 = {
+    HIDE: "hide" + EVENT_KEY$7,
+    HIDDEN: "hidden" + EVENT_KEY$7,
+    SHOW: "show" + EVENT_KEY$7,
+    SHOWN: "shown" + EVENT_KEY$7,
+    INSERTED: "inserted" + EVENT_KEY$7,
+    CLICK: "click" + EVENT_KEY$7,
+    FOCUSIN: "focusin" + EVENT_KEY$7,
+    FOCUSOUT: "focusout" + EVENT_KEY$7,
+    MOUSEENTER: "mouseenter" + EVENT_KEY$7,
+    MOUSELEAVE: "mouseleave" + EVENT_KEY$7
+  };
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Popover = /*#__PURE__*/function (_Tooltip) {
+    _inheritsLoose(Popover, _Tooltip);
+
+    function Popover() {
+      return _Tooltip.apply(this, arguments) || this;
+    }
+
+    var _proto = Popover.prototype;
+
+    // Overrides
+    _proto.isWithContent = function isWithContent() {
+      return this.getTitle() || this._getContent();
+    };
+
+    _proto.addAttachmentClass = function addAttachmentClass(attachment) {
+      $(this.getTipElement()).addClass(CLASS_PREFIX$1 + "-" + attachment);
+    };
+
+    _proto.getTipElement = function getTipElement() {
+      this.tip = this.tip || $(this.config.template)[0];
+      return this.tip;
+    };
+
+    _proto.setContent = function setContent() {
+      var $tip = $(this.getTipElement()); // We use append for html objects to maintain js events
+
+      this.setElementContent($tip.find(SELECTOR_TITLE), this.getTitle());
+
+      var content = this._getContent();
+
+      if (typeof content === 'function') {
+        content = content.call(this.element);
+      }
+
+      this.setElementContent($tip.find(SELECTOR_CONTENT), content);
+      $tip.removeClass(CLASS_NAME_FADE$3 + " " + CLASS_NAME_SHOW$5);
+    } // Private
+    ;
+
+    _proto._getContent = function _getContent() {
+      return this.element.getAttribute('data-content') || this.config.content;
+    };
+
+    _proto._cleanTipClass = function _cleanTipClass() {
+      var $tip = $(this.getTipElement());
+      var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX$1);
+
+      if (tabClass !== null && tabClass.length > 0) {
+        $tip.removeClass(tabClass.join(''));
+      }
+    } // Static
+    ;
+
+    Popover._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$7);
+
+        var _config = typeof config === 'object' ? config : null;
+
+        if (!data && /dispose|hide/.test(config)) {
+          return;
+        }
+
+        if (!data) {
+          data = new Popover(this, _config);
+          $(this).data(DATA_KEY$7, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Popover, null, [{
+      key: "VERSION",
+      // Getters
+      get: function get() {
+        return VERSION$7;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$5;
+      }
+    }, {
+      key: "NAME",
+      get: function get() {
+        return NAME$7;
+      }
+    }, {
+      key: "DATA_KEY",
+      get: function get() {
+        return DATA_KEY$7;
+      }
+    }, {
+      key: "Event",
+      get: function get() {
+        return Event$1;
+      }
+    }, {
+      key: "EVENT_KEY",
+      get: function get() {
+        return EVENT_KEY$7;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$5;
+      }
+    }]);
+
+    return Popover;
+  }(Tooltip);
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+
+  $.fn[NAME$7] = Popover._jQueryInterface;
+  $.fn[NAME$7].Constructor = Popover;
+
+  $.fn[NAME$7].noConflict = function () {
+    $.fn[NAME$7] = JQUERY_NO_CONFLICT$7;
+    return Popover._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$8 = 'scrollspy';
+  var VERSION$8 = '4.5.0';
+  var DATA_KEY$8 = 'bs.scrollspy';
+  var EVENT_KEY$8 = "." + DATA_KEY$8;
+  var DATA_API_KEY$6 = '.data-api';
+  var JQUERY_NO_CONFLICT$8 = $.fn[NAME$8];
+  var Default$6 = {
+    offset: 10,
+    method: 'auto',
+    target: ''
+  };
+  var DefaultType$6 = {
+    offset: 'number',
+    method: 'string',
+    target: '(string|element)'
+  };
+  var EVENT_ACTIVATE = "activate" + EVENT_KEY$8;
+  var EVENT_SCROLL = "scroll" + EVENT_KEY$8;
+  var EVENT_LOAD_DATA_API$2 = "load" + EVENT_KEY$8 + DATA_API_KEY$6;
+  var CLASS_NAME_DROPDOWN_ITEM = 'dropdown-item';
+  var CLASS_NAME_ACTIVE$2 = 'active';
+  var SELECTOR_DATA_SPY = '[data-spy="scroll"]';
+  var SELECTOR_NAV_LIST_GROUP = '.nav, .list-group';
+  var SELECTOR_NAV_LINKS = '.nav-link';
+  var SELECTOR_NAV_ITEMS = '.nav-item';
+  var SELECTOR_LIST_ITEMS = '.list-group-item';
+  var SELECTOR_DROPDOWN = '.dropdown';
+  var SELECTOR_DROPDOWN_ITEMS = '.dropdown-item';
+  var SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle';
+  var METHOD_OFFSET = 'offset';
+  var METHOD_POSITION = 'position';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var ScrollSpy = /*#__PURE__*/function () {
+    function ScrollSpy(element, config) {
+      var _this = this;
+
+      this._element = element;
+      this._scrollElement = element.tagName === 'BODY' ? window : element;
+      this._config = this._getConfig(config);
+      this._selector = this._config.target + " " + SELECTOR_NAV_LINKS + "," + (this._config.target + " " + SELECTOR_LIST_ITEMS + ",") + (this._config.target + " " + SELECTOR_DROPDOWN_ITEMS);
+      this._offsets = [];
+      this._targets = [];
+      this._activeTarget = null;
+      this._scrollHeight = 0;
+      $(this._scrollElement).on(EVENT_SCROLL, function (event) {
+        return _this._process(event);
+      });
+      this.refresh();
+
+      this._process();
+    } // Getters
+
+
+    var _proto = ScrollSpy.prototype;
+
+    // Public
+    _proto.refresh = function refresh() {
+      var _this2 = this;
+
+      var autoMethod = this._scrollElement === this._scrollElement.window ? METHOD_OFFSET : METHOD_POSITION;
+      var offsetMethod = this._config.method === 'auto' ? autoMethod : this._config.method;
+      var offsetBase = offsetMethod === METHOD_POSITION ? this._getScrollTop() : 0;
+      this._offsets = [];
+      this._targets = [];
+      this._scrollHeight = this._getScrollHeight();
+      var targets = [].slice.call(document.querySelectorAll(this._selector));
+      targets.map(function (element) {
+        var target;
+        var targetSelector = Util.getSelectorFromElement(element);
+
+        if (targetSelector) {
+          target = document.querySelector(targetSelector);
+        }
+
+        if (target) {
+          var targetBCR = target.getBoundingClientRect();
+
+          if (targetBCR.width || targetBCR.height) {
+            // TODO (fat): remove sketch reliance on jQuery position/offset
+            return [$(target)[offsetMethod]().top + offsetBase, targetSelector];
+          }
+        }
+
+        return null;
+      }).filter(function (item) {
+        return item;
+      }).sort(function (a, b) {
+        return a[0] - b[0];
+      }).forEach(function (item) {
+        _this2._offsets.push(item[0]);
+
+        _this2._targets.push(item[1]);
+      });
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$8);
+      $(this._scrollElement).off(EVENT_KEY$8);
+      this._element = null;
+      this._scrollElement = null;
+      this._config = null;
+      this._selector = null;
+      this._offsets = null;
+      this._targets = null;
+      this._activeTarget = null;
+      this._scrollHeight = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2({}, Default$6), typeof config === 'object' && config ? config : {});
+
+      if (typeof config.target !== 'string' && Util.isElement(config.target)) {
+        var id = $(config.target).attr('id');
+
+        if (!id) {
+          id = Util.getUID(NAME$8);
+          $(config.target).attr('id', id);
+        }
+
+        config.target = "#" + id;
+      }
+
+      Util.typeCheckConfig(NAME$8, config, DefaultType$6);
+      return config;
+    };
+
+    _proto._getScrollTop = function _getScrollTop() {
+      return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop;
+    };
+
+    _proto._getScrollHeight = function _getScrollHeight() {
+      return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);
+    };
+
+    _proto._getOffsetHeight = function _getOffsetHeight() {
+      return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height;
+    };
+
+    _proto._process = function _process() {
+      var scrollTop = this._getScrollTop() + this._config.offset;
+
+      var scrollHeight = this._getScrollHeight();
+
+      var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight();
+
+      if (this._scrollHeight !== scrollHeight) {
+        this.refresh();
+      }
+
+      if (scrollTop >= maxScroll) {
+        var target = this._targets[this._targets.length - 1];
+
+        if (this._activeTarget !== target) {
+          this._activate(target);
+        }
+
+        return;
+      }
+
+      if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) {
+        this._activeTarget = null;
+
+        this._clear();
+
+        return;
+      }
+
+      for (var i = this._offsets.length; i--;) {
+        var isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]);
+
+        if (isActiveTarget) {
+          this._activate(this._targets[i]);
+        }
+      }
+    };
+
+    _proto._activate = function _activate(target) {
+      this._activeTarget = target;
+
+      this._clear();
+
+      var queries = this._selector.split(',').map(function (selector) {
+        return selector + "[data-target=\"" + target + "\"]," + selector + "[href=\"" + target + "\"]";
+      });
+
+      var $link = $([].slice.call(document.querySelectorAll(queries.join(','))));
+
+      if ($link.hasClass(CLASS_NAME_DROPDOWN_ITEM)) {
+        $link.closest(SELECTOR_DROPDOWN).find(SELECTOR_DROPDOWN_TOGGLE).addClass(CLASS_NAME_ACTIVE$2);
+        $link.addClass(CLASS_NAME_ACTIVE$2);
+      } else {
+        // Set triggered link as active
+        $link.addClass(CLASS_NAME_ACTIVE$2); // Set triggered links parents as active
+        // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
+
+        $link.parents(SELECTOR_NAV_LIST_GROUP).prev(SELECTOR_NAV_LINKS + ", " + SELECTOR_LIST_ITEMS).addClass(CLASS_NAME_ACTIVE$2); // Handle special case when .nav-link is inside .nav-item
+
+        $link.parents(SELECTOR_NAV_LIST_GROUP).prev(SELECTOR_NAV_ITEMS).children(SELECTOR_NAV_LINKS).addClass(CLASS_NAME_ACTIVE$2);
+      }
+
+      $(this._scrollElement).trigger(EVENT_ACTIVATE, {
+        relatedTarget: target
+      });
+    };
+
+    _proto._clear = function _clear() {
+      [].slice.call(document.querySelectorAll(this._selector)).filter(function (node) {
+        return node.classList.contains(CLASS_NAME_ACTIVE$2);
+      }).forEach(function (node) {
+        return node.classList.remove(CLASS_NAME_ACTIVE$2);
+      });
+    } // Static
+    ;
+
+    ScrollSpy._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var data = $(this).data(DATA_KEY$8);
+
+        var _config = typeof config === 'object' && config;
+
+        if (!data) {
+          data = new ScrollSpy(this, _config);
+          $(this).data(DATA_KEY$8, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(ScrollSpy, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$8;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$6;
+      }
+    }]);
+
+    return ScrollSpy;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(window).on(EVENT_LOAD_DATA_API$2, function () {
+    var scrollSpys = [].slice.call(document.querySelectorAll(SELECTOR_DATA_SPY));
+    var scrollSpysLength = scrollSpys.length;
+
+    for (var i = scrollSpysLength; i--;) {
+      var $spy = $(scrollSpys[i]);
+
+      ScrollSpy._jQueryInterface.call($spy, $spy.data());
+    }
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$8] = ScrollSpy._jQueryInterface;
+  $.fn[NAME$8].Constructor = ScrollSpy;
+
+  $.fn[NAME$8].noConflict = function () {
+    $.fn[NAME$8] = JQUERY_NO_CONFLICT$8;
+    return ScrollSpy._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$9 = 'tab';
+  var VERSION$9 = '4.5.0';
+  var DATA_KEY$9 = 'bs.tab';
+  var EVENT_KEY$9 = "." + DATA_KEY$9;
+  var DATA_API_KEY$7 = '.data-api';
+  var JQUERY_NO_CONFLICT$9 = $.fn[NAME$9];
+  var EVENT_HIDE$3 = "hide" + EVENT_KEY$9;
+  var EVENT_HIDDEN$3 = "hidden" + EVENT_KEY$9;
+  var EVENT_SHOW$3 = "show" + EVENT_KEY$9;
+  var EVENT_SHOWN$3 = "shown" + EVENT_KEY$9;
+  var EVENT_CLICK_DATA_API$6 = "click" + EVENT_KEY$9 + DATA_API_KEY$7;
+  var CLASS_NAME_DROPDOWN_MENU = 'dropdown-menu';
+  var CLASS_NAME_ACTIVE$3 = 'active';
+  var CLASS_NAME_DISABLED$1 = 'disabled';
+  var CLASS_NAME_FADE$4 = 'fade';
+  var CLASS_NAME_SHOW$6 = 'show';
+  var SELECTOR_DROPDOWN$1 = '.dropdown';
+  var SELECTOR_NAV_LIST_GROUP$1 = '.nav, .list-group';
+  var SELECTOR_ACTIVE$2 = '.active';
+  var SELECTOR_ACTIVE_UL = '> li > .active';
+  var SELECTOR_DATA_TOGGLE$4 = '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]';
+  var SELECTOR_DROPDOWN_TOGGLE$1 = '.dropdown-toggle';
+  var SELECTOR_DROPDOWN_ACTIVE_CHILD = '> .dropdown-menu .active';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Tab = /*#__PURE__*/function () {
+    function Tab(element) {
+      this._element = element;
+    } // Getters
+
+
+    var _proto = Tab.prototype;
+
+    // Public
+    _proto.show = function show() {
+      var _this = this;
+
+      if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(CLASS_NAME_ACTIVE$3) || $(this._element).hasClass(CLASS_NAME_DISABLED$1)) {
+        return;
+      }
+
+      var target;
+      var previous;
+      var listElement = $(this._element).closest(SELECTOR_NAV_LIST_GROUP$1)[0];
+      var selector = Util.getSelectorFromElement(this._element);
+
+      if (listElement) {
+        var itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? SELECTOR_ACTIVE_UL : SELECTOR_ACTIVE$2;
+        previous = $.makeArray($(listElement).find(itemSelector));
+        previous = previous[previous.length - 1];
+      }
+
+      var hideEvent = $.Event(EVENT_HIDE$3, {
+        relatedTarget: this._element
+      });
+      var showEvent = $.Event(EVENT_SHOW$3, {
+        relatedTarget: previous
+      });
+
+      if (previous) {
+        $(previous).trigger(hideEvent);
+      }
+
+      $(this._element).trigger(showEvent);
+
+      if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (selector) {
+        target = document.querySelector(selector);
+      }
+
+      this._activate(this._element, listElement);
+
+      var complete = function complete() {
+        var hiddenEvent = $.Event(EVENT_HIDDEN$3, {
+          relatedTarget: _this._element
+        });
+        var shownEvent = $.Event(EVENT_SHOWN$3, {
+          relatedTarget: previous
+        });
+        $(previous).trigger(hiddenEvent);
+        $(_this._element).trigger(shownEvent);
+      };
+
+      if (target) {
+        this._activate(target, target.parentNode, complete);
+      } else {
+        complete();
+      }
+    };
+
+    _proto.dispose = function dispose() {
+      $.removeData(this._element, DATA_KEY$9);
+      this._element = null;
+    } // Private
+    ;
+
+    _proto._activate = function _activate(element, container, callback) {
+      var _this2 = this;
+
+      var activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL') ? $(container).find(SELECTOR_ACTIVE_UL) : $(container).children(SELECTOR_ACTIVE$2);
+      var active = activeElements[0];
+      var isTransitioning = callback && active && $(active).hasClass(CLASS_NAME_FADE$4);
+
+      var complete = function complete() {
+        return _this2._transitionComplete(element, active, callback);
+      };
+
+      if (active && isTransitioning) {
+        var transitionDuration = Util.getTransitionDurationFromElement(active);
+        $(active).removeClass(CLASS_NAME_SHOW$6).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+    };
+
+    _proto._transitionComplete = function _transitionComplete(element, active, callback) {
+      if (active) {
+        $(active).removeClass(CLASS_NAME_ACTIVE$3);
+        var dropdownChild = $(active.parentNode).find(SELECTOR_DROPDOWN_ACTIVE_CHILD)[0];
+
+        if (dropdownChild) {
+          $(dropdownChild).removeClass(CLASS_NAME_ACTIVE$3);
+        }
+
+        if (active.getAttribute('role') === 'tab') {
+          active.setAttribute('aria-selected', false);
+        }
+      }
+
+      $(element).addClass(CLASS_NAME_ACTIVE$3);
+
+      if (element.getAttribute('role') === 'tab') {
+        element.setAttribute('aria-selected', true);
+      }
+
+      Util.reflow(element);
+
+      if (element.classList.contains(CLASS_NAME_FADE$4)) {
+        element.classList.add(CLASS_NAME_SHOW$6);
+      }
+
+      if (element.parentNode && $(element.parentNode).hasClass(CLASS_NAME_DROPDOWN_MENU)) {
+        var dropdownElement = $(element).closest(SELECTOR_DROPDOWN$1)[0];
+
+        if (dropdownElement) {
+          var dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(SELECTOR_DROPDOWN_TOGGLE$1));
+          $(dropdownToggleList).addClass(CLASS_NAME_ACTIVE$3);
+        }
+
+        element.setAttribute('aria-expanded', true);
+      }
+
+      if (callback) {
+        callback();
+      }
+    } // Static
+    ;
+
+    Tab._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $this = $(this);
+        var data = $this.data(DATA_KEY$9);
+
+        if (!data) {
+          data = new Tab(this);
+          $this.data(DATA_KEY$9, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config]();
+        }
+      });
+    };
+
+    _createClass(Tab, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$9;
+      }
+    }]);
+
+    return Tab;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * Data Api implementation
+   * ------------------------------------------------------------------------
+   */
+
+
+  $(document).on(EVENT_CLICK_DATA_API$6, SELECTOR_DATA_TOGGLE$4, function (event) {
+    event.preventDefault();
+
+    Tab._jQueryInterface.call($(this), 'show');
+  });
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+  $.fn[NAME$9] = Tab._jQueryInterface;
+  $.fn[NAME$9].Constructor = Tab;
+
+  $.fn[NAME$9].noConflict = function () {
+    $.fn[NAME$9] = JQUERY_NO_CONFLICT$9;
+    return Tab._jQueryInterface;
+  };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Constants
+   * ------------------------------------------------------------------------
+   */
+
+  var NAME$a = 'toast';
+  var VERSION$a = '4.5.0';
+  var DATA_KEY$a = 'bs.toast';
+  var EVENT_KEY$a = "." + DATA_KEY$a;
+  var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
+  var EVENT_CLICK_DISMISS$1 = "click.dismiss" + EVENT_KEY$a;
+  var EVENT_HIDE$4 = "hide" + EVENT_KEY$a;
+  var EVENT_HIDDEN$4 = "hidden" + EVENT_KEY$a;
+  var EVENT_SHOW$4 = "show" + EVENT_KEY$a;
+  var EVENT_SHOWN$4 = "shown" + EVENT_KEY$a;
+  var CLASS_NAME_FADE$5 = 'fade';
+  var CLASS_NAME_HIDE = 'hide';
+  var CLASS_NAME_SHOW$7 = 'show';
+  var CLASS_NAME_SHOWING = 'showing';
+  var DefaultType$7 = {
+    animation: 'boolean',
+    autohide: 'boolean',
+    delay: 'number'
+  };
+  var Default$7 = {
+    animation: true,
+    autohide: true,
+    delay: 500
+  };
+  var SELECTOR_DATA_DISMISS$1 = '[data-dismiss="toast"]';
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
+  var Toast = /*#__PURE__*/function () {
+    function Toast(element, config) {
+      this._element = element;
+      this._config = this._getConfig(config);
+      this._timeout = null;
+
+      this._setListeners();
+    } // Getters
+
+
+    var _proto = Toast.prototype;
+
+    // Public
+    _proto.show = function show() {
+      var _this = this;
+
+      var showEvent = $.Event(EVENT_SHOW$4);
+      $(this._element).trigger(showEvent);
+
+      if (showEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      if (this._config.animation) {
+        this._element.classList.add(CLASS_NAME_FADE$5);
+      }
+
+      var complete = function complete() {
+        _this._element.classList.remove(CLASS_NAME_SHOWING);
+
+        _this._element.classList.add(CLASS_NAME_SHOW$7);
+
+        $(_this._element).trigger(EVENT_SHOWN$4);
+
+        if (_this._config.autohide) {
+          _this._timeout = setTimeout(function () {
+            _this.hide();
+          }, _this._config.delay);
+        }
+      };
+
+      this._element.classList.remove(CLASS_NAME_HIDE);
+
+      Util.reflow(this._element);
+
+      this._element.classList.add(CLASS_NAME_SHOWING);
+
+      if (this._config.animation) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+    };
+
+    _proto.hide = function hide() {
+      if (!this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+        return;
+      }
+
+      var hideEvent = $.Event(EVENT_HIDE$4);
+      $(this._element).trigger(hideEvent);
+
+      if (hideEvent.isDefaultPrevented()) {
+        return;
+      }
+
+      this._close();
+    };
+
+    _proto.dispose = function dispose() {
+      clearTimeout(this._timeout);
+      this._timeout = null;
+
+      if (this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+        this._element.classList.remove(CLASS_NAME_SHOW$7);
+      }
+
+      $(this._element).off(EVENT_CLICK_DISMISS$1);
+      $.removeData(this._element, DATA_KEY$a);
+      this._element = null;
+      this._config = null;
+    } // Private
+    ;
+
+    _proto._getConfig = function _getConfig(config) {
+      config = _objectSpread2(_objectSpread2(_objectSpread2({}, Default$7), $(this._element).data()), typeof config === 'object' && config ? config : {});
+      Util.typeCheckConfig(NAME$a, config, this.constructor.DefaultType);
+      return config;
+    };
+
+    _proto._setListeners = function _setListeners() {
+      var _this2 = this;
+
+      $(this._element).on(EVENT_CLICK_DISMISS$1, SELECTOR_DATA_DISMISS$1, function () {
+        return _this2.hide();
+      });
+    };
+
+    _proto._close = function _close() {
+      var _this3 = this;
+
+      var complete = function complete() {
+        _this3._element.classList.add(CLASS_NAME_HIDE);
+
+        $(_this3._element).trigger(EVENT_HIDDEN$4);
+      };
+
+      this._element.classList.remove(CLASS_NAME_SHOW$7);
+
+      if (this._config.animation) {
+        var transitionDuration = Util.getTransitionDurationFromElement(this._element);
+        $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration);
+      } else {
+        complete();
+      }
+    } // Static
+    ;
+
+    Toast._jQueryInterface = function _jQueryInterface(config) {
+      return this.each(function () {
+        var $element = $(this);
+        var data = $element.data(DATA_KEY$a);
+
+        var _config = typeof config === 'object' && config;
+
+        if (!data) {
+          data = new Toast(this, _config);
+          $element.data(DATA_KEY$a, data);
+        }
+
+        if (typeof config === 'string') {
+          if (typeof data[config] === 'undefined') {
+            throw new TypeError("No method named \"" + config + "\"");
+          }
+
+          data[config](this);
+        }
+      });
+    };
+
+    _createClass(Toast, null, [{
+      key: "VERSION",
+      get: function get() {
+        return VERSION$a;
+      }
+    }, {
+      key: "DefaultType",
+      get: function get() {
+        return DefaultType$7;
+      }
+    }, {
+      key: "Default",
+      get: function get() {
+        return Default$7;
+      }
+    }]);
+
+    return Toast;
+  }();
+  /**
+   * ------------------------------------------------------------------------
+   * jQuery
+   * ------------------------------------------------------------------------
+   */
+
+
+  $.fn[NAME$a] = Toast._jQueryInterface;
+  $.fn[NAME$a].Constructor = Toast;
+
+  $.fn[NAME$a].noConflict = function () {
+    $.fn[NAME$a] = JQUERY_NO_CONFLICT$a;
+    return Toast._jQueryInterface;
+  };
+
+  exports.Alert = Alert;
+  exports.Button = Button;
+  exports.Carousel = Carousel;
+  exports.Collapse = Collapse;
+  exports.Dropdown = Dropdown;
+  exports.Modal = Modal;
+  exports.Popover = Popover;
+  exports.Scrollspy = ScrollSpy;
+  exports.Tab = Tab;
+  exports.Toast = Toast;
+  exports.Tooltip = Tooltip;
+  exports.Util = Util;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+})));
+//# sourceMappingURL=bootstrap.bundle.js.map
diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js
index b3b72d967..447f31aae 100644
--- a/web/skins/classic/js/classic.js
+++ b/web/skins/classic/js/classic.js
@@ -63,7 +63,7 @@ var popupSizes = {
   'settings':     {'width': 220, 'height': 225},
   'state':        {'width': 370, 'height': 134},
   'stats':        {'width': 840, 'height': 200},
-  'storage':      {'width': 600, 'height': 405},
+  'storage':      {'width': 600, 'height': 425},
   'timeline':     {'width': 760, 'height': 540},
   'user':         {'width': 360, 'height': 720},
   'version':      {'width': 360, 'height': 140},
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index c29ef4a84..dc45f32fe 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -21,9 +21,24 @@
 // This file should only contain static JavaScript and no php.
 // Use skin.js.php for JavaScript that need pre-processing
 //
-
 var popupOptions = "resizable,scrollbars,status=no,toolbar=yes";
 
+// Globally define the icons used in the bootstrap-table top-right toolbar
+var icons = {
+  paginationSwitchDown: 'fa-caret-square-o-down',
+  paginationSwitchUp: 'fa-caret-square-o-up',
+  export: 'fa-download',
+  refresh: 'fa-retweet',
+  autoRefresh: 'fa-clock-o',
+  advancedSearchIcon: 'fa-chevron-down',
+  toggleOff: 'fa-toggle-off',
+  toggleOn: 'fa-toggle-on',
+  columns: 'fa-th-list',
+  fullscreen: 'fa-arrows-alt',
+  detailOpen: 'fa-plus',
+  detailClose: 'fa-minus'
+};
+
 function checkSize() {
   if ( 0 ) {
     if (window.outerHeight) {
@@ -98,8 +113,8 @@ function getPopupSize( tag, width, height ) {
   return popupSize;
 }
 
-function zmWindow() {
-  var zmWin = window.open( 'http://www.zoneminder.com', 'ZoneMinder' );
+function zmWindow(sub_url) {
+  var zmWin = window.open( 'https://www.zoneminder.com'+(sub_url?sub_url:''), 'ZoneMinder' );
   if ( ! zmWin ) {
     // if popup blocking is enabled, the popup won't be defined.
     console.log("Please disable popup blocking.");
@@ -160,7 +175,23 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     });
   });
 
-  document.querySelectorAll(".tabList a").forEach(function addOnClick(el) {
+  document.querySelectorAll(".zmlink").forEach(function(el) {
+    el.addEventListener("click", function onClick(evt) {
+      var el = this;
+      var url;
+      if ( el.hasAttribute("href") ) {
+        // <a>
+        url = el.getAttribute("href");
+      } else {
+        // buttons
+        url = el.getAttribute("data-url");
+      }
+      evt.preventDefault();
+      window.location.assign(url);
+    });
+  });
+
+  document.querySelectorAll(".pillList a").forEach(function addOnClick(el) {
     el.addEventListener("click", submitTab);
   });
 
@@ -168,21 +199,22 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
   document.querySelectorAll("a[data-on-click-this], button[data-on-click-this], input[data-on-click-this]").forEach(function attachOnClick(el) {
     var fnName = el.getAttribute("data-on-click-this");
     if ( !window[fnName] ) {
-      console.error("Nothing found to bind to " + fnName);
+      console.error("Nothing found to bind to " + fnName + " on element " + el.name);
       return;
     }
     el.onclick = window[fnName].bind(el, el);
   });
 
   // 'data-on-click' calls the global function in the attribute value with no arguments when a click happens.
-  document.querySelectorAll("a[data-on-click], button[data-on-click], input[data-on-click]").forEach(function attachOnClick(el) {
+  document.querySelectorAll("i[data-on-click], a[data-on-click], button[data-on-click], input[data-on-click]").forEach(function attachOnClick(el) {
     var fnName = el.getAttribute("data-on-click");
     if ( !window[fnName] ) {
-      console.error("Nothing found to bind to " + fnName);
+      console.error("Nothing found to bind to " + fnName + " on element " + el.name);
       return;
     }
-    el.onclick = function() {
-      window[fnName]();
+
+    el.onclick = function(ev) {
+      window[fnName](ev);
     };
   });
 
@@ -217,6 +249,26 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     }
     el.onchange = window[fnName];
   });
+
+  // 'data-on-input' adds an event listener for the global function in the attribute value when an input happens.
+  document.querySelectorAll("input[data-on-input]").forEach(function(el) {
+    var fnName = el.getAttribute("data-on-input");
+    if ( !window[fnName] ) {
+      console.error("Nothing found to bind to " + fnName);
+      return;
+    }
+    el.oninput = window[fnName];
+  });
+
+  // 'data-on-input-this' calls the global function in the attribute value with the element when an input happens.
+  document.querySelectorAll("input[data-on-input-this]").forEach(function(el) {
+    var fnName = el.getAttribute("data-on-input-this");
+    if ( !window[fnName] ) {
+      console.error("Nothing found to bind to " + fnName);
+      return;
+    }
+    el.oninput = window[fnName].bind(el, el);
+  });
 });
 
 function createEventPopup( eventId, eventFilter, width, height ) {
@@ -272,6 +324,9 @@ function closeWindow() {
 function refreshWindow() {
   window.location.reload( true );
 }
+function backWindow() {
+  window.history.back();
+}
 
 function refreshParentWindow() {
   if ( refreshParent ) {
@@ -289,16 +344,112 @@ if ( currentView != 'none' && currentView != 'login' ) {
   $j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
 
   $j(document).ready(function() {
+    // Load the Logout and State modals into the dom
+    getLogoutModal();
+    if ( canEditSystem ) $j('#stateModalBtn').click(getStateModal);
+
+    // Trigger autorefresh of the widget bar stats on the navbar
     if ( $j('.navbar').length ) {
       setInterval(getNavBar, navBarRefresh);
     }
+    // Workaround Bootstrap-Mootools conflict
+    var bootstrapLoaded = (typeof $j().carousel == 'function');
+    var mootoolsLoaded = (typeof MooTools != 'undefined');
+    if (bootstrapLoaded && mootoolsLoaded) {
+      Element.implement({
+        hide: function() {
+          return this;
+        },
+        show: function(v) {
+          return this;
+        },
+        slide: function(v) {
+          return this;
+        }
+      });
+    }
+    // Update zmBandwidth cookie when the user makes a selection from the dropdown
+    bwClickFunction();
+    // Update update reminders when the user makes a selection from the dropdown
+    reminderClickFunction();
+    // Manage the widget bar minimize chevron
+    $j("#flip").click(function() {
+      $j("#panel").slideToggle("slow");
+      var flip = $j("#flip");
+      if ( flip.html() == 'keyboard_arrow_up' ) {
+        flip.html('keyboard_arrow_down');
+        Cookie.write('zmHeaderFlip', 'down', {duration: 10*365} );
+      } else {
+        flip.html('keyboard_arrow_up');
+        Cookie.write('zmHeaderFlip', 'up', {duration: 10*365} );
+      }
+    });
+    // Manage the web console filter bar minimize chevron
+    $j("#fbflip").click(function() {
+      $j("#fbpanel").slideToggle("slow");
+      var fbflip = $j("#fbflip");
+      if ( fbflip.html() == 'keyboard_arrow_up' ) {
+        fbflip.html('keyboard_arrow_down');
+        Cookie.write('zmFilterBarFlip', 'down', {duration: 10*365} );
+      } else {
+        fbflip.html('keyboard_arrow_up');
+        Cookie.write('zmFilterBarFlip', 'up', {duration: 10*365} );
+        $j('.chosen').chosen("destroy");
+        $j('.chosen').chosen();
+      }
+    });
+
+    // Manage the web console filter bar minimize chevron
+    $j("#mfbflip").click(function() {
+      $j("#mfbpanel").slideToggle("slow");
+      var mfbflip = $j("#mfbflip");
+      if ( mfbflip.html() == 'keyboard_arrow_up' ) {
+        mfbflip.html('keyboard_arrow_down');
+        Cookie.write('zmMonitorFilterBarFlip', 'up', {duration: 10*365} );
+      } else {
+        mfbflip.html('keyboard_arrow_up');
+        Cookie.write('zmMonitorFilterBarFlip', 'down', {duration: 10*365} );
+        $j('.chosen').chosen("destroy");
+        $j('.chosen').chosen();
+      }
+    });
+    // Autoclose the hamburger button if the end user clicks outside the button
+    $j(document).click(function(event) {
+      var target = $j(event.target);
+      var _mobileMenuOpen = $j("#main-header-nav").hasClass("show");
+      if (_mobileMenuOpen === true && !target.hasClass("navbar-toggler")) {
+        $j("button.navbar-toggler").click();
+      }
+    });
+    // Manage the optionhelp links
+    $j(".optionhelp").click(function(evt) {
+      $j.getJSON(thisUrl + '?request=modal&modal=optionhelp&ohndx=' + evt.target.id)
+          .done(optionhelpModal)
+          .fail(logAjaxFail);
+    });
   });
 
+  // Manage the modal html we received after user clicks help link
+  function optionhelpModal(data) {
+    if ( $j('#optionhelp').length ) {
+      $j('#optionhelp').replaceWith(data.html);
+    } else {
+      $j("body").append(data.html);
+    }
+    $j('#optionhelp').modal('show');
+
+    // Manage the CLOSE optionhelp modal button
+    document.getElementById("ohCloseBtn").addEventListener("click", function onOhCloseClick(evt) {
+      $j('#optionhelp').modal('hide');
+    });
+  }
+
   function getNavBar() {
     $j.getJSON(thisUrl + '?view=request&request=status&entity=navBar')
         .done(setNavBar)
         .fail(function(jqxhr, textStatus, error) {
           console.log("Request Failed: " + textStatus + ", " + error);
+          console.log("Response Text: " + jqxhr.responseText.replace(/(<([^>]+)>)/gi, ''));
           if ( textStatus != "timeout" ) {
           // The idea is that this should only fail due to auth, so reload the page
           // which should go to login if it can't stay logged in.
@@ -308,13 +459,23 @@ if ( currentView != 'none' && currentView != 'login' ) {
   }
 
   function setNavBar(data) {
+    if ( !data ) {
+      console.error("No data in setNavBar");
+      return;
+    }
     if ( data.auth ) {
       if ( data.auth != auth_hash ) {
         // Update authentication token.
         auth_hash = data.auth;
       }
     }
-    $j('#reload').replaceWith(data.message);
+    // iterate through all the keys then update each element id with the same name
+    for (var key of Object.keys(data)) {
+      if ( key == "auth" ) continue;
+      if ( $j('#'+key).hasClass("show") ) continue; // don't update if the user has the dropdown open
+      if ( $j('#'+key).length ) $j('#'+key).replaceWith(data[key]);
+      if ( key == 'getBandwidthHTML' ) bwClickFunction();
+    }
   }
 }
 
@@ -373,6 +534,10 @@ function submitTab(evt) {
 }
 
 function submitThisForm() {
+  if ( ! this.form ) {
+    console.log("No this.form.  element with onchange is not in a form");
+    return;
+  }
   this.form.submit();
 }
 
@@ -429,10 +594,37 @@ function convertLabelFormat(LabelFormat, monitorName) {
   //convert label format from strftime to moment's format (modified from
   //https://raw.githubusercontent.com/benjaminoakes/moment-strftime/master/lib/moment-strftime.js
   //added %f and %N below (TODO: add %Q)
-  var replacements = {"a": 'ddd', "A": 'dddd', "b": 'MMM', "B": 'MMMM', "d": 'DD', "e": 'D', "F": 'YYYY-MM-DD', "H": 'HH', "I": 'hh', "j": 'DDDD', "k": 'H', "l": 'h', "m": 'MM', "M": 'mm', "p": 'A', "S": 'ss', "u": 'E', "w": 'd', "W": 'WW', "y": 'YY', "Y": 'YYYY', "z": 'ZZ', "Z": 'z', 'f': 'SS', 'N': "["+monitorName+"]", '%': '%'};
+  var replacements = {
+    'a': 'ddd',
+    'A': 'dddd',
+    'b': 'MMM',
+    'B': 'MMMM',
+    'd': 'DD',
+    'e': 'D',
+    'F': 'YYYY-MM-DD',
+    'H': 'HH',
+    'I': 'hh',
+    'j': 'DDDD',
+    'k': 'H',
+    'l': 'h',
+    'm': 'MM',
+    'M': 'mm',
+    'p': 'A',
+    'r': 'hh:mm:ss A',
+    'S': 'ss',
+    'u': 'E',
+    'w': 'd',
+    'W': 'WW',
+    'y': 'YY',
+    'Y': 'YYYY',
+    'z': 'ZZ',
+    'Z': 'z',
+    'f': 'SS',
+    'N': '['+monitorName+']',
+    '%': '%'};
   var momentLabelFormat = Object.keys(replacements).reduce(function(momentFormat, key) {
     var value = replacements[key];
-    return momentFormat.replace("%" + key, value);
+    return momentFormat.replace('%' + key, value);
   }, LabelFormat);
   return momentLabelFormat;
 }
@@ -443,7 +635,7 @@ function addVideoTimingTrack(video, LabelFormat, monitorName, duration, startTim
   var labelFormat = convertLabelFormat(LabelFormat, monitorName);
   startTime = moment(startTime);
 
-  for (var i = 0; i <= duration; i++) {
+  for ( var i = 0; i <= duration; i++ ) {
     cues[i] = {id: i, index: i, startTime: i, endTime: i+1, text: startTime.format(labelFormat)};
     startTime.add(1, 's');
   }
@@ -506,3 +698,230 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
   autoScale = closest;
   return {width: Math.floor(newWidth), height: Math.floor(newHeight), autoScale: autoScale};
 }
+
+function setButtonState(element_id, butClass) {
+  var element = $(element_id);
+  if ( element ) {
+    element.className = butClass;
+    if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
+      element.disabled = true;
+    } else {
+      element.disabled = false;
+    }
+  } else {
+    console.log('Element was null or not found in setButtonState. id:'+element_id);
+  }
+}
+
+function setCookie(name, value, days) {
+  var expires = "";
+  if (days) {
+    var date = new Date();
+    date.setTime(date.getTime() + (days*24*60*60*1000));
+    expires = "; expires=" + date.toUTCString();
+  }
+  document.cookie = name + "=" + (value || "") + expires + "; path=/";
+}
+
+function getCookie(name) {
+  var nameEQ = name + "=";
+  var ca = document.cookie.split(';');
+  for (var i=0; i < ca.length; i++) {
+    var c = ca[i];
+    while (c.charAt(0)==' ') c = c.substring(1, c.length);
+    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
+  }
+  return null;
+}
+
+function delCookie(name) {
+  document.cookie = name + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+}
+
+function bwClickFunction() {
+  $j("#dropdown_bandwidth a").click(function() {
+    var bwval = $j(this).data('pdsa-dropdown-val');
+    setCookie("zmBandwidth", bwval, 3600);
+    getNavBar();
+  });
+}
+
+function reminderClickFunction() {
+  $j("#dropdown_reminder a").click(function() {
+    var option = $j(this).data('pdsa-dropdown-val');
+    $j.getJSON(thisUrl + '?view=version&action=version&option=' + option)
+        .done(window.location.reload(true)) //Do a full refresh to update ZM_DYN_LAST_VERSION
+        .fail(logAjaxFail);
+  });
+}
+
+// Load then show the "You No Permission" error modal
+function enoperm() {
+  $j.getJSON(thisUrl + '?request=modal&modal=enoperm')
+      .done(function(data) {
+        if ( $j('#ENoPerm').length ) {
+          $j('#ENoPerm').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#ENoPerm').modal('show');
+
+        // Manage the CLOSE optionhelp modal button
+        document.getElementById("enpCloseBtn").addEventListener("click", function onENPCloseClick(evt) {
+          $j('#ENoPerm').modal('hide');
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function getLogoutModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=logout')
+      .done(function(data) {
+        if ( $j('#modalLogout').length ) {
+          $j('#modalLogout').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+      })
+      .fail(logAjaxFail);
+}
+
+function getStateModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=state')
+      .done(function(data) {
+        if ( $j('#modalState').length ) {
+          $j('#modalState').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#modalState').modal('show');
+        manageStateModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+function manageStateModalBtns() {
+  // Enable or disable the Delete button depending on the selected run state
+  $j("#runState").change(function() {
+    runstate = $j(this).val();
+
+    if ( (runstate == 'stop') || (runstate == 'restart') || (runstate == 'start') || (runstate == 'default') ) {
+      $j("#btnDelete").prop("disabled", true);
+    } else {
+      $j("#btnDelete").prop("disabled", false);
+    }
+  });
+
+  // Enable or disable the Save button when entering a new state
+  $j("#newState").keyup(function() {
+    length = $j(this).val().length;
+    if ( length < 1 ) {
+      $j("#btnSave").prop("disabled", true);
+    } else {
+      $j("#btnSave").prop("disabled", false);
+    }
+  });
+
+
+  // Delete a state
+  $j("#btnDelete").click(function() {
+    stateStuff('delete', $j("#runState").val());
+  });
+
+
+  // Save a new state
+  $j("#btnSave").click(function() {
+    stateStuff('save', undefined, $j("#newState").val());
+  });
+
+  // Change state
+  $j("#btnApply").click(function() {
+    stateStuff('state', $j("#runState").val());
+  });
+}
+
+function stateStuff(action, runState, newState) {
+  // the state action will redirect to console
+  var formData = {
+    'view': 'state',
+    'action': action,
+    'apply': 1,
+    'runState': runState,
+    'newState': newState
+  };
+
+  $j("#pleasewait").toggleClass("hidden");
+
+  $j.ajax({
+    type: 'POST',
+    url: thisUrl,
+    data: formData,
+    dataType: 'html',
+    timeout: 0
+  }).done(function(data) {
+    location.reload();
+  });
+}
+
+function logAjaxFail(jqxhr, textStatus, error) {
+  console.log("Request Failed: " + textStatus + ", " + error);
+  console.log("Response Text: " + jqxhr.responseText.replace(/(<([^>]+)>)/gi, '')); // strip any html from the response
+}
+
+// Load the Modal HTML via Ajax call
+function getModal(id) {
+  $j.getJSON(thisUrl + '?request=modal&modal='+id)
+      .done(function(data) {
+        if ( !data ) {
+          console.error("Get modal returned no data");
+          return;
+        }
+
+        if ( $j('#'+id).length ) {
+          $j('#'+id).replaceWith(data.html);
+        } else {
+          $j('body').append(data.html);
+        }
+        manageModalBtns(id);
+        modal = $j('#'+id+'Modal');
+        if ( ! modal.length ) {
+          console.log('No modal found');
+        }
+        $j('#'+id+'Modal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function manageModalBtns(id) {
+  // Manage the CANCEL modal button
+  var cancelBtn = document.getElementById(id+"CancelBtn");
+  if ( cancelBtn ) {
+    document.getElementById(id+"CancelBtn").addEventListener('click', function onCancelClick(evt) {
+      $j('#'+id).modal('hide');
+    });
+  }
+  // 'data-on-click-this' calls the global function in the attribute value with the element when a click happens.
+  document.querySelectorAll('#'+id+'Modal button[data-on-click]').forEach(function attachOnClick(el) {
+    var fnName = el.getAttribute('data-on-click');
+    if ( !window[fnName] ) {
+      console.error('Nothing found to bind to ' + fnName + ' on element ' + el.name);
+      return;
+    } else {
+      console.log("Setting onclick for " + el.name);
+    }
+    el.onclick = window[fnName].bind(el, el);
+  });
+}
+
+function human_filesize(size, precision = 2) {
+  var units = Array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+  var step = 1024;
+  var i = 0;
+  while ((size / step) > 0.9) {
+    size = size / step;
+    i++;
+  }
+  return (Math.round(size*(10^precision))/(10^precision))+units[i];
+}
+
+
diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index a9f6b85af..08ed2d57d 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -70,7 +70,6 @@ var focusWindow = <?php echo !empty($focusWindow)?'true':'false' ?>;
 
 var imagePrefix = "<?php echo '?view=image&eid=' ?>";
 
-var auth_hash;
-<?php if ( ZM_OPT_USE_AUTH && ZM_AUTH_HASH_LOGINS ) { ?>
-auth_hash = '<?php echo generateAuthHash(ZM_AUTH_HASH_IPS) ?>';
-<?php } ?>
+var auth_hash = '<?php echo generateAuthHash(ZM_AUTH_HASH_IPS) ?>';
+var auth_relay = '<?php echo get_auth_relay() ?>';
+var running = <?php echo daemonCheck()?'true':'false' ?>;
diff --git a/web/skins/classic/js/tableExport.min.js b/web/skins/classic/js/tableExport.min.js
new file mode 100644
index 000000000..f79cf5f40
--- /dev/null
+++ b/web/skins/classic/js/tableExport.min.js
@@ -0,0 +1,93 @@
+/*
+ tableExport.jquery.plugin
+
+ Version 1.10.20
+
+ Copyright (c) 2015-2020 hhurz, https://github.com/hhurz/tableExport.jquery.plugin
+
+ Based on https://github.com/kayalshri/tableExport.jquery.plugin
+
+ Licensed under the MIT License
+*/
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(c,k,y){c instanceof String&&(c=String(c));for(var v=c.length,A=0;A<v;A++){var S=c[A];if(k.call(y,S,A,c))return{i:A,v:S}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(c,k,y){c!=Array.prototype&&c!=Object.prototype&&(c[k]=y.value)};
+$jscomp.getGlobal=function(c){return"undefined"!=typeof window&&window===c?c:"undefined"!=typeof global&&null!=global?global:c};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(c,k,y,v){if(k){y=$jscomp.global;c=c.split(".");for(v=0;v<c.length-1;v++){var A=c[v];A in y||(y[A]={});y=y[A]}c=c[c.length-1];v=y[c];k=k(v);k!=v&&null!=k&&$jscomp.defineProperty(y,c,{configurable:!0,writable:!0,value:k})}};
+$jscomp.polyfill("Array.prototype.find",function(c){return c?c:function(c,y){return $jscomp.findInternal(this,c,y).v}},"es6","es3");
+(function(c){c.fn.tableExport=function(k){function y(b){var d=[];A(b,"thead").each(function(){d.push.apply(d,A(c(this),a.theadSelector).toArray())});return d}function v(b){var d=[];A(b,"tbody").each(function(){d.push.apply(d,A(c(this),a.tbodySelector).toArray())});a.tfootSelector.length&&A(b,"tfoot").each(function(){d.push.apply(d,A(c(this),a.tfootSelector).toArray())});return d}function A(b,a){var d=b[0].tagName,p=b.parents(d).length;return b.find(a).filter(function(){return p===c(this).closest(d).parents(d).length})}
+function S(b){var a=[];c(b).find("thead").first().find("th").each(function(b,d){void 0!==c(d).attr("data-field")?a[b]=c(d).attr("data-field"):a[b]=b.toString()});return a}function I(b){var a="undefined"!==typeof b[0].rowIndex,e=!1===a&&"undefined"!==typeof b[0].cellIndex,p=e||a?Ja(b):b.is(":visible"),f=b.attr("data-tableexport-display");e&&"none"!==f&&"always"!==f&&(b=c(b[0].parentNode),a="undefined"!==typeof b[0].rowIndex,f=b.attr("data-tableexport-display"));a&&"none"!==f&&"always"!==f&&(f=b.closest("table").attr("data-tableexport-display"));
+return"none"!==f&&(!0===p||"always"===f)}function Ja(b){var a=[];V&&(a=J.filter(function(){var a=!1;this.nodeType===b[0].nodeType&&("undefined"!==typeof this.rowIndex&&this.rowIndex===b[0].rowIndex?a=!0:"undefined"!==typeof this.cellIndex&&this.cellIndex===b[0].cellIndex&&"undefined"!==typeof this.parentNode.rowIndex&&"undefined"!==typeof b[0].parentNode.rowIndex&&this.parentNode.rowIndex===b[0].parentNode.rowIndex&&(a=!0));return a}));return!1===V||0===a.length}function sa(b,d,e){var p=!1;I(b)?0<
+a.ignoreColumn.length&&(-1!==c.inArray(e,a.ignoreColumn)||-1!==c.inArray(e-d,a.ignoreColumn)||T.length>e&&"undefined"!==typeof T[e]&&-1!==c.inArray(T[e],a.ignoreColumn))&&(p=!0):p=!0;return p}function B(b,d,e,p,f){if("function"===typeof f){var l=!1;"function"===typeof a.onIgnoreRow&&(l=a.onIgnoreRow(c(b),e));if(!1===l&&(0===a.ignoreRow.length||-1===c.inArray(e,a.ignoreRow)&&-1===c.inArray(e-p,a.ignoreRow))&&I(c(b))){var q=A(c(b),d),h=0;q.each(function(b){var a=c(this),d,l=O(this),p=U(this);c.each(G,
+function(){if(e>=this.s.r&&e<=this.e.r&&h>=this.s.c&&h<=this.e.c)for(d=0;d<=this.e.c-this.s.c;++d)f(null,e,h++)});if(!1===sa(a,q.length,b)){if(p||l)l=l||1,G.push({s:{r:e,c:h},e:{r:e+(p||1)-1,c:h+l-1}});f(this,e,h++)}if(l)for(d=0;d<l-1;++d)f(null,e,h++)});c.each(G,function(){if(e>=this.s.r&&e<=this.e.r&&h>=this.s.c&&h<=this.e.c)for(da=0;da<=this.e.c-this.s.c;++da)f(null,e,h++)})}}}function ta(b,a,e,c){if("undefined"!==typeof c.images&&(e=c.images[e],"undefined"!==typeof e)){a=a.getBoundingClientRect();
+var d=b.width/b.height,l=a.width/a.height,p=b.width,h=b.height,z=19.049976/25.4,g=0;l<=d?(h=Math.min(b.height,a.height),p=a.width*h/a.height):l>d&&(p=Math.min(b.width,a.width),h=a.height*p/a.width);p*=z;h*=z;h<b.height&&(g=(b.height-h)/2);try{c.doc.addImage(e.src,b.textPos.x,b.y+g,p,h)}catch(Pa){}b.textPos.x+=p}}function ua(b,d){if("string"===a.outputMode)return b.output();if("base64"===a.outputMode)return K(b.output());if("window"===a.outputMode)window.URL=window.URL||window.webkitURL,window.open(window.URL.createObjectURL(b.output("blob")));
+else try{var e=b.output("blob");saveAs(e,a.fileName+".pdf")}catch(p){ja(a.fileName+".pdf","data:application/pdf"+(d?"":";base64")+",",d?b.output("blob"):b.output())}}function va(b,a,e){var d=0;"undefined"!==typeof e&&(d=e.colspan);if(0<=d){for(var c=b.width,l=b.textPos.x,q=a.table.columns.indexOf(a.column),h=1;h<d;h++)c+=a.table.columns[q+h].width;1<d&&("right"===b.styles.halign?l=b.textPos.x+c-b.width:"center"===b.styles.halign&&(l=b.textPos.x+(c-b.width)/2));b.width=c;b.textPos.x=l;"undefined"!==
+typeof e&&1<e.rowspan&&(b.height*=e.rowspan);if("middle"===b.styles.valign||"bottom"===b.styles.valign)e=("string"===typeof b.text?b.text.split(/\r\n|\r|\n/g):b.text).length||1,2<e&&(b.textPos.y-=(2-1.15)/2*a.row.styles.fontSize*(e-2)/3);return!0}return!1}function wa(b,a,e){"undefined"!==typeof b&&null!==b&&(b.hasAttribute("data-tableexport-canvas")?(a=(new Date).getTime(),c(b).attr("data-tableexport-canvas",a),e.images[a]={url:'[data-tableexport-canvas="'+a+'"]',src:null}):"undefined"!==a&&null!=
+a&&a.each(function(){if(c(this).is("img")){var a=xa(this.src);e.images[a]={url:this.src,src:this.src}}wa(b,c(this).children(),e)}))}function Ka(b,a){function d(b){if(b.url)if(b.src){var d=new Image;p=++f;d.crossOrigin="Anonymous";d.onerror=d.onload=function(){if(d.complete&&(0===d.src.indexOf("data:image/")&&(d.width=b.width||d.width||0,d.height=b.height||d.height||0),d.width+d.height)){var e=document.createElement("canvas"),c=e.getContext("2d");e.width=d.width;e.height=d.height;c.drawImage(d,0,0);
+b.src=e.toDataURL("image/png")}--f||a(p)};d.src=b.url}else{var e=c(b.url);e.length&&(p=++f,html2canvas(e[0]).then(function(d){b.src=d.toDataURL("image/png");--f||a(p)}))}}var p=0,f=0;if("undefined"!==typeof b.images)for(var l in b.images)b.images.hasOwnProperty(l)&&d(b.images[l]);(b=f)||(a(p),b=void 0);return b}function ya(b,d,e){d.each(function(){if(c(this).is("div")){var d=ea(L(this,"background-color"),[255,255,255]),f=ea(L(this,"border-top-color"),[0,0,0]),l=fa(this,"border-top-width",a.jspdf.unit),
+q=this.getBoundingClientRect(),h=this.offsetLeft*e.wScaleFactor,z=this.offsetTop*e.hScaleFactor,g=q.width*e.wScaleFactor;q=q.height*e.hScaleFactor;e.doc.setDrawColor.apply(void 0,f);e.doc.setFillColor.apply(void 0,d);e.doc.setLineWidth(l);e.doc.rect(b.x+h,b.y+z,g,q,l?"FD":"F")}else c(this).is("img")&&(d=xa(this.src),ta(b,this,d,e));ya(b,c(this).children(),e)})}function za(b,d,e){if("function"===typeof e.onAutotableText)e.onAutotableText(e.doc,b,d);else{var p=b.textPos.x,f=b.textPos.y,l={halign:b.styles.halign,
+valign:b.styles.valign};if(d.length){for(d=d[0];d.previousSibling;)d=d.previousSibling;for(var q=!1,h=!1;d;){var z=d.innerText||d.textContent||"",g=z.length&&" "===z[0]?" ":"",k=1<z.length&&" "===z[z.length-1]?" ":"";!0!==a.preserve.leadingWS&&(z=g+ka(z));!0!==a.preserve.trailingWS&&(z=la(z)+k);c(d).is("br")&&(p=b.textPos.x,f+=e.doc.internal.getFontSize());c(d).is("b")?q=!0:c(d).is("i")&&(h=!0);(q||h)&&e.doc.setFontType(q&&h?"bolditalic":q?"bold":"italic");if(g=e.doc.getStringUnitWidth(z)*e.doc.internal.getFontSize()){"linebreak"===
+b.styles.overflow&&p>b.textPos.x&&p+g>b.textPos.x+b.width&&(0<=".,!%*;:=-".indexOf(z.charAt(0))&&(k=z.charAt(0),g=e.doc.getStringUnitWidth(k)*e.doc.internal.getFontSize(),p+g<=b.textPos.x+b.width&&(e.doc.autoTableText(k,p,f,l),z=z.substring(1,z.length)),g=e.doc.getStringUnitWidth(z)*e.doc.internal.getFontSize()),p=b.textPos.x,f+=e.doc.internal.getFontSize());if("visible"!==b.styles.overflow)for(;z.length&&p+g>b.textPos.x+b.width;)z=z.substring(0,z.length-1),g=e.doc.getStringUnitWidth(z)*e.doc.internal.getFontSize();
+e.doc.autoTableText(z,p,f,l);p+=g}if(q||h)c(d).is("b")?q=!1:c(d).is("i")&&(h=!1),e.doc.setFontType(q||h?q?"bold":"italic":"normal");d=d.nextSibling}b.textPos.x=p;b.textPos.y=f}else e.doc.autoTableText(b.text,b.textPos.x,b.textPos.y,l)}}function W(b,a,e){return null==b?"":b.toString().replace(new RegExp(null==a?"":a.toString().replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),e)}function ka(b){return null==b?"":b.toString().replace(/^\s+/,"")}function la(b){return null==b?"":b.toString().replace(/\s+$/,
+"")}function La(b){if(0===a.date.html.length)return!1;a.date.pattern.lastIndex=0;var d=a.date.pattern.exec(b);if(null==d)return!1;b=+d[a.date.match_y];if(0>b||8099<b)return!1;var e=1*d[a.date.match_m];d=1*d[a.date.match_d];if(!isFinite(d))return!1;var c=new Date(b,e-1,d,0,0,0);return c.getFullYear()===b&&c.getMonth()===e-1&&c.getDate()===d?new Date(Date.UTC(b,e-1,d,0,0,0)):!1}function ma(b){b=b||"0";""!==a.numbers.html.thousandsSeparator&&(b=W(b,a.numbers.html.thousandsSeparator,""));"."!==a.numbers.html.decimalMark&&
+(b=W(b,a.numbers.html.decimalMark,"."));return"number"===typeof b||!1!==jQuery.isNumeric(b)?b:!1}function Ma(b){-1<b.indexOf("%")?(b=ma(b.replace(/%/g,"")),!1!==b&&(b/=100)):b=!1;return b}function E(b,d,e,p){var f="",l="text";if(null!==b){var q=c(b);q.removeData("teUserDefText");if(q[0].hasAttribute("data-tableexport-canvas"))var h="";else if(q[0].hasAttribute("data-tableexport-value"))h=(h=q.attr("data-tableexport-value"))?h+"":"",q.data("teUserDefText",1);else if(h=q.html(),"function"===typeof a.onCellHtmlData)h=
+a.onCellHtmlData(q,d,e,h),q.data("teUserDefText",1);else if(""!==h){b=c.parseHTML(h);var g=0,k=0;h="";c.each(b,function(){if(c(this).is("input"))h+=q.find("input").eq(g++).val();else if(c(this).is("select"))h+=q.find("select option:selected").eq(k++).text();else if(c(this).is("br"))h+="<br>";else{if("undefined"===typeof c(this).html())h+=c(this).text();else if(void 0===jQuery().bootstrapTable||!1===c(this).hasClass("fht-cell")&&!1===c(this).hasClass("filterControl")&&0===q.parents(".detail-view").length)h+=
+c(this).html();if(c(this).is("a")){var b=q.find("a").attr("href")||"";f="function"===typeof a.onCellHtmlHyperlink?f+a.onCellHtmlHyperlink(q,d,e,b,h):"href"===a.htmlHyperlink?f+b:f+h;h=""}}})}if(h&&""!==h&&!0===a.htmlContent)f=c.trim(h);else if(h&&""!==h)if(""!==q.attr("data-tableexport-cellformat")){var m=h.replace(/\n/g,"\u2028").replace(/(<\s*br([^>]*)>)/gi,"\u2060"),n=c("<div/>").html(m).contents();b=!1;m="";c.each(n.text().split("\u2028"),function(b,d){0<b&&(m+=" ");!0!==a.preserve.leadingWS&&
+(d=ka(d));m+=!0!==a.preserve.trailingWS?la(d):d});c.each(m.split("\u2060"),function(b,d){0<b&&(f+="\n");!0!==a.preserve.leadingWS&&(d=ka(d));!0!==a.preserve.trailingWS&&(d=la(d));f+=d.replace(/\u00AD/g,"")});f=f.replace(/\u00A0/g," ");if("json"===a.type||"excel"===a.type&&"xmlss"===a.mso.fileFormat||!1===a.numbers.output)b=ma(f),!1!==b&&(l="number",f=Number(b));else if(a.numbers.html.decimalMark!==a.numbers.output.decimalMark||a.numbers.html.thousandsSeparator!==a.numbers.output.thousandsSeparator)if(b=
+ma(f),!1!==b){n=(""+b.substr(0>b?1:0)).split(".");1===n.length&&(n[1]="");var t=3<n[0].length?n[0].length%3:0;l="number";f=(0>b?"-":"")+(a.numbers.output.thousandsSeparator?(t?n[0].substr(0,t)+a.numbers.output.thousandsSeparator:"")+n[0].substr(t).replace(/(\d{3})(?=\d)/g,"$1"+a.numbers.output.thousandsSeparator):n[0])+(n[1].length?a.numbers.output.decimalMark+n[1]:"")}}else f=h;!0===a.escape&&(f=escape(f));"function"===typeof a.onCellData&&(f=a.onCellData(q,d,e,f,l),q.data("teUserDefText",1))}void 0!==
+p&&(p.type=l);return f}function Aa(b){return 0<b.length&&!0===a.preventInjection&&0<="=+-@".indexOf(b.charAt(0))?"'"+b:b}function Na(b,a,e){return a+"-"+e.toLowerCase()}function ea(b,a){(b=/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(b))&&(a=[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]);return a}function Ba(b){var a=L(b,"text-align"),e=L(b,"font-weight"),c=L(b,"font-style"),f="";"start"===a&&(a="rtl"===L(b,"direction")?"right":"left");700<=e&&(f="bold");"italic"===c&&(f+=c);""===f&&(f="normal");
+a={style:{align:a,bcolor:ea(L(b,"background-color"),[255,255,255]),color:ea(L(b,"color"),[0,0,0]),fstyle:f},colspan:O(b),rowspan:U(b)};null!==b&&(b=b.getBoundingClientRect(),a.rect={width:b.width,height:b.height});return a}function O(b){var a=c(b).attr("data-tableexport-colspan");"undefined"===typeof a&&c(b).is("[colspan]")&&(a=c(b).attr("colspan"));return parseInt(a)||0}function U(b){var a=c(b).attr("data-tableexport-rowspan");"undefined"===typeof a&&c(b).is("[rowspan]")&&(a=c(b).attr("rowspan"));
+return parseInt(a)||0}function L(b,a){try{return window.getComputedStyle?(a=a.replace(/([a-z])([A-Z])/,Na),window.getComputedStyle(b,null).getPropertyValue(a)):b.currentStyle?b.currentStyle[a]:b.style[a]}catch(e){}return""}function fa(a,d,e){d=L(a,d).match(/\d+/);if(null!==d){d=d[0];a=a.parentElement;var b=document.createElement("div");b.style.overflow="hidden";b.style.visibility="hidden";a.appendChild(b);b.style.width=100+e;e=100/b.offsetWidth;a.removeChild(b);return d*e}return 0}function Oa(a){for(var b=
+new ArrayBuffer(a.length),e=new Uint8Array(b),c=0;c!==a.length;++c)e[c]=a.charCodeAt(c)&255;return b}function na(a){var b=a.c,c="";for(++b;b;b=Math.floor((b-1)/26))c=String.fromCharCode((b-1)%26+65)+c;return c+(""+(a.r+1))}function oa(a,d){if("undefined"===typeof d||"number"===typeof d)return oa(a.s,a.e);"string"!==typeof a&&(a=na(a));"string"!==typeof d&&(d=na(d));return a===d?a:a+":"+d}function Ca(a,d){var b=Number(a);if(isFinite(b))return b;var c=1;""!==d.thousandsSeparator&&(a=a.replace(new RegExp("([\\d])"+
+d.thousandsSeparator+"([\\d])","g"),"$1$2"));"."!==d.decimalMark&&(a=a.replace(new RegExp("([\\d])"+d.decimalMark+"([\\d])","g"),"$1.$2"));a=a.replace(/[$]/g,"").replace(/[%]/g,function(){c*=100;return""});if(isFinite(b=Number(a)))return b/c;a=a.replace(/[(](.*)[)]/,function(a,b){c=-c;return b});return isFinite(b=Number(a))?b/c:b}function xa(a){var b=0,c;if(0===a.length)return b;var p=0;for(c=a.length;p<c;p++){var f=a.charCodeAt(p);b=(b<<5)-b+f;b|=0}return b}function M(b,d,c,p,f,l){var e=!0;"function"===
+typeof a.onBeforeSaveToFile&&(e=a.onBeforeSaveToFile(b,d,c,p,f),"boolean"!==typeof e&&(e=!0));if(e)try{if(Da=new Blob([b],{type:c+";charset="+p}),saveAs(Da,d,!1===l),"function"===typeof a.onAfterSaveToFile)a.onAfterSaveToFile(b,d)}catch(h){ja(d,"data:"+c+(p.length?";charset="+p:"")+(f.length?";"+f:"")+",",l?"\ufeff"+b:b)}}function ja(b,d,c){var e=window.navigator.userAgent;if(!1!==b&&window.navigator.msSaveOrOpenBlob)window.navigator.msSaveOrOpenBlob(new Blob([c]),b);else if(!1!==b&&(0<e.indexOf("MSIE ")||
+e.match(/Trident.*rv\:11\./))){if(d=document.createElement("iframe")){document.body.appendChild(d);d.setAttribute("style","display:none");d.contentDocument.open("txt/plain","replace");d.contentDocument.write(c);d.contentDocument.close();d.contentWindow.focus();switch(b.substr(b.lastIndexOf(".")+1)){case "doc":case "json":case "png":case "pdf":case "xls":case "xlsx":b+=".txt"}d.contentDocument.execCommand("SaveAs",!0,b);document.body.removeChild(d)}}else{var f=document.createElement("a");if(f){var l=
+null;f.style.display="none";!1!==b?f.download=b:f.target="_blank";"object"===typeof c?(window.URL=window.URL||window.webkitURL,e=[],e.push(c),l=window.URL.createObjectURL(new Blob(e,{type:d})),f.href=l):0<=d.toLowerCase().indexOf("base64,")?f.href=d+K(c):f.href=d+encodeURIComponent(c);document.body.appendChild(f);if(document.createEvent)null===ha&&(ha=document.createEvent("MouseEvents")),ha.initEvent("click",!0,!1),f.dispatchEvent(ha);else if(document.createEventObject)f.fireEvent("onclick");else if("function"===
+typeof f.onclick)f.onclick();setTimeout(function(){l&&window.URL.revokeObjectURL(l);document.body.removeChild(f);if("function"===typeof a.onAfterSaveToFile)a.onAfterSaveToFile(c,b)},100)}}}function K(a){var b,c="",p=0;if("string"===typeof a){a=a.replace(/\x0d\x0a/g,"\n");var f="";for(b=0;b<a.length;b++){var l=a.charCodeAt(b);128>l?f+=String.fromCharCode(l):(127<l&&2048>l?f+=String.fromCharCode(l>>6|192):(f+=String.fromCharCode(l>>12|224),f+=String.fromCharCode(l>>6&63|128)),f+=String.fromCharCode(l&
+63|128))}a=f}for(;p<a.length;){var q=a.charCodeAt(p++);f=a.charCodeAt(p++);b=a.charCodeAt(p++);l=q>>2;q=(q&3)<<4|f>>4;var h=(f&15)<<2|b>>6;var g=b&63;isNaN(f)?h=g=64:isNaN(b)&&(g=64);c=c+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(l)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(q)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(h)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(g)}return c}
+var a={csvEnclosure:'"',csvSeparator:",",csvUseBOM:!0,date:{html:"dd/mm/yyyy"},displayTableName:!1,escape:!1,exportHiddenCells:!1,fileName:"tableExport",htmlContent:!1,htmlHyperlink:"content",ignoreColumn:[],ignoreRow:[],jsonScope:"all",jspdf:{orientation:"p",unit:"pt",format:"a4",margins:{left:20,right:10,top:10,bottom:10},onDocCreated:null,autotable:{styles:{cellPadding:2,rowHeight:12,fontSize:8,fillColor:255,textColor:50,fontStyle:"normal",overflow:"ellipsize",halign:"inherit",valign:"middle"},
+headerStyles:{fillColor:[52,73,94],textColor:255,fontStyle:"bold",halign:"inherit",valign:"middle"},alternateRowStyles:{fillColor:245},tableExport:{doc:null,onAfterAutotable:null,onBeforeAutotable:null,onAutotableText:null,onTable:null,outputImages:!0}}},mso:{fileFormat:"xlshtml",onMsoNumberFormat:null,pageFormat:"a4",pageOrientation:"portrait",rtl:!1,styles:[],worksheetName:"",xslx:{formatId:{date:14,numbers:2}}},numbers:{html:{decimalMark:".",thousandsSeparator:","},output:{decimalMark:".",thousandsSeparator:","}},
+onAfterSaveToFile:null,onBeforeSaveToFile:null,onCellData:null,onCellHtmlData:null,onCellHtmlHyperlink:null,onIgnoreRow:null,onTableExportBegin:null,onTableExportEnd:null,outputMode:"file",pdfmake:{enabled:!1,docDefinition:{pageOrientation:"portrait",defaultStyle:{font:"Roboto"}},fonts:{}},preserve:{leadingWS:!1,trailingWS:!1},preventInjection:!0,sql:{tableEnclosure:"`",columnEnclosure:"`"},tbodySelector:"tr",tfootSelector:"tr",theadSelector:"tr",tableName:"Table",type:"csv"},N={a0:[2383.94,3370.39],
+a1:[1683.78,2383.94],a2:[1190.55,1683.78],a3:[841.89,1190.55],a4:[595.28,841.89],a5:[419.53,595.28],a6:[297.64,419.53],a7:[209.76,297.64],a8:[147.4,209.76],a9:[104.88,147.4],a10:[73.7,104.88],b0:[2834.65,4008.19],b1:[2004.09,2834.65],b2:[1417.32,2004.09],b3:[1000.63,1417.32],b4:[708.66,1000.63],b5:[498.9,708.66],b6:[354.33,498.9],b7:[249.45,354.33],b8:[175.75,249.45],b9:[124.72,175.75],b10:[87.87,124.72],c0:[2599.37,3676.54],c1:[1836.85,2599.37],c2:[1298.27,1836.85],c3:[918.43,1298.27],c4:[649.13,
+918.43],c5:[459.21,649.13],c6:[323.15,459.21],c7:[229.61,323.15],c8:[161.57,229.61],c9:[113.39,161.57],c10:[79.37,113.39],dl:[311.81,623.62],letter:[612,792],"government-letter":[576,756],legal:[612,1008],"junior-legal":[576,360],ledger:[1224,792],tabloid:[792,1224],"credit-card":[153,243]},C=this,ha=null,u=[],w=[],n=0,t="",T=[],G=[],Da,J=[],V=!1;c.extend(!0,a,k);"xlsx"===a.type&&(a.mso.fileFormat=a.type,a.type="excel");"undefined"!==typeof a.excelFileFormat&&"undefined"===a.mso.fileFormat&&(a.mso.fileFormat=
+a.excelFileFormat);"undefined"!==typeof a.excelPageFormat&&"undefined"===a.mso.pageFormat&&(a.mso.pageFormat=a.excelPageFormat);"undefined"!==typeof a.excelPageOrientation&&"undefined"===a.mso.pageOrientation&&(a.mso.pageOrientation=a.excelPageOrientation);"undefined"!==typeof a.excelRTL&&"undefined"===a.mso.rtl&&(a.mso.rtl=a.excelRTL);"undefined"!==typeof a.excelstyles&&"undefined"===a.mso.styles&&(a.mso.styles=a.excelstyles);"undefined"!==typeof a.onMsoNumberFormat&&"undefined"===a.mso.onMsoNumberFormat&&
+(a.mso.onMsoNumberFormat=a.onMsoNumberFormat);"undefined"!==typeof a.worksheetName&&"undefined"===a.mso.worksheetName&&(a.mso.worksheetName=a.worksheetName);a.mso.pageOrientation="l"===a.mso.pageOrientation.substr(0,1)?"landscape":"portrait";a.date.html=a.date.html||"";if(a.date.html.length){k=[];k.dd="(3[01]|[12][0-9]|0?[1-9])";k.mm="(1[012]|0?[1-9])";k.yyyy="((?:1[6-9]|2[0-2])\\d{2})";k.yy="(\\d{2})";var r=a.date.html.match(/[^a-zA-Z0-9]/)[0];r=a.date.html.toLowerCase().split(r);a.date.regex="^\\s*";
+a.date.regex+=k[r[0]];a.date.regex+="(.)";a.date.regex+=k[r[1]];a.date.regex+="\\2";a.date.regex+=k[r[2]];a.date.regex+="\\s*$";a.date.pattern=new RegExp(a.date.regex,"g");k=r.indexOf("dd")+1;a.date.match_d=k+(1<k?1:0);k=r.indexOf("mm")+1;a.date.match_m=k+(1<k?1:0);k=(0<=r.indexOf("yyyy")?r.indexOf("yyyy"):r.indexOf("yy"))+1;a.date.match_y=k+(1<k?1:0)}T=S(C);if("function"===typeof a.onTableExportBegin)a.onTableExportBegin();if("csv"===a.type||"tsv"===a.type||"txt"===a.type){var P="",Z=0;G=[];n=0;
+var pa=function(b,d,e){b.each(function(){t="";B(this,d,n,e+b.length,function(b,c,d){var e=t,f="";if(null!==b)if(b=E(b,c,d),c=null===b||""===b?"":b.toString(),"tsv"===a.type)b instanceof Date&&b.toLocaleString(),f=W(c,"\t"," ");else if(b instanceof Date)f=a.csvEnclosure+b.toLocaleString()+a.csvEnclosure;else if(f=Aa(c),f=W(f,a.csvEnclosure,a.csvEnclosure+a.csvEnclosure),0<=f.indexOf(a.csvSeparator)||/[\r\n ]/g.test(f))f=a.csvEnclosure+f+a.csvEnclosure;t=e+(f+("tsv"===a.type?"\t":a.csvSeparator))});
+t=c.trim(t).substring(0,t.length-1);0<t.length&&(0<P.length&&(P+="\n"),P+=t);n++});return b.length};Z+=pa(c(C).find("thead").first().find(a.theadSelector),"th,td",Z);A(c(C),"tbody").each(function(){Z+=pa(A(c(this),a.tbodySelector),"td,th",Z)});a.tfootSelector.length&&pa(c(C).find("tfoot").first().find(a.tfootSelector),"td,th",Z);P+="\n";if("string"===a.outputMode)return P;if("base64"===a.outputMode)return K(P);if("window"===a.outputMode){ja(!1,"data:text/"+("csv"===a.type?"csv":"plain")+";charset=utf-8,",
+P);return}M(P,a.fileName+"."+a.type,"text/"+("csv"===a.type?"csv":"plain"),"utf-8","","csv"===a.type&&a.csvUseBOM)}else if("sql"===a.type){n=0;G=[];var D="INSERT INTO "+a.sql.tableEnclosure+a.tableName+a.sql.tableEnclosure+" (";u=y(c(C));c(u).each(function(){B(this,"th,td",n,u.length,function(b,c,e){b=E(b,c,e)||"";-1<b.indexOf(a.sql.columnEnclosure)&&(b=W(b.toString(),a.sql.columnEnclosure,a.sql.columnEnclosure+a.sql.columnEnclosure));D+=a.sql.columnEnclosure+b+a.sql.columnEnclosure+","});n++;D=c.trim(D).substring(0,
+D.length-1)});D+=") VALUES ";w=v(c(C));c(w).each(function(){t="";B(this,"td,th",n,u.length+w.length,function(a,c,e){a=E(a,c,e)||"";-1<a.indexOf("'")&&(a=W(a.toString(),"'","''"));t+="'"+a+"',"});3<t.length&&(D+="("+t,D=c.trim(D).substring(0,D.length-1),D+="),");n++});D=c.trim(D).substring(0,D.length-1);D+=";";if("string"===a.outputMode)return D;if("base64"===a.outputMode)return K(D);M(D,a.fileName+".sql","application/sql","utf-8","",!1)}else if("json"===a.type){var X=[];G=[];u=y(c(C));c(u).each(function(){var a=
+[];B(this,"th,td",n,u.length,function(b,c,g){a.push(E(b,c,g))});X.push(a)});var qa=[];w=v(c(C));c(w).each(function(){var a={},d=0;B(this,"td,th",n,u.length+w.length,function(b,c,f){X.length?a[X[X.length-1][d]]=E(b,c,f):a[d]=E(b,c,f);d++});!1===c.isEmptyObject(a)&&qa.push(a);n++});k="head"===a.jsonScope?JSON.stringify(X):"data"===a.jsonScope?JSON.stringify(qa):JSON.stringify({header:X,data:qa});if("string"===a.outputMode)return k;if("base64"===a.outputMode)return K(k);M(k,a.fileName+".json","application/json",
+"utf-8","base64",!1)}else if("xml"===a.type){n=0;G=[];var Q='<?xml version="1.0" encoding="utf-8"?>';Q+="<tabledata><fields>";u=y(c(C));c(u).each(function(){B(this,"th,td",n,u.length,function(a,c,e){Q+="<field>"+E(a,c,e)+"</field>"});n++});Q+="</fields><data>";var Ea=1;w=v(c(C));c(w).each(function(){var a=1;t="";B(this,"td,th",n,u.length+w.length,function(b,c,g){t+="<column-"+a+">"+E(b,c,g)+"</column-"+a+">";a++});0<t.length&&"<column-1></column-1>"!==t&&(Q+='<row id="'+Ea+'">'+t+"</row>",Ea++);n++});
+Q+="</data></tabledata>";if("string"===a.outputMode)return Q;if("base64"===a.outputMode)return K(Q);M(Q,a.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===a.type&&"xmlss"===a.mso.fileFormat){var ra=[],F=[];c(C).filter(function(){return I(c(this))}).each(function(){function b(a,b,d){var f=[];c(a).each(function(){var b=0,e=0;t="";B(this,"td,th",n,d+a.length,function(a,d,l){if(null!==a){var h="";d=E(a,d,l);l="String";if(!1!==jQuery.isNumeric(d))l="Number";else{var g=Ma(d);!1!==
+g&&(d=g,l="Number",h+=' ss:StyleID="pct1"')}"Number"!==l&&(d=d.replace(/\n/g,"<br>"));g=O(a);a=U(a);c.each(f,function(){if(n>=this.s.r&&n<=this.e.r&&e>=this.s.c&&e<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)e++,b++});if(a||g)a=a||1,g=g||1,f.push({s:{r:n,c:e},e:{r:n+a-1,c:e+g-1}});1<g&&(h+=' ss:MergeAcross="'+(g-1)+'"',e+=g-1);1<a&&(h+=' ss:MergeDown="'+(a-1)+'" ss:StyleID="rsp1"');0<b&&(h+=' ss:Index="'+(e+1)+'"',b=0);t+="<Cell"+h+'><Data ss:Type="'+l+'">'+c("<div />").text(d).html()+"</Data></Cell>\r";
+e++}});0<t.length&&(H+='<Row ss:AutoFitHeight="0">\r'+t+"</Row>\r");n++});return a.length}var d=c(this),e="";"string"===typeof a.mso.worksheetName&&a.mso.worksheetName.length?e=a.mso.worksheetName+" "+(F.length+1):"undefined"!==typeof a.mso.worksheetName[F.length]&&(e=a.mso.worksheetName[F.length]);e.length||(e=d.find("caption").text()||"");e.length||(e="Table "+(F.length+1));e=c.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));F.push(c("<div />").text(e).html());!1===a.exportHiddenCells&&(J=
+d.find("tr, th, td").filter(":hidden"),V=0<J.length);n=0;T=S(this);H="<Table>\r";e=b(y(d),"th,td",0);b(v(d),"td,th",e);H+="</Table>\r";ra.push(H)});k={};r={};for(var m,R,Y=0,da=F.length;Y<da;Y++)m=F[Y],R=k[m],R=k[m]=null==R?1:R+1,2===R&&(F[r[m]]=F[r[m]].substring(0,29)+"-1"),1<k[m]?F[Y]=F[Y].substring(0,29)+"-"+k[m]:r[m]=Y;k='<?xml version="1.0" encoding="UTF-8"?>\r<?mso-application progid="Excel.Sheet"?>\r<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:o="urn:schemas-microsoft-com:office:office"\r xmlns:x="urn:schemas-microsoft-com:office:excel"\r xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:html="http://www.w3.org/TR/REC-html40">\r<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">\r  <Created>'+
+(new Date).toISOString()+'</Created>\r</DocumentProperties>\r<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">\r  <AllowPNG/>\r</OfficeDocumentSettings>\r<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">\r  <WindowHeight>9000</WindowHeight>\r  <WindowWidth>13860</WindowWidth>\r  <WindowTopX>0</WindowTopX>\r  <WindowTopY>0</WindowTopY>\r  <ProtectStructure>False</ProtectStructure>\r  <ProtectWindows>False</ProtectWindows>\r</ExcelWorkbook>\r<Styles>\r  <Style ss:ID="Default" ss:Name="Normal">\r    <Alignment ss:Vertical="Bottom"/>\r    <Borders/>\r    <Font/>\r    <Interior/>\r    <NumberFormat/>\r    <Protection/>\r  </Style>\r  <Style ss:ID="rsp1">\r    <Alignment ss:Vertical="Center"/>\r  </Style>\r  <Style ss:ID="pct1">\r    <NumberFormat ss:Format="Percent"/>\r  </Style>\r</Styles>\r';
+for(r=0;r<ra.length;r++)k+='<Worksheet ss:Name="'+F[r]+'" ss:RightToLeft="'+(a.mso.rtl?"1":"0")+'">\r'+ra[r],k=a.mso.rtl?k+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">\r<DisplayRightToLeft/>\r</WorksheetOptions>\r':k+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"/>\r',k+="</Worksheet>\r";k+="</Workbook>\r";if("string"===a.outputMode)return k;if("base64"===a.outputMode)return K(k);M(k,a.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===
+a.type&&"xlsx"===a.mso.fileFormat){var aa=[],Fa=XLSX.utils.book_new();c(C).filter(function(){return I(c(this))}).each(function(){for(var b=c(this),d={},e=this.getElementsByTagName("tr"),g={s:{r:0,c:0},e:{r:0,c:0}},f=[],l,q=[],h=0,k=0,m,n,t,u,r,w=XLSX.SSF.get_table();h<e.length&&1E7>k;++h)if(m=e[h],n=!1,"function"===typeof a.onIgnoreRow&&(n=a.onIgnoreRow(c(m),h)),!0!==n&&(0===a.ignoreRow.length||-1===c.inArray(h,a.ignoreRow)&&-1===c.inArray(h-e.length,a.ignoreRow))&&!1!==I(c(m))){var y=m.children,
+C=0;for(m=0;m<y.length;++m)r=y[m],u=+O(r)||1,C+=u;var A=0;for(m=n=0;m<y.length;++m)if(r=y[m],u=+O(r)||1,l=m+A,!sa(c(r),C,l+(l<n?n-l:0))){A+=u-1;for(l=0;l<f.length;++l){var v=f[l];v.s.c==n&&v.s.r<=k&&k<=v.e.r&&(n=v.e.c+1,l=-1)}(0<(t=+U(r))||1<u)&&f.push({s:{r:k,c:n},e:{r:k+(t||1)-1,c:n+u-1}});var D={type:""};l=E(r,h,m+A,D);v={t:"s",v:l};var B="";if(""!==c(r).attr("data-tableexport-cellformat")){var x=parseInt(c(r).attr("data-tableexport-xlsxformatid")||0);0===x&&"function"===typeof a.mso.xslx.formatId.numbers&&
+(x=a.mso.xslx.formatId.numbers(c(r),h,m+A));0===x&&"function"===typeof a.mso.xslx.formatId.date&&(x=a.mso.xslx.formatId.date(c(r),h,m+A));if(49===x||"@"===x)B="s";else if("number"===D.type||0<x&&14>x||36<x&&41>x||48===x)B="n";else if("date"===D.type||13<x&&37>x||44<x&&48>x||56===x)B="d"}else B="s";if(null!=l)if(0===l.length)v.t="z";else if(0!==l.trim().length&&"s"!==B)if("function"===D.type)v={f:l};else if("TRUE"===l)v={t:"b",v:!0};else if("FALSE"===l)v={t:"b",v:!1};else if(""===B&&c(r).find("a").length)l=
+"href"!==a.htmlHyperlink?l:"",v={f:'=HYPERLINK("'+c(r).find("a").attr("href")+(l.length?'","'+l:"")+'")'};else if("n"===B||isFinite(Ca(l,a.numbers.output))){if(r=Ca(l,a.numbers.output),0===x&&"function"!==typeof a.mso.xslx.formatId.numbers&&(x=a.mso.xslx.formatId.numbers),isFinite(r)||isFinite(l))v={t:"n",v:isFinite(r)?r:l,z:"string"===typeof x?x:x in w?w[x]:"0.00"}}else if(!1!==(r=La(l))||"d"===B)0===x&&"function"!==typeof a.mso.xslx.formatId.date&&(x=a.mso.xslx.formatId.date),v={t:"d",v:!1!==r?
+r:l,z:"string"===typeof x?x:x in w?w[x]:"m/d/yy"};d[na({c:n,r:k})]=v;g.e.c<n&&(g.e.c=n);n+=u}++k}f.length&&(d["!merges"]=f);q.length&&(d["!rows"]=q);g.e.r=k-1;d["!ref"]=oa(g);1E7<=k&&(d["!fullref"]=oa((g.e.r=e.length-h+k-1,g)));e="";"string"===typeof a.mso.worksheetName&&a.mso.worksheetName.length?e=a.mso.worksheetName+" "+(aa.length+1):"undefined"!==typeof a.mso.worksheetName[aa.length]&&(e=a.mso.worksheetName[aa.length]);e.length||(e=b.find("caption").text()||"");e.length||(e="Table "+(aa.length+
+1));e=c.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));aa.push(e);XLSX.utils.book_append_sheet(Fa,d,e)});k=XLSX.write(Fa,{type:"binary",bookType:a.mso.fileFormat,bookSST:!1});M(Oa(k),a.fileName+"."+a.mso.fileFormat,"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","UTF-8","",!1)}else if("excel"===a.type||"xls"===a.type||"word"===a.type||"doc"===a.type){k="excel"===a.type||"xls"===a.type?"excel":"word";r="excel"===k?"xls":"doc";m='xmlns:x="urn:schemas-microsoft-com:office:'+
+k+'"';var H="",ba="";c(C).filter(function(){return I(c(this))}).each(function(){var b=c(this);""===ba&&(ba=a.mso.worksheetName||b.find("caption").text()||"Table",ba=c.trim(ba.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31)));!1===a.exportHiddenCells&&(J=b.find("tr, th, td").filter(":hidden"),V=0<J.length);n=0;G=[];T=S(this);H+="<table><thead>";u=y(b);c(u).each(function(){var b=c(this);t="";B(this,"th,td",n,u.length,function(c,d,f){if(null!==c){var e="";t+="<th";if(a.mso.styles.length){var g=document.defaultView.getComputedStyle(c,
+null),h=document.defaultView.getComputedStyle(b[0],null),k;for(k in a.mso.styles){var m=g[a.mso.styles[k]];""===m&&(m=h[a.mso.styles[k]]);""!==m&&"0px none rgb(0, 0, 0)"!==m&&"rgba(0, 0, 0, 0)"!==m&&(e+=""===e?'style="':";",e+=a.mso.styles[k]+":"+m)}}""!==e&&(t+=" "+e+'"');e=O(c);0<e&&(t+=' colspan="'+e+'"');e=U(c);0<e&&(t+=' rowspan="'+e+'"');t+=">"+E(c,d,f)+"</th>"}});0<t.length&&(H+="<tr>"+t+"</tr>");n++});H+="</thead><tbody>";w=v(b);c(w).each(function(){var b=c(this);t="";B(this,"td,th",n,u.length+
+w.length,function(d,g,f){if(null!==d){var e=E(d,g,f),q="",h=c(d).attr("data-tableexport-msonumberformat");"undefined"===typeof h&&"function"===typeof a.mso.onMsoNumberFormat&&(h=a.mso.onMsoNumberFormat(d,g,f));"undefined"!==typeof h&&""!==h&&(q="style=\"mso-number-format:'"+h+"'");if(a.mso.styles.length){g=document.defaultView.getComputedStyle(d,null);f=document.defaultView.getComputedStyle(b[0],null);for(var k in a.mso.styles)h=g[a.mso.styles[k]],""===h&&(h=f[a.mso.styles[k]]),""!==h&&"0px none rgb(0, 0, 0)"!==
+h&&"rgba(0, 0, 0, 0)"!==h&&(q+=""===q?'style="':";",q+=a.mso.styles[k]+":"+h)}t+="<td";""!==q&&(t+=" "+q+'"');q=O(d);0<q&&(t+=' colspan="'+q+'"');d=U(d);0<d&&(t+=' rowspan="'+d+'"');"string"===typeof e&&""!==e&&(e=Aa(e),e=e.replace(/\n/g,"<br>"));t+=">"+e+"</td>"}});0<t.length&&(H+="<tr>"+t+"</tr>");n++});a.displayTableName&&(H+="<tr><td></td></tr><tr><td></td></tr><tr><td>"+E(c("<p>"+a.tableName+"</p>"))+"</td></tr>");H+="</tbody></table>"});m='<html xmlns:o="urn:schemas-microsoft-com:office:office" '+
+m+' xmlns="http://www.w3.org/TR/REC-html40">'+('<meta http-equiv="content-type" content="application/vnd.ms-'+k+'; charset=UTF-8">');m+="<head>";"excel"===k&&(m+="\x3c!--[if gte mso 9]>",m+="<xml>",m+="<x:ExcelWorkbook>",m+="<x:ExcelWorksheets>",m+="<x:ExcelWorksheet>",m+="<x:Name>",m+=ba,m+="</x:Name>",m+="<x:WorksheetOptions>",m+="<x:DisplayGridlines/>",a.mso.rtl&&(m+="<x:DisplayRightToLeft/>"),m+="</x:WorksheetOptions>",m+="</x:ExcelWorksheet>",m+="</x:ExcelWorksheets>",m+="</x:ExcelWorkbook>",
+m+="</xml>",m+="<![endif]--\x3e");m+="<style>";m+="@page { size:"+a.mso.pageOrientation+"; mso-page-orientation:"+a.mso.pageOrientation+"; }";m+="@page Section1 {size:"+N[a.mso.pageFormat][0]+"pt "+N[a.mso.pageFormat][1]+"pt";m+="; margin:1.0in 1.25in 1.0in 1.25in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";m+="div.Section1 {page:Section1;}";m+="@page Section2 {size:"+N[a.mso.pageFormat][1]+"pt "+N[a.mso.pageFormat][0]+"pt";m+=";mso-page-orientation:"+a.mso.pageOrientation+
+";margin:1.25in 1.0in 1.25in 1.0in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";m+="div.Section2 {page:Section2;}";m+="br {mso-data-placement:same-cell;}";m+="</style>";m+="</head>";m+="<body>";m+='<div class="Section'+("landscape"===a.mso.pageOrientation?"2":"1")+'">';m+=H;m+="</div>";m+="</body>";m+="</html>";if("string"===a.outputMode)return m;if("base64"===a.outputMode)return K(m);M(m,a.fileName+"."+r,"application/vnd.ms-"+k,"","base64",!1)}else if("png"===a.type)html2canvas(c(C)[0]).then(function(b){b=
+b.toDataURL();for(var c=atob(b.substring(22)),e=new ArrayBuffer(c.length),g=new Uint8Array(e),f=0;f<c.length;f++)g[f]=c.charCodeAt(f);if("string"===a.outputMode)return c;if("base64"===a.outputMode)return K(b);"window"===a.outputMode?window.open(b):M(e,a.fileName+".png","image/png","","",!1)});else if("pdf"===a.type)if(!0===a.pdfmake.enabled){k=[];var Ga=[];n=0;G=[];r=function(a,d,e){var b=0;c(a).each(function(){var a=[];B(this,d,n,e,function(b,c,d){if("undefined"!==typeof b&&null!==b){var e=O(b),
+f=U(b);b=E(b,c,d)||" ";1<e||1<f?a.push({colSpan:e||1,rowSpan:f||1,text:b}):a.push(b)}else a.push(" ")});a.length&&Ga.push(a);b<a.length&&(b=a.length);n++});return b};u=y(c(this));m=r(u,"th,td",u.length);for(R=k.length;R<m;R++)k.push("*");w=v(c(this));r(w,"th,td",u.length+w.length);k={content:[{table:{headerRows:u.length,widths:k,body:Ga}}]};"undefined"!==typeof pdfMake&&(pdfMake.fonts={Roboto:{normal:"Roboto-Regular.ttf",bold:"Roboto-Medium.ttf",italics:"Roboto-Italic.ttf",bolditalics:"Roboto-MediumItalic.ttf"}},
+pdfMake.vfs.hasOwnProperty("Mirza-Regular.ttf")?(a.pdfmake.docDefinition.defaultStyle.font="Mirza",c.extend(!0,pdfMake.fonts,{Mirza:{normal:"Mirza-Regular.ttf",bold:"Mirza-Bold.ttf",italics:"Mirza-Medium.ttf",bolditalics:"Mirza-SemiBold.ttf"}})):pdfMake.vfs.hasOwnProperty("gbsn00lp.ttf")?(a.pdfmake.docDefinition.defaultStyle.font="gbsn00lp",c.extend(!0,pdfMake.fonts,{gbsn00lp:{normal:"gbsn00lp.ttf",bold:"gbsn00lp.ttf",italics:"gbsn00lp.ttf",bolditalics:"gbsn00lp.ttf"}})):pdfMake.vfs.hasOwnProperty("ZCOOLXiaoWei-Regular.ttf")&&
+(a.pdfmake.docDefinition.defaultStyle.font="ZCOOLXiaoWei",c.extend(!0,pdfMake.fonts,{ZCOOLXiaoWei:{normal:"ZCOOLXiaoWei-Regular.ttf",bold:"ZCOOLXiaoWei-Regular.ttf",italics:"ZCOOLXiaoWei-Regular.ttf",bolditalics:"ZCOOLXiaoWei-Regular.ttf"}})),c.extend(!0,k,a.pdfmake.docDefinition),c.extend(!0,pdfMake.fonts,a.pdfmake.fonts),"undefined"!==typeof pdfMake.createPdf&&pdfMake.createPdf(k).getBuffer(function(b){M(b,a.fileName+".pdf","application/pdf","","",!1)}))}else if(!1===a.jspdf.autotable){k={dim:{w:fa(c(C).first().get(0),
+"width","mm"),h:fa(c(C).first().get(0),"height","mm")},pagesplit:!1};var Ha=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format);Ha.addHTML(c(C).first(),a.jspdf.margins.left,a.jspdf.margins.top,k,function(){ua(Ha,!1)})}else{var g=a.jspdf.autotable.tableExport;if("string"===typeof a.jspdf.format&&"bestfit"===a.jspdf.format.toLowerCase()){var ia="",ca="",Ia=0;c(C).each(function(){if(I(c(this))){var a=fa(c(this).get(0),"width","pt");if(a>Ia){a>N.a0[0]&&(ia="a0",ca="l");for(var d in N)N.hasOwnProperty(d)&&
+N[d][1]>a&&(ia=d,ca="l",N[d][0]>a&&(ca="p"));Ia=a}}});a.jspdf.format=""===ia?"a4":ia;a.jspdf.orientation=""===ca?"w":ca}if(null==g.doc&&(g.doc=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format),g.wScaleFactor=1,g.hScaleFactor=1,"function"===typeof a.jspdf.onDocCreated))a.jspdf.onDocCreated(g.doc);!0===g.outputImages&&(g.images={});"undefined"!==typeof g.images&&(c(C).filter(function(){return I(c(this))}).each(function(){var b=0;G=[];!1===a.exportHiddenCells&&(J=c(this).find("tr, th, td").filter(":hidden"),
+V=0<J.length);u=y(c(this));w=v(c(this));c(w).each(function(){B(this,"td,th",u.length+b,u.length+w.length,function(a){wa(a,c(a).children(),g)});b++})}),u=[],w=[]);Ka(g,function(){c(C).filter(function(){return I(c(this))}).each(function(){var b;n=0;G=[];!1===a.exportHiddenCells&&(J=c(this).find("tr, th, td").filter(":hidden"),V=0<J.length);T=S(this);g.columns=[];g.rows=[];g.teCells={};if("function"===typeof g.onTable&&!1===g.onTable(c(this),a))return!0;a.jspdf.autotable.tableExport=null;var d=c.extend(!0,
+{},a.jspdf.autotable);a.jspdf.autotable.tableExport=g;d.margin={};c.extend(!0,d.margin,a.jspdf.margins);d.tableExport=g;"function"!==typeof d.beforePageContent&&(d.beforePageContent=function(a){if(1===a.pageCount){var b=a.table.rows.concat(a.table.headerRow);c.each(b,function(){0<this.height&&(this.height+=(2-1.15)/2*this.styles.fontSize,a.table.height+=(2-1.15)/2*this.styles.fontSize)})}});"function"!==typeof d.createdHeaderCell&&(d.createdHeaderCell=function(a,b){a.styles=c.extend({},b.row.styles);
+if("undefined"!==typeof g.columns[b.column.dataKey]){var e=g.columns[b.column.dataKey];if("undefined"!==typeof e.rect){a.contentWidth=e.rect.width;if("undefined"===typeof g.heightRatio||0===g.heightRatio){var f=b.row.raw[b.column.dataKey].rowspan?b.row.raw[b.column.dataKey].rect.height/b.row.raw[b.column.dataKey].rowspan:b.row.raw[b.column.dataKey].rect.height;g.heightRatio=a.styles.rowHeight/f}f=b.row.raw[b.column.dataKey].rect.height*g.heightRatio;f>a.styles.rowHeight&&(a.styles.rowHeight=f)}a.styles.halign=
+"inherit"===d.headerStyles.halign?"center":d.headerStyles.halign;a.styles.valign=d.headerStyles.valign;"undefined"!==typeof e.style&&!0!==e.style.hidden&&("inherit"===d.headerStyles.halign&&(a.styles.halign=e.style.align),"inherit"===d.styles.fillColor&&(a.styles.fillColor=e.style.bcolor),"inherit"===d.styles.textColor&&(a.styles.textColor=e.style.color),"inherit"===d.styles.fontStyle&&(a.styles.fontStyle=e.style.fstyle))}});"function"!==typeof d.createdCell&&(d.createdCell=function(a,b){b=g.teCells[b.row.index+
+":"+b.column.dataKey];a.styles.halign="inherit"===d.styles.halign?"center":d.styles.halign;a.styles.valign=d.styles.valign;"undefined"!==typeof b&&"undefined"!==typeof b.style&&!0!==b.style.hidden&&("inherit"===d.styles.halign&&(a.styles.halign=b.style.align),"inherit"===d.styles.fillColor&&(a.styles.fillColor=b.style.bcolor),"inherit"===d.styles.textColor&&(a.styles.textColor=b.style.color),"inherit"===d.styles.fontStyle&&(a.styles.fontStyle=b.style.fstyle))});"function"!==typeof d.drawHeaderCell&&
+(d.drawHeaderCell=function(a,b){var c=g.columns[b.column.dataKey];return(!0!==c.style.hasOwnProperty("hidden")||!0!==c.style.hidden)&&0<=c.rowIndex?va(a,b,c):!1});"function"!==typeof d.drawCell&&(d.drawCell=function(a,b){var d=g.teCells[b.row.index+":"+b.column.dataKey];if(!0!==("undefined"!==typeof d&&d.isCanvas))va(a,b,d)&&(g.doc.rect(a.x,a.y,a.width,a.height,a.styles.fillStyle),"undefined"===typeof d||"undefined"!==typeof d.hasUserDefText&&!0===d.hasUserDefText||"undefined"===typeof d.elements||
+!d.elements.length?za(a,{},g):(b=a.height/d.rect.height,b>g.hScaleFactor&&(g.hScaleFactor=b),g.wScaleFactor=a.width/d.rect.width,b=a.textPos.y,ya(a,d.elements,g),a.textPos.y=b,za(a,d.elements,g)));else{d=d.elements[0];var e=c(d).attr("data-tableexport-canvas"),f=d.getBoundingClientRect();a.width=f.width*g.wScaleFactor;a.height=f.height*g.hScaleFactor;b.row.height=a.height;ta(a,d,e,g)}return!1});g.headerrows=[];u=y(c(this));c(u).each(function(){b=0;g.headerrows[n]=[];B(this,"th,td",n,u.length,function(a,
+c,d){var e=Ba(a);e.title=E(a,c,d);e.key=b++;e.rowIndex=n;g.headerrows[n].push(e)});n++});if(0<n)for(var e=n-1;0<=e;)c.each(g.headerrows[e],function(){var a=this;0<e&&null===this.rect&&(a=g.headerrows[e-1][this.key]);null!==a&&0<=a.rowIndex&&(!0!==a.style.hasOwnProperty("hidden")||!0!==a.style.hidden)&&g.columns.push(a)}),e=0<g.columns.length?-1:e-1;var k=0;w=[];w=v(c(this));c(w).each(function(){var a=[];b=0;B(this,"td,th",n,u.length+w.length,function(d,e,f){if("undefined"===typeof g.columns[b]){var h=
+{title:"",key:b,style:{hidden:!0}};g.columns.push(h)}a.push(E(d,e,f));"undefined"!==typeof d&&null!==d?(h=Ba(d),h.isCanvas=d.hasAttribute("data-tableexport-canvas"),h.elements=h.isCanvas?c(d):c(d).children(),"undefined"!==typeof c(d).data("teUserDefText")&&(h.hasUserDefText=!0)):(h=c.extend(!0,{},g.teCells[k+":"+(b-1)]),h.colspan=-1);g.teCells[k+":"+b++]=h});a.length&&(g.rows.push(a),k++);n++});if("function"===typeof g.onBeforeAutotable)g.onBeforeAutotable(c(this),g.columns,g.rows,d);g.doc.autoTable(g.columns,
+g.rows,d);if("function"===typeof g.onAfterAutotable)g.onAfterAutotable(c(this),d);a.jspdf.autotable.startY=g.doc.autoTableEndPosY()+d.margin.top});ua(g.doc,"undefined"!==typeof g.images&&!1===jQuery.isEmptyObject(g.images));"undefined"!==typeof g.headerrows&&(g.headerrows.length=0);"undefined"!==typeof g.columns&&(g.columns.length=0);"undefined"!==typeof g.rows&&(g.rows.length=0);delete g.doc;g.doc=null})}if("function"===typeof a.onTableExportEnd)a.onTableExportEnd();return this}})(jQuery);
diff --git a/web/skins/classic/skin.php b/web/skins/classic/skin.php
index b24811066..9a6940887 100644
--- a/web/skins/classic/skin.php
+++ b/web/skins/classic/skin.php
@@ -39,11 +39,6 @@ if ( empty($view) ) {
   $view = isset($user)?'console':'login';
 }
 
-if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == 'remote' && !empty( $_SERVER['REMOTE_USER']) ) {
-  $view = 'postlogin';
-  $action = 'login';
-  $_REQUEST['username'] = $_SERVER['REMOTE_USER'];
-}
 
 if ( isset($user) ) {
   // Bandwidth Limiter
diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php
index 1d07e3d3a..1531237b0 100644
--- a/web/skins/classic/views/_monitor_filters.php
+++ b/web/skins/classic/views/_monitor_filters.php
@@ -18,13 +18,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-$servers = ZM\Server::find(null, array('order'=>'lower(Name)'));
-$ServersById = array();
-foreach ( $servers as $S ) {
-  $ServersById[$S->Id()] = $S;
-}
-session_start();
-foreach ( array('Group','Function','ServerId','StorageId','Status','MonitorId','MonitorName','Source') as $var ) {
+require_once('includes/Monitor.php');
+
+zm_session_start();
+foreach ( array('GroupId','Function','ServerId','StorageId','Status','MonitorId','MonitorName','Source') as $var ) {
   if ( isset($_REQUEST[$var]) ) {
     if ( $_REQUEST[$var] != '' ) {
       $_SESSION[$var] = $_REQUEST[$var];
@@ -42,15 +39,20 @@ $StorageById = array();
 foreach ( $storage_areas as $S ) {
   $StorageById[$S->Id()] = $S;
 }
+$servers = ZM\Server::find(null, array('order'=>'lower(Name)'));
+$ServersById = array();
+foreach ( $servers as $S ) {
+  $ServersById[$S->Id()] = $S;
+}
 
 $html =
 '
 <div class="controlHeader">
+
   <!-- Used to submit the form with the enter key -->
-  <input type="submit" class="hide"/>
+  <input type="submit" class="d-none"/>
   <input type="hidden" name="filtering" value=""/>
 ';
-
 $GroupsById = array();
 foreach ( ZM\Group::find() as $G ) {
   $GroupsById[$G->Id()] = $G;
@@ -60,7 +62,7 @@ $groupSql = '';
 if ( count($GroupsById) ) {
   $html .= '<span id="groupControl"><label>'. translate('Group') .'</label>';
   # This will end up with the group_id of the deepest selection
-  $group_id = isset($_SESSION['Group']) ? $_SESSION['Group'] : null;
+  $group_id = isset($_SESSION['GroupId']) ? $_SESSION['GroupId'] : null;
   $html .= ZM\Group::get_group_dropdown();
   $groupSql = ZM\Group::get_group_sql($group_id);
   $html .= '</span>
@@ -68,7 +70,7 @@ if ( count($GroupsById) ) {
 }
 
 $selected_monitor_ids = isset($_SESSION['MonitorId']) ? $_SESSION['MonitorId'] : array();
-if ( ! is_array( $selected_monitor_ids ) ) {
+if ( !is_array($selected_monitor_ids) ) {
   $selected_monitor_ids = array($selected_monitor_ids);
 }
 
@@ -88,10 +90,11 @@ foreach ( array('ServerId','StorageId','Status','Function') as $filter ) {
     }
   }
 } # end foreach filter
-if ( ! empty($user['MonitorIds']) ) {
+
+if ( !empty($user['MonitorIds']) ) {
   $ids = explode(',', $user['MonitorIds']);
   $conditions[] = 'M.Id IN ('.implode(',',array_map(function(){return '?';}, $ids)).')';
-  $values += $ids;
+  $values = array_merge($values, $ids);
 }
 
 $html .= '<span class="MonitorNameFilter"><label>'.translate('Name').'</label>';
@@ -99,10 +102,7 @@ $html .= '<input type="text" name="MonitorName" value="'.(isset($_SESSION['Monit
 $html .= '</span>
 ';
 
-$Functions = array();
-foreach ( getEnumValues('Monitors', 'Function') as $optFunction ) {
-  $Functions[$optFunction] = translate('Fn'.$optFunction);
-}
+$Functions = ZM\GetMonitorFunctionTypes();
 
 $html .= '<span class="FunctionFilter"><label>'.translate('Function').'</label>';
 $html .= htmlSelect('Function[]', $Functions,
@@ -146,7 +146,7 @@ if ( count($StorageById) > 1 ) {
 ';
 } # end if have Storage Areas
 
-$html .= '<span class="StatusFilter"><label>'. translate('Status') . '</label>';
+$html .= '<span class="StatusFilter"><label>'.translate('Status').'</label>';
 $status_options = array(
     'Unknown' => translate('StatusUnknown'),
     'NotRunning' => translate('StatusNotRunning'),
@@ -188,7 +188,7 @@ $html .= '</span>
         $found_selected_monitor = true;
       }
     } // end foreach monitor
-    if ( ! $found_selected_monitor ) {
+    if ( !$found_selected_monitor ) {
       $selected_monitor_ids = array();
     }
   } // end if a monitor was specified
@@ -232,7 +232,7 @@ $html .= '</span>
       }
     }
 
-    $monitors_dropdown[$monitors[$i]['Id']] = $monitors[$i]['Name'];
+    $monitors_dropdown[$monitors[$i]['Id']] = $monitors[$i]['Id'].' '.$monitors[$i]['Name'];
 
     if ( count($selected_monitor_ids) and ! in_array($monitors[$i]['Id'], $selected_monitor_ids) ) {
       continue;
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 25a4fb946..7700ba037 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -94,6 +94,7 @@ $eventCounts = array(
   ),
 );
 
+require_once('includes/Group_Monitor.php');
 
 $navbar = getNavBarHTML();
 ob_start();
@@ -101,16 +102,23 @@ include('_monitor_filters.php');
 $filterbar = ob_get_contents();
 ob_end_clean();
 
-$show_storage_areas = count($storage_areas) > 1 and canEdit( 'System' ) ? 1 : 0;
+$show_storage_areas = (count($storage_areas) > 1) and (canEdit('System') ? 1 : 0);
 $maxWidth = 0;
 $maxHeight = 0;
 $zoneCount = 0;
 $total_capturing_bandwidth=0;
 
+$group_ids_by_monitor_id = array();
+foreach ( ZM\Group_Monitor::find(array('MonitorId'=>$selected_monitor_ids)) as $GM ) {
+  if ( !isset($group_ids_by_monitor_id[$GM->MonitorId()]) )
+    $group_ids_by_monitor_id[$GM->MonitorId()] = array();
+  $group_ids_by_monitor_id[$GM->MonitorId()][] = $GM->GroupId();
+}
+
 $status_counts = array();
 for ( $i = 0; $i < count($displayMonitors); $i++ ) {
   $monitor = &$displayMonitors[$i];
-  if ( ! $monitor['Status'] ) {
+  if ( !$monitor['Status'] ) {
     if ( $monitor['Type'] == 'WebSite' )
      $monitor['Status'] = 'Running';
     else
@@ -121,21 +129,22 @@ for ( $i = 0; $i < count($displayMonitors); $i++ ) {
   $status_counts[$monitor['Status']] += 1;
 
   if ( $monitor['Function'] != 'None' ) {
-    $scaleWidth = reScale( $monitor['Width'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-    $scaleHeight = reScale( $monitor['Height'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+    $scaleWidth = reScale($monitor['Width'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
+    $scaleHeight = reScale($monitor['Height'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
     if ( $maxWidth < $scaleWidth ) $maxWidth = $scaleWidth;
     if ( $maxHeight < $scaleHeight ) $maxHeight = $scaleHeight;
   }
   $zoneCount += $monitor['ZoneCount'];
 
   $counts = array();
-  foreach ( array_keys( $eventCounts ) as $j ) {
+  foreach ( array_keys($eventCounts) as $j ) {
     $filter = addFilterTerm(
       $eventCounts[$j]['filter'],
       count($eventCounts[$j]['filter']['Query']['terms']),
-      array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] )
+      array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'=', 'val'=>$monitor['Id'])
     );
-    parseFilter( $filter );
+    parseFilter($filter);
+    #$counts[] = 'count(if(1'.$filter['sql'].",1,NULL)) AS EventCount$j, SUM(if(1".$filter['sql'].",DiskSpace,NULL)) As DiskSpace$j";
     $monitor['eventCounts'][$j]['filter'] = $filter;
     $eventCounts[$j]['totalevents'] += $monitor[$j.'Events'];
     $eventCounts[$j]['totaldiskspace'] += $monitor[$j.'EventDiskSpace'];
@@ -153,17 +162,20 @@ if ( count($servers) ) $left_columns += 1;
 if ( ZM_WEB_ID_ON_CONSOLE ) $left_columns += 1;
 if ( $show_storage_areas ) $left_columns += 1;
 
-
-xhtmlHeaders( __FILE__, translate('Console') );
+xhtmlHeaders(__FILE__, translate('Console'));
 getBodyTopHTML();
 ?>
+  <?php echo $navbar ?>
   <form name="monitorForm" method="get" action="?">
     <input type="hidden" name="view" value="<?php echo $view ?>"/>
     <input type="hidden" name="action" value=""/>
 
-    <?php echo $navbar ?>
-    <div class="filterBar"><?php echo $filterbar ?></div>
-    <div class="statusBreakdown">
+    <div class="filterBar" id="fbpanel"<?php echo ( isset($_COOKIE['zmFilterBarFlip']) and $_COOKIE['zmFilterBarFlip'] == 'down' ) ? ' style="display:none;"' : '' ?>>
+      <?php echo $filterbar ?>
+    </div>
+
+    <div class="container-fluid pt-2">    
+      <div class="statusBreakdown float-left">
 <?php
   $html = '';
   foreach ( array_keys($status_counts) as $status ) {
@@ -172,29 +184,39 @@ getBodyTopHTML();
   }
   echo $html;
 ?>
-    </div>
+      </div>
 
-    <div class="container-fluid">
       <button type="button" name="addBtn" data-on-click-this="addMonitor"
-      <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
+      <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled" title="'.translate('AddMonitorDisabled').'"' ?>
       >
-      <span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span>&nbsp;<?php echo translate('AddNewMonitor') ?>
+        <i class="material-icons md-18">add_circle</i>
+        &nbsp;<?php echo translate('AddNewMonitor') ?>
       </button>
       <button type="button" name="cloneBtn" data-on-click-this="cloneMonitor"
       <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
       style="display:none;">
-      <span class="glyphicon glyphicon-copy"></span>&nbsp;<?php echo translate('CloneMonitor') ?>
+        <i class="material-icons md-18">content_copy</i>
+<!--content_copy used instead of file_copy as there is a bug in material-icons -->
+        &nbsp;<?php echo translate('CloneMonitor') ?>
       </button>
       <button type="button" name="editBtn" data-on-click-this="editMonitor" disabled="disabled">
-      <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>&nbsp;<?php echo translate('Edit') ?>
+        <i class="material-icons md-18">edit</i>
+        &nbsp;<?php echo translate('Edit') ?>
       </button>
       <button type="button" name="deleteBtn" data-on-click-this="deleteMonitor" disabled="disabled">
-      <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>&nbsp;<?php echo translate('Delete') ?>
+        <i class="material-icons md-18">delete</i>
+        &nbsp;<?php echo translate('Delete') ?>
       </button>
-      <button type="button" name="selectBtn" data-on-click-this="selectMonitor" disabled="disabled"><?php echo translate('Select')?></button>
+      <button type="button" name="selectBtn" data-on-click-this="selectMonitor" disabled="disabled">
+        <i class="material-icons md-18">view_list</i>
+        &nbsp;<?php echo translate('Select') ?>
+        </button>
+        
+        &nbsp;<a href="#"><i id="fbflip" class="material-icons md-18">keyboard_arrow_<?php echo ( isset($_COOKIE['zmFilterBarFlip']) and $_COOKIE['zmFilterBarFlip'] == 'down') ? 'down' : 'up' ?></i></a>
 <?php
 ob_start();
 ?>
+	<div class="table-responsive-sm pt-2">
       <table class="table table-striped table-hover table-condensed consoleTable">
         <thead class="thead-highlight">
           <tr>
@@ -214,7 +236,7 @@ ob_start();
         echo '<th class="colEvents">'. $eventCounts[$j]['title'] .'</th>';
       }
 ?>
-            <th class="colZones"><?php echo translate('Zones') ?></th>
+            <th class="colZones"><a href="?view=zones"><?php echo translate('Zones') ?></a></th>
 <?php if ( canEdit('Monitors') ) { ?>
             <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="markMids[]" data-on-click-this="updateFormCheckboxesByName"/> <?php echo translate('All') ?></th>
 <?php } ?>
@@ -225,10 +247,12 @@ ob_start();
 $table_head = ob_get_contents();
 ob_end_clean();
 echo $table_head;
+$monitors = array();
 for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   $monitor = $displayMonitors[$monitor_i];
   $Monitor = new ZM\Monitor($monitor);
-
+  $monitors[] = $Monitor;
+  $Monitor->GroupIds(isset($group_ids_by_monitor_id[$Monitor->Id()]) ? $group_ids_by_monitor_id[$Monitor->Id()] : array());
   if ( $monitor_i and ( $monitor_i % 100 == 0 ) ) {
     echo '</table>';
     echo $table_head;
@@ -267,9 +291,36 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
             <td class="colId"><a <?php echo ($stream_available ? 'href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>') . $monitor['Id'] ?></a></td>
 <?php
   }
+  $imgHTML='';
+  if ( ZM_WEB_LIST_THUMBS && ($monitor['Status'] == 'Connected') && $running ) {
+    $options = array();
+    $ratio_factor = $Monitor->ViewHeight() / $Monitor->ViewWidth();
+    $options['width'] = ZM_WEB_LIST_THUMB_WIDTH;
+    $options['height'] = ZM_WEB_LIST_THUMB_HEIGHT ? ZM_WEB_LIST_THUMB_HEIGHT : ZM_WEB_LIST_THUMB_WIDTH*$ratio_factor;
+    $options['scale'] = intval(100*ZM_WEB_LIST_THUMB_WIDTH / $Monitor->ViewWidth());
+    $options['mode'] = 'single';
+
+    $stillSrc = $Monitor->getStreamSrc($options);
+    $streamSrc = $Monitor->getStreamSrc(array('scale'=>$options['scale']*5));
+
+    $thmbWidth = ( $options['width'] ) ? 'width:'.$options['width'].'px;' : '';
+    $thmbHeight = ( $options['height'] ) ? 'height:'.$options['height'].'px;' : '';
+    
+    $imgHTML = '<div class="colThumbnail zoom-right"><a';
+    $imgHTML .= $stream_available ? ' href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>';
+    $imgHTML .= '<img id="thumbnail' .$Monitor->Id(). '" src="' .$stillSrc. '" style="'
+      .$thmbWidth.$thmbHeight. '" stream_src="' .$streamSrc. '" still_src="' .$stillSrc. '"'.
+      ($options['width'] ? ' width="'.$options['width'].'"' : '' ).
+      ($options['height'] ? ' height="'.$options['height'].'"' : '' ).
+      '/></a></div>';
+  }
 ?>
             <td class="colName">
-              <span class="glyphicon glyphicon-dot <?php echo $dot_class ?>" aria-hidden="true"></span><a <?php echo ($stream_available ? 'href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>') . $monitor['Name'] ?></a><br/><div class="small text-nowrap text-muted">
+            <i class="material-icons md-18 <?php echo $dot_class ?>">lens</i>
+              <a <?php echo ($stream_available ? 'href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>') . validHtmlStr($monitor['Name']) ?></a><br/>
+              <?php echo $imgHTML ?>
+              <div class="small text-nowrap text-muted">
+
               <?php echo implode('<br/>',
                   array_map(function($group_id){
                     $Group = ZM\Group::find_one(array('Id'=>$group_id));
@@ -277,12 +328,12 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
                       $Groups = $Group->Parents();
                       array_push( $Groups, $Group );
                     }
-                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.$Group->Name().'</a>'; }, $Groups ));
+                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.validHtmlStr($Group->Name()).'</a>'; }, $Groups ));
                     }, $Monitor->GroupIds() ) ); 
 ?>
             </div></td>
             <td class="colFunction">
-              <?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$function_class.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', <span class="disabledText">disabled</span>' : '' ) .'</span>', canEdit('Monitors') ) ?><br/>
+              <a class="functionLnk <?php echo $function_class ?>" data-mid="<?php echo $monitor['Id'] ?>" id="functionLnk-<?php echo $monitor['Id'] ?>" href="#"><?php echo translate('Fn'.$monitor['Function']) ?></a><br/>
               <?php echo translate('Status'.$monitor['Status']) ?><br/>
               <div class="small text-nowrap text-muted">
 <?php 
@@ -302,30 +353,30 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
               </div></td>
 <?php
   if ( count($servers) ) { ?>
-            <td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new ZM\Server($monitor['ServerId']); echo $Server->Name(); ?></td>
+            <td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new ZM\Server($monitor['ServerId']); echo validHtmlStr($Server->Name()); ?></td>
 <?php
   }
-  echo '<td class="colSource">'. makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$source_class.'">'.validHtmlStr($Monitor->Source()).'</span>', canEdit('Monitors') ).'</td>';
+  echo '<td class="colSource">'. makeLink( '?view=monitor&amp;mid='.$monitor['Id'], '<span class="'.$source_class.'">'.validHtmlStr($Monitor->Source()).'</span>', canEdit('Monitors') ).'</td>';
   if ( $show_storage_areas ) {
 ?>
-            <td class="colStorage"><?php if ( isset($StorageById[$monitor['StorageId']]) ) { echo $StorageById[ $monitor['StorageId'] ]->Name(); } ?></td>
+            <td class="colStorage"><?php echo isset($StorageById[$monitor['StorageId']]) ? validHtmlStr($StorageById[$monitor['StorageId']]->Name()) : ($monitor['StorageId']?'<span class="error">Deleted '.$monitor['StorageId'].'</span>' : '') ?></td>
 <?php
   }
 
       foreach ( array_keys($eventCounts) as $i ) {
 ?>
-            <td class="colEvents"><a <?php echo (canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$monitor['eventCounts'][$i]['filter']['query'].'">'  : '') . 
+            <td class="colEvents"><a <?php echo (canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$monitor['eventCounts'][$i]['filter']['querystring'].'">'  : '') . 
                 $monitor[$i.'Events'] . '<br/></a><div class="small text-nowrap text-muted">' . human_filesize($monitor[$i.'EventDiskSpace']) ?></div></td>
 <?php
   }
 ?>
-            <td class="colZones"><?php echo makePopupLink('?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array('zones', $monitor['Width'], $monitor['Height']), $monitor['ZoneCount'], canView('Monitors')) ?></td>
+            <td class="colZones"><?php echo makeLink('?view=zones&amp;mid='.$monitor['Id'], $monitor['ZoneCount'], canView('Monitors')) ?></td>
 <?php
   if ( canEdit('Monitors') ) {
 ?>
             <td class="colMark">
               <input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" data-on-click-this="setButtonStates"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
-              <span class="glyphicon glyphicon-sort" title="Click and drag to change order"></span>
+<i class="material-icons sort" title="Click and drag to change order">swap_vert</i>
             </td>
 <?php
   }
@@ -350,22 +401,39 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
             <td class="colStorage"></td>
 <?php
 }
-  foreach ( array_keys( $eventCounts ) as $i ) {
-    parseFilter( $eventCounts[$i]['filter'] );
+  foreach ( array_keys($eventCounts) as $i ) {
+    $filter = addFilterTerm(
+      $eventCounts[$i]['filter'],
+      count($eventCounts[$i]['filter']['Query']['terms']),
+      array(
+        'cnj'=>'and',
+        'attr'=>'MonitorId',
+        'op'=>'IN',
+        'val'=>implode(',',array_map(function($m){return $m['Id'];}, $displayMonitors))
+        )
+    );
+    parseFilter($filter);
 ?>
             <td class="colEvents">
-              <a <?php echo (canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$eventCounts[$i]['filter']['query'].'">' : '') . 
-                  $eventCounts[$i]['totalevents'].'<br/></a>'.'<div class="small text-nowrap text-muted">'.human_filesize($eventCounts[$i]['totaldiskspace']) ?></td>
+              <a <?php echo
+              (canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$filter['querystring'].'">' : '') . 
+              $eventCounts[$i]['totalevents'].'</a><br/>
+              <div class="small text-nowrap text-muted">'.human_filesize($eventCounts[$i]['totaldiskspace'])
+            ?></div>
+            </td>
 <?php
-      }
+      } // end foreach eventCounts
 ?>
             <td class="colZones"><?php echo $zoneCount ?></td>
 <?php if ( canEdit('Monitors') ) { ?>
             <td class="colMark"></td>
 <?php } ?>
-          </tr>
+         </tr>
         </tfoot>
-      </table>
+        </table>
+	    </div>
     </div>
   </form>
-<?php xhtmlFooter() ?>
+<?php
+  xhtmlFooter();
+?>
diff --git a/web/skins/classic/views/control.php b/web/skins/classic/views/control.php
index fc8923d82..9fad31c41 100644
--- a/web/skins/classic/views/control.php
+++ b/web/skins/classic/views/control.php
@@ -26,13 +26,13 @@ if ( !canView('Control') ) {
 $params = array();
 $groupSql = '';
 if ( !empty($_REQUEST['group']) ) {
-  $groupSql = ' AND gm.GroupId = :groupid';
+  $groupSql = ' AND (m.Id IN (SELECT MonitorID FROM Groups_Monitors WHERE GroupId = :groupid))';
   $params[':groupid'] = $_REQUEST['group'];
 }
 
 $mid = !empty($_REQUEST['mid']) ? validInt($_REQUEST['mid']) : 0;
 
-$sql = "SELECT m.* FROM Monitors m INNER JOIN Groups_Monitors AS gm ON m.Id = gm.MonitorId WHERE m.Function != 'None' AND m.Controllable = 1$groupSql ORDER BY Sequence";
+$sql = "SELECT m.* FROM Monitors m WHERE m.`Function` != 'None' AND m.`Controllable` = 1$groupSql ORDER BY `Sequence`";
 $mids = array();
 foreach ( dbFetchAll($sql, false, $params) as $row ) {
   if ( !visibleMonitor($row['Id']) ) {
diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php
index bc48d05e4..d7d57b284 100644
--- a/web/skins/classic/views/controlcap.php
+++ b/web/skins/classic/views/controlcap.php
@@ -18,40 +18,31 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit( 'Control' ) )
-{
-    $view = "error";
-    return;
+if ( !canEdit('Control') ) {
+  $view = 'error';
+  return;
 }
 
 $tabs = array();
-$tabs["main"] = translate('Main');
-$tabs["move"] = translate('Move');
-$tabs["pan"] = translate('Pan');
-$tabs["tilt"] = translate('Tilt');
-$tabs["zoom"] = translate('Zoom');
-$tabs["focus"] = translate('Focus');
-$tabs["white"] = translate('White');
-$tabs["iris"] = translate('Iris');
-$tabs["presets"] = translate('Presets');
+$tabs['main'] = translate('Main');
+$tabs['move'] = translate('Move');
+$tabs['pan'] = translate('Pan');
+$tabs['tilt'] = translate('Tilt');
+$tabs['zoom'] = translate('Zoom');
+$tabs['focus'] = translate('Focus');
+$tabs['gain'] = translate('Gain');
+$tabs['white'] = translate('White');
+$tabs['iris'] = translate('Iris');
+$tabs['presets'] = translate('Presets');
 
-if ( isset($_REQUEST['tab']) )
-    $tab = validHtmlStr($_REQUEST['tab']);
-else
-    $tab = "main";
+$tab = isset($_REQUEST['tab']) ? validHtmlStr($_REQUEST['tab']) :'main';
 
-if ( isset( $_REQUEST['newControl'] ) )
-{
+if ( isset($_REQUEST['newControl']) ) {
     $newControl = $_REQUEST['newControl'];
-}
-else
-{
-    if ( !empty($_REQUEST['cid']) )
-    {
-        $control = dbFetchOne( 'SELECT * FROM Controls WHERE Id = ?', NULL, array($_REQUEST['cid'] ) );
-    }
-    else
-    {
+} else {
+    if ( !empty($_REQUEST['cid']) ) {
+        $control = dbFetchOne('SELECT * FROM Controls WHERE Id = ?', NULL, array($_REQUEST['cid']));
+    } else {
         $control = array(
             'Name' => translate('New'),
             'Type' => "Local",
@@ -156,7 +147,7 @@ else
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('ControlCap')." - ".$newControl['Name'] );
+xhtmlHeaders(__FILE__, translate('ControlCap').' - '.$newControl['Name']);
 ?>
 <body>
   <div id="page">
@@ -166,16 +157,12 @@ xhtmlHeaders(__FILE__, translate('ControlCap')." - ".$newControl['Name'] );
     <div id="content">
       <ul class="tabList">
 <?php
-foreach ( $tabs as $name=>$value )
-{
-    if ( $tab == $name )
-    {
+foreach ( $tabs as $name=>$value ) {
+    if ( $tab == $name ) {
 ?>
         <li class="active"><?php echo $value ?></li>
 <?php
-    }
-    else
-    {
+    } else {
 ?>
         <li><a href="#" data-tab-name="<?php echo $name ?>"><?php echo $value ?></a></li>
 <?php
@@ -190,8 +177,7 @@ foreach ( $tabs as $name=>$value )
         <input type="hidden" name="action" value="controlcap"/>
         <input type="hidden" name="cid" value="<?php echo requestVar('cid') ?>"/>
 <?php
-if ( $tab != 'main' )
-{
+if ( $tab != 'main' ) {
 ?>
         <input type="hidden" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/>
         <input type="hidden" name="newControl[Type]" value="<?php echo validHtmlStr($newControl['Type']) ?>"/>
@@ -201,8 +187,7 @@ if ( $tab != 'main' )
         <input type="hidden" name="newControl[CanReset]" value="<?php echo !empty($newControl['CanReset']) ?>"/>
 <?php
 }
-if ( $tab != 'move' )
-{
+if ( $tab != 'move' ) {
 ?>
         <input type="hidden" name="newControl[CanMove]" value="<?php echo !empty($newControl['CanMove']) ?>"/>
         <input type="hidden" name="newControl[CanMoveDiag]" value="<?php echo !empty($newControl['CanMoveDiag']) ?>"/>
@@ -212,8 +197,7 @@ if ( $tab != 'move' )
         <input type="hidden" name="newControl[CanMoveCon]" value="<?php echo !empty($newControl['CanMoveCon']) ?>"/>
 <?php
 }
-if ( $tab != 'pan' )
-{
+if ( $tab != 'pan' ) {
 ?>
         <input type="hidden" name="newControl[CanPan]" value="<?php echo !empty($newControl['CanPan']) ?>"/>
         <input type="hidden" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>"/>
@@ -227,8 +211,7 @@ if ( $tab != 'pan' )
         <input type="hidden" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'tilt' )
-{
+if ( $tab != 'tilt' ) {
 ?>
         <input type="hidden" name="newControl[CanTilt]" value="<?php echo !empty($newControl['CanTilt']) ?>"/>
         <input type="hidden" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>"/>
@@ -242,8 +225,7 @@ if ( $tab != 'tilt' )
         <input type="hidden" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'zoom' )
-{
+if ( $tab != 'zoom' ) {
 ?>
         <input type="hidden" name="newControl[CanZoom]" value="<?php echo !empty($newControl['CanZoom']) ?>"/>
         <input type="hidden" name="newControl[CanZoomAbs]" value="<?php echo !empty($newControl['CanZoomAbs']) ?>"/>
@@ -258,8 +240,7 @@ if ( $tab != 'zoom' )
         <input type="hidden" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'focus' )
-{
+if ( $tab != 'focus' ) {
 ?>
         <input type="hidden" name="newControl[CanFocus]" value="<?php echo !empty($newControl['CanFocus']) ?>"/>
         <input type="hidden" name="newControl[CanAutoFocus]" value="<?php echo !empty($newControl['CanAutoFocus']) ?>"/>
@@ -275,8 +256,7 @@ if ( $tab != 'focus' )
         <input type="hidden" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'iris' )
-{
+if ( $tab != 'iris' ) {
 ?>
         <input type="hidden" name="newControl[CanIris]" value="<?php echo !empty($newControl['CanIris']) ?>"/>
         <input type="hidden" name="newControl[CanAutoIris]" value="<?php echo !empty($newControl['CanAutoIris']) ?>"/>
@@ -292,8 +272,7 @@ if ( $tab != 'iris' )
         <input type="hidden" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'gain' )
-{
+if ( $tab != 'gain' ) {
 ?>
         <input type="hidden" name="newControl[CanGain]" value="<?php echo !empty($newControl['CanGain']) ?>"/>
         <input type="hidden" name="newControl[CanAutoGain]" value="<?php echo !empty($newControl['CanAutoGain']) ?>"/>
@@ -309,8 +288,7 @@ if ( $tab != 'gain' )
         <input type="hidden" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'white' )
-{
+if ( $tab != 'white' ) {
 ?>
         <input type="hidden" name="newControl[CanWhite]" value="<?php echo !empty($newControl['CanWhite']) ?>"/>
         <input type="hidden" name="newControl[CanAutoWhite]" value="<?php echo !empty($newControl['CanAutoWhite']) ?>"/>
@@ -326,8 +304,7 @@ if ( $tab != 'white' )
         <input type="hidden" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>"/>
 <?php
 }
-if ( $tab != 'presets' )
-{
+if ( $tab != 'presets' ) {
 ?>
         <input type="hidden" name="newControl[HasPresets]" value="<?php echo !empty($newControl['HasPresets']) ?>"/>
         <input type="hidden" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>"/>
@@ -336,19 +313,17 @@ if ( $tab != 'presets' )
 <?php
 }
 ?>
-        <table id="contentTable" class="major" cellspacing="0">
+        <table id="contentTable" class="major">
           <tbody>
 <?php
-switch ( $tab )
-{
-    case 'main' :
-    {
+switch ( $tab ) {
+  case 'main' :
+  {
 ?>
-            <tr><th scope="row"><?php echo translate('Name') ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>" size="24"/></td></tr>
-<?php
-        $types = array( 'Local'=>translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>"cURL");
-?>
-            <tr><th scope="row"><?php echo translate('Type') ?></th><td><?php echo buildSelect( "newControl[Type]", $types ); ?></td></tr>
+            <tr><th scope="row"><?php echo translate('Name') ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('Type') ?></th><td><?php 
+            $types = array( 'Local'=>translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>'cURL');
+            echo buildSelect('newControl[Type]', $types); ?></td></tr>
             <tr><th scope="row"><?php echo translate('Protocol') ?></th><td><input type="text" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>" size="24"/></td></tr>
             <tr><th scope="row"><?php echo translate('CanWake') ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanSleep') ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
@@ -373,15 +348,15 @@ switch ( $tab )
     {
 ?>
             <tr><th scope="row"><?php echo translate('CanPan') ?></th><td><input type="checkbox" name="newControl[CanPan]" value="1"<?php if ( !empty($newControl['CanPan']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanRange') ?></th><td><input type="text" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanRange') ?></th><td><input type="text" name="newControl[MaxPanRange]" value="<?php echo validHtmlStr($newControl['MaxPanRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanStep') ?></th><td><input type="text" name="newControl[MinPanStep]" value="<?php echo validHtmlStr($newControl['MinPanStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanStep') ?></th><td><input type="text" name="newControl[MaxPanStep]" value="<?php echo validHtmlStr($newControl['MaxPanStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinPanRange') ?></th><td><input type="number" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxPanRange') ?></th><td><input type="number" name="newControl[MaxPanRange]" value="<?php echo validHtmlStr($newControl['MaxPanRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinPanStep') ?></th><td><input type="number" name="newControl[MinPanStep]" value="<?php echo validHtmlStr($newControl['MinPanStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxPanStep') ?></th><td><input type="number" name="newControl[MaxPanStep]" value="<?php echo validHtmlStr($newControl['MaxPanStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasPanSpeed') ?></th><td><input type="checkbox" name="newControl[HasPanSpeed]" value="1"<?php if ( !empty($newControl['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanSpeed') ?></th><td><input type="text" name="newControl[MinPanSpeed]" value="<?php echo validHtmlStr($newControl['MinPanSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanSpeed') ?></th><td><input type="text" name="newControl[MaxPanSpeed]" value="<?php echo validHtmlStr($newControl['MaxPanSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinPanSpeed') ?></th><td><input type="number" name="newControl[MinPanSpeed]" value="<?php echo validHtmlStr($newControl['MinPanSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxPanSpeed') ?></th><td><input type="number" name="newControl[MaxPanSpeed]" value="<?php echo validHtmlStr($newControl['MaxPanSpeed']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasTurboPan') ?></th><td><input type="checkbox" name="newControl[HasTurboPan]" value="1"<?php if ( !empty($newControl['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('TurboPanSpeed') ?></th><td><input type="text" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('TurboPanSpeed') ?></th><td><input type="number" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -389,15 +364,15 @@ switch ( $tab )
     {
 ?>
             <tr><th scope="row"><?php echo translate('CanTilt') ?></th><td><input type="checkbox" name="newControl[CanTilt]" value="1"<?php if ( !empty($newControl['CanTilt']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltRange') ?></th><td><input type="text" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltRange') ?></th><td><input type="text" name="newControl[MaxTiltRange]" value="<?php echo validHtmlStr($newControl['MaxTiltRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltStep') ?></th><td><input type="text" name="newControl[MinTiltStep]" value="<?php echo validHtmlStr($newControl['MinTiltStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltStep') ?></th><td><input type="text" name="newControl[MaxTiltStep]" value="<?php echo validHtmlStr($newControl['MaxTiltStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinTiltRange') ?></th><td><input type="number" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxTiltRange') ?></th><td><input type="number" name="newControl[MaxTiltRange]" value="<?php echo validHtmlStr($newControl['MaxTiltRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinTiltStep') ?></th><td><input type="number" name="newControl[MinTiltStep]" value="<?php echo validHtmlStr($newControl['MinTiltStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxTiltStep') ?></th><td><input type="number" name="newControl[MaxTiltStep]" value="<?php echo validHtmlStr($newControl['MaxTiltStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasTiltSpeed') ?></th><td><input type="checkbox" name="newControl[HasTiltSpeed]" value="1"<?php if ( !empty($newControl['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltSpeed') ?></th><td><input type="text" name="newControl[MinTiltSpeed]" value="<?php echo validHtmlStr($newControl['MinTiltSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltSpeed') ?></th><td><input type="text" name="newControl[MaxTiltSpeed]" value="<?php echo validHtmlStr($newControl['MaxTiltSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinTiltSpeed') ?></th><td><input type="number" name="newControl[MinTiltSpeed]" value="<?php echo validHtmlStr($newControl['MinTiltSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxTiltSpeed') ?></th><td><input type="number" name="newControl[MaxTiltSpeed]" value="<?php echo validHtmlStr($newControl['MaxTiltSpeed']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasTurboTilt') ?></th><td><input type="checkbox" name="newControl[HasTurboTilt]" value="1"<?php if ( !empty($newControl['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('TurboTiltSpeed') ?></th><td><input type="text" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('TurboTiltSpeed') ?></th><td><input type="number" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -408,13 +383,13 @@ switch ( $tab )
             <tr><th scope="row"><?php echo translate('CanZoomAbs') ?></th><td><input type="checkbox" name="newControl[CanZoomAbs]" value="1"<?php if ( !empty($newControl['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanZoomRel') ?></th><td><input type="checkbox" name="newControl[CanZoomRel]" value="1"<?php if ( !empty($newControl['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanZoomCon') ?></th><td><input type="checkbox" name="newControl[CanZoomCon]" value="1"<?php if ( !empty($newControl['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomRange') ?></th><td><input type="text" name="newControl[MinZoomRange]" value="<?php echo validHtmlStr($newControl['MinZoomRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomRange') ?></th><td><input type="text" name="newControl[MaxZoomRange]" value="<?php echo validHtmlStr($newControl['MaxZoomRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomStep') ?></th><td><input type="text" name="newControl[MinZoomStep]" value="<?php echo validHtmlStr($newControl['MinZoomStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomStep') ?></th><td><input type="text" name="newControl[MaxZoomStep]" value="<?php echo validHtmlStr($newControl['MaxZoomStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinZoomRange') ?></th><td><input type="number" name="newControl[MinZoomRange]" value="<?php echo validHtmlStr($newControl['MinZoomRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxZoomRange') ?></th><td><input type="number" name="newControl[MaxZoomRange]" value="<?php echo validHtmlStr($newControl['MaxZoomRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinZoomStep') ?></th><td><input type="number" name="newControl[MinZoomStep]" value="<?php echo validHtmlStr($newControl['MinZoomStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxZoomStep') ?></th><td><input type="number" name="newControl[MaxZoomStep]" value="<?php echo validHtmlStr($newControl['MaxZoomStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasZoomSpeed') ?></th><td><input type="checkbox" name="newControl[HasZoomSpeed]" value="1"<?php if ( !empty($newControl['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomSpeed') ?></th><td><input type="text" name="newControl[MinZoomSpeed]" value="<?php echo validHtmlStr($newControl['MinZoomSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomSpeed') ?></th><td><input type="text" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinZoomSpeed') ?></th><td><input type="number" name="newControl[MinZoomSpeed]" value="<?php echo validHtmlStr($newControl['MinZoomSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxZoomSpeed') ?></th><td><input type="number" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -426,13 +401,13 @@ switch ( $tab )
             <tr><th scope="row"><?php echo translate('CanFocusAbs') ?></th><td><input type="checkbox" name="newControl[CanFocusAbs]" value="1"<?php if ( !empty($newControl['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanFocusRel') ?></th><td><input type="checkbox" name="newControl[CanFocusRel]" value="1"<?php if ( !empty($newControl['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanFocusCon') ?></th><td><input type="checkbox" name="newControl[CanFocusCon]" value="1"<?php if ( !empty($newControl['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusRange') ?></th><td><input type="text" name="newControl[MinFocusRange]" value="<?php echo validHtmlStr($newControl['MinFocusRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusRange') ?></th><td><input type="text" name="newControl[MaxFocusRange]" value="<?php echo validHtmlStr($newControl['MaxFocusRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusStep') ?></th><td><input type="text" name="newControl[MinFocusStep]" value="<?php echo validHtmlStr($newControl['MinFocusStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusStep') ?></th><td><input type="text" name="newControl[MaxFocusStep]" value="<?php echo validHtmlStr($newControl['MaxFocusStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinFocusRange') ?></th><td><input type="number" name="newControl[MinFocusRange]" value="<?php echo validHtmlStr($newControl['MinFocusRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxFocusRange') ?></th><td><input type="number" name="newControl[MaxFocusRange]" value="<?php echo validHtmlStr($newControl['MaxFocusRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinFocusStep') ?></th><td><input type="number" name="newControl[MinFocusStep]" value="<?php echo validHtmlStr($newControl['MinFocusStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxFocusStep') ?></th><td><input type="number" name="newControl[MaxFocusStep]" value="<?php echo validHtmlStr($newControl['MaxFocusStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasFocusSpeed') ?></th><td><input type="checkbox" name="newControl[HasFocusSpeed]" value="1"<?php if ( !empty($newControl['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusSpeed') ?></th><td><input type="text" name="newControl[MinFocusSpeed]" value="<?php echo validHtmlStr($newControl['MinFocusSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusSpeed') ?></th><td><input type="text" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinFocusSpeed') ?></th><td><input type="number" name="newControl[MinFocusSpeed]" value="<?php echo validHtmlStr($newControl['MinFocusSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxFocusSpeed') ?></th><td><input type="number" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -444,13 +419,13 @@ switch ( $tab )
             <tr><th scope="row"><?php echo translate('CanIrisAbs') ?></th><td><input type="checkbox" name="newControl[CanIrisAbs]" value="1"<?php if ( !empty($newControl['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanIrisRel') ?></th><td><input type="checkbox" name="newControl[CanIrisRel]" value="1"<?php if ( !empty($newControl['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanIrisCon') ?></th><td><input type="checkbox" name="newControl[CanIrisCon]" value="1"<?php if ( !empty($newControl['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisRange') ?></th><td><input type="text" name="newControl[MinIrisRange]" value="<?php echo validHtmlStr($newControl['MinIrisRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisRange') ?></th><td><input type="text" name="newControl[MaxIrisRange]" value="<?php echo validHtmlStr($newControl['MaxIrisRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisStep') ?></th><td><input type="text" name="newControl[MinIrisStep]" value="<?php echo validHtmlStr($newControl['MinIrisStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisStep') ?></th><td><input type="text" name="newControl[MaxIrisStep]" value="<?php echo validHtmlStr($newControl['MaxIrisStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinIrisRange') ?></th><td><input type="number" name="newControl[MinIrisRange]" value="<?php echo validHtmlStr($newControl['MinIrisRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxIrisRange') ?></th><td><input type="number" name="newControl[MaxIrisRange]" value="<?php echo validHtmlStr($newControl['MaxIrisRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinIrisStep') ?></th><td><input type="number" name="newControl[MinIrisStep]" value="<?php echo validHtmlStr($newControl['MinIrisStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxIrisStep') ?></th><td><input type="number" name="newControl[MaxIrisStep]" value="<?php echo validHtmlStr($newControl['MaxIrisStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasIrisSpeed') ?></th><td><input type="checkbox" name="newControl[HasIrisSpeed]" value="1"<?php if ( !empty($newControl['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisSpeed') ?></th><td><input type="text" name="newControl[MinIrisSpeed]" value="<?php echo validHtmlStr($newControl['MinIrisSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisSpeed') ?></th><td><input type="text" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinIrisSpeed') ?></th><td><input type="number" name="newControl[MinIrisSpeed]" value="<?php echo validHtmlStr($newControl['MinIrisSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxIrisSpeed') ?></th><td><input type="number" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -462,13 +437,13 @@ switch ( $tab )
             <tr><th scope="row"><?php echo translate('CanGainAbs') ?></th><td><input type="checkbox" name="newControl[CanGainAbs]" value="1"<?php if ( !empty($newControl['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanGainRel') ?></th><td><input type="checkbox" name="newControl[CanGainRel]" value="1"<?php if ( !empty($newControl['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanGainCon') ?></th><td><input type="checkbox" name="newControl[CanGainCon]" value="1"<?php if ( !empty($newControl['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainRange') ?></th><td><input type="text" name="newControl[MinGainRange]" value="<?php echo validHtmlStr($newControl['MinGainRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainRange') ?></th><td><input type="text" name="newControl[MaxGainRange]" value="<?php echo validHtmlStr($newControl['MaxGainRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainStep') ?></th><td><input type="text" name="newControl[MinGainStep]" value="<?php echo validHtmlStr($newControl['MinGainStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainStep') ?></th><td><input type="text" name="newControl[MaxGainStep]" value="<?php echo validHtmlStr($newControl['MaxGainStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinGainRange') ?></th><td><input type="number" name="newControl[MinGainRange]" value="<?php echo validHtmlStr($newControl['MinGainRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxGainRange') ?></th><td><input type="number" name="newControl[MaxGainRange]" value="<?php echo validHtmlStr($newControl['MaxGainRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinGainStep') ?></th><td><input type="number" name="newControl[MinGainStep]" value="<?php echo validHtmlStr($newControl['MinGainStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxGainStep') ?></th><td><input type="number" name="newControl[MaxGainStep]" value="<?php echo validHtmlStr($newControl['MaxGainStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasGainSpeed') ?></th><td><input type="checkbox" name="newControl[HasGainSpeed]" value="1"<?php if ( !empty($newControl['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainSpeed') ?></th><td><input type="text" name="newControl[MinGainSpeed]" value="<?php echo validHtmlStr($newControl['MinGainSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainSpeed') ?></th><td><input type="text" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinGainSpeed') ?></th><td><input type="number" name="newControl[MinGainSpeed]" value="<?php echo validHtmlStr($newControl['MinGainSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxGainSpeed') ?></th><td><input type="number" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -480,13 +455,13 @@ switch ( $tab )
             <tr><th scope="row"><?php echo translate('CanWhiteAbs') ?></th><td><input type="checkbox" name="newControl[CanWhiteAbs]" value="1"<?php if ( !empty($newControl['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanWhiteRel') ?></th><td><input type="checkbox" name="newControl[CanWhiteRel]" value="1"<?php if ( !empty($newControl['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanWhiteCon') ?></th><td><input type="checkbox" name="newControl[CanWhiteCon]" value="1"<?php if ( !empty($newControl['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteRange') ?></th><td><input type="text" name="newControl[MinWhiteRange]" value="<?php echo validHtmlStr($newControl['MinWhiteRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteRange') ?></th><td><input type="text" name="newControl[MaxWhiteRange]" value="<?php echo validHtmlStr($newControl['MaxWhiteRange']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteStep') ?></th><td><input type="text" name="newControl[MinWhiteStep]" value="<?php echo validHtmlStr($newControl['MinWhiteStep']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteStep') ?></th><td><input type="text" name="newControl[MaxWhiteStep]" value="<?php echo validHtmlStr($newControl['MaxWhiteStep']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinWhiteRange') ?></th><td><input type="number" name="newControl[MinWhiteRange]" value="<?php echo validHtmlStr($newControl['MinWhiteRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxWhiteRange') ?></th><td><input type="number" name="newControl[MaxWhiteRange]" value="<?php echo validHtmlStr($newControl['MaxWhiteRange']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinWhiteStep') ?></th><td><input type="number" name="newControl[MinWhiteStep]" value="<?php echo validHtmlStr($newControl['MinWhiteStep']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxWhiteStep') ?></th><td><input type="number" name="newControl[MaxWhiteStep]" value="<?php echo validHtmlStr($newControl['MaxWhiteStep']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasWhiteSpeed') ?></th><td><input type="checkbox" name="newControl[HasWhiteSpeed]" value="1"<?php if ( !empty($newControl['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteSpeed') ?></th><td><input type="text" name="newControl[MinWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MinWhiteSpeed']) ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteSpeed') ?></th><td><input type="text" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MinWhiteSpeed') ?></th><td><input type="number" name="newControl[MinWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MinWhiteSpeed']) ?>"/></td></tr>
+            <tr><th scope="row"><?php echo translate('MaxWhiteSpeed') ?></th><td><input type="number" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
@@ -494,7 +469,7 @@ switch ( $tab )
     {
 ?>
             <tr><th scope="row"><?php echo translate('HasPresets') ?></th><td><input type="checkbox" name="newControl[HasPresets]" value="1"<?php if ( !empty($newControl['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('NumPresets') ?></th><td><input type="text" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('NumPresets') ?></th><td><input type="number" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>"/></td></tr>
             <tr><th scope="row"><?php echo translate('HasHomePreset') ?></th><td><input type="checkbox" name="newControl[HasHomePreset]" value="1"<?php if ( !empty($newControl['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanSetPresets') ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
@@ -505,10 +480,10 @@ switch ( $tab )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
+          <button type="submit" value="Save"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>><?php echo translate('Save') ?></button>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php
index 3ae021f9b..58bca5dbd 100644
--- a/web/skins/classic/views/controlcaps.php
+++ b/web/skins/classic/views/controlcaps.php
@@ -18,17 +18,16 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Control' ) )
-{
-    $view = "error";
+if ( !canView('Control') ) {
+    $view = 'error';
     return;
 }
 
-$controls = dbFetchAll( 'SELECT * FROM Controls ORDER BY Id' );
+$controls = dbFetchAll('SELECT * FROM Controls ORDER BY Name');
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('ControlCaps') );
+xhtmlHeaders(__FILE__, translate('ControlCaps'));
 ?>
 <body>
   <div id="page">
@@ -42,7 +41,7 @@ xhtmlHeaders(__FILE__, translate('ControlCaps') );
       <form name="contentForm" id="contentForm" method="get" action="?" onsubmit="return( confirmDelete( 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.\nAre you sure you wish to delete?' ) );">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="delete"/>
-        <table id="contentTable" class="major" cellspacing="0">
+        <table id="contentTable" class="major">
           <thead>
             <tr>
               <th class="colName"><?php echo translate('Name') ?></th>
@@ -59,8 +58,7 @@ xhtmlHeaders(__FILE__, translate('ControlCaps') );
           </thead>
           <tbody>
 <?php
-foreach( $controls as $control )
-{
+foreach( $controls as $control ) {
 ?>
             <tr>
               <td class="colName"><?php echo makePopupLink( '?view=controlcap&cid='.$control['Id'], 'zmControlCap', 'controlcap', validHtmlStr($control['Name']), canView( 'Control' ) ) ?></td>
@@ -86,5 +84,4 @@ foreach( $controls as $control )
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/controlpreset.php b/web/skins/classic/views/controlpreset.php
index 9b5af9618..6d67c5424 100644
--- a/web/skins/classic/views/controlpreset.php
+++ b/web/skins/classic/views/controlpreset.php
@@ -66,5 +66,4 @@ xhtmlHeaders(__FILE__, translate('SetPreset') );
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index a36390b52..7e974cd4e 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -40,7 +40,7 @@ if ( empty($_REQUEST['mode']) ) {
 }
 
 $widths = array(
-  ''  => translate('auto'),
+  'auto'  => translate('auto'),
   '100%'  => '100%',
   '160px' => '160px',
   '320px' => '320px',
@@ -58,34 +58,6 @@ $heights = array(
   '1080px'  =>  '1080px',
 );
 
-session_start();
-
-if ( isset($_REQUEST['scale']) ) {
-  $options['scale'] = validInt($_REQUEST['scale']);
-  ZM\Logger::Debug('Setting scale from request to '.$options['scale']);
-} else if ( isset($_COOKIE['zmCycleScale']) ) {
-  $options['scale'] = $_COOKIE['zmCycleScale'];
-  ZM\Logger::Debug('Setting scale from cookie to '.$options['scale']);
-}
-
-if ( !(isset($options['scale']) and $options['scale']) )
-  $options['scale'] = 100;
-
-if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {
-  $_SESSION['zmCycleWidth'] = $options['width'] = $_COOKIE['zmCycleWidth'];
-#} elseif ( isset($_SESSION['zmCycleWidth']) and $_SESSION['zmCycleWidth'] ) {
-  #$options['width'] = $_SESSION['zmCycleWidth'];
-} else
-  $options['width'] = '';
-
-if ( isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight'] )
-  $_SESSION['zmCycleHeight'] = $options['height'] = $_COOKIE['zmCycleHeight'];
-#else if ( isset($_SESSION['zmCycleHeight']) and $_SESSION['zmCycleHeight'] )
-  #$options['height'] = $_SESSION['zmCycleHeight'];
-else
-  $options['height'] = '';
-
-session_write_close();
 
 $monIdx = 0;
 $monitors = array();
@@ -106,7 +78,6 @@ foreach( $displayMonitors as &$row ) {
     $heights[$row['Height'].'px'] = $row['Height'].'px';
   }
 
-  $row['connKey'] = generateConnKey();
   $monitors[] = new ZM\Monitor($row);
   unset($row);
 } # end foreach Monitor
@@ -115,6 +86,41 @@ if ( $monitors ) {
   $monitor = $monitors[$monIdx];
   $nextMid = $monIdx==(count($monitors)-1)?$monitors[0]->Id():$monitors[$monIdx+1]->Id();
 }
+if ( !$monitor ) {
+  ZM\Error('There was no monitor to display.');
+}
+$options['connkey'] = generateConnKey();
+
+zm_session_start();
+
+if ( isset($_REQUEST['scale']) ) {
+  $options['scale'] = validInt($_REQUEST['scale']);
+} else if ( isset($_COOKIE['zmCycleScale']) ) {
+  $options['scale'] = $_COOKIE['zmCycleScale'];
+} else if ( $monitor ) {
+  $options['scale'] = $monitor->DefaultScale();
+}
+
+if ( !isset($options['scale']) )
+  $options['scale'] = 100;
+
+if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {
+  $_SESSION['zmCycleWidth'] = $options['width'] = $_COOKIE['zmCycleWidth'];
+#} elseif ( isset($_SESSION['zmCycleWidth']) and $_SESSION['zmCycleWidth'] ) {
+  #$options['width'] = $_SESSION['zmCycleWidth'];
+} else {
+  $options['width'] = '';
+}
+
+if ( isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight'] ) {
+  $_SESSION['zmCycleHeight'] = $options['height'] = $_COOKIE['zmCycleHeight'];
+#else if ( isset($_SESSION['zmCycleHeight']) and $_SESSION['zmCycleHeight'] )
+  #$options['height'] = $_SESSION['zmCycleHeight'];
+} else {
+  $options['height'] = '';
+}
+
+session_write_close();
 
 ZM\Logger::Debug(print_r($options,true));
 
@@ -141,36 +147,49 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
       <div id="sizeControl">
         <span id="widthControl">
           <label><?php echo translate('Width') ?>:</label>
-          <?php echo htmlSelect('width', $widths, $options['width'], array('data-on-change-this'=>'changeSize') ); ?>
+          <?php echo htmlSelect('width', $widths, $options['width'], array('id'=>'width', 'data-on-change-this'=>'changeSize') ); ?>
         </span>
         <span id="heightControl">
           <label><?php echo translate('Height') ?>:</label>
-          <?php echo htmlSelect('height', $heights, $options['height'], array('data-on-change-this'=>'changeSize') ); ?>
+          <?php echo htmlSelect('height', $heights, $options['height'], array('id'=>'height', 'data-on-change-this'=>'changeSize') ); ?>
         </span>
         <span id="scaleControl">
           <label><?php echo translate('Scale') ?>:</label>
-          <?php echo htmlSelect('scale', $scales, $options['scale'], array('data-on-change-this'=>'changeScale') ); ?>
+          <?php echo htmlSelect('scale', $scales, $options['scale'], array('id'=>'scale', 'data-on-change-this'=>'changeScale') ); ?>
         </span>
       </div>
     </div>
-    <div id="content">
-      <div id="imageFeed">
-      <?php 
-        if ( $monitor ) {
-          echo getStreamHTML($monitor, $options);
-        } else {
-          echo 'There are no monitors to view.';
-        }
-      ?>
-      </div>
+    <div class="container-fluid h-100">
+      <div class="row flex-nowrap h-100" id="content">
+        <nav id="sidebar" class="h-100">
+          <ul class="nav nav-pills flex-column h-100">
+  <?php
+  foreach ( $monitors as $m ) {
+            echo '<li class="nav-item"><a class="nav-link'.( $m->Id() == $monitor->Id() ? ' active' : '' ).'" href="?view=cycle&amp;mid='.$m->Id().'">'.$m->Name().'</a></li>';
+  }
+  ?>
+          </ul>
+        </nav>
+        <div class="container-fluid col-sm-offset-2 h-100 pr-0">
 
-      <div class="buttons">
-        <button type="button" value="&lt;" id="prevBtn" title="<?php echo translate('PreviousMonitor') ?>" class="active" data-on-click-true="cyclePrev">&lt;&lt;</button>
-        <button type="button" value="||" id="pauseBtn" title="<?php echo translate('PauseCycle') ?>" class="active" data-on-click-true="cyclePause">||</button>
-        <button type="button" value="|&gt;" id="playBtn" title="<?php echo translate('PlayCycle') ?>" class="inactive" disabled="disabled" data-on-click-true="streamCmdPlay">|&gt;</button>
-        <button type="button" value="&gt;" id="nextBtn" title="<?php echo translate('NextMonitor') ?>" class="active" data-on-click-true="cycleNext">&gt;&gt;</button>
-      </div>
+          <div id="imageFeed">
+          <?php 
+            if ( $monitor ) {
+              echo getStreamHTML($monitor, $options);
+            } else {
+              echo 'There are no monitors to view.';
+            }
+          ?>
+          </div>
 
+          <div class="buttons">
+            <button type="button" value="&lt;" id="prevBtn" title="<?php echo translate('PreviousMonitor') ?>" class="active" data-on-click-true="cyclePrev">&lt;&lt;</button>
+            <button type="button" value="||" id="pauseBtn" title="<?php echo translate('PauseCycle') ?>" class="active" data-on-click-true="cyclePause">||</button>
+            <button type="button" value="|&gt;" id="playBtn" title="<?php echo translate('PlayCycle') ?>" class="inactive" disabled="disabled" data-on-click-true="cycleStart">|&gt;</button>
+            <button type="button" value="&gt;" id="nextBtn" title="<?php echo translate('NextMonitor') ?>" class="active" data-on-click-true="cycleNext">&gt;&gt;</button>
+          </div>
+
+        </div>
+      </div>
     </div>
-  </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/donate.php b/web/skins/classic/views/donate.php
deleted file mode 100644
index 456fc1e47..000000000
--- a/web/skins/classic/views/donate.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-//
-// ZoneMinder web donate view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
-
-$options = array( 
-  "go"      => translate('DonateYes'),
-  "hour"    => translate('DonateRemindHour'),
-  "day"     => translate('DonateRemindDay'),
-  "week"    => translate('DonateRemindWeek'),
-  "month"   => translate('DonateRemindMonth'),
-  "never"   => translate('DonateRemindNever'),
-  "already" => translate('DonateAlready'),
-);
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Donate'));
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Donate') ?></h2>
-      <h1>ZoneMinder - <?php echo translate('Donate') ?></h1>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="view" value="donate"/>
-        <input type="hidden" name="action" value="donate"/>
-        <p>
-          <?php echo translate('DonateEnticement') ?>
-        </p>
-        <p>
-          <?php echo buildSelect('option', $options); ?>
-        </p>
-        <div id="contentButtons">
-          <button type="submit"><?php echo translate('Apply') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/download.php b/web/skins/classic/views/download.php
index 88bb0958b..91ac635fe 100644
--- a/web/skins/classic/views/download.php
+++ b/web/skins/classic/views/download.php
@@ -54,15 +54,8 @@ if ( isset($_REQUEST['exportFormat']) ) {
   }
 }
 
-if ( !empty($_REQUEST['eid']) ) {
-  $Event = new ZM\Event($_REQUEST['eid']);
-  if ( !$Event->Id ) {
-    Error('Invalid event id');
-  }
-}
-
 $focusWindow = true;
-$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
+$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Download'));
 ?>
@@ -75,7 +68,7 @@ xhtmlHeaders(__FILE__, translate('Download'));
       <h2><?php echo translate('Download') ?></h2>
     </div>
     <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+      <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
 <?php
 if ( !empty($_REQUEST['eid']) ) {
@@ -83,7 +76,12 @@ if ( !empty($_REQUEST['eid']) ) {
         <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
     <?php
     $Event = new ZM\Event($_REQUEST['eid']);
-    echo 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
+    if ( !$Event->Id() ) {
+      ZM\Error('Invalid event id');
+      echo '<div class="error">Invalid event id</div>';
+    } else {
+      echo 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
+    }
 } else if ( !empty($_REQUEST['eids']) ) {
     $total_size = 0;
     foreach ( $_REQUEST['eids'] as $eid ) {
@@ -148,5 +146,4 @@ if ( !empty($_REQUEST['eid']) ) {
     }
 ?>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/error.php b/web/skins/classic/views/error.php
index a5c7e887f..545c734ef 100644
--- a/web/skins/classic/views/error.php
+++ b/web/skins/classic/views/error.php
@@ -35,7 +35,7 @@ xhtmlHeaders(__FILE__, translate('Error') );
         <?php echo translate('ContactAdmin') ?>
       </p>
       <p>
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
+        <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
       </p>
     </div>
   </div>
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 489486032..992bbc597 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -23,8 +23,11 @@ if ( !canView('Events') ) {
   return;
 }
 
+require_once('includes/Event.php');
+require_once('includes/Filter.php');
+
 $eid = validInt($_REQUEST['eid']);
-$fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
+$fid = !empty($_REQUEST['fid']) ? validInt($_REQUEST['fid']) : 1;
 
 $Event = new ZM\Event($eid);
 if ( $user['MonitorIds'] ) {
@@ -48,7 +51,7 @@ if ( isset($_REQUEST['scale']) ) {
   $scale = validInt($_REQUEST['scale']);
 } else if ( isset($_COOKIE['zmEventScaleAuto']) ) {
   // If we're using scale to fit use it on all monitors
-  $scale = 'auto';
+  $scale = '0';
 } else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) {
   $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()];
 } else {
@@ -58,7 +61,7 @@ if ( isset($_REQUEST['scale']) ) {
 $codec = 'auto';
 if ( isset($_REQUEST['codec']) ) {
   $codec = $_REQUEST['codec'];
-  session_start();
+  zm_session_start();
   $_SESSION['zmEventCodec'.$Event->MonitorId()] = $codec;
   session_write_close();
 } else if ( isset($_SESSION['zmEventCodec'.$Event->MonitorId()]) ) {
@@ -79,15 +82,15 @@ $replayModes = array(
   'gapless' => translate('ReplayGapless'),
 );
 
-if ( isset( $_REQUEST['streamMode'] ) )
+if ( isset($_REQUEST['streamMode']) )
   $streamMode = validHtmlStr($_REQUEST['streamMode']);
 else
   $streamMode = 'video';
 
 $replayMode = '';
-if ( isset( $_REQUEST['replayMode'] ) )
+if ( isset($_REQUEST['replayMode']) )
   $replayMode = validHtmlStr($_REQUEST['replayMode']);
-if ( isset( $_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
+if ( isset($_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
   $replayMode = validHtmlStr($_COOKIE['replayMode']);
 
 if ( ( !$replayMode ) or ( !$replayModes[$replayMode] ) ) {
@@ -95,7 +98,7 @@ if ( ( !$replayMode ) or ( !$replayModes[$replayMode] ) ) {
 }
 
 $video_tag = false;
-if ( $Event->DefaultVideo() and ( 'mp4' == pathinfo($Event->DefaultVideo(), PATHINFO_EXTENSION) ) && ( $codec == 'H264' || $codec == 'auto' ) ) {
+if ( $Event->DefaultVideo() and ( 'mp4' == pathinfo($Event->DefaultVideo(), PATHINFO_EXTENSION) ) && ( $codec == 'MP4' || $codec == 'auto' ) ) {
   $video_tag = true;
 }
 // videojs zoomrotate only when direct recording
@@ -108,10 +111,19 @@ if ( $Monitor->VideoWriter() == '2' ) {
     $Zoom = $Event->Height()/$Event->Width();
 }
 
-// These are here to figure out the next/prev event
+// These are here to figure out the next/prev event, however if there is no filter, then default to one that specifies the Monitor
+if ( !isset($_REQUEST['filter']) ) {
+  $_REQUEST['filter'] = array(
+    'Query'=>array(
+      'terms'=>array(
+        array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$Event->MonitorId())
+      )
+    )
+  );
+}
 parseSort();
-parseFilter($_REQUEST['filter']);
-$filterQuery = $_REQUEST['filter']['query'];
+$filter = ZM\Filter::parse($_REQUEST['filter']);
+$filterQuery = $filter->querystring();
 
 $connkey = generateConnKey();
 
@@ -126,24 +138,27 @@ xhtmlHeaders(__FILE__, translate('Event'));
     <?php if ( !$popup ) echo getNavBarHTML() ?>
     <div id="header">
 <?php 
-if ( ! $Event->Id() ) {
+if ( !$Event->Id() ) {
   echo 'Event was not found.';
 } else {
+  if ( !file_exists($Event->Path()) ) {
+    echo '<div class="error">Event was not found at '.$Event->Path().'.  It is unlikely that playback will be possible.</div>';
+  }
 ?>
       <div id="dataBar">
         <span id="dataId" title="<?php echo translate('Id') ?>"><?php echo $Event->Id() ?></span>
-        <span id="dataMonitor" title="<?php echo translate('Monitor') ?>"><?php echo $Monitor->Id() . ' ' . $Monitor->Name() ?></span>
+        <span id="dataMonitor" title="<?php echo translate('Monitor') ?>"><?php echo $Monitor->Id().' '.validHtmlStr($Monitor->Name()) ?></span>
         <span id="dataCause" title="<?php echo $Event->Notes()?validHtmlStr($Event->Notes()):translate('AttrCause') ?>"><?php echo validHtmlStr($Event->Cause()) ?></span>
-        <span id="dataTime" title="<?php echo translate('Time') ?>"><?php echo strftime( STRF_FMT_DATETIME_SHORT, strtotime($Event->StartTime() ) ) ?></span>
+        <span id="dataTime" title="<?php echo translate('Time') ?>"><?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartTime())) ?></span>
         <span id="dataDuration" title="<?php echo translate('Duration') ?>"><?php echo $Event->Length().'s' ?></span>
         <span id="dataFrames" title="<?php echo translate('AttrFrames').'/'.translate('AttrAlarmFrames') ?>"><?php echo $Event->Frames() ?>/<?php echo $Event->AlarmFrames() ?></span>
         <span id="dataScore" title="<?php echo translate('AttrTotalScore').'/'.translate('AttrAvgScore').'/'.translate('AttrMaxScore') ?>"><?php echo $Event->TotScore() ?>/<?php echo $Event->AvgScore() ?>/<?php echo $Event->MaxScore() ?></span>
         <span id="Storage">
 <?php echo 
-  human_filesize($Event->DiskSpace(null)) . ' on ' . $Event->Storage()->Name().
-  ( $Event->SecondaryStorageId() ? ', ' . $Event->SecondaryStorage()->Name() :'' )
+  human_filesize($Event->DiskSpace(null)) . ' on ' . validHtmlStr($Event->Storage()->Name()).
+  ( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' )
 ?></span>
-        <div id="closeWindow"><a href="#" onclick="<?php echo $popup ? 'window.close()' : 'window.history.back();return false;' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
+        <div id="closeWindow"><a href="#" data-on-click="<?php echo $popup ? 'closeWindow' : 'backWindow' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
       </div>
       <div id="menuBar1">
         <div id="nameControl">
@@ -156,8 +171,8 @@ if ( canEdit('Events') ) {
 ?>
         <div id="deleteEvent"><button type="button" data-on-click="deleteEvent" <?php echo $Event->can_delete() ? '' : ' disabled="disabled" title="'.$Event->cant_delete_reason().'"' ?>><?php echo translate('Delete') ?></button></div>
         <div id="editEvent"><button type="button" data-on-click="editEvent"><?php echo translate('Edit') ?></button></div>
-        <div id="archiveEvent"<?php echo $Event->Archived == 1 ? ' class="hidden"' : ''  ?>><button type="button" data-on-click="archiveEvent"><?php echo translate('Archive') ?></button></div>
-        <div id="unarchiveEvent"<?php echo $Event->Archived == 0 ? ' class="hidden"' : '' ?>><button type="button" data-on-click="unarchiveEvent"><?php echo translate('Unarchive') ?></button></div>
+        <div id="archiveEvent"<?php echo $Event->Archived() == 1 ? ' class="hidden"' : ''  ?>><button type="button" data-on-click="archiveEvent"><?php echo translate('Archive') ?></button></div>
+        <div id="unarchiveEvent"<?php echo $Event->Archived() == 0 ? ' class="hidden"' : '' ?>><button type="button" data-on-click="unarchiveEvent"><?php echo translate('Unarchive') ?></button></div>
 <?php
 } // end if can edit Events
 ?>
@@ -167,7 +182,7 @@ if ( canEdit('Events') ) {
 <?php
   if ( $Event->DefaultVideo() ) { 
 ?>
-        <div id="downloadEventFile"><a class="btn-primary" href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'))?>" download>Download MP4</a></div>
+        <div id="downloadEventFile"><a class="btn-primary" href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'),'&amp;')?>" download>Download MP4</a></div>
 <?php
   } else {
 ?>
@@ -176,20 +191,34 @@ if ( canEdit('Events') ) {
   } // end if Event->DefaultVideo
 ?>
         <div id="exportEvent"><button type="button" data-on-click="exportEvent"><?php echo translate('Export') ?></button></div>
-        <div id="replayControl"><label for="replayMode"><?php echo translate('Replay') ?></label><?php echo buildSelect('replayMode', $replayModes, 'changeReplayMode();'); ?></div>
-        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect('scale', $scales, 'changeScale();'); ?></div>
-        <div id="codecControl"><label for="codec"><?php echo translate('Codec') ?></label><?php echo htmlSelect('codec', $codecs, $codec, array('onchange'=>'changeCodec(this);')); ?></div>
+        <div id="replayControl">
+          <label for="replayMode"><?php echo translate('Replay') ?></label>
+          <?php echo htmlSelect('replayMode', $replayModes, $replayMode, array('data-on-change'=>'changeReplayMode','id'=>'replayMode')); ?>
+        </div>
+        <div id="scaleControl">
+          <label for="scale"><?php echo translate('Scale') ?></label>
+          <?php echo htmlSelect('scale', $scales, $scale, array('data-on-change'=>'changeScale','id'=>'scale')); ?>
+        </div>
+        <div id="codecControl">
+          <label for="codec"><?php echo translate('Codec') ?></label>
+          <?php echo htmlSelect('codec', $codecs, $codec, array('data-on-change'=>'changeCodec','id'=>'codec')); ?>
+        </div>
       </div>
-     </div>
+    </div>
     <div id="content">
-      <div id="eventVideo" class="">
+      <div id="eventVideo">
 <?php
 if ( $video_tag ) {
 ?>
         <div id="videoFeed">
-          <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0)" width="<?php echo reScale( $Event->Width(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $scale ) ?>" data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
-          <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264')); ?>" type="video/mp4">
-          <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default>
+          <video id="videoobj" class="video-js vjs-default-skin"
+            style="transform: matrix(1, 0, 0, 1, 0, 0);"
+           <?php echo $scale ? 'width="'.reScale($Event->Width(), $scale).'"' : '' ?>
+           <?php echo $scale ? 'height="'.reScale($Event->Height(), $scale).'"' : '' ?>
+            data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'
+          >
+          <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264'),'&amp;'); ?>" type="video/mp4">
+          <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default/>
           Your browser does not support the video tag.
           </video>
         </div><!--videoFeed-->
@@ -198,11 +227,11 @@ if ( $video_tag ) {
 ?>
       <div id="imageFeed">
 <?php
-if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
-  $streamSrc = $Event->getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode));
+if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
+  $streamSrc = $Event->getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode),'&amp;');
   outputVideoStream('evtStream', $streamSrc, reScale( $Event->Width(), $scale ).'px', reScale( $Event->Height(), $scale ).'px', ZM_MPEG_LIVE_FORMAT );
 } else {
-  $streamSrc = $Event->getStreamSrc(array('mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode));
+  $streamSrc = $Event->getStreamSrc(array('mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode),'&amp;');
   if ( canStreamNative() ) {
     outputImageStream('evtStream', $streamSrc, reScale($Event->Width(), $scale).'px', reScale($Event->Height(), $scale).'px', validHtmlStr($Event->Name()));
   } else {
@@ -219,19 +248,42 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
 } /*end if !DefaultVideo*/
 ?>
         <p id="dvrControls">
-          <input type="button" value="&lt;+" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" data-on-click-true="streamPrev"/>
-          <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" data-on-click-true="streamFastRev"/>
-          <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" data-on-click-true="streamSlowRev"/>
-          <input type="button" value="||" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" data-on-click="pauseClicked"/>
-          <input type="button" value="|>" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" data-on-click="playClicked"/>
-          <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamSlowFwd"/>
-          <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="inactive" data-on-click-true="streamFastFwd"/>
-          <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="unavail" disabled="disabled" data-on-click="streamZoomOut"/>
-          <input type="button" value="+&gt;" id="nextBtn" title="<?php echo translate('Next') ?>" class="inactive" data-on-click-true="streamNext"/>
+          <button type="button" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" data-on-click-true="streamPrev">
+          <i class="material-icons md-18">skip_previous</i>
+          </button>
+          <button type="button" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" data-on-click-true="streamFastRev">
+          <i class="material-icons md-18">fast_rewind</i>
+          </button>
+          <button type="button" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" data-on-click-true="streamSlowRev">
+          <i class="material-icons md-18">chevron_left</i>
+          </button>
+          <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" data-on-click="pauseClicked">
+          <i class="material-icons md-18">pause</i>
+          </button>
+          <button type="button" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" data-on-click="playClicked">
+          <i class="material-icons md-18">play_arrow</i>
+          </button>
+          <button type="button" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamSlowFwd">
+          <i class="material-icons md-18">chevron_right</i>
+          </button>
+          <button type="button" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="inactive" data-on-click-true="streamFastFwd">
+          <i class="material-icons md-18">fast_forward</i>
+          </button>
+          <button type="button" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="unavail" disabled="disabled" data-on-click="streamZoomOut">
+          <i class="material-icons md-18">zoom_out</i>
+          </button>
+          <button type="button" id="nextBtn" title="<?php echo translate('Next') ?>" class="inactive" data-on-click-true="streamNext">
+          <i class="material-icons md-18">skip_next</i>
+          </button>
         </p>
         <div id="replayStatus">
           <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">Replay</span></span>
-          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"><?php echo $rate/100 ?></span>x</span>
+          <span id="rate"><?php echo translate('Rate') ?>: 
+<?php 
+$rates = array( -800=>'-8x', -400=>'-4x', -200=>'-2x', -100=>'-1x', 0=>translate('Stop'), 100 => '1x', 200=>'2x', 400=>'4x', 800=>'8x' );
+echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
+?>
+<!--<span id="rateValue"><?php echo $rate/100 ?></span>x</span>-->
           <span id="progress"><?php echo translate('Progress') ?>: <span id="progressValue">0</span>s</span>
           <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue">1</span>x</span>
         </div>
@@ -261,12 +313,12 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
           </div>
           <div id="eventImageButtons">
             <div id="prevButtonsPanel">
-              <input id="prevEventBtn" type="button" value="&lt;E" data-on-click="prevEvent" disabled="disabled"/>
-              <input id="prevThumbsBtn" type="button" value="&lt;&lt;" data-on-click="prevThumbs" disabled="disabled"/>
-              <input id="prevImageBtn" type="button" value="&lt;" data-on-click="prevImage" disabled="disabled"/>
-              <input id="nextImageBtn" type="button" value="&gt;" data-on-click="nextImage" disabled="disabled"/>
-              <input id="nextThumbsBtn" type="button" value="&gt;&gt;" data-on-click="nextThumbs" disabled="disabled"/>
-              <input id="nextEventBtn" type="button" value="E&gt;" data-on-click="nextEvent" disabled="disabled"/>
+              <button id="prevEventBtn" type="button" data-on-click="prevEvent" disabled="disabled">&lt;E</button>
+              <button id="prevThumbsBtn" type="button" data-on-click="prevThumbs" disabled="disabled">&lt;&lt;</button>
+              <button id="prevImageBtn" type="button" data-on-click="prevImage" disabled="disabled">&lt;</button>
+              <button id="nextImageBtn" type="button" data-on-click="nextImage" disabled="disabled">&gt;</button>
+              <button id="nextThumbsBtn" type="button" data-on-click="nextThumbs" disabled="disabled">&gt;&gt;</button>
+              <button id="nextEventBtn" type="button" data-on-click="nextEvent" disabled="disabled">E&gt;</button>
             </div>
           </div>
         </div>
@@ -276,5 +328,4 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
 ?>
     </div><!--content-->
   </div><!--page-->
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php
deleted file mode 100644
index 35f4eec30..000000000
--- a/web/skins/classic/views/eventdetail.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-//
-// ZoneMinder web event detail view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canEdit('Events') ) {
-  $view = 'error';
-  return;
-}
-if ( isset($_REQUEST['eid']) ) {
-  $mode = 'single';
-  $eid = validInt($_REQUEST['eid']);
-  $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
-} elseif ( isset($_REQUEST['eids']) ) {
-  $mode = 'multi';
-  $sql = 'SELECT E.* FROM Events AS E WHERE ';
-  $sqlWhere = array();
-  $sqlValues = array();
-  foreach ( $_REQUEST['eids'] as $eid ) {
-    $sqlWhere[] = 'E.Id = ?';
-    $sqlValues[] = validInt($eid);
-  }
-  unset($eid);
-  $sql .= join(' OR ', $sqlWhere);
-  foreach( dbFetchAll( $sql, NULL, $sqlValues ) as $row ) {
-    if ( !isset($newEvent) ) {
-      $newEvent = $row;
-    } else {
-      if ( $newEvent['Cause'] && $newEvent['Cause'] != $row['Cause'] )
-        $newEvent['Cause'] = '';
-      if ( $newEvent['Notes'] && $newEvent['Notes'] != $row['Notes'] )
-        $newEvent['Notes'] = '';
-    }
-  }
-} else {
-  $mode = '';
-}
-
-$focusWindow = true;
-
-if ( $mode == 'single' )
-    xhtmlHeaders(__FILE__, translate('Event').' - '.$eid );
-else
-    xhtmlHeaders(__FILE__, translate('Events') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-<?php
-if ( $mode == 'single' ) {
-?>
-      <h2><?php echo translate('Event') ?> <?php echo $eid ?></h2>
-<?php
-} else {
-?>
-      <h2><?php echo translate('Events') ?></h2>
-<?php
-}
-?>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="action" value="eventdetail"/>
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-<?php
-if ( $mode == 'single' ) {
-?>
-        <input type="hidden" name="markEids[]" value="<?php echo validInt($eid) ?>"/>
-<?php
-} else if ( $mode = 'multi' ) {
-?>
-<?php
-    foreach ( $_REQUEST['eids'] as $eid ) {
-?>
-        <input type="hidden" name="markEids[]" value="<?php echo validInt($eid) ?>"/>
-<?php
-    }
-}
-?>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Cause') ?></th>
-              <td><input type="text" name="newEvent[Cause]" value="<?php echo validHtmlStr($newEvent['Cause']) ?>" size="32"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Notes') ?></th>
-              <td><textarea name="newEvent[Notes]" rows="6" cols="50"><?php echo validHtmlStr($newEvent['Notes']) ?></textarea></td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button type="submit" value="Save" <?php echo !canEdit('Events') ? ' disabled="disabled"' : '' ?>>
-          <?php echo translate('Save') ?>
-          </button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index fc692169b..d7921ccc3 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -24,33 +24,60 @@ if ( !canView('Events') || (!empty($_REQUEST['execute']) && !canEdit('Events'))
 }
 
 require_once('includes/Event.php');
+require_once('includes/Filter.php');
 
-$countSql = 'SELECT count(E.Id) AS EventCount FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId) WHERE';
 $eventsSql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE';
 if ( $user['MonitorIds'] ) {
-	$user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
-	$countSql .= $user_monitor_ids;
-	$eventsSql .= $user_monitor_ids;
+  $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
+  $eventsSql .= $user_monitor_ids;
 } else {
-  $countSql .= ' 1';
   $eventsSql .= ' 1';
 }
 
-parseSort();
-parseFilter($_REQUEST['filter']);
-$filterQuery = $_REQUEST['filter']['query'];
-
-if ( $_REQUEST['filter']['sql'] ) {
-  $countSql .= $_REQUEST['filter']['sql'];
-  $eventsSql .= $_REQUEST['filter']['sql'];
+$filter = isset($_REQUEST['filter_id']) ? new ZM\Filter($_REQUEST['filter_id']) : new ZM\Filter();
+if ( isset($_REQUEST['filter'])) {
+  $filter->set($_REQUEST['filter']);
 }
-$eventsSql .= " ORDER BY $sortColumn $sortOrder,Id $sortOrder";
+
+parseSort();
+
+$filterQuery = $filter->querystring();
+ZM\Logger::Debug('Filter '.print_r($filter, true));
+
+if ( $filter->sql() ) {
+  $eventsSql .= ' AND ('.$filter->sql().')';
+} else {
+  ZM\Warning('No filters');
+  exit;
+}
+$eventsSql .= ' ORDER BY '.$sortColumn.' '.$sortOrder;
+if ( $sortColumn != 'E.Id' ) $eventsSql .= ',E.Id '.$sortOrder;
 
 $page = isset($_REQUEST['page']) ? validInt($_REQUEST['page']) : 0;
-$limit = isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : 0;
+$limit = isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : $filter['limit'];
 
-$nEvents = dbFetchOne($countSql, 'EventCount');
-if ( !empty($limit) && $nEvents > $limit ) {
+if ( $_POST ) {
+  // I think this is basically so that a refresh doesn't repost
+  ZM\Logger::Debug('Redirecting to ' . $_SERVER['REQUEST_URI']);
+  header('Location: ?view=' . $view.htmlspecialchars_decode($filterQuery).htmlspecialchars_decode($sortQuery).$limitQuery.'&page='.$page);
+  exit();
+}
+
+$failed = !$filter->test_pre_sql_conditions();
+if ( $failed ) {
+  ZM\Logger::Debug('Pre conditions failed, not doing sql');
+}
+
+$results = $failed ? null : dbQuery($eventsSql);
+
+$nEvents = $results ? $results->rowCount() : 0;
+if ( ! $results ) {
+  global $error_message;
+  $error_message = dbError($eventsSql);
+} 
+ZM\Logger::Debug("Pre conditions succeeded sql return $nEvents events");
+
+if ( !empty($limit) && ($nEvents > $limit) ) {
   $nEvents = $limit;
 }
 $pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE);
@@ -62,175 +89,187 @@ if ( !empty($page) ) {
     $page = $pages;
 
   $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
-  if ( empty( $limit ) ) {
+  if ( empty($limit) ) {
     $limitAmount = ZM_WEB_EVENTS_PER_PAGE;
   } else {
     $limitLeft = $limit - $limitStart;
     $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
   }
-  $eventsSql .= " limit $limitStart, $limitAmount";
-} elseif ( !empty($limit) ) {
-  $eventsSql .= ' limit 0, '.$limit;
+  $eventsSql .= ' LIMIT '.$limitStart.', '.$limitAmount;
+} else if ( !empty($limit) ) {
+  $eventsSql .= ' LIMIT 0, '.$limit;
 }
 
 $maxShortcuts = 5;
-$pagination = getPagination($pages, $page, $maxShortcuts, $filterQuery.$sortQuery.$limitQuery);
 
 $focusWindow = true;
 
-if ( $_POST ) {
-  // I think this is basically so that a refresh doesn't repost
-  ZM\Logger::Debug('Redirecting to ' . $_SERVER['REQUEST_URI']);
-  header('Location: ?view=' . $view.htmlspecialchars_decode($filterQuery).htmlspecialchars_decode($sortQuery).$limitQuery.'&page='.$page);
-  exit();
-}
-
 $storage_areas = ZM\Storage::find();
 $StorageById = array();
 foreach ( $storage_areas as $S ) {
   $StorageById[$S->Id()] = $S;
 }
 
-xhtmlHeaders(__FILE__, translate('Events') );
+xhtmlHeaders(__FILE__, translate('Events'));
+getBodyTopHTML();
 
 ?>
-<body>
-  <div id="page">
-    <?php echo getNavBarHTML() ?>
-    <div id="header">
-      <div id="info">
-        <h2><?php echo sprintf($CLANG['EventCount'], $nEvents, zmVlang($VLANG['Event'], $nEvents)) ?></h2>
-        <a id="refreshLink" href="#"><?php echo translate('Refresh') ?></a>
-      </div>
-      <div id="pagination">
-<?php
-if ( $pagination ) {
-?>
-        <h2 class="pagination"><?php echo $pagination ?></h2>
-<?php
-}
-?>
-<?php
-if ( $pages > 1 ) {
-  if ( !empty($page) ) {
-?>
-        <a href="?view=<?php echo $view ?>&amp;page=0<?php echo $filterQuery ?><?php echo $sortQuery.$limitQuery ?>"><?php echo translate('ViewAll') ?></a>
-<?php
-  } else {
-?>
-        <a href="?view=<?php echo $view ?>&amp;page=1<?php echo $filterQuery ?><?php echo $sortQuery.$limitQuery ?>"><?php echo translate('ViewPaged') ?></a>
-<?php
-  }
-}
-?>
-      </div>
-      <div id="controls">
-        <a href="#" id="backLink"><?php echo translate('Back') ?></a>
-        <a id="timelineLink" href="?view=timeline<?php echo $filterQuery ?>"><?php echo translate('ShowTimeline') ?></a>
-      </div>
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="container-fluid p-3">
+    <!-- Toolbar button placement and styling handled by bootstrap-tables -->
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      <button id="tlineBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ShowTimeline') ?>" ><i class="fa fa-history"></i></button>
+      <button id="viewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('View') ?>" disabled><i class="fa fa-binoculars"></i></button>
+      <button id="archiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Archive') ?>" disabled><i class="fa fa-archive"></i></button>
+      <button id="unarchiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Unarchive') ?>" disabled><i class="fa fa-file-archive-o"></i></button>
+      <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Edit') ?>" disabled><i class="fa fa-pencil"></i></button>
+      <button id="exportBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Export') ?>" disabled><i class="fa fa-external-link"></i></button>
+      <button id="downloadBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DownloadVideo') ?>" disabled><i class="fa fa-download"></i></button>
+      <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
     </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value=""/>
-        <input type="hidden" name="page" value="<?php echo $page ?>"/>
-        <?php echo $_REQUEST['filter']['fields'] ?>
-        <input type="hidden" name="sort_field" value="<?php echo validHtmlStr($_REQUEST['sort_field']) ?>"/>
-        <input type="hidden" name="sort_asc" value="<?php echo validHtmlStr($_REQUEST['sort_asc']) ?>"/>
-        <input type="hidden" name="limit" value="<?php echo $limit ?>"/>
-        <table id="contentTable" class="major">
-          <tbody>
-<?php
-$count = 0;
-$disk_space_total = 0;
 
-$results = dbQuery($eventsSql);
-while ( $event_row = dbFetchNext($results) ) {
-  $event = new ZM\Event($event_row);
-  if ( $event_row['Archived'] )
-    $archived = true;
-  else
-    $unarchived = true;
-
-  if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) {
-?>
+    <!-- Table styling handled by bootstrap-tables -->
+    <div class="row justify-content-center">
+      <table
+        id="eventTable"
+        data-pagination="true"
+        data-show-pagination-switch="true"
+        data-page-list="[10, 25, 50, 100, 200, All]"
+        data-search="true"
+        data-cookie="true"
+        data-cookie-id-table="zmEventsTable"
+        data-cookie-expire="2y"
+        data-click-to-select="true"
+        data-remember-order="true"
+        data-show-columns="true"
+        data-show-export="true"
+        data-uncheckAll="true"
+        data-toolbar="#toolbar"
+        data-show-fullscreen="true"
+        data-click-to-select="true"
+        data-maintain-meta-data="true"
+        data-mobile-responsive="true"
+        data-buttons-class="btn btn-normal"
+        data-show-jump-to="true"
+        class="table-sm table-borderless"
+        style="display:none;"
+      >
+        <thead>
+            <!-- Row styling is handled by bootstrap-tables -->
             <tr>
-              <th class="colId"><a href="<?php echo sortHeader('Id') ?>"><?php echo translate('Id') ?><?php echo sortTag('Id') ?></a></th>
-              <th class="colName"><a href="<?php echo sortHeader('Name') ?>"><?php echo translate('Name') ?><?php echo sortTag('Name') ?></a></th>
-              <th class="colMonitor"><a href="<?php echo sortHeader('MonitorName') ?>"><?php echo translate('Monitor') ?><?php echo sortTag('MonitorName') ?></a></th>
-              <th class="colCause"><a href="<?php echo sortHeader('Cause') ?>"><?php echo translate('Cause') ?><?php echo sortTag('Cause') ?></a></th>
-              <th class="colTime"><a href="<?php echo sortHeader('StartTime') ?>"><?php echo translate('Time') ?><?php echo sortTag('StartTime') ?></a></th>
-              <th class="colDuration"><a href="<?php echo sortHeader('Length') ?>"><?php echo translate('Duration') ?><?php echo sortTag('Length') ?></a></th>
-              <th class="colFrames"><a href="<?php echo sortHeader('Frames') ?>"><?php echo translate('Frames') ?><?php echo sortTag('Frames') ?></a></th>
-              <th class="colAlarmFrames"><a href="<?php echo sortHeader('AlarmFrames') ?>"><?php echo translate('AlarmBrFrames') ?><?php echo sortTag('AlarmFrames') ?></a></th>
-              <th class="colTotScore"><a href="<?php echo sortHeader('TotScore') ?>"><?php echo translate('TotalBrScore') ?><?php echo sortTag('TotScore') ?></a></th>
-              <th class="colAvgScore"><a href="<?php echo sortHeader('AvgScore') ?>"><?php echo translate('AvgBrScore') ?><?php echo sortTag('AvgScore') ?></a></th>
-              <th class="colMaxScore"><a href="<?php echo sortHeader('MaxScore') ?>"><?php echo translate('MaxBrScore') ?><?php echo sortTag('MaxScore') ?></a></th>
+              <th data-sortable="false" data-field="toggleCheck" data-checkbox="true"></th>
+              <th data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
+              <th data-sortable="true" data-field="Name"><?php echo translate('Name') ?></th>
+              <th data-sortable="true" data-field="Archived"><?php echo translate('Archived') ?></th>
+              <th data-sortable="true" data-field="Emailed"><?php echo translate('Emailed') ?></th>
+              <th data-sortable="true" data-field="Monitor"><?php echo translate('Monitor') ?></th>
+              <th data-sortable="true" data-field="Cause"><?php echo translate('Cause') ?></th>
+              <th data-sortable="true" data-field="AttrStartTime"><?php echo translate('AttrStartTime') ?></th>
+              <th data-sortable="true" data-field="AttrEndTime"><?php echo translate('AttrEndTime') ?></th>
+              <th data-sortable="true" data-field="Duration"><?php echo translate('Duration') ?></th>
+              <th data-sortable="true" data-field="Frames"><?php echo translate('Frames') ?></th>
+              <th data-sortable="true" data-field="AlarmBrFrames"><?php echo translate('AlarmBrFrames') ?></th>
+              <th data-sortable="true" data-field="TotalBrScore"><?php echo translate('TotalBrScore') ?></th>
+              <th data-sortable="true" data-field="AvgBrScore"><?php echo translate('AvgBrScore') ?></th>
+              <th data-sortable="true" data-field="MaxBrScore"><?php echo translate('MaxBrScore') ?></th>
 <?php
     if ( count($storage_areas) > 1 ) { 
 ?>
-              <th class="colStorage"><?php echo translate('Storage') ?></th>
+              <th data-sortable="true" data-field="Storage"><?php echo translate('Storage') ?></th>
 <?php
     }
     if ( ZM_WEB_EVENT_DISK_SPACE ) {
 ?>
-              <th class="colDiskSpace"><a href="<?php echo sortHeader('DiskSpace') ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag('DiskSpace') ?></a></th>
+              <th data-sortable="true" data-field="DiskSpace"><?php echo translate('DiskSpace') ?></th>
 <?php
     }
     if ( ZM_WEB_LIST_THUMBS ) {
 ?>
-              <th class="colThumbnail"><?php echo translate('Thumbnail') ?></th>
+              <th data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
 <?php
     }
 ?>
-              <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="eids[]" data-on-click-this="updateFormCheckboxesByName"/></th>
             </tr>
+           </thead>
+           <tbody>
 <?php
-  }
-  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
-?>
-            <tr<?php if ($event->Archived()) echo ' class="archived"' ?>>
-              <td class="colId"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$event->Id().($event->Archived()?'*':'') ?></a></td>
-              <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
-              <td class="colMonitorName"><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->Monitorid(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
-              <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?>
-                    <?php
-                        # display notes as small text
-                        if ($event->Notes()) {
-                            # if notes include detection objects, then link it to objdetect.jpg
-                            if (strpos($event->Notes(),"detected:")!== false){
-                             # make a link
-                                echo makePopupLink( '?view=image&amp;eid='.$event->Id().'&amp;fid=objdetect', 'zmImage',
-                                     array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)),
-                                     "<div class=\"small text-nowrap text-muted\"><u>".$event->Notes()."</u></div>");
-                            }
-                            elseif ($event->Notes() != 'Forced Web: ') {
-                                echo "<br/><div class=\"small text-nowrap text-muted\">".$event->Notes()."</div>";
-                            }
-                        }
-                ?>
+$count = 0;
+$disk_space_total = 0;
+if ( $results ) {
+  $events = array();
 
+  while ( $event_row = dbFetchNext($results) ) {
+    $event = new ZM\Event($event_row);
+
+    if ( !$filter->test_post_sql_conditions($event) ) {
+      $event->remove_from_cache();
+      continue;
+    }
+    $events[] = $event;
+    if ( $limit and (count($events) >= $limit) ) {
+      break;
+    }
+    ZM\Logger::Debug("Have " . count($events) . " events, limit $limit");
+  }
+  foreach ( $events as $event ) {
+
+    $scale = max(reScale(SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
+?>
+            <tr<?php echo $event->Archived() ? ' class="archived"' : '' ?>>
+              <td data-checkbox="true"></td>            
+              <td><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$event->Id() ?></a></td>
+
+              <td><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.validHtmlStr($event->Name())?></a>
+              <?php 
+              $archived = $event->Archived() ? translate('Archived') : '';
+              $emailed = $event->Emailed() ? ' '.translate('Emailed') : '';
+              echo '<br/><div class="small text-nowrap text-muted">'.$archived.$emailed.'</div>';
+              ?>
               </td>
-              <td class="colTime"><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) . 
-( $event->EndTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime()) ) : '' ) ?>
+
+              <td class="text-center"><?php echo ( $event->Archived() ) ? 'Yes' : 'No' ?></td>
+              <td class="text-center"><?php echo ( $event->Emailed() ) ? 'Yes' : 'No' ?></td>
+              <td><?php echo makeLink( '?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
+              <td><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?>
+              <?php
+              # display notes as small text
+              if ( $event->Notes() ) {
+                # if notes include detection objects, then link it to objdetect.jpg
+                if ( strpos($event->Notes(), 'detected:') !== false ) {
+                  # make a link
+                  echo makeLink( '?view=image&amp;eid='.$event->Id().'&amp;fid=objdetect', '<div class="small text-nowrap text-muted"><u>'.$event->Notes().'</u></div>');
+                } else if ( $event->Notes() != 'Forced Web: ' ) {
+                  echo '<br/><div class="small text-nowrap text-muted">'.$event->Notes().'</div>';
+                }
+              }
+              ?>
               </td>
-              <td class="colDuration"><?php echo gmdate("H:i:s", $event->Length() ) ?></td>
-              <td class="colFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 
-              ( ZM_WEB_LIST_THUMBS ? array('frames', ZM_WEB_LIST_THUMB_WIDTH, ZM_WEB_LIST_THUMB_HEIGHT) : 'frames'),
-              $event->Frames() ) ?></td>
-              <td class="colAlarmFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames',
-              ( ZM_WEB_LIST_THUMBS ? array('frames', ZM_WEB_LIST_THUMB_WIDTH, ZM_WEB_LIST_THUMB_HEIGHT) : 'frames'),
-              $event->AlarmFrames() ) ?></td>
-              <td class="colTotScore"><?php echo $event->TotScore() ?></td>
-              <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
-              <td class="colMaxScore"><?php echo makePopupLink(
-                '?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage',
-                array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), $event->MaxScore()
-              ); ?></td>
+              
+              <td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) ?></td>
+              <td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime())) ?></td>
+              <td><?php echo gmdate('H:i:s', $event->Length() ) ?></td>
+              <td><a href="?view=frames&amp;eid=<?php echo $event->Id() ?>"><?php echo $event->Frames() ?></a></td>
+              <td><a href="?view=frames&amp;eid=<?php echo $event->Id() ?>"><?php echo $event->AlarmFrames() ?></a></td>
+              <td><?php echo $event->TotScore() ?></td>
+              <td><?php echo $event->AvgScore() ?></td>
+              <td><?php echo makeLink('?view=frame&amp;eid='.$event->Id().'&amp;fid=0', $event->MaxScore()); ?></td>
 <?php
   if ( count($storage_areas) > 1 ) { 
 ?>
-              <td class="colStorage"><?php echo isset($StorageById[$event->StorageId()]) ? $StorageById[$event->StorageId()]->Name() : '' ?></td>
+              <td>
+<?php
+    if ( $event->StorageId() ) {
+      echo isset($StorageById[$event->StorageId()]) ? $StorageById[$event->StorageId()]->Name() : 'Unknown Storage Id: '.$event->StorageId();
+    } else {
+      echo 'Default';
+    }
+    if ( $event->SecondaryStorageId() ) {
+      echo '<br/>'.(isset($StorageById[$event->SecondaryStorageId()]) ? $StorageById[$event->SecondaryStorageId()]->Name() : 'Unknown Storage Id '.$event->SecondaryStorageId());
+    }
+ ?>
+</td>
           
 <?php
   }
@@ -241,24 +280,23 @@ while ( $event_row = dbFetchNext($results) ) {
 <?php
   }
   if ( ZM_WEB_LIST_THUMBS ) {
-#Logger::Debug(print_r($thumbData,true));
-      echo '<td class="colThumbnail">';
-      $imgSrc = $event->getThumbnailSrc();
+      echo '<td class="colThumbnail zoom">';
+      $imgSrc = $event->getThumbnailSrc(array(),'&amp;');
       $streamSrc = $event->getStreamSrc(array(
-        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single'));
+        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
 
-      $imgHtml = '<img id="thumbnail'.$event->id().'" src="'.$imgSrc.'" alt="'. validHtmlStr('Event '.$event->Id()) .'" style="width:'. validInt($event->ThumbnailWidth()) .'px;height:'. validInt($event->ThumbnailHeight()).'px;" stream_src="'.$streamSrc.'" still_src="'.$imgSrc.'"/>';
+      $imgHtml = '<img id="thumbnail'.$event->Id().'" src="'.$imgSrc.'" alt="'. validHtmlStr('Event '.$event->Id()) .'" style="width:'. validInt($event->ThumbnailWidth()) .'px;height:'. validInt($event->ThumbnailHeight()).'px;" stream_src="'.$streamSrc.'" still_src="'.$imgSrc.'"/>';
       echo '<a href="?view=event&amp;eid='. $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$imgHtml.'</a>';
       echo '</td>';
   } // end if ZM_WEB_LIST_THUMBS
 ?>
-              <td class="colMark"><input type="checkbox" name="eids[]" value="<?php echo $event->Id() ?>"/></td>
             </tr>
 <?php
-}
+} # end foreach row
 ?>
           </tbody>
 <?php
+} # end if $results
   if ( ZM_WEB_EVENT_DISK_SPACE ) {
 ?>
           <tfoot>
@@ -286,44 +324,6 @@ while ( $event_row = dbFetchNext($results) ) {
   }
 ?>
         </table>
-<?php
-if ( $pagination ) {
-?>
-        <h3 class="pagination"><?php echo $pagination ?></h3>
-<?php
-}
-?>
-        <div id="contentButtons">
-          <button type="button" name="viewBtn" value="View" data-on-click-this="viewEvents" disabled="disabled">
-          <?php echo translate('View') ?>
-          </button>
-          <button type="button" name="archiveBtn" value="Archive" data-on-click-this="archiveEvents" disabled="disabled">
-          <?php echo translate('Archive') ?>
-          </button>
-          <button type="button" name="unarchiveBtn" value="Unarchive" data-on-click-this="unarchiveEvents" disabled="disabled">
-          <?php echo translate('Unarchive') ?>
-          </button>
-          <button type="button" name="editBtn" value="Edit" data-on-click-this="editEvents" disabled="disabled">
-          <?php echo translate('Edit') ?>
-          </button>
-          <button type="button" name="exportBtn" value="Export" data-on-click-this="exportEvents" disabled="disabled">
-          <?php echo translate('Export') ?>
-          </button>
-          <button type="button" name="downloadBtn" value="DownloadVideo" data-on-click-this="downloadVideo" disabled="disabled">
-          <?php echo translate('DownloadVideo') ?>
-          </button>
-          <button type="button" name="deleteBtn" value="Delete" data-on-click-this="deleteEvents" disabled="disabled">
-          <?php echo translate('Delete') ?>
-          </button>
-        </div>
-      </form>
-    </div>
+      </div>       
   </div>
-<script nonce="<?php echo $cspNonce;?>">
-  // These are defined in the .js.php but need to be updated down here.
-// This might be better done by selecting through the dom for the archived class
-  archivedEvents = <?php echo !empty($archived)?'true':'false' ?>;
-  unarchivedEvents = <?php echo !empty($unarchived)?'true':'false' ?>;
-</script>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index 38c81d8f6..db938d26b 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -17,6 +17,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
+global $sortQuery;
 
 if ( !canView('Events') ) {
   $view = 'error';
@@ -55,7 +56,7 @@ if (isset($_REQUEST['exportFormat'])) {
 }
 
 $focusWindow = true;
-$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
+$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Export'));
 ?>
@@ -85,23 +86,21 @@ if ( $user['MonitorIds'] ) {
 }
 
 if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
-  ZM\Logger::Debug('Loading events by single eid');
   $eventsSql .= ' AND E.Id=?';
   $eventsValues[] = $_REQUEST['eid'];
-} elseif ( isset($_REQUEST['eids']) and count($_REQUEST['eids']) > 0 ) {
-  ZM\Logger::Debug('Loading events by eids');
+} else if ( isset($_REQUEST['eids']) and count($_REQUEST['eids']) > 0 ) {
   $eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')';
   $eventsValues += $_REQUEST['eids'];
 } else if ( isset($_REQUEST['filter']) ) {
   parseSort();
-  parseFilter($_REQUEST['filter']);
-  $filterQuery = $_REQUEST['filter']['query'];
+  $filter = Filter::parse($_REQUEST['filter']);
+  $filterQuery = $filter->querystring();
 
-  if ( $_REQUEST['filter']['sql'] ) {
-    $eventsSql .= $_REQUEST['filter']['sql'];
+  if ( $filter->sql() ) {
+    $eventsSql .= $filter->sql();
   }
   $eventsSql .= " ORDER BY $sortColumn $sortOrder";
-  if ( isset($_REQUEST['filter']['Query']['limit']) ) 
+  if ( isset($_REQUEST['filter']['Query']['limit']) )
     $eventsSql .= ' LIMIT '.validInt($_REQUEST['filter']['Query']['limit']);
 } # end if filter
 
@@ -138,113 +137,135 @@ $disk_space_total = 0;
 $event_count = 0;
 while ( $event_row = dbFetchNext($results) ) {
   $event = new ZM\Event($event_row);
-  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
-  echo '<input type="hidden" name="eids[]" value="'.validInt($event->Id())."\"/>\n";
+  $scale = max(reScale(SCALE_BASE, $event->Monitor()->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
 ?>
           <tr<?php echo $event->Archived() ? ' class="archived"' : '' ?>>
-              <td class="colId"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo $event->Id().($event->Archived()?'*':'') ?></a></td>
+              <td class="colId">
+                <input type="hidden" name="eids[]" value="<?php echo $event->Id()?>"/>
+                <a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo $event->Id().($event->Archived()?'*':'') ?></a>
+              </td>
               <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
-              <td class="colMonitorName"><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->Monitorid(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
-              <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?></td>
+              <td class="colMonitorName"><?php echo makeLink( '?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
+              <td class="colCause"><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?></td>
               <td class="colTime"><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) .
 ( $event->EndTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime()) ) : '' ) ?>
               </td>
               <td class="colDuration"><?php echo gmdate("H:i:s", $event->Length() ) ?></td>
-              <td class="colFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 'frames', $event->Frames() ) ?></td>
-              <td class="colAlarmFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 'frames', $event->AlarmFrames() ) ?></td>
+              <td class="colFrames"><?php echo makeLink( '?view=frames&amp;eid='.$event->Id(), $event->Frames() ) ?></td>
+              <td class="colAlarmFrames"><?php echo makeLink( '?view=frames&amp;eid='.$event->Id(), $event->AlarmFrames() ) ?></td>
               <td class="colTotScore"><?php echo $event->TotScore() ?></td>
               <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
-              <td class="colMaxScore"><?php echo
- $event->MaxScore();
- #makePopupLink('?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage', array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), $event->MaxScore()) ?></td>
+              <td class="colMaxScore"><?php echo $event->MaxScore() ?></td>
 <?php
   if ( ZM_WEB_EVENT_DISK_SPACE ) {
     $disk_space_total += $event->DiskSpace();
 		$event_count += 1;
-?>
-              <td class="colDiskSpace"><?php echo human_filesize($event->DiskSpace()) ?></td>
-<?php
+    echo '<td class="colDiskSpace">'.human_filesize($event->DiskSpace()).'</td>';
   }
   unset($event);
+  echo '
+</tr>
+';
 } # end foreach event
 ?>
         </tbody>
 				<tfoot>
-					<td colspan="11"><?php echo $event_count ?> events</td>
-					<td class="colDiskSpace"><?php echo human_filesize($disk_space_total);?></td>
+          <tr>
+            <td colspan="11"><?php echo $event_count ?> events</td>
+<?php
+  if ( ZM_WEB_EVENT_DISK_SPACE ) {
+?>
+            <td class="colDiskSpace"><?php echo human_filesize($disk_space_total);?></td>
+<?php
+  }
+?>
+          </tr>
 				</tfoot>
       </table>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-3">
+      <div class="form-group">
+        <label for="exportDetail"><?php echo translate('ExportDetails') ?>
+          <input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+        </label>
+      </div>
+      <div class="form-group">
+        <label for="exportFrames"><?php echo translate('ExportFrames') ?>
+          <input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+        </label>
+      </div>
+    </div>
+    <div class="col-md-3">
+      <div class="form-group">
+        <label for="exportImages"><?php echo translate('ExportImageFiles') ?>
+          <input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
 
-      <table id="contentTable" class="minor">
-        <tbody>
-          <tr>
-            <th scope="row"><?php echo translate('ExportDetails') ?></th>
-            <td><input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('ExportFrames') ?></th>
-            <td><input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('ExportImageFiles') ?></th>
-            <td><input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('ExportVideoFiles') ?></th>
-            <td><input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('ExportMiscFiles') ?></th>
-            <td><input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('ExportFormat') ?></th>
-            <td>
-              <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "tar" ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/><label for="exportFormatTar"><?php echo translate('ExportFormatTar') ?></label>
-              <input type="radio" id="exportFormatZip" name="exportFormat" value="zip"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "zip" ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/><label for="exportFormatZip"><?php echo translate('ExportFormatZip') ?></label>
-            </td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('ExportCompress') ?></th>
-            <td>
-              <input type="radio" id="exportCompress1" name="exportCompress" value="1"<?php echo ( isset($_REQUEST['exportCompress']) && $_REQUEST['exportCompress'] ) ? ' checked="checked"' : '' ?> data-on-click-this="configureExportButton"/>
-              <label for="exportCompress1"><?php echo translate('Yes') ?></label>
-              <input type="radio" id="exportCompress0" name="exportCompress" value="0"<?php echo ( isset($_REQUEST['exportCompress']) && $_REQUEST['exportCompress'] ) ? '' : ' checked="checked"' ?> data-on-click-this="configureExportButton"/>
-              <label for="exportCompress0"><?php echo translate('No') ?></label>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <button type="button" id="exportButton" name="exportButton" value="Export" disabled="disabled" data-on-click="exportEvent"><?php echo translate('Export') ?></button>
-<?php
-?>
-      <h2 id="exportProgress" class="
-<?php
-    if ( isset($_REQUEST['generated']) ) {
-      if ( $_REQUEST['generated'] )
-        echo 'infoText';
-      else 
-        echo 'errorText';
-    } else {
-      echo 'hidden warnText';
-    }
-?>">
-        <span id="exportProgressText">
-          <?php 
+        </label>
+       </div>
+       <div class="form-group">
+         <label for="exportVideo"><?php echo translate('ExportVideoFiles') ?>
+         <input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+         </label>
+       </div>
+    </div>
+    <div class="col-md-3">
+      <div class="form-group">
+        <label for="exportMisc"><?php echo translate('ExportMiscFiles') ?>
+        <input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+        </label>
+      </div>
+    </div>
+    <div class="col-md-3">
+      <div class="form-group">
+        <label for="exportFormat"><?php echo translate('ExportFormat') ?>
+          <?php echo html_radio('exportFormat',
+            array('tar'=>translate('ExportFormatTar'), 'zip' => translate('ExportFormatZip')),
+            (isset($_REQUEST['exportFormat'])?$_REQUEST['exportFormat']:'zip'), # default to zip
+            array(),
+            array('data-on-click-this'=>'configureExportButton')
+          ); ?>
+        </label>
+      </div>
+      <div class="form-group">
+        <label for="exportCompress"><?php echo translate('ExportCompress') ?>
+          <?php echo html_radio('exportCompress',
+            array('1'=>translate('Yes'), '0' => translate('No')),
+            (isset($_REQUEST['exportCompress'])?$_REQUEST['exportCompress']:'0'), # default to no
+            array(),
+            array('data-on-click-this'=>'configureExportButton')
+          ); ?>
+        </label>
+      </div>
+    </div>
+  </div><!--row-->
+  <button type="button" id="exportButton" name="exportButton" value="Export" disabled="disabled"><?php echo translate('Export') ?></button>
+</div><!--container-->
+          <h2 id="exportProgress" class="<?php
             if ( isset($_REQUEST['generated']) ) {
               if ( $_REQUEST['generated'] )
-                echo translate('ExportSucceeded');
-              else 
-                echo translate('ExportFailed');
+                echo 'infoText';
+              else
+                echo 'errorText';
+            } else {
+              echo 'hidden warnText';
             }
-        ?></span>
-        <span id="exportProgressTicker"></span>
-      </h2>
-      <button type="button" data-on-click-this="startDownload" <?php echo empty($_REQUEST['generated'])? ' class="hidden"' : '' ?>><?php echo translate('Download') ?></button>
-      <input type="hidden" name="exportFile" value="<?php echo isset($_REQUEST['exportFile']) ? validHtmlStr($_REQUEST['exportFile']) : '' ?>"/>
-      <input type="hidden" name="generated" value="<?php echo isset($_REQUEST['generated']) ? validHtmlStr($_REQUEST['generated']) : '' ?>"/>
-    </form>
-  </div>
+        ?>">
+            <span id="exportProgressText">
+              <?php
+                if ( isset($_REQUEST['generated']) ) {
+                  if ( $_REQUEST['generated'] )
+                    echo translate('ExportSucceeded');
+                  else
+                    echo translate('ExportFailed');
+                }
+            ?></span>
+            <span id="exportProgressTicker"></span>
+          </h2>
+          <button type="button" data-on-click-this="startDownload"<?php echo empty($_REQUEST['generated'])? ' class="hidden"' : '' ?>><?php echo translate('Download') ?></button>
+          <input type="hidden" name="exportFile" value="<?php echo isset($_REQUEST['exportFile']) ? validHtmlStr($_REQUEST['exportFile']) : '' ?>"/>
+          <input type="hidden" name="generated" value="<?php echo isset($_REQUEST['generated']) ? validHtmlStr($_REQUEST['generated']) : '' ?>"/>
+        </form>
+      </div>
     </div>
-  </body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 0c078daf0..38ad3e88c 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web filter view file, $Date$, $Revision$
+// ZoneMinder web filter view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -25,6 +25,10 @@ if ( !canView('Events') ) {
 require_once('includes/Object.php');
 require_once('includes/Storage.php');
 require_once('includes/Filter.php');
+require_once('includes/FilterTerm.php');
+require_once('includes/Monitor.php');
+require_once('includes/Zone.php');
+require_once('includes/User.php');
 parseSort();
 
 $filterNames = array(''=>translate('ChooseFilter'));
@@ -43,14 +47,14 @@ foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
 }
 if ( !$filter ) {
   $filter = new ZM\Filter();
+
+  if ( isset($_REQUEST['filter']) ) {
+    # Update our filter object with whatever changes we have made before saving
+    $filter->set($_REQUEST['filter']);
+  }
 }
 
-if ( isset($_REQUEST['filter']) ) {
-  # Update our filter object with whatever changes we have made before saving
-  #$filter->set($_REQUEST['filter']);
-}
-
-$conjunctionTypes = getFilterQueryConjunctionTypes();
+$conjunctionTypes = ZM\getFilterQueryConjunctionTypes();
 $obracketTypes = array();
 $cbracketTypes = array();
 
@@ -68,38 +72,41 @@ if ( count($terms) ) {
 }
 
 $attrTypes = array(
-    'MonitorId'   => translate('AttrMonitorId'),
-    'MonitorName' => translate('AttrMonitorName'),
-    'Id'          => translate('AttrId'),
-    'Name'        => translate('AttrName'),
+    'AlarmFrames' => translate('AttrAlarmFrames'),
+		'AlarmedZoneId'	=>	translate('AttrAlarmedZone'),
+    'Archived'    => translate('AttrArchiveStatus'),
+    'AvgScore'    => translate('AttrAvgScore'),
     'Cause'       => translate('AttrCause'),
-    'Notes'       => translate('AttrNotes'),
-    'StartDateTime'    => translate('AttrStartDateTime'),
-    'StartDate'        => translate('AttrStartDate'),
-    'StartTime'        => translate('AttrStartTime'),
-    'StartWeekday'     => translate('AttrStartWeekday'),
+    'DiskBlocks'  => translate('AttrDiskBlocks'),
+    'DiskPercent' => translate('AttrDiskPercent'),
+    'DiskSpace'   => translate('AttrDiskSpace'),
+    'EventDiskSpace'   => translate('AttrEventDiskSpace'),
     'EndDateTime'    => translate('AttrEndDateTime'),
     'EndDate'        => translate('AttrEndDate'),
     'EndTime'        => translate('AttrEndTime'),
     'EndWeekday'     => translate('AttrEndWeekday'),
-    'Length'      => translate('AttrDuration'),
+    'ExistsInFileSystem'  => translate('ExistsInFileSystem'),
+    'FilterServerId'     => translate('AttrFilterServer'),
     'Frames'      => translate('AttrFrames'),
-    'AlarmFrames' => translate('AttrAlarmFrames'),
-    'TotScore'    => translate('AttrTotalScore'),
-    'AvgScore'    => translate('AttrAvgScore'),
+    'Id'          => translate('AttrId'),
+    'Length'      => translate('AttrDuration'),
     'MaxScore'    => translate('AttrMaxScore'),
-    'Archived'    => translate('AttrArchiveStatus'),
-    'DiskBlocks'  => translate('AttrDiskBlocks'),
-    'DiskPercent' => translate('AttrDiskPercent'),
-    'DiskSpace'   => translate('AttrDiskSpace'),
-    'SystemLoad'  => translate('AttrSystemLoad'),
-    'StorageId'           => translate('AttrStorageArea'),
+    'MonitorId'   => translate('AttrMonitorId'),
+    'MonitorName' => translate('AttrMonitorName'),
+    'MonitorServerId'    => translate('AttrMonitorServer'),
+    'Name'        => translate('AttrName'),
+    'Notes'       => translate('AttrNotes'),
     'SecondaryStorageId'   => translate('AttrSecondaryStorageArea'),
     'ServerId'           => translate('AttrMonitorServer'),
-    'FilterServerId'     => translate('AttrFilterServer'),
-    'MonitorServerId'    => translate('AttrMonitorServer'),
-    'StorageServerId'    => translate('AttrStorageServer'),
+    'StartDateTime'    => translate('AttrStartDateTime'),
+    'StartDate'        => translate('AttrStartDate'),
+    'StartTime'        => translate('AttrStartTime'),
+    'StartWeekday'     => translate('AttrStartWeekday'),
     'StateId'            => translate('AttrStateId'),
+    'StorageId'           => translate('AttrStorageArea'),
+    'StorageServerId'    => translate('AttrStorageServer'),
+    'SystemLoad'  => translate('AttrSystemLoad'),
+    'TotScore'    => translate('AttrTotalScore'),
     );
 
 $opTypes = array(
@@ -115,12 +122,23 @@ $opTypes = array(
     '![]' => translate('OpNotIn'),
     'IS'  => translate('OpIs'),
     'IS NOT'  => translate('OpIsNot'),
+    'LIKE' => translate('OpLike'),
+    'NOT LIKE' => translate('OpNotLike'),
     );
+$is_isnot_opTypes = array(
+  'IS'  => translate('OpIs'),
+  'IS NOT'  => translate('OpIsNot'),
+);
 
 $archiveTypes = array(
-    '0' => translate('ArchUnarchived'),
-    '1' => translate('ArchArchived')
-    );
+  '0' => translate('ArchUnarchived'),
+  '1' => translate('ArchArchived')
+);
+
+$booleanValues = array(
+  'false' => translate('False'),
+  'true' => translate('True')
+);
 
 $focusWindow = true;
 
@@ -141,13 +159,24 @@ foreach ( dbFetchAll('SELECT `Id`, `Name` FROM `Servers` ORDER BY lower(`Name`)
   $servers[$server['Id']] = validHtmlStr($server['Name']);
 }
 $monitors = array();
+$monitor_names = array();
 foreach ( dbFetchAll('SELECT `Id`, `Name` FROM `Monitors` ORDER BY lower(`Name`) ASC') as $monitor ) {
   if ( visibleMonitor($monitor['Id']) ) {
-    $monitors[$monitor['Name']] = validHtmlStr($monitor['Name']);
+    $monitors[$monitor['Id']] = new ZM\Monitor($monitor);
+		$monitor_names[] = validHtmlStr($monitor['Name']);
+  }
+}
+$zones = array();
+foreach ( dbFetchAll('SELECT Id, Name, MonitorId FROM Zones ORDER BY lower(`Name`) ASC') as $zone ) {
+  if ( visibleMonitor($zone['MonitorId']) ) {
+    if ( isset($monitors[$zone['MonitorId']]) ) {
+      $zone['Name'] = validHtmlStr($monitors[$zone['MonitorId']]->Name().': '.$zone['Name']);
+      $zones[$zone['Id']] = new ZM\Zone($zone);
+    }
   }
 }
 
-xhtmlHeaders(__FILE__, translate('EventFilter') );
+xhtmlHeaders(__FILE__, translate('EventFilter'));
 ?>
 <body>
   <div id="page">
@@ -157,7 +186,7 @@ xhtmlHeaders(__FILE__, translate('EventFilter') );
         <input type="hidden" name="view" value="filter"/>
         <hr/>
         <div id="filterSelector"><label for="<?php echo 'Id' ?>"><?php echo translate('UseFilter') ?></label>
-<?php
+          <?php
 if ( count($filterNames) > 1 ) {
    echo htmlSelect('Id', $filterNames, $filter->Id(), array('data-on-change-this'=>'selectFilter'));
 } else {
@@ -177,13 +206,25 @@ if ( (null !== $filter->Concurrent()) and $filter->Concurrent() )
         <input type="hidden" name="object" value="filter"/>
 
         <hr/>
-        <?php if ( $filter->Id() ) { ?>
+<?php if ( $filter->Id() ) { ?>
         <p class="Id"><label><?php echo translate('Id') ?></label><?php echo $filter->Id() ?></p>
-        <?php } ?>
+<?php } ?>
         <p class="Name">
           <label for="filter[Name]"><?php echo translate('Name') ?></label>
           <input type="text" id="filter[Name]" name="filter[Name]" value="<?php echo validHtmlStr($filter->Name()) ?>" data-on-input-this="updateButtons"/>
         </p>
+<?php if ( ZM_OPT_USE_AUTH ) { ?>
+        <p><label><?php echo translate('FilterUser') ?></label>
+          <?php 
+            global $user;
+echo htmlSelect('filter[UserId]',
+  ZM\User::Indexed_By_Id(),
+  //ZM\User::find(),
+  $filter->UserId() ? $filter->UserId() : $user['Id']
+); ?>
+        </p>
+<?php } ?>
+        <p>
         <table id="fieldsTable" class="filterTable">
           <tbody>
 <?php
@@ -215,7 +256,7 @@ for ( $i=0; $i < count($terms); $i++ ) {
   }
 ?>
               <td><?php if ( count($terms) > 2 ) { echo htmlSelect("filter[Query][terms][$i][obr]", $obracketTypes, $term['obr']); } else { ?>&nbsp;<?php } ?></td>
-              <td><?php echo htmlSelect("filter[Query][terms][$i][attr]", $attrTypes, $term['attr'], 'checkValue(this);'); ?></td>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][attr]", $attrTypes, $term['attr'], array('data-on-change-this'=>'checkValue')); ?></td>
 <?php
   if ( isset($term['attr']) ) {
     if ( $term['attr'] == 'Archived' ) {
@@ -228,7 +269,6 @@ for ( $i=0; $i < count($terms); $i++ ) {
               <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
               <td>
                 <input type="text" name="filter[Query][terms][<?php echo $i ?>][val]" id="filter[Query][terms][<?php echo $i ?>][val]" value="<?php echo isset($term['val'])?validHtmlStr(str_replace('T', ' ', $term['val'])):'' ?>"/>
-                <script nonce="<?php echo $cspNonce;?>">$j("[name$='\\[<?php echo $i ?>\\]\\[val\\]']").datetimepicker({timeFormat: "HH:mm:ss", dateFormat: "yy-mm-dd", maxDate: 0, constrainInput: false}); </script>
               </td>
 <?php
     } elseif ( $term['attr'] == 'Date' || $term['attr'] == 'StartDate' || $term['attr'] == 'EndDate' ) {
@@ -236,7 +276,6 @@ for ( $i=0; $i < count($terms); $i++ ) {
               <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
               <td>
                 <input type="text" name="filter[Query][terms][<?php echo $i ?>][val]" id="filter[Query][terms][<?php echo $i ?>][val]" value="<?php echo isset($term['val'])?validHtmlStr($term['val']):'' ?>"/>
-                <script nonce="<?php echo $cspNonce;?>">$j("[name$='\\[<?php echo $i ?>\\]\\[val\\]']").datepicker({dateFormat: "yy-mm-dd", maxDate: 0, constrainInput: false});</script>
               </td>
 <?php
     } elseif ( $term['attr'] == 'StartTime' || $term['attr'] == 'EndTime' ) {
@@ -244,8 +283,12 @@ for ( $i=0; $i < count($terms); $i++ ) {
               <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
               <td>
                 <input type="text" name="filter[Query][terms][<?php echo $i ?>][val]" id="filter[Query][terms][<?php echo $i ?>][val]" value="<?php echo isset($term['val'])?validHtmlStr(str_replace('T', ' ', $term['val'])):'' ?>"/>
-                <script nonce="<?php echo $cspNonce;?>">$j("[name$='\\[<?php echo $i ?>\\]\\[val\\]']").timepicker({timeFormat: "HH:mm:ss", constrainInput: false}); </script>
               </td>
+<?php
+    } elseif ( $term['attr'] == 'ExistsInFileSystem' ) {
+?>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $is_isnot_opTypes, $term['op']); ?></td>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][val]", $booleanValues, $term['val']); ?></td>
 <?php
     } elseif ( $term['attr'] == 'StateId' ) {
 ?>
@@ -257,10 +300,15 @@ for ( $i=0; $i < count($terms); $i++ ) {
               <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
               <td><?php echo htmlSelect("filter[Query][terms][$i][val]", $weekdays, $term['val']); ?></td>
 <?php
-    } elseif ( $term['attr'] == 'MonitorName' ) {
+    } elseif ( $term['attr'] == 'Monitor' ) {
 ?>
               <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
               <td><?php echo htmlSelect("filter[Query][terms][$i][val]", $monitors, $term['val']); ?></td>
+<?php
+    } elseif ( $term['attr'] == 'MonitorName' ) {
+?>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][val]", array_combine($monitor_names,$monitor_names), $term['val']); ?></td>
 <?php
     } elseif ( $term['attr'] == 'ServerId' || $term['attr'] == 'MonitorServerId' || $term['attr'] == 'StorageServerId' || $term['attr'] == 'FilterServerId' ) {
 ?>
@@ -271,6 +319,11 @@ for ( $i=0; $i < count($terms); $i++ ) {
 ?>
               <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
               <td><?php echo htmlSelect("filter[Query][terms][$i][val]", $storageareas, $term['val']); ?></td>
+<?php
+    } elseif ( $term['attr'] == 'AlarmedZoneId' ) {
+?>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']); ?></td>
+              <td><?php echo htmlSelect("filter[Query][terms][$i][val]", $zones, $term['val']); ?></td>
 <?php
     } else {
 ?>
@@ -363,8 +416,22 @@ if ( ZM_OPT_EMAIL ) {
 ?>
             <p>
               <label><?php echo translate('FilterEmailEvents') ?></label>
-              <input type="checkbox" name="filter[AutoEmail]" value="1"<?php if ( $filter->AutoEmail() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <input type="checkbox" name="filter[AutoEmail]" value="1"<?php if ( $filter->AutoEmail() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_AutoEmail"/>
             </p>
+						<div id="EmailOptions"<?php echo $filter->AutoEmail() ? '' : ' style="display:none;"' ?>>
+							<p>
+								<label><?php echo translate('FilterEmailTo') ?></label>
+								<input type="email" name="filter[EmailTo]" value="<?php echo validHtmlStr($filter->EmailTo()) ?>" multiple/>
+							</p>
+							<p>
+								<label><?php echo translate('FilterEmailSubject') ?></label>
+								<input type="text" name="filter[EmailSubject]" value="<?php echo validHtmlStr($filter->EmailSubject()) ?>"/>
+							</p>
+							<p>
+								<label><?php echo translate('FilterEmailBody') ?></label>
+								<textarea name="filter[EmailBody]"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
+							</p>
+						</div>
 <?php
 }
 if ( ZM_OPT_MESSAGE ) {
@@ -406,8 +473,8 @@ if ( ZM_OPT_MESSAGE ) {
         </div>
         <hr/>
         <div id="contentButtons">
-          <button type="submit" data-on-click-this="submitToEvents"><?php echo translate('ListMatches') ?></button>
-          <!--<button type="submit" data-on-click-this="submitToMontageReview"><?php echo translate('ViewMatches') ?></button>-->
+          <button type="button" data-on-click-this="submitToEvents"><?php echo translate('ListMatches') ?></button>
+          <button type="button" data-on-click-this="submitToMontageReview"><?php echo translate('ViewMatches') ?></button>
           <button type="button" data-on-click-this="submitToExport"><?php echo translate('ExportMatches') ?></button>
           <button type="button" name="executeButton" id="executeButton" data-on-click-this="executeFilter"><?php echo translate('Execute') ?></button>
 <?php 
@@ -423,6 +490,7 @@ if ( canEdit('Events') ) {
   }
 }
 ?>
+          <button type="button" value="Debug" data-on-click-this="debugFilter"><?php echo translate('Debug') ?></button>
           <button type="button" value="Reset" data-on-click-this="resetFilter"><?php echo translate('Reset') ?></button>
         </div>
       </form>
diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index af412794b..dc9ef9c4f 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -26,16 +26,17 @@ if ( !canView('Events') ) {
 require_once('includes/Frame.php');
 
 $eid = validInt($_REQUEST['eid']);
-if ( !empty($_REQUEST['fid']) )
-  $fid = validInt($_REQUEST['fid']);
+$fid = empty($_REQUEST['fid']) ? 0 : validInt($_REQUEST['fid']);
 
 $Event = new ZM\Event($eid);
 $Monitor = $Event->Monitor();
 
+# This is kinda weird.. so if we pass fid=0 or some other non-integer, then it loads max score
+# perhaps we should consider being explicit, like fid = maxscore
 if ( !empty($fid) ) {
   $sql = 'SELECT * FROM Frames WHERE EventId = ? AND FrameId = ?';
-  if ( !($frame = dbFetchOne( $sql, NULL, array($eid, $fid) )) )
-    $frame = array( 'EventId'=>$eid, 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0 );
+  if ( !($frame = dbFetchOne($sql, NULL, array($eid, $fid))) )
+    $frame = array('EventId'=>$eid, 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0);
 } else {
   $frame = dbFetchOne('SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array($eid, $Event->MaxScore()));
 }
@@ -50,19 +51,19 @@ $lastFid = $maxFid;
 
 $alarmFrame = $Frame->Type() == 'Alarm';
 
-if ( isset( $_REQUEST['scale'] ) ) {
+if ( isset($_REQUEST['scale']) ) {
   $scale = validNum($_REQUEST['scale']);
-} else if ( isset( $_COOKIE['zmWatchScale'.$Monitor->Id()] ) ) {
+} else if ( isset($_COOKIE['zmWatchScale'.$Monitor->Id()]) ) {
   $scale = validNum($_COOKIE['zmWatchScale'.$Monitor->Id()]);
-} else if ( isset( $_COOKIE['zmWatchScale'] ) ) {
+} else if ( isset($_COOKIE['zmWatchScale']) ) {
   $scale = validNum($_COOKIE['zmWatchScale']);
 } else {
-  $scale = max( reScale( SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
+  $scale = max(reScale(SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
 }
-$scale = $scale ?: 'auto';
+$scale = $scale ? $scale : 0;
 
-$imageData = $Event->getImageSrc( $frame, $scale, 0 );
-if ( ! $imageData ) {
+$imageData = $Event->getImageSrc($frame, $scale, 0);
+if ( !$imageData ) {
   ZM\Error("No data found for Event $eid frame $fid");
   $imageData = array();
 }
@@ -84,32 +85,41 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->FrameId());
 ?>
 <body>
-  <div id="page">
-    <div id="header">
-    <form>
-      <div id="headerButtons">
-        <?php if ( ZM_RECORD_EVENT_STATS && $alarmFrame ) { echo makePopupLink( '?view=stats&amp;eid='.$Event->Id().'&amp;fid='.$Frame->FrameId(), 'zmStats', 'stats', translate('Stats') ); } ?>
-        <?php if ( canEdit( 'Events' ) ) { ?><a href="?view=none&amp;action=delete&amp;markEid=<?php echo $Event->Id() ?>"><?php echo translate('Delete') ?></a><?php } ?>
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
+  <?php echo getNavBarHTML() ?>
+  <div id="page p-0">
+    <div class="d-flex flex-row justify-content-between px-3 pt-1">
+      <div id="toolbar" >
+        <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        <button id="statsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Stats') ?>" ><i class="fa fa-info"></i></button>
       </div>
-      <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect('scale', $scales); ?></div>
+      
       <h2><?php echo translate('Frame') ?> <?php echo $Event->Id().'-'.$Frame->FrameId().' ('.$Frame->Score().')' ?></h2>
-      <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
-      <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
-    </form>
+      
+      <form>
+        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo htmlSelect('scale', $scales, $scale); ?></div>        
+        <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
+        <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
+      </form>
     </div>
-    <div id="content">
-      <p id="image">
-
+    
+  <div id="content">
+    <p id="image">
 <?php if ( $imageData['hasAnalImage'] ) {
  echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s">', $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ) );
 } ?>
-<img id="frameImg" src="<?php echo validHtmlStr($Frame->getImageSrc($show=='anal'?'analyse':'capture')) ?>" width="<?php echo reScale( $Event->Width(), $Event->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Event->DefaultScale(), $scale ) ?>" alt="<?php echo $Frame->EventId()."-".$Frame->FrameId() ?>" class="<?php echo $imageData['imageClass'] ?>"/>
+<img id="frameImg"
+  src="<?php echo validHtmlStr($Frame->getImageSrc($show=='anal'?'analyse':'capture')) ?>"
+  width="<?php echo reScale($Event->Width(), $Monitor->DefaultScale(), $scale) ?>"
+  height="<?php echo reScale( $Event->Height(), $Monitor->DefaultScale(), $scale ) ?>"
+  alt="<?php echo $Frame->EventId().'-'.$Frame->FrameId() ?>"
+  class="<?php echo $imageData['imageClass'] ?>"
+/>
 <?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?>
 
       </p>
 <?php
-  $frame_url_base = '?view=frame&amp;eid='.$Event->Id().'&amp;scale='.$scale.'&amp;show='.$show.'&fid=';
+  $frame_url_base = '?view=frame&amp;eid='.$Event->Id().'&amp;scale='.$scale.'&amp;show='.$show.'&amp;fid=';
 ?>
       <p id="controls">
         <a id="firstLink" <?php echo (( $Frame->FrameId() > 1 ) ? 'href="'.$frame_url_base.$firstFid.'" class="btn-primary"' : 'class="btn-primary disabled"') ?>><?php echo translate('First') ?></a>
@@ -117,14 +127,32 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
         <a id="nextLink" <?php echo ( $Frame->FrameId() < $maxFid ) ? 'href="'.$frame_url_base.$nextFid.'" class="btn-primary"' : 'class="btn-primary disabled"' ?>><?php echo translate('Next') ?></a>
         <a id="lastLink" <?php echo ( $Frame->FrameId() < $maxFid ) ? 'href="'.$frame_url_base.$lastFid .'" class="btn-primary"' : 'class="btn-primary disabled"' ?>><?php echo translate('Last') ?></a>
       </p>
-<?php if (file_exists ($dImagePath)) { ?>
+<?php
+if ( file_exists($dImagePath) ) {
+?>
       <p id="diagImagePath"><?php echo $dImagePath ?></p>
-      <p id="diagImage"><img src="<?php echo viewImagePath( $dImagePath ) ?>" width="<?php echo reScale( $Event->Width(), $Monitor->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Monitor->DefaultScale(), $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
-<?php } if (file_exists ($rImagePath)) { ?>
+      <p id="diagImage">
+        <img
+          src="<?php echo viewImagePath($dImagePath) ?>"
+          width="<?php echo reScale($Event->Width(), $Monitor->DefaultScale(), $scale) ?>"
+          height="<?php echo reScale($Event->Height(), $Monitor->DefaultScale(), $scale) ?>"
+          class="<?php echo $imageData['imageClass'] ?>"
+        />
+      </p>
+<?php
+}
+if ( file_exists($rImagePath) ) {
+?>
       <p id="refImagePath"><?php echo $rImagePath ?></p>
-      <p id="refImage"><img src="<?php echo viewImagePath( $rImagePath ) ?>" width="<?php echo reScale( $Event->Width(), $Monitor->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Monitor->DefaultScale(), $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
+      <p id="refImage">
+        <img
+          src="<?php echo viewImagePath($rImagePath) ?>"
+          width="<?php echo reScale($Event->Width(), $Monitor->DefaultScale(), $scale) ?>"
+          height="<?php echo reScale($Event->Height(), $Monitor->DefaultScale(), $scale) ?>"
+          class="<?php echo $imageData['imageClass'] ?>"
+        />
+      </p>
 <?php } ?>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php
index aec2f658b..c623ec3dd 100644
--- a/web/skins/classic/views/frames.php
+++ b/web/skins/classic/views/frames.php
@@ -24,13 +24,14 @@ if ( !canView('Events') ) {
 }
 
 require_once('includes/Frame.php');
+require_once('includes/Filter.php');
+
 $eid = validInt($_REQUEST['eid']);
 $Event = new ZM\Event($eid);
 $Monitor = $Event->Monitor();
 
 $countSql = 'SELECT COUNT(*) AS FrameCount FROM Frames AS F WHERE 1 ';
-$frameSql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames AS F WHERE 1 ';
-
+$frameSql = 'SELECT *, unix_timestamp(TimeStamp) AS UnixTimeStamp FROM Frames AS F WHERE 1 ';
 
 // override the sort_field handling in parseSort for frames
 if ( empty($_REQUEST['sort_field']) )
@@ -39,9 +40,9 @@ if ( empty($_REQUEST['sort_field']) )
 if ( !isset($_REQUEST['sort_asc']) )
   $_REQUEST['sort_asc'] = true;
 
-if ( ! isset($_REQUEST['filter'])){
+if ( !isset($_REQUEST['filter']) ) {
   // generate a dummy filter from the eid for pagination
-  $_REQUEST['filter'] = array('Query' => array( 'terms' => array( ) ) );
+  $_REQUEST['filter'] = array('Query' => array('terms' => array()));
   $_REQUEST['filter'] = addFilterTerm(
     $_REQUEST['filter'],
     0,
@@ -50,21 +51,23 @@ if ( ! isset($_REQUEST['filter'])){
 }
 
 parseSort();
-parseFilter($_REQUEST['filter']);
-$filterQuery = $_REQUEST['filter']['query'];
+$filter = ZM\Filter::parse($_REQUEST['filter']);
+$filterQuery = $filter->querystring();
 
-if ( $_REQUEST['filter']['sql'] ) {
-  $countSql .= $_REQUEST['filter']['sql'];
-  $frameSql .= $_REQUEST['filter']['sql'];
+if ( $filter->sql() ) {
+  $countSql .= ' AND ('.$filter->sql().')';
+  $frameSql .= ' AND ('.$filter->sql().')';
 }
 
-$frameSql .= " ORDER BY $sortColumn $sortOrder,Id $sortOrder";
+$frameSql .= " ORDER BY $sortColumn $sortOrder";
+if ( $sortColumn != 'Id' )
+  $frameSql .= ',Id '.$sortOrder;
 
-if ( isset( $_REQUEST['scale'] ) ) {
+if ( isset($_REQUEST['scale']) ) {
   $scale = validNum($_REQUEST['scale']);
-} else if ( isset( $_COOKIE['zmWatchScale'.$Monitor->Id()] ) ) {
+} else if ( isset($_COOKIE['zmWatchScale'.$Monitor->Id()]) ) {
   $scale = validNum($_COOKIE['zmWatchScale'.$Monitor->Id()]);
-} else if ( isset( $_COOKIE['zmWatchScale'] ) ) {
+} else if ( isset($_COOKIE['zmWatchScale']) ) {
   $scale = validNum($_COOKIE['zmWatchScale']);
 } else {
   $scale = max(reScale(SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
@@ -94,13 +97,14 @@ if ( !empty($page) ) {
     $limitLeft = $limit - $limitStart;
     $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
   }
-  $frameSql .= " limit $limitStart, $limitAmount";
-} elseif ( !empty($limit) ) {
-  $frameSql .= ' limit 0, '.$limit;
+  $frameSql .= " LIMIT $limitStart, $limitAmount";
+} else if ( !empty($limit) ) {
+  $frameSql .= ' LIMIT 0, '.$limit;
 }
 
 $maxShortcuts = 5;
-$pagination = getPagination($pages, $page, $maxShortcuts, $sortQuery.'&eid='.$eid.$limitQuery.$filterQuery);
+$totalQuery = $sortQuery.'&amp;eid='.$eid.$limitQuery.$filterQuery;
+$pagination = getPagination($pages, $page, $maxShortcuts, $totalQuery);
 
 $frames = dbFetchAll($frameSql);
 
@@ -109,101 +113,82 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
 ?>
 <body>
-  <div id="page">
-    <div id="header">
-      <div id="headerButtons"><a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a></div>
-      <h2><?php echo translate('Frames') ?> - <?php echo $Event->Id() ?></h2>
-      <div id="pagination">
-<?php
-if ( $pagination ) {
-?>
-        <h2 class="pagination"><?php echo $pagination ?></h2>
-<?php
-}
-?>
-<?php
-if ( $pages > 1 ) {
-  if ( !empty($page) ) {
-?>
-        <a href="?view=<?php echo $view ?>&amp;page=0<?php echo $filterQuery ?><?php echo $sortQuery.$limitQuery ?>"><?php echo translate('ViewAll') ?></a>
-<?php
-  } else {
-?>
-        <a href="?view=<?php echo $view ?>&amp;page=1<?php echo $filterQuery ?><?php echo $sortQuery.$limitQuery ?>"><?php echo translate('ViewPaged') ?></a>
-<?php
-  }
-}
-?>
-      </div>      
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="container-fluid p-3">
+    <!-- Toolbar button placement and styling handled by bootstrap-tables -->
+    <div id="toolbar">
+      <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
     </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="none"/>
-        <table id="contentTable" class="major" cellspacing="0">
-          <input type="hidden" name="view" value="<?php echo $view ?>"/>
-          <input type="hidden" name="action" value=""/>
-          <input type="hidden" name="page" value="<?php echo $page ?>"/>
-          <input type="hidden" name="eid" value="<?php echo $eid ?>"/>
-          <?php echo $_REQUEST['filter']['fields'] ?>
-          <input type="hidden" name="sort_field" value="<?php echo validHtmlStr($_REQUEST['sort_field']) ?>"/>
-          <input type="hidden" name="sort_asc" value="<?php echo validHtmlStr($_REQUEST['sort_asc']) ?>"/>
-          <input type="hidden" name="limit" value="<?php echo $limit ?>"/>
-          <thead>
-            <tr>
-            <th class="colId"><a href="<?php echo sortHeader('FramesFrameId') ?>"><?php echo translate('Frame Id') ?><?php echo sortTag('FramesFrameId') ?></a></th>
-            <th class="colType"><a href="<?php echo sortHeader('FramesType') ?>"><?php echo translate('Type') ?><?php echo sortTag('FramesType') ?></a></th>
-            <th class="colTimeStamp"><a href="<?php echo sortHeader('FramesTimeStamp') ?>"><?php echo translate('TimeStamp') ?><?php echo sortTag('FramesTimeStamp') ?></a></th>
-            <th class="colTimeDelta"><a href="<?php echo sortHeader('FramesDelta') ?>"><?php echo translate('TimeDelta') ?><?php echo sortTag('FramesDelta') ?></a></th>
-            <th class="colScore"><a href="<?php echo sortHeader('FramesScore') ?>"><?php echo translate('Score') ?><?php echo sortTag('FramesScore') ?></a></th>
+
+    <!-- Table styling handled by bootstrap-tables -->
+    <div class="row justify-content-center">      
+      <table
+        id="framesTable"
+        data-pagination="true"
+        data-show-pagination-switch="true"
+        data-page-list="[10, 25, 50, 100, 200, All]"
+        data-search="true"
+        data-cookie="true"
+        data-cookie-id-table="zmFramesTable"
+        data-cookie-expire="2y"
+        data-remember-order="true"
+        data-show-columns="true"
+        data-show-export="true"
+        data-toolbar="#toolbar"
+        data-show-fullscreen="true"
+        data-maintain-meta-data="true"
+        data-mobile-responsive="true"
+        data-buttons-class="btn btn-normal"
+        data-detail-view="true"
+        data-detail-formatter="detailFormatter"
+        data-show-toggle="true"
+        data-show-jump-to="true"
+        class="table-sm table-borderless">
+
+        <thead>
+          <!-- Row styling is handled by bootstrap-tables -->
+          <tr>
+            <th class="px-3" data-align="center" data-sortable="false" data-field="EventId"><?php echo translate('EventId') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameId"><?php echo translate('FrameId') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameType"><?php echo translate('Type') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameTimeStamp"><?php echo translate('TimeStamp') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameDelta"><?php echo translate('TimeDelta') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameScore"><?php echo translate('Score') ?></th>
 <?php
         if ( ZM_WEB_LIST_THUMBS ) {
 ?>
-              <th class="colThumbnail"><?php echo translate('Thumbnail') ?></th>
+            <th class="px-3" data-align="center" data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
 <?php
         }
 ?>
-            </tr>
-          </thead>
-          <tbody>
+          </tr>
+        </thead>
+        <tbody>
 <?php
 if ( count($frames) ) {
   foreach ( $frames as $frame ) {
     $Frame = new ZM\Frame($frame);
-
-    $class = strtolower($frame['Type']);
 ?>
-            <tr class="<?php echo $class ?>">
-              <td class="colId"><?php echo makePopupLink(
-                '?view=frame&amp;eid='.$Event->Id().'&amp;fid='.$frame['FrameId'], 'zmImage',
-                array(
-                  'frame',
-                  ($scale ? $Event->Width()*$scale/100 : $Event->Width()),
-                  ($scale ? $Event->Height()*$scale/100 : $Event->Height())
-                ),
-                $frame['FrameId'])
-              ?></td>
-              <td class="colType"><?php echo $frame['Type'] ?></td>
-              <td class="colTimeStamp"><?php echo strftime(STRF_FMT_TIME, $frame['UnixTimeStamp']) ?></td>
-              <td class="colTimeDelta"><?php echo number_format( $frame['Delta'], 2 ) ?></td>
+            <tr class="<?php echo strtolower($frame['Type']) ?>">
+              <td><?php echo $frame['EventId'] ?></td>
+              <td><?php echo $frame['FrameId'] ?></td>
+              <td><?php echo $frame['Type'] ?></td>
+              <td><?php echo strftime(STRF_FMT_TIME, $frame['UnixTimeStamp']) ?></td>
+              <td><?php echo number_format( $frame['Delta'], 2 ) ?></td>
+              <td><?php echo $frame['Score'] ?></td>
 <?php
-    if ( ZM_RECORD_EVENT_STATS && ($frame['Type'] == 'Alarm') ) {
-?>
-              <td class="colScore"><?php echo makePopupLink('?view=stats&amp;eid='.$Event->Id().'&amp;fid='.$frame['FrameId'], 'zmStats', 'stats', $frame['Score']) ?></td>
-<?php
-    } else {
-?> 
-              <td class="colScore"><?php echo $frame['Score'] ?></td>
-<?php
-    }
     if ( ZM_WEB_LIST_THUMBS ) {
-?>
-              <td class="colThumbnail"><?php echo makePopupLink( '?view=frame&amp;eid='.$Event->Id().'&amp;fid='.$frame['FrameId'], 'zmImage', array('image', $Event->Width(), $Event->Height()), '<img src="?view=image&amp;fid='.$Frame->Id().'&amp;'.
-(ZM_WEB_LIST_THUMB_WIDTH?'width='.ZM_WEB_LIST_THUMB_WIDTH.'&amp;':'').
-(ZM_WEB_LIST_THUMB_HEIGHT?'height='.ZM_WEB_LIST_THUMB_HEIGHT.'&amp;':'').'filename='.$Event->MonitorId().'_'.$frame['EventId'].'_'.$frame['FrameId'].'.jpg" '.
-(ZM_WEB_LIST_THUMB_WIDTH?'width="'.ZM_WEB_LIST_THUMB_WIDTH.'" ':'').
-(ZM_WEB_LIST_THUMB_HEIGHT?'height="'.ZM_WEB_LIST_THUMB_HEIGHT.'" ':'').' alt="'.$frame['FrameId'].'"/>' ) ?></td>
-<?php
-    }
+      $base_img_src = '?view=image&amp;fid=' .$Frame->Id();
+      $thmb_width = ZM_WEB_LIST_THUMB_WIDTH ? 'width='.ZM_WEB_LIST_THUMB_WIDTH : '';
+      $thmb_height = ZM_WEB_LIST_THUMB_HEIGHT ? 'height='.ZM_WEB_LIST_THUMB_HEIGHT : '';
+      $thmb_fn = 'filename=' .$Event->MonitorId(). '_' .$frame['EventId']. '_' .$frame['FrameId']. '.jpg';
+      $img_src = join('&amp;', array_filter(array($base_img_src, $thmb_width, $thmb_height, $thmb_fn)));
+      $full_img_src = join('&amp;', array_filter(array($base_img_src, $thmb_fn)));
+      $frame_src = '?view=frame&amp;eid=' .$Event->Id(). '&amp;fid=' .$frame['FrameId'];
+      
+      echo '<td class="colThumbnail zoom"><img src="' .$img_src. '" '.$thmb_width. ' ' .$thmb_height. 'img_src="' .$img_src. '" full_img_src="' .$full_img_src. '"></td>'.PHP_EOL;
+		}
 ?>
             </tr>
 <?php
@@ -218,19 +203,6 @@ if ( count($frames) ) {
 ?>
           </tbody>
         </table>
-
-<?php
-if ( $pagination ) {
-?>
-        <h3 class="pagination"><?php echo $pagination ?></h3>
-<?php
-}
-?>
-
-        <div id="contentButtons">
-        </div>
-      </form>
-    </div>
+      </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/function.php b/web/skins/classic/views/function.php
deleted file mode 100644
index 1cd2985ef..000000000
--- a/web/skins/classic/views/function.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-//
-// ZoneMinder web function view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canEdit('Monitors') ) {
-  $view = 'error';
-  return;
-}
-
-$monitor = ZM\Monitor::find_one(array('Id'=>$_REQUEST['mid']));
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Function').' - '.validHtmlStr($monitor->Name()));
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Function').' - '.validHtmlStr($monitor->Name()) ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="view" value="function"/>
-        <input type="hidden" name="action" value="function"/>
-        <input type="hidden" name="mid" value="<?php echo $monitor->Id() ?>"/>
-        <p>
-          <select name="newFunction">
-<?php
-foreach ( getEnumValues('Monitors', 'Function') as $optFunction ) {
-?>
-            <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor->Function() ) { ?> selected="selected"<?php } ?>><?php echo translate('Fn'.$optFunction) ?></option>
-<?php
-}
-?>
-          </select>
-          <label for="newEnabled"><?php echo translate('Enabled') ?></label>
-          <input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor->Enabled()) ) { ?> checked="checked"<?php } ?>/>
-        </p>
-        <div id="contentButtons">
-          <button type="submit" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index aa8ec4b56..4b9ca6152 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -37,14 +37,14 @@ xhtmlHeaders(__FILE__, translate('Group').' - '.$newGroup->Name());
       <h2><?php echo translate('Group') ?> - <?php echo validHtmlStr($newGroup->Name()); ?></h2>
     </div>
     <div id="content">
-      <form name="groupForm" method="post" action="?">
+      <form id="groupForm" name="groupForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="gid" value="<?php echo $newGroup->Id() ?>"/>
         <table id="contentTable" class="major">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup->Name()) ?>" oninput="configureButtons(this);"/></td>
+              <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup->Name()) ?>" data-on-input="configureButtons"/></td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('ParentGroup') ?></th>
@@ -88,19 +88,19 @@ function get_children($Group) {
 $kids = get_children($newGroup);
 if ( $newGroup->Id() )
   $kids[] = $newGroup->Id();
-$sql = 'SELECT Id,Name from Groups'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids)).')' : '').' ORDER BY Name';
+$sql = 'SELECT Id,Name FROM `Groups`'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids)).')' : '').' ORDER BY Name';
 $options = array(''=>'None');
 foreach ( dbFetchAll($sql, null, $kids) as $option ) {
   $options[$option['Id']] = str_repeat('&nbsp;&nbsp;', $Groups[$option['Id']]->depth()) . $option['Name'];
 }
-echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('onchange'=>'configureButtons(this);'));
+echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configureButtons'));
 ?>
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('Monitor') ?></th>
               <td>
-                <select name="newGroup[MonitorIds][]" class="chosen" multiple="multiple" onchange="configureButtons(this);">
+                <select name="newGroup[MonitorIds][]" class="chosen" multiple="multiple" data-on-change="configureButtons">
 <?php
   $monitors = dbFetchAll('SELECT Id,Name FROM Monitors ORDER BY Sequence ASC');
   $monitorIds = $newGroup->MonitorIds();
@@ -127,5 +127,4 @@ echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('on
     </div>
   </div>
   <script nonce="<?php echo $cspNonce;?>">$j('.chosen').chosen();</script>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/groups.php b/web/skins/classic/views/groups.php
index 5ae28a40a..045e56cc0 100644
--- a/web/skins/classic/views/groups.php
+++ b/web/skins/classic/views/groups.php
@@ -55,7 +55,9 @@ xhtmlHeaders(__FILE__, translate('Groups'));
             <tr>
               <th class="colName" colspan="<?php echo $max_depth+1 ?>"><?php echo translate('Name') ?></th>
               <th class="colIds"><?php echo translate('Monitors') ?></th>
+<?php if ( canEdit('Groups') ) { ?>
               <th class="colSelect"><?php echo translate('Mark') ?></th>
+<?php } ?>
             </tr>
           </thead>
           <tbody>
@@ -67,14 +69,15 @@ function group_line( $Group ) {
   $html .= str_repeat('<td class="colName">&nbsp;</td>', $Group->depth());
   $html .= '<td class="colName" colspan="'.($max_depth-($Group->depth()-1)).'">';
   if ( canEdit('Groups') ) {
-    $html .= '<a href="#" onclick="editGroup('.$Group->Id().');">'. validHtmlStr($Group->Id() . ' ' . $Group->Name()).'</a>';
+    $html .= '<a href="#" data-on-click-this="editGroup" data-group-id="'.$Group->Id().'">'.validHtmlStr($Group->Id().' '.$Group->Name()).'</a>';
   } else {
     $html .= validHtmlStr($Group->Name());
   }
-  $html .= '</td><td class="colIds">'. monitorIdsToNames($Group->MonitorIds(), 30).'</td>
-                <td class="colSelect"><input type="checkbox" name="gid[]" value="'. $Group->Id() .'" data-on-click-this="configureButtons"/></td>
-              </tr>
-  ';
+  $html .= '</td><td class="colIds">'. validHtmlStr(monitorIdsToNames($Group->MonitorIds(), 30)).'</td>';
+  if ( canEdit('Groups') ) {
+    $html .= '<td class="colSelect"><input type="checkbox" name="gid[]" value="'. $Group->Id() .'" data-on-click-this="configureButtons"/></td>';
+  }
+  $html .= '</tr>';
   if ( isset( $children[$Group->Id()] ) ) {
     foreach ( $children[$Group->Id()] as $G ) {
       $html .= group_line($G);
@@ -99,5 +102,4 @@ if ( isset( $children[null] ) )
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/image-ffmpeg.php b/web/skins/classic/views/image-ffmpeg.php
deleted file mode 100644
index 496b4c695..000000000
--- a/web/skins/classic/views/image-ffmpeg.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-//
-// ZoneMinder web frame view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $view = "error";
-    return;
-}
-
-$eid = validInt($_REQUEST['eid']);
-if ( !empty($_REQUEST['fid']) )
-    $fid = validInt($_REQUEST['fid']);
-
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale,M.VideoWriter,M.Orientation FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
-$event = dbFetchOne( $sql, NULL, array($eid) );
-
-if ( !empty($fid) ) {
-    $sql = 'SELECT * FROM Frames WHERE EventId = ? AND FrameId = ?';
-    if ( !($frame = dbFetchOne( $sql, NULL, array($eid, $fid) )) )
-        $frame = array( 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0 );
-} else {
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $event['MaxScore'] ) );
-}
-
-$maxFid = $event['Frames'];
-
-$firstFid = 1;
-$prevFid = $frame['FrameId']-1;
-$nextFid = $frame['FrameId']+1;
-$lastFid = $maxFid;
-
-$alarmFrame = $frame['Type']=='Alarm';
-
-if ( isset( $_REQUEST['scale'] ) )
-    $scale = validInt($_REQUEST['scale']);
-else
-    $scale = max( reScale( SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
-
-$Transpose = '';
-if ( $event['VideoWriter'] == "2" ) { // PASSTHROUGH
-	$Rotation = $event['Orientation'];
-// rotate right
-	if ( in_array($event['Orientation'],array("90")))
-		$Transpose = 'transpose=1,';
-// rotate 180 // upside down cam
-	if ( in_array($event['Orientation'],array("180")))
-		$Transpose = 'transpose=2,transpose=2,';
-// rotate left
-	if ( in_array($event['Orientation'],array("270")))
-		$Transpose = 'transpose=2,';
-}
-$focusWindow = true;
-$Scale = 100/$scale;
-$fid = $fid - 1;
-#$command = 'ffmpeg -v 0 -i '.getEventDefaultVideoPath($event).' -vf "select=gte(selected_n\,'.$fid.'),setpts=PTS-STARTPTS" '.$Transpose.',scale=iw/'.$Scale.':-1" -frames:v 1 -f mjpeg -';
-$command = 'ffmpeg -v 0 -i '.getEventDefaultVideoPath($event).' -vf "select=gte(n\\,'.$fid.'),setpts=PTS-STARTPTS,'.$Transpose.'scale=iw/'.$Scale.':-1" -f image2 -';
-header('Content-Type: image/jpeg');
-system($command);
-?>
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 469a54331..47201689d 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -1,11 +1,28 @@
+function thumbnail_onmouseover(event) {
+  var img = event.target;
+  img.src = '';
+  img.src = img.getAttribute('stream_src');
+}
+
+function thumbnail_onmouseout(event) {
+  var img = event.target;
+  img.src = '';
+  img.src = img.getAttribute('still_src');
+}
+
+function initThumbAnimation() {
+  $j('.colThumbnail img').each(function() {
+    this.addEventListener('mouseover', thumbnail_onmouseover, false);
+    this.addEventListener('mouseout', thumbnail_onmouseout, false);
+  });
+}
 
 function setButtonStates( element ) {
   var form = element.form;
   var checked = 0;
   for ( var i=0; i < form.elements.length; i++ ) {
     if (
-      form.elements[i].type=="checkbox"
-      &&
+      form.elements[i].type=="checkbox" &&
       form.elements[i].name=="markMids[]"
     ) {
       var tr = $j(form.elements[i]).closest("tr");
@@ -35,7 +52,7 @@ function setButtonStates( element ) {
 }
 
 function addMonitor(element) {
-  createPopup( '?view=monitor', 'zmMonitor0', 'monitor' );
+  window.location.assign('?view=monitor');
 }
 
 function cloneMonitor(element) {
@@ -44,10 +61,8 @@ function cloneMonitor(element) {
   // get the value of the first checkbox
   for ( var i = 0; i < form.elements.length; i++ ) {
     if (
-      form.elements[i].type == "checkbox"
-      &&
-      form.elements[i].name == "markMids[]"
-      &&
+      form.elements[i].type == "checkbox" &&
+      form.elements[i].name == "markMids[]" &&
       form.elements[i].checked
     ) {
       monitorId = form.elements[i].value;
@@ -55,7 +70,7 @@ function cloneMonitor(element) {
     }
   } // end foreach element
   if ( monitorId != -1 ) {
-    createPopup( '?view=monitor&dupId='+monitorId, 'zmMonitor0', 'monitor' );
+    window.location.assign('?view=monitor&dupId='+monitorId);
   }
 }
 
@@ -65,10 +80,8 @@ function editMonitor( element ) {
 
   for ( var i = 0; i < form.elements.length; i++ ) {
     if (
-      form.elements[i].type == "checkbox"
-      &&
-      form.elements[i].name == "markMids[]"
-      &&
+      form.elements[i].type == "checkbox" &&
+      form.elements[i].name == "markMids[]" &&
       form.elements[i].checked
     ) {
       monitorIds.push( form.elements[i].value );
@@ -79,11 +92,11 @@ function editMonitor( element ) {
     }
   } // end foreach checkboxes
   if ( monitorIds.length == 1 ) {
-    createPopup( '?view=monitor&mid='+monitorIds[0], 'zmMonitor'+monitorIds[0], 'monitor' );
+    window.location.assign('?view=monitor&mid='+monitorIds[0]);
   } else if ( monitorIds.length > 1 ) {
-    createPopup( '?view=monitors&'+(monitorIds.map(function(mid) {
+    window.location.assign( '?view=monitors&'+(monitorIds.map(function(mid) {
       return 'mids[]='+mid;
-    }).join('&')), 'zmMonitors', 'monitors' );
+    }).join('&')));
   }
 }
 
@@ -100,13 +113,11 @@ function selectMonitor(element) {
   var url = thisUrl+'?view=console';
   for ( var i = 0; i < form.elements.length; i++ ) {
     if (
-      form.elements[i].type == "checkbox"
-        &&
-        form.elements[i].name == "markMids[]"
-        &&
-        form.elements[i].checked
+      form.elements[i].type == 'checkbox' &&
+      form.elements[i].name == 'markMids[]' &&
+      form.elements[i].checked
     ) {
-      url += '&MonitorId='+form.elements[i].value;
+      url += '&MonitorId[]='+form.elements[i].value;
     }
   }
   window.location.replace(url);
@@ -116,23 +127,94 @@ function reloadWindow() {
   window.location.replace( thisUrl );
 }
 
+// Manage the the Function modal and its buttons
+function manageFunctionModal() {
+  $j('.functionLnk').click(function(evt) {
+    evt.preventDefault();
+    if ( !canEditEvents ) {
+      enoperm();
+      return;
+    }
+    var mid = evt.currentTarget.getAttribute('data-mid');
+    monitor = monitors[mid];
+    if ( !monitor ) {
+      console.error("No monitor found for mid " + mid);
+      return;
+    }
+
+    var function_form = document.getElementById('function_form');
+    if ( !function_form ) {
+      console.error("Unable to find form with id function_form");
+      return;
+    }
+    function_form.elements['newFunction'].value = monitor.Function;
+    function_form.elements['newEnabled'].checked = monitor.Enabled == '1';
+    function_form.elements['mid'].value = mid;
+    document.getElementById('function_monitor_name').innerHTML = monitor.Name;
+
+    $j('#modalFunction').modal('show');
+  });
+
+  // Manage the CANCEL modal buttons
+  $j('.funcCancelBtn').click(function(evt) {
+    evt.preventDefault();
+    $j('#modalFunction').modal('hide');
+  });
+
+  // Manage the SAVE modal buttons
+  $j('.funcSaveBtn').click(function(evt) {
+    evt.preventDefault();
+    $j('#function_form').submit();
+  });
+}
+
 function initPage() {
-  reloadWindow.periodical( consoleRefreshTimeout );
+  reloadWindow.periodical(consoleRefreshTimeout);
   if ( showVersionPopup ) {
-    createPopup( '?view=version', 'zmVersion', 'version' );
+    window.location.assign('?view=version');
   }
   if ( showDonatePopup ) {
-    createPopup( '?view=donate', 'zmDonate', 'donate' );
+    $j.getJSON(thisUrl + '?request=modal&modal=donate')
+        .done(function(data) {
+          if ( $j('#donate').length ) {
+            $j('#donate').replaceWith(data.html);
+          } else {
+            $j("body").append(data.html);
+          }
+          $j('#donate').modal('show');
+          // Manage the Apply button
+          $j('#donateApplyBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#donateForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
   }
 
   // Makes table sortable
   $j( function() {
     $j( "#consoleTableBody" ).sortable({
-      handle: ".glyphicon-sort",
+      handle: ".sort",
       update: applySort,
       axis: 'Y'} );
     $j( "#consoleTableBody" ).disableSelection();
   } );
+
+  // Setup the thumbnail video animation
+  initThumbAnimation();
+
+  // Load the Function modal on page load
+  $j.getJSON(thisUrl + '?request=modal&modal=function')
+      .done(function(data) {
+        if ( $j('#modalFunction').length ) {
+          $j('#modalFunction').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        // Manage the Function modal
+        manageFunctionModal();
+      })
+      .fail(logAjaxFail);
 }
 
 function applySort(event, ui) {
diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php
index f5e65332d..6ef6c199c 100644
--- a/web/skins/classic/views/js/console.js.php
+++ b/web/skins/classic/views/js/console.js.php
@@ -1,20 +1,42 @@
 var consoleRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_MAIN ?>;
 
 <?php
-if ( ZM_CHECK_FOR_UPDATES && canEdit('System') && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) ) {
-  $showVersionPopup = true;
-} elseif ( ZM_DYN_SHOW_DONATE_REMINDER ) {
-  if ( canEdit('System') ) {
+if ( canEdit('System') ) {
+  if ( ZM_CHECK_FOR_UPDATES && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) ) {
+    $showVersionPopup = true;
+    $nextReminder = time() + 60*60;
+    // limit popups to one per hour instead of on every console refresh.
+    dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_NEXT_REMINDER'");
+
+  } else if ( ZM_DYN_SHOW_DONATE_REMINDER ) {
     if ( ZM_DYN_DONATE_REMINDER_TIME > 0 ) {
       if ( ZM_DYN_DONATE_REMINDER_TIME < time() ) {
         $showDonatePopup = true;
       }
     } else {
       $nextReminder = time() + 30*24*60*60;
-      dbQuery( "update Config set Value = '".$nextReminder."' where Name = 'ZM_DYN_DONATE_REMINDER_TIME'" );
+      dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
     }
   }
-}
+} // end if canEdit('System')
 ?>
 var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
 var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;
+var monitors = new Array();
+<?php
+  global $monitors;
+  foreach ( $monitors as $monitor ) {
+?>
+  monitors[<?php echo $monitor->Id() ?>] = {
+  'Id': <?php echo $monitor->Id() ?>,
+  'Name': '<?php echo $monitor->Name() ?>',
+  'ViewWidth': <?php echo $monitor->ViewWidth() ?>,
+  'ViewHeight':<?php echo $monitor->ViewHeight() ?>,
+  'Url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
+  'Type': '<?php echo $monitor->Type() ?>',
+  'Function': '<?php echo $monitor->Function() ?>',
+  'Enabled': '<?php echo $monitor->Enabled() ?>'
+};
+<?php
+  }
+?>
diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js
index c52ab3dd5..ff21286c2 100644
--- a/web/skins/classic/views/js/controlcap.js
+++ b/web/skins/classic/views/js/controlcap.js
@@ -3,21 +3,108 @@ function validateForm( form ) {
 
   // If "Can Move" is enabled, then the end user must also select at least one of the other check boxes (excluding Can Move Diagonally)
   if ( form.elements['newControl[CanMove]'].checked ) {
-    if ( !(form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked) ) {
-      errors[errors.length] = "In addition to \"Can Move\", you also must select at least one of: \"Can Move Mapped\", \"Can Move Absolute\", \"Can Move Relative\", or \"Can Move Continuous\"";
+    if ( !(
+      form.elements['newControl[CanMoveCon]'].checked ||
+      form.elements['newControl[CanMoveRel]'].checked ||
+      form.elements['newControl[CanMoveAbs]'].checked ||
+      form.elements['newControl[CanMoveMap]'].checked
+    ) ) {
+      errors[errors.length] = 'In addition to "Can Move", you also must select at least one of: "Can Move Mapped", "Can Move Absolute", "Can Move Relative", or "Can Move Continuous"';
     }
   } else {
     // Now lets check for the opposite condition. If any of the boxes below Can Move are checked, but Can Move is not checked then signal an error
 
-    if ( form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked || form.elements['newControl[CanMoveDiag]'].checked ) {
-      errors[errors.length] = "\"Can Move\" must also be selected if any one of the movement types are sleceted";
+    if ( form.elements['newControl[CanMoveCon]'].checked ||
+      form.elements['newControl[CanMoveRel]'].checked ||
+      form.elements['newControl[CanMoveAbs]'].checked ||
+      form.elements['newControl[CanMoveMap]'].checked ||
+      form.elements['newControl[CanMoveDiag]'].checked
+    ) {
+      errors[errors.length] = '"Can Move" must also be selected if any one of the movement types are selected.';
+    }
+  }
+  // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes
+  if ( form.elements['newControl[CanZoom]'].checked ) {
+    if ( !(
+      form.elements['newControl[CanZoomCon]'].checked ||
+      form.elements['newControl[CanZoomRel]'].checked ||
+      form.elements['newControl[CanZoomAbs]'].checked
+    ) ) {
+      errors[errors.length] = 'In addition to "Can Zoom", you also must select at least one of: "Can Zoom Absolute", "Can Zoom Relative", or "Can Zoom Continuous"';
+    }
+  } else {
+    // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+    if ( form.elements['newControl[CanZoomCon]'].checked ||
+      form.elements['newControl[CanZoomRel]'].checked ||
+      form.elements['newControl[CanZoomAbs]'].checked
+    ) {
+      errors[errors.length] = '"Can Move" must also be selected if any one of the zoom types are selected.';
+    }
+  }
+  // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes
+  if ( form.elements['newControl[CanFocus]'].checked ) {
+    if ( !(
+      form.elements['newControl[CanFocusCon]'].checked ||
+      form.elements['newControl[CanFocusRel]'].checked ||
+      form.elements['newControl[CanFocusAbs]'].checked
+    ) ) {
+      errors[errors.length] = 'In addition to "Can Focus", you also must select at least one of: "Can Focus Absolute", "Can Focus Relative", or "Can Focus Continuous"';
+    }
+  } else {
+    // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+    if ( form.elements['newControl[CanFocusCon]'].checked ||
+      form.elements['newControl[CanFocusRel]'].checked ||
+      form.elements['newControl[CanFocusAbs]'].checked
+    ) {
+      errors[errors.length] = '"Can Focus" must also be selected if any one of the focus types are selected.';
+    }
+  }
+  // If "Can White" is enabled, then the end user must also select at least one of the other check boxes
+  if ( form.elements['newControl[CanWhite]'].checked ) {
+    if ( !(
+      form.elements['newControl[CanWhiteCon]'].checked ||
+      form.elements['newControl[CanWhiteRel]'].checked ||
+      form.elements['newControl[CanWhiteAbs]'].checked
+    ) ) {
+      errors[errors.length] = 'In addition to "Can White Balance", you also must select at least one of: "Can White Bal Absolute", "Can White Bal Relative", or "Can White Bal Continuous"';
+    }
+  } else {
+    // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+    if ( form.elements['newControl[CanWhiteCon]'].checked ||
+      form.elements['newControl[CanWhiteRel]'].checked ||
+      form.elements['newControl[CanWhiteAbs]'].checked
+    ) {
+      errors[errors.length] = '"Can White Balance" must also be selected if any one of the white balance types are selected.';
+    }
+  }
+
+  // If "Can Iris" is enabled, then the end user must also select at least one of the other check boxes
+  if ( form.elements['newControl[CanIris]'].checked ) {
+    if ( !(
+      form.elements['newControl[CanIrisCon]'].checked ||
+      form.elements['newControl[CanIrisRel]'].checked ||
+      form.elements['newControl[CanIrisAbs]'].checked
+    ) ) {
+      errors[errors.length] = 'In addition to "Can Iris", you also must select at least one of: "Can Iris Absolute", "Can Iris Relative", or "Can Iris Continuous"';
+    }
+  } else {
+    // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
+
+    if ( form.elements['newControl[CanIrisCon]'].checked ||
+      form.elements['newControl[CanIrisRel]'].checked ||
+      form.elements['newControl[CanIrisAbs]'].checked
+    ) {
+      errors[errors.length] = '"Can Iris" must also be selected if any one of the iris types are selected.';
     }
   }
 
   if ( errors.length ) {
-    alert( errors.join( "\n" ) );
-    return ( false );
+    alert(errors.join("\n"));
+    return false;
   }
-  return ( true );
+  return true;
 }
 
diff --git a/web/skins/classic/views/js/controlpreset.js.php b/web/skins/classic/views/js/controlpreset.js.php
index d358b3369..9bd8155f1 100644
--- a/web/skins/classic/views/js/controlpreset.js.php
+++ b/web/skins/classic/views/js/controlpreset.js.php
@@ -1,3 +1,6 @@
+<?php
+  global $labels;
+?>
 var labels = new Array();
 <?php
 foreach ( $labels as $index=>$label ) {
diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 4e6de5320..6d2c3bdd4 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -9,24 +9,27 @@ function cyclePause() {
   $('pauseBtn').disabled = true;
   $('playBtn').disabled = false;
 }
+
 function cycleStart() {
   periodical_id = nextCycleView.periodical(cycleRefreshTimeout);
   $('pauseBtn').disabled = false;
   $('playBtn').disabled = true;
 }
+
 function cycleNext() {
   monIdx ++;
   if ( monIdx >= monitorData.length ) {
     monIdx = 0;
   }
   if ( !monitorData[monIdx] ) {
-    console.log("No monitorData for " + monIdx);
+    console.log('No monitorData for ' + monIdx);
   }
 
   window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
 }
+
 function cyclePrev() {
-  if (monIdx) {
+  if ( monIdx ) {
     monIdx -= 1;
   } else {
     monIdx = monitorData.length - 1;
@@ -46,7 +49,7 @@ function changeSize() {
   // Scale the frame
   monitor_frame = $j('#imageFeed');
   if ( !monitor_frame ) {
-    console.log("Error finding frame");
+    console.log('Error finding frame');
     return;
   }
   if ( width ) {
@@ -71,7 +74,7 @@ function changeSize() {
     streamImg.style.width = width ? width : null;
     streamImg.style.height = height ? height : null;
   } else {
-    console.log("Did not find liveStream"+monitorData[monIdx].id);
+    console.log('Did not find liveStream'+monitorData[monIdx].id);
   }
   $('scale').set('value', '');
   Cookie.write('zmCycleScale', '', {duration: 10*365});
@@ -92,32 +95,51 @@ function changeScale() {
   // Scale the frame
   monitor_frame = $j('#imageFeed');
   if ( !monitor_frame ) {
-    console.log("Error finding frame");
+    console.log('Error finding frame');
     return;
   }
-  if ( newWidth ) {
-    monitor_frame.css('width', newWidth+'px');
-  }
-  if ( newHeight ) {
-    monitor_frame.css('height', newHeight+'px');
+
+  if ( scale != '0' && scale != '' && scale != 'auto' ) {
+    if ( newWidth ) {
+      monitor_frame.css('width', newWidth+'px');
+    }
+    if ( newHeight ) {
+      monitor_frame.css('height', newHeight+'px');
+    }
+  } else {
+    monitor_frame.css('width', '100%');
+    monitor_frame.css('height', 'auto');
   }
+
   /*Stream could be an applet so can't use moo tools*/
   var streamImg = $j('#liveStream'+monitorData[monIdx].id)[0];
-  if ( streamImg ) {
-    if ( streamImg.nodeName == 'IMG' ) {
-      var src = streamImg.src;
-      streamImg.src = '';
+  if ( !streamImg ) {
+    console.log("Did not find liveStream"+monitorData[monIdx].id);
+    return;
+  }
 
-      //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
-      src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
+  if ( streamImg.nodeName == 'IMG' ) {
+    var src = streamImg.src;
+    streamImg.src = '';
+
+    //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
+    src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
+    if ( scale != '0' && scale != '' && scale != 'auto' ) {
       src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
       src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
-      streamImg.src = src;
+    } else {
+      src = src.replace(/width=[\.\d]+/i, 'width='+monitorData[monIdx].width);
+      src = src.replace(/height=[\.\d]+/i, 'height='+monitorData[monIdx].height);
     }
-    streamImg.style.width = newWidth + 'px';
-    streamImg.style.height = newHeight + 'px';
+    streamImg.src = src;
+  }
+
+  if ( scale != '0' && scale != '' && scale != 'auto' ) {
+    streamImg.style.width = newWidth+'px';
+    streamImg.style.height = newHeight+'px';
   } else {
-    console.log("Did not find liveStream"+monitorData[monIdx].id);
+    streamImg.style.width = '100%';
+    streamImg.style.height = 'auto';
   }
 } // end function changeScale()
 
diff --git a/web/skins/classic/views/js/cycle.js.php b/web/skins/classic/views/js/cycle.js.php
index 316296410..f53ab006d 100644
--- a/web/skins/classic/views/js/cycle.js.php
+++ b/web/skins/classic/views/js/cycle.js.php
@@ -1,3 +1,9 @@
+<?php
+  global $monIdx;
+  global $nextMid;
+  global $options;
+  global $monitors;
+?>
 var monIdx = '<?php echo $monIdx; ?>';
 var nextMid = "<?php echo isset($nextMid)?$nextMid:'' ?>";
 var mode = "<?php echo $options['mode'] ?>";
@@ -9,11 +15,10 @@ foreach ( $monitors as $monitor ) {
 ?>
 monitorData[monitorData.length] = {
   'id': <?php echo $monitor->Id() ?>,
-  'connKey': <?php echo $monitor->connKey() ?>,
-  'width': <?php echo $monitor->Width() ?>,
-  'height':<?php echo $monitor->Height() ?>,
+  'width': <?php echo $monitor->ViewWidth() ?>,
+  'height':<?php echo $monitor->ViewHeight() ?>,
   'url': '<?php echo $monitor->UrlToIndex() ?>',
-  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?> );},
+  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->ViewWidth(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->ViewHeight(), $monitor->PopupScale() ); ?> );},
   'type': '<?php echo $monitor->Type() ?>',
   'refresh': '<?php echo $monitor->Refresh() ?>'
 };
diff --git a/web/skins/classic/views/js/donate.js b/web/skins/classic/views/js/donate.js
deleted file mode 100644
index 0cfb42fae..000000000
--- a/web/skins/classic/views/js/donate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-if ( action == "donate" && option == "go" ) {
-  zmWindow();
-}
diff --git a/web/skins/classic/views/js/donate.js.php b/web/skins/classic/views/js/donate.js.php
deleted file mode 100644
index 4fc36d5bb..000000000
--- a/web/skins/classic/views/js/donate.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var action = '<?php echo isset($_REQUEST['action'])?validJsStr($_REQUEST['action']):'' ?>';
-var option = '<?php echo isset($_REQUEST['option'])?validJsStr($_REQUEST['option']):'' ?>';
diff --git a/web/skins/classic/views/js/download.js b/web/skins/classic/views/js/download.js
index 717ab76de..16b47c8b4 100644
--- a/web/skins/classic/views/js/download.js
+++ b/web/skins/classic/views/js/download.js
@@ -29,11 +29,11 @@ function exportProgress() {
 function exportResponse(respObj, respText) {
   console.log(respObj);
   window.location.replace(
-      thisUrl+'?view='+currentView+'&'+eidParm
-      +'&exportFormat='+respObj.exportFormat
-      +'&exportFile='+respObj.exportFile
-      +'&generated='+((respObj.result=='Ok')?1:0)
-      +'&connkey='+connkey
+      thisUrl+'?view='+currentView+'&'+eidParm+
+      '&exportFormat='+respObj.exportFormat+
+      '&exportFile='+respObj.exportFile+
+      '&generated='+((respObj.result=='Ok')?1:0)+
+      '&connkey='+connkey
   );
 }
 
diff --git a/web/skins/classic/views/js/download.js.php b/web/skins/classic/views/js/download.js.php
index 0d0c05679..390c9d17f 100644
--- a/web/skins/classic/views/js/download.js.php
+++ b/web/skins/classic/views/js/download.js.php
@@ -1,16 +1,19 @@
 <?php
-if ( isset($_REQUEST['eids']) ) {
-  $eidParms = array();
-  foreach ( $_REQUEST['eids'] as $eid )
-    $eidParms[] = 'eids[]='.validInt($eid);
+  global $connkey;
+  global $exportFormat;
+
+  if ( isset($_REQUEST['eids']) ) {
+    $eidParms = array();
+    foreach ( $_REQUEST['eids'] as $eid )
+      $eidParms[] = 'eids[]='.validInt($eid);
 ?>
 var eidParm = '<?php echo join('&', $eidParms) ?>';
 <?php
-} else if (isset($_REQUEST['eid'])) {
+  } else if (isset($_REQUEST['eid'])) {
 ?>
 var eidParm = 'eid=<?php echo validInt($_REQUEST['eid']) ?>';
 <?php
-}
+ }
 ?>
 
 var exportReady = <?php echo !empty($_REQUEST['generated'])?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 79893336f..e20d460cf 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -1,4 +1,7 @@
 var vid = null;
+var spf = Math.round((eventData.Length / eventData.Frames)*1000000 )/1000000;//Seconds per frame for videojs frame by frame.
+var intervalRewind;
+var revSpeed = .5;
 
 // Function called when video.js hits the end of the video
 function vjsReplay() {
@@ -39,14 +42,15 @@ function vjsReplay() {
       streamNext(true);
       break;
   }
-}
+} // end function vjsReplay
 
 $j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
 
 var cueFrames = null; //make cueFrames available even if we don't send another ajax query
 
 function initialAlarmCues(eventId) {
-  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId, setAlarmCues); //get frames data for alarmCues and inserts into html
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId, setAlarmCues) //get frames data for alarmCues and inserts into html
+      .fail(logAjaxFail);
 }
 
 function setAlarmCues(data) {
@@ -57,7 +61,7 @@ function setAlarmCues(data) {
 
 function renderAlarmCues(containerEl) {
   if ( !( cueFrames && cueFrames.length ) ) {
-    console.log("No cue frames for event");
+    console.log('No cue frames for event');
     return;
   }
   // This uses the Delta of the last frame to get the length of the event.  I can't help but wonder though
@@ -67,14 +71,14 @@ function renderAlarmCues(containerEl) {
   var spanTimeStart = 0;
   var spanTimeEnd = 0;
   var alarmed = 0;
-  var alarmHtml = "";
+  var alarmHtml = '';
   var pixSkew = 0;
   var skip = 0;
   var num_cueFrames = cueFrames.length;
   for ( var i = 0; i < num_cueFrames; i++ ) {
     skip = 0;
     frame = cueFrames[i];
-    if (frame.Type == "Alarm" && alarmed == 0) { //From nothing to alarm.  End nothing and start alarm.
+    if ( (frame.Type == 'Alarm') && (alarmed == 0) ) { //From nothing to alarm.  End nothing and start alarm.
       alarmed = 1;
       if (frame.Delta == 0) continue; //If event starts with an alarm or too few for a nonespan
       spanTimeEnd = frame.Delta * 100;
@@ -88,24 +92,24 @@ function renderAlarmCues(containerEl) {
       }
       alarmHtml += '<span class="alarmCue noneCue" style="width: ' + pix + 'px;"></span>';
       spanTimeStart = spanTimeEnd;
-    } else if (frame.Type !== "Alarm" && alarmed == 1) { //from alarm to nothing.  End alarm and start nothing.
+    } else if ( (frame.Type !== 'Alarm') && (alarmed == 1) ) { //from alarm to nothing.  End alarm and start nothing.
       futNone = 0;
       indexPlus = i+1;
       if (((frame.Delta * 100) - spanTimeStart) < minAlarm && indexPlus < num_cueFrames) {
         //alarm is too short and there is more event
         continue;
       }
-      while (futNone < minAlarm) { //check ahead to see if there's enough for a nonespan
-        if (indexPlus >= cueFrames.length) break; //check if end of event.
+      while ( futNone < minAlarm ) { //check ahead to see if there's enough for a nonespan
+        if ( indexPlus >= cueFrames.length ) break; //check if end of event.
         futNone = (cueFrames[indexPlus].Delta *100) - (frame.Delta *100);
-        if (cueFrames[indexPlus].Type == "Alarm") {
+        if ( cueFrames[indexPlus].Type == 'Alarm' ) {
           i = --indexPlus;
           skip = 1;
           break;
         }
         indexPlus++;
       }
-      if (skip == 1) continue; //javascript doesn't support continue 2;
+      if ( skip == 1 ) continue; //javascript doesn't support continue 2;
       spanTimeEnd = frame.Delta *100;
       spanTime = spanTimeEnd - spanTimeStart;
       alarmed = 0;
@@ -118,7 +122,7 @@ function renderAlarmCues(containerEl) {
       }
       alarmHtml += '<span class="alarmCue" style="width: ' + pix + 'px;"></span>';
       spanTimeStart = spanTimeEnd;
-    } else if (frame.Type == "Alarm" && alarmed == 1 && i + 1 >= cueFrames.length) { //event ends on an alarm
+    } else if ( (frame.Type == 'Alarm') && (alarmed == 1) && (i + 1 >= cueFrames.length) ) { //event ends on an alarm
       spanTimeEnd = frame.Delta * 100;
       spanTime = spanTimeEnd - spanTimeStart;
       alarmed = 0;
@@ -130,21 +134,9 @@ function renderAlarmCues(containerEl) {
   return alarmHtml;
 }
 
-function setButtonState( element, butClass ) {
-  if ( element ) {
-    element.className = butClass;
-    if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
-      element.disabled = true;
-    } else {
-      element.disabled = false;
-    }
-  } else {
-    console.log("Element was null in setButtonState");
-  }
-}
 
-function changeCodec(element) {
-  location.replace(thisUrl + '?view=event&eid=' + eventData.Id + filterQuery + sortQuery+'&codec='+element.value);
+function changeCodec() {
+  location.replace(thisUrl + '?view=event&eid=' + eventData.Id + filterQuery + sortQuery+'&codec='+$j('#codec').val());
 }
 
 function changeScale() {
@@ -155,12 +147,12 @@ function changeScale() {
   var eventViewer;
   var alarmCue = $j('div.alarmCue');
   var bottomEl = streamMode == 'stills' ? $j('#eventImageNav') : $j('#replayStatus');
-  if (streamMode == 'stills') {
+  if ( streamMode == 'stills' ) {
     eventViewer = $j('#eventThumbs');
   } else {
     eventViewer = $j(vid ? '#videoobj' : '#evtStream');
   }
-  if ( scale == "auto" ) {
+  if ( scale == '0' || scale == 'auto' ) {
     var newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl);
     newWidth = newSize.width;
     newHeight = newSize.height;
@@ -170,12 +162,12 @@ function changeScale() {
     newWidth = eventData.Width * scale / SCALE_BASE;
     newHeight = eventData.Height * scale / SCALE_BASE;
   }
-  if ( !(streamMode == 'stills') ) {
+  if ( streamMode != 'stills' ) {
     eventViewer.width(newWidth);
-  } //stills handles its own width
+  } // stills handles its own width
   eventViewer.height(newHeight);
   if ( !vid ) { // zms needs extra sizing
-    streamScale(scale == "auto" ? autoScale : scale);
+    streamScale(scale == '0' ? autoScale : scale);
     drawProgressBar();
   }
   if ( streamMode == 'stills' ) {
@@ -184,13 +176,13 @@ function changeScale() {
   } else {
     alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues.  skip ajax call
   }
-  if ( scale == "auto" ) {
+  if ( scale == '0' ) {
     Cookie.write('zmEventScaleAuto', 'auto', {duration: 10*365});
   } else {
     Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365});
     Cookie.dispose('zmEventScaleAuto');
   }
-}
+} // end function changeScale
 
 function changeReplayMode() {
   var replayMode = $('replayMode').get('value');
@@ -200,7 +192,36 @@ function changeReplayMode() {
   refreshWindow();
 }
 
+function changeRate() {
+  var rate = parseInt($j('select[name="rate"]').val());
+  if ( ! rate ) {
+    pauseClicked();
+  } else if ( rate < 0 ) {
+    if ( vid ) { //There is no reverse play with mp4.  Set the speed to 0 and manually set the time back.
+      revSpeed = rates[rates.indexOf(-1*rate)-1]/100;
+      clearInterval(intervalRewind);
+      intervalRewind = setInterval(function() {
+        if ( vid.currentTime() <= 0 ) {
+          clearInterval(intervalRewind);
+          vid.pause();
+        } else {
+          vid.playbackRate(0);
+          vid.currentTime(vid.currentTime() - (revSpeed/2)); //Half of reverse speed because our interval is 500ms.
+        }
+      }, 500); //500ms is a compromise between smooth reverse and realistic performance
+    } // end if vid
+  } else { // Forward rate
+    if ( vid ) {
+      vid.playbackRate(rate/100);
+    }
+  }
+  Cookie.write('zmEventRate', rate, {duration: 10*365});
+} // end function changeRate
+
 var streamParms = "view=request&request=stream&connkey="+connKey;
+if ( auth_hash ) {
+  streamParms += '&auth='+auth_hash;
+}
 var streamCmdTimer = null;
 
 var streamStatus = null;
@@ -208,7 +229,7 @@ var lastEventId = 0;
 var zmsBroke = false; //Use alternate navigation if zms has crashed
 
 function getCmdResponse( respObj, respText ) {
-  if ( checkStreamForErrors("getCmdResponse", respObj) ) {
+  if ( checkStreamForErrors('getCmdResponse', respObj) ) {
     console.log('Got an error from getCmdResponse');
     console.log(respObj);
     console.log(respText);
@@ -242,7 +263,8 @@ function getCmdResponse( respObj, respText ) {
   if ( streamStatus.paused == true ) {
     streamPause( );
   } else {
-    $j('#rateValue').html(streamStatus.rate);
+    console.log('streamStatus.rate: ' + streamStatus.rate);
+    $j('select[name="rate"]').val(streamStatus.rate*100);
     Cookie.write('zmEventRate', streamStatus.rate*100, {duration: 10*365});
     streamPlay( );
   }
@@ -264,11 +286,11 @@ function getCmdResponse( respObj, respText ) {
     }
   } // end if haev a new auth hash
 
-  streamCmdTimer = streamQuery.delay( streamTimeout ); //Timeout is refresh rate for progressBox and time display
+  streamCmdTimer = streamQuery.delay(streamTimeout); //Timeout is refresh rate for progressBox and time display
 }
 
 var streamReq = new Request.JSON( {
-  url: thisUrl,
+  url: monitorUrl,
   method: 'get',
   timeout: AJAX_TIMEOUT,
   link: 'chain',
@@ -277,23 +299,18 @@ var streamReq = new Request.JSON( {
 
 function pauseClicked() {
   if ( vid ) {
+    if ( intervalRewind ) {
+      stopFastRev();
+    }
     vid.pause();
   } else {
     streamReq.send(streamParms+"&command="+CMD_PAUSE);
-    streamPause();
-  }
-}
-
-function vjsPause() {
-  if ( intervalRewind ) {
-    stopFastRev();
   }
   streamPause();
 }
 
-function streamPause( ) {
+function streamPause() {
   $j('#modeValue').html('Paused');
-  $j('#rateValue').html('0');
   setButtonState( $('pauseBtn'), 'active' );
   setButtonState( $('playBtn'), 'inactive' );
   setButtonState( $('fastFwdBtn'), 'unavail' );
@@ -303,6 +320,10 @@ function streamPause( ) {
 }
 
 function playClicked( ) {
+  var rate_select = $j('select[name="rate"]');
+  if ( ! rate_select.val() ) {
+    $j('select[name="rate"]').val(100);
+  }
   if ( vid ) {
     if ( vid.paused() ) {
       vid.play();
@@ -310,22 +331,21 @@ function playClicked( ) {
       vjsPlay(); //handles fast forward and rewind
     }
   } else {
-    streamReq.send( streamParms+"&command="+CMD_PLAY );
-    streamPlay();
+    streamReq.send(streamParms+"&command="+CMD_PLAY);
   }
+  streamPlay();
 }
 
 function vjsPlay() { //catches if we change mode programatically
   if ( intervalRewind ) {
     stopFastRev();
   }
-  $j('#rateValue').html(vid.playbackRate());
+  $j('select[name="rate"]').val(vid.playbackRate()*100);
   Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
   streamPlay();
 }
 
 function streamPlay( ) {
-  $j('#modeValue').html('Replay');
   setButtonState( $('pauseBtn'), 'inactive' );
   setButtonState( $('playBtn'), 'active' );
   setButtonState( $('fastFwdBtn'), 'inactive' );
@@ -347,16 +367,13 @@ function streamFastFwd( action ) {
     if ( rates.indexOf(vid.playbackRate()*100)-1 == -1 ) {
       setButtonState($('fastFwdBtn'), 'unavail');
     }
-    $j('#rateValue').html(vid.playbackRate());
+    $j('select[name="rate"]').val(vid.playbackRate()*100);
     Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
   } else {
     streamReq.send(streamParms+"&command="+CMD_FASTFWD);
   }
 }
 
-var spf = Math.round((eventData.Length / eventData.Frames)*1000000 )/1000000;//Seconds per frame for videojs frame by frame.
-var intervalRewind;
-var revSpeed = .5;
 
 function streamSlowFwd( action ) {
   if ( vid ) {
@@ -377,6 +394,7 @@ function streamSlowRev( action ) {
 function stopFastRev() {
   clearInterval(intervalRewind);
   vid.playbackRate(1);
+  $j('select[name="rate"]').val(vid.playbackRate()*100);
   Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
   revSpeed = .5;
 }
@@ -394,7 +412,7 @@ function streamFastRev( action ) {
       setButtonState( $('fastRevBtn'), 'unavail' );
     }
     clearInterval(intervalRewind);
-    $j('#rateValue').html(-revSpeed);
+    $j('select[name="rate"]').val(-revSpeed*100);
     Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
     intervalRewind = setInterval(function() {
       if (vid.currentTime() <= 0) {
@@ -406,7 +424,7 @@ function streamFastRev( action ) {
       }
     }, 500); //500ms is a compromise between smooth reverse and realistic performance
   } else {
-    streamReq.send( streamParms+"&command="+CMD_FASTREV );
+    streamReq.send(streamParms+"&command="+CMD_FASTREV);
   }
 }
 
@@ -538,9 +556,9 @@ var scroll = null;
 var currEventId = null;
 var CurEventDefVideoPath = null;
 
-function getEventResponse( respObj, respText ) {
-  if ( checkStreamForErrors( "getEventResponse", respObj ) ) {
-    console.log("getEventResponse: errors" );
+function getEventResponse(respObj, respText) {
+  if ( checkStreamForErrors('getEventResponse', respObj) ) {
+    console.log('getEventResponse: errors');
     return;
   }
 
@@ -579,13 +597,13 @@ function getEventResponse( respObj, respText ) {
   //eventImg.setStyles( { 'width': eventData.width, 'height': eventData.height } );
   if ( vid && CurEventDefVideoPath ) {
     vid.src({type: 'video/mp4', src: CurEventDefVideoPath}); //Currently mp4 is all we use
-    console.log("getEventResponse");
+    console.log('getEventResponse');
     initialAlarmCues(eventData.Id);//ajax and render, new event
     addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime);
     CurEventDefVideoPath = null;
     $j('#modeValue').html('Replay');
     $j('#zoomValue').html('1');
-    $j('#rateValue').html('1');
+    $j('#rate').val('100');
     vjsPanZoom('zoomOut');
   } else {
     drawProgressBar();
@@ -597,6 +615,9 @@ var eventReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIM
 
 function eventQuery( eventId ) {
   var eventParms = "view=request&request=status&entity=event&id="+eventId;
+  if ( auth_hash ) {
+    eventParms += '&auth='+auth_hash;
+  }
   eventReq.send( eventParms );
 }
 
@@ -638,7 +659,7 @@ var frameBatch = 40;
 function loadEventThumb( event, frame, loadImage ) {
   var thumbImg = $('eventThumb'+frame.FrameId);
   if ( !thumbImg ) {
-    console.error( "No holder found for frame "+frame.FrameId );
+    console.error('No holder found for frame '+frame.FrameId);
     return;
   }
   var img = new Asset.image( imagePrefix+frame.EventId+"&fid="+frame.FrameId,
@@ -660,31 +681,31 @@ function loadEventThumb( event, frame, loadImage ) {
   );
 }
 
-function loadEventImage( event, frame ) {
-  console.debug( "Loading "+event.Id+"/"+frame.FrameId );
+function loadEventImage(event, frame) {
+  console.debug('Loading '+event.Id+'/'+frame.FrameId);
   var eventImg = $('eventImage');
   var thumbImg = $('eventThumb'+frame.FrameId);
-  if ( eventImg.getProperty( 'src' ) != thumbImg.getProperty( 'src' ) ) {
+  if ( eventImg.getProperty('src') != thumbImg.getProperty('src') ) {
     var eventImagePanel = $('eventImagePanel');
 
-    if ( eventImagePanel.getStyle( 'display' ) != 'none' ) {
-      var lastThumbImg = $('eventThumb'+eventImg.getProperty( 'alt' ));
+    if ( eventImagePanel.getStyle('display') != 'none' ) {
+      var lastThumbImg = $('eventThumb'+eventImg.getProperty('alt'));
       lastThumbImg.removeClass('selected');
-      lastThumbImg.setOpacity( 1.0 );
+      lastThumbImg.setOpacity(1.0);
     }
 
-    $('eventImageBar').setStyle( 'width', event.Width );
-    if ( frame.Type=='Alarm' ) {
-      $('eventImageStats').removeClass( 'hidden' );
+    $('eventImageBar').setStyle('width', event.Width);
+    if ( frame.Type == 'Alarm' ) {
+      $('eventImageStats').removeClass('hidden');
     } else {
-      $('eventImageStats').addClass( 'hidden' );
+      $('eventImageStats').addClass('hidden');
     }
-    thumbImg.addClass( 'selected' );
-    thumbImg.setOpacity( 0.5 );
+    thumbImg.addClass('selected');
+    thumbImg.setOpacity(0.5);
 
-    if ( eventImagePanel.getStyle( 'display' ) == 'none' ) {
-      eventImagePanel.setOpacity( 0 );
-      eventImagePanel.setStyle( 'display', 'inline-block' );
+    if ( eventImagePanel.getStyle('display') == 'none' ) {
+      eventImagePanel.setOpacity(0);
+      eventImagePanel.setStyle('display', 'inline-block');
       new Fx.Tween( eventImagePanel, {duration: 500, transition: Fx.Transitions.Sine} ).start( 'opacity', 0, 1 );
     }
 
@@ -696,29 +717,29 @@ function loadEventImage( event, frame ) {
       'height': $j('#eventThumbs').height() - $j('#eventImageBar').outerHeight(true)-10
     } );
 
-    $('eventImageNo').set( 'text', frame.FrameId );
+    $('eventImageNo').set('text', frame.FrameId);
     $('prevImageBtn').disabled = (frame.FrameId==1);
     $('nextImageBtn').disabled = (frame.FrameId==event.Frames);
   }
 }
 
 function hideEventImageComplete() {
-  var thumbImg = $('eventThumb'+$('eventImage').getProperty( 'alt' ));
+  var thumbImg = $('eventThumb'+$('eventImage').getProperty('alt'));
   if ( thumbImg ) {
     thumbImg.removeClass('selected');
-    thumbImg.setOpacity( 1.0 );
+    thumbImg.setOpacity(1.0);
   } else {
-    console.log("Unable to find eventThumb at " + 'eventThumb'+$('eventImage').getProperty( 'alt' ) );
+    console.log('Unable to find eventThumb at eventThumb'+$('eventImage').getProperty('alt'));
   }
   $('prevImageBtn').disabled = true;
   $('nextImageBtn').disabled = true;
-  $('eventImagePanel').setStyle( 'display', 'none' );
-  $('eventImageStats').addClass( 'hidden' );
+  $('eventImagePanel').setStyle('display', 'none');
+  $('eventImageStats').addClass('hidden');
 }
 
 function hideEventImage() {
-  if ( $('eventImagePanel').getStyle( 'display' ) != 'none' ) {
-    new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start( 'opacity', 1, 0 );
+  if ( $('eventImagePanel').getStyle('display') != 'none' ) {
+    new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start('opacity', 1, 0);
   }
 }
 
@@ -745,15 +766,15 @@ function resetEventStills() {
   }
 }
 
-function getFrameResponse( respObj, respText ) {
-  if ( checkStreamForErrors( "getFrameResponse", respObj ) ) {
+function getFrameResponse(respObj, respText) {
+  if ( checkStreamForErrors('getFrameResponse', respObj) ) {
     return;
   }
 
   var frame = respObj.frameimage;
 
   if ( !eventData ) {
-    console.error( "No event "+frame.EventId+" found" );
+    console.error('No event '+frame.EventId+' found');
     return;
   }
 
@@ -763,21 +784,21 @@ function getFrameResponse( respObj, respText ) {
 
   eventData['frames'][frame.FrameId] = frame;
 
-  loadEventThumb( eventData, frame, respObj.loopback=="true" );
+  loadEventThumb(eventData, frame, respObj.loopback=="true");
 }
 
 var frameReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', onSuccess: getFrameResponse} );
 
 function frameQuery( eventId, frameId, loadImage ) {
   var parms = "view=request&request=status&entity=frameimage&id[0]="+eventId+"&id[1]="+frameId+"&loopback="+loadImage;
-  frameReq.send( parms );
+  frameReq.send(parms);
 }
 
 var currFrameId = null;
 
 function checkFrames( eventId, frameId, loadImage ) {
   if ( !eventData ) {
-    console.error( "No event "+eventId+" found" );
+    console.error("No event "+eventId+" found");
     return;
   }
 
@@ -798,29 +819,30 @@ function checkFrames( eventId, frameId, loadImage ) {
 
   for ( var fid = loFid; fid <= hiFid; fid++ ) {
     if ( !$('eventThumb'+fid) ) {
-      var img = new Element( 'img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'} );
-      img.addEvent( 'click', function() {
-        eventData['frames'][fid] = null; checkFrames( eventId, fid );
-      } );
-      frameQuery( eventId, fid, loadImage && (fid == frameId) );
-      var imgs = $('eventThumbs').getElements( 'img' );
+      var img = new Element('img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'});
+      img.addEvent('click', function() {
+        eventData['frames'][fid] = null;
+        checkFrames(eventId, fid);
+      });
+      frameQuery(eventId, fid, loadImage && (fid == frameId));
+      var imgs = $('eventThumbs').getElements('img');
       var injected = false;
       if ( fid < imgs.length ) {
-        img.inject( imgs[fid-1], 'before' );
+        img.inject(imgs[fid-1], 'before');
         injected = true;
       } else {
         injected = imgs.some(
             function( thumbImg, index ) {
-              if ( parseInt(img.getProperty( 'alt' )) < parseInt(thumbImg.getProperty( 'alt' )) ) {
-                img.inject( thumbImg, 'before' );
-                return ( true );
+              if ( parseInt(img.getProperty('alt')) < parseInt(thumbImg.getProperty('alt')) ) {
+                img.inject(thumbImg, 'before');
+                return true;
               }
-              return ( false );
+              return false;
             }
         );
       }
       if ( !injected ) {
-        img.inject( $('eventThumbs') );
+        img.inject($('eventThumbs'));
       }
       var scale = parseInt(img.getStyle('height'));
       img.setStyles( {
@@ -895,12 +917,15 @@ function getActResponse( respObj, respText ) {
 
 var actReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getActResponse} );
 
-function actQuery( action, parms ) {
+function actQuery(action, parms) {
   var actParms = "view=request&request=event&id="+eventData.Id+"&action="+action;
-  if ( parms != null ) {
-    actParms += "&"+Object.toQueryString( parms );
+  if ( auth_hash ) {
+    actParms += '&auth='+auth_hash;
   }
-  actReq.send( actParms );
+  if ( parms != null ) {
+    actParms += "&"+Object.toQueryString(parms);
+  }
+  actReq.send(actParms);
 }
 
 function deleteEvent() {
@@ -914,7 +939,7 @@ function deleteEvent() {
       getActResponse(respObj, respText);
       // We must wait for the deletion to happen before navigating to the next
       // event or this request will be cancelled.
-      streamNext( true );
+      streamNext(true);
     },
   });
   deleteReq.send("view=request&request=event&id="+eventData.Id+"&action=delete");
@@ -922,43 +947,43 @@ function deleteEvent() {
 
 function renameEvent() {
   var newName = $('eventName').get('value');
-  actQuery( 'rename', {eventName: newName} );
+  actQuery('rename', {eventName: newName});
 }
 
 function editEvent() {
-  createPopup( '?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail' );
+  createPopup('?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail');
 }
 
 function exportEvent() {
-  createPopup( '?view=export&eid='+eventData.Id, 'zmExport', 'export' );
+  createPopup('?view=export&eid='+eventData.Id, 'zmExport', 'export');
 }
 
 function archiveEvent() {
-  actQuery( 'archive' );
+  actQuery('archive');
 }
 
 function unarchiveEvent() {
-  actQuery( 'unarchive' );
+  actQuery('unarchive');
 }
 
 function showEventFrames() {
-  createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT );
+  createPopup('?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT);
 }
 
 function showStream() {
-  $('eventStills').addClass( 'hidden' );
-  $('eventVideo').removeClass( 'hidden' );
+  $('eventStills').addClass('hidden');
+  $('eventVideo').removeClass('hidden');
 
-  $('stillsEvent').removeClass( 'hidden' );
-  $('streamEvent').addClass( 'hidden' );
+  $('stillsEvent').removeClass('hidden');
+  $('streamEvent').addClass('hidden');
 
   streamMode = 'video';
   if (scale == 'auto') changeScale();
 }
 
 function showStills() {
-  $('eventStills').removeClass( 'hidden' );
-  $('eventVideo').addClass( 'hidden' );
+  $('eventStills').removeClass('hidden');
+  $('eventVideo').addClass('hidden');
 
   if (vid && ( vid.paused != true ) ) {
     // Pause the video
@@ -969,14 +994,14 @@ function showStills() {
     //playButton.innerHTML = "Play";
   }
 
-  $('stillsEvent').addClass( 'hidden' );
-  $('streamEvent').removeClass( 'hidden' );
+  $('stillsEvent').addClass('hidden');
+  $('streamEvent').removeClass('hidden');
 
   streamMode = 'stills';
 
   pauseClicked();
   if ( !scroll ) {
-    scroll = new Fx.Scroll( 'eventThumbs', {
+    scroll = new Fx.Scroll('eventThumbs', {
       wait: false,
       duration: 500,
       offset: {'x': 0, 'y': 0},
@@ -990,17 +1015,17 @@ function showStills() {
 
 function showFrameStats() {
   var fid = $('eventImageNo').get('text');
-  createPopup( '?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height );
+  createPopup('?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height);
 }
 
 function videoEvent() {
-  createPopup( '?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height );
+  createPopup('?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height);
 }
 
 // Called on each event load because each event can be a different width
 function drawProgressBar() {
   var barWidth = $j('#evtStream').width();
-  $j('#progressBar').css( 'width', barWidth );
+  $j('#progressBar').css('width', barWidth);
 }
 
 // Shows current stream progress.
@@ -1023,8 +1048,8 @@ function progressBarNav() {
 
 function handleClick( event ) {
   var target = event.target;
-  if (vid) {
-    if (target.id != 'videoobj') return; //ignore clicks on control bar
+  if ( vid ) {
+    if (target.id != 'videoobj') return; // ignore clicks on control bar
     var x = event.offsetX;
     var y = event.offsetY;
   } else {
@@ -1032,9 +1057,9 @@ function handleClick( event ) {
     var y = event.page.y - $(target).getTop();
   }
 
-  if (event.shift || event.shiftKey) {//handle both jquery and mootools
+  if ( event.shift || event.shiftKey ) { // handle both jquery and mootools
     streamPan(x, y);
-  } else if (vid && event.ctrlKey) { //allow zoom out by control click.  useful in fullscreen
+  } else if ( vid && event.ctrlKey ) { // allow zoom out by control click.  useful in fullscreen
     vjsPanZoom('zoomOut', x, y);
   } else {
     streamZoomIn(x, y);
@@ -1049,21 +1074,28 @@ function initPage() {
     $j('.vjs-progress-control').append('<div class="alarmCue"></div>');//add a place for videojs only on first load
     vid.on('ended', vjsReplay);
     vid.on('play', vjsPlay);
-    vid.on('pause', vjsPause);
+    vid.on('pause', pauseClicked);
     vid.on('click', function(event) {
       handleClick(event);
     });
+    vid.on('volumechange', function() {
+      Cookie.write('volume', vid.volume(), {duration: 10*365});
+    });
+    if ( Cookie.read('volume') != null ) {
+      vid.volume(Cookie.read('volume'));
+    }
     vid.on('timeupdate', function() {
       $j('#progressValue').html(secsToTime(Math.floor(vid.currentTime())));
     });
 
-    if ( rate > 1 ) {
+    // rate is in % so 100 would be 1x
+    if ( rate > 0 ) {
       // rate should be 100 = 1x, etc.
       vid.playbackRate(rate/100);
     }
   } else {
     progressBarNav();
-    streamCmdTimer = streamQuery.delay( 250 );
+    streamCmdTimer = streamQuery.delay(250);
     if ( canStreamNative ) {
       var imageFeed = $('imageFeed');
       if ( !imageFeed ) {
@@ -1073,16 +1105,19 @@ function initPage() {
         if ( !streamImg ) {
           streamImg = imageFeed.getElement('object');
         }
-        $(streamImg).addEvent( 'click', function( event ) {
-          handleClick( event );
-        } );
+        $(streamImg).addEvent('click', function(event) {
+          handleClick(event);
+        });
       }
     }
   }
   nearEventsQuery(eventData.Id);
   initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues
-  if (scale == "auto") changeScale();
+  if ( scale == '0' || scale == 'auto' ) changeScale();
+  document.querySelectorAll('select[name="rate"]').forEach(function(el) {
+    el.onchange = window['changeRate'];
+  });
 }
 
 // Kick everything off
-window.addEventListener( 'DOMContentLoaded', initPage );
+window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index 5df0be70d..b3f746e07 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -1,3 +1,15 @@
+<?php
+  global $connkey;
+  global $Event;
+  global $Monitor;
+  global $filterQuery;
+  global $sortQuery;
+  global $rates;
+  global $rate;
+  global $scale;
+  global $streamMode;
+  global $popup;
+?>
 //
 // Import constants
 //
@@ -34,8 +46,9 @@ var eventData = {
     StartTime: '<?php echo $Event->StartTime() ?>',
     EndTime: '<?php echo $Event->EndTime() ?>',
     Frames: '<?php echo $Event->Frames() ?>',
-    MonitorName: '<?php echo $Monitor->Name() ?>'
+    MonitorName: '<?php echo validJsStr($Monitor->Name()) ?>'
 };
+var monitorUrl = '<?php echo $Event->Storage()->Server()->UrlToIndex(); ?>';
 
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
 var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
@@ -45,7 +58,7 @@ var rate = '<?php echo $rate ?>'; // really only used when setting up initial pl
 var scale = "<?php echo $scale ?>";
 var LabelFormat = "<?php echo validJsStr($Monitor->LabelFormat())?>";
 
-var canEditEvents = <?php echo canEdit( 'Events' )?'true':'false' ?>;
+var canEditEvents = <?php echo canEdit('Events')?'true':'false' ?>;
 var streamTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 
 var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
@@ -54,8 +67,8 @@ var streamMode = '<?php echo $streamMode ?>';
 //
 // Strings
 //
-var deleteString = "<?php echo translate('Delete') ?>";
-var causeString = "<?php echo translate('AttrCause') ?>";
+var deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
+var causeString = "<?php echo validJsStr(translate('AttrCause')) ?>";
 var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
 var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';
 var popup = '<?php echo $popup ?>';
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index ca7f7c7ec..9334927f0 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -1,177 +1,276 @@
-function closeWindows() {
-  window.close();
-  // This is a hack. The only way to close an existing window is to try and open it!
-  var filterWindow = window.open( thisUrl+'?view=none', 'zmFilter', 'width=1,height=1' );
-  filterWindow.close();
-}
-
-function setButtonStates( element ) {
-  var form = element.form;
-  var checked = element.checked;
-  form.viewBtn.disabled = !(canViewEvents && checked);
-  form.editBtn.disabled = !(canEditEvents && checked);
-  form.archiveBtn.disabled = unarchivedEvents?!checked:true;
-  form.unarchiveBtn.disabled = !(canEditEvents && archivedEvents && checked);
-  form.downloadBtn.disabled = !(canViewEvents && checked);
-  form.exportBtn.disabled = !(canViewEvents && checked);
-  form.deleteBtn.disabled = !(canEditEvents && checked);
-}
-
-function configureButton(event) {
-  var element = event.target;
-  var form = element.form;
-  var checked = element.checked;
-  if ( !checked ) {
-    for (var i = 0, len=form.elements.length; i < len; i++) {
-      if ( form.elements[i].name.indexOf('eids') == 0) {
-        if ( form.elements[i].checked ) {
-          checked = true;
-          break;
-        }
-      }
-    }
-  }
-  if ( !element.checked ) {
-    form.toggleCheck.checked = false;
-  }
-  form.viewBtn.disabled = !(canViewEvents && checked);
-  form.editBtn.disabled = !(canEditEvents && checked);
-  form.archiveBtn.disabled = (!checked)||(!unarchivedEvents);
-  form.unarchiveBtn.disabled = !(canEditEvents && checked && archivedEvents);
-  form.downloadBtn.disabled = !(canViewEvents && checked);
-  form.exportBtn.disabled = !(canViewEvents && checked);
-  form.deleteBtn.disabled = !(canEditEvents && checked);
-}
-
-function deleteEvents( element ) {
-  if ( ! canEditEvents ) {
-    alert("You do not have permission to delete events.");
-    return;
-  }
-  var form = element.form;
-
-  var count = 0;
-  // This is slightly more efficient than a jquery selector because we stop after finding one.
-  for (var i = 0; i < form.elements.length; i++) {
-    if (form.elements[i].name.indexOf('eids') == 0) {
-      if ( form.elements[i].checked ) {
-        count++;
-        break;
-      }
-    }
-  }
-  if ( count > 0 ) {
-    if ( confirm(confirmDeleteEventsString) ) {
-      form.elements['action'].value = 'delete';
-      form.submit();
-    }
-  }
-}
-
-function editEvents( element ) {
-  if ( ! canEditEvents ) {
-    alert("You do not have permission to delete events.");
-    return;
-  }
-  var form = element.form;
-  var eids = new Array();
-  for (var i = 0, len=form.elements.length; i < len; i++) {
-    if (form.elements[i].name.indexOf('eids') == 0) {
-      if ( form.elements[i].checked ) {
-        eids[eids.length] = 'eids[]='+form.elements[i].value;
-      }
-    }
-  }
-  createPopup('?view=eventdetail&'+eids.join('&'), 'zmEventDetail', 'eventdetail');
-}
-
-function downloadVideo( element ) {
-  var form = element.form;
-  var eids = new Array();
-  for (var i = 0, len=form.elements.length; i < len; i++) {
-    if (form.elements[i].name.indexOf('eids') == 0 ) {
-      if ( form.elements[i].checked ) {
-        eids[eids.length] = 'eids[]='+form.elements[i].value;
-      }
-    }
-  }
-  createPopup( '?view=download&'+eids.join('&'), 'zmDownload', 'download' );
-}
-
-function exportEvents( element ) {
-  var form = element.form;
-  console.log(form);
-  form.action = '?view=export';
-  form.elements['view'].value='export';
-  form.submit();
-}
-
-function viewEvents( element ) {
-  var form = element.form;
-  var events = new Array();
-  for (var i = 0, len=form.elements.length; i < len; i++) {
-    if ( form.elements[i].name.indexOf('eids') == 0 ) {
-      if ( form.elements[i].checked ) {
-        events[events.length] = form.elements[i].value;
-      }
-    }
-  }
-  if ( events.length > 0 ) {
-    var filter = '&filter[Query][terms][0][attr]=Id&filter[Query][terms][0][op]=%3D%5B%5D&filter[Query][terms][0][val]='+events.join('%2C');
-    window.location.href = thisUrl+'?view=event&eid='+events[0]+filter+sortQuery+'&page=1&play=1';
-  }
-}
-
-function archiveEvents(element) {
-  var form = element.form;
-  form.elements['action'].value = 'archive';
-  form.submit();
-}
-
-function unarchiveEvents(element) {
-  if ( ! canEditEvents ) {
-    alert("You do not have permission to delete events.");
-    return;
-  }
-  var form = element.form;
-  form.elements['action'].value = 'unarchive';
-  form.submit();
-}
-
-if ( openFilterWindow ) {
-  //opener.location.reload(true);
-  createPopup( '?view=filter&page='+thisPage+filterQuery, 'zmFilter', 'filter' );
-  location.replace( '?view='+currentView+'&page='+thisPage+filterQuery );
-}
-
 function thumbnail_onmouseover(event) {
   var img = event.target;
+  img.src = '';
   img.src = img.getAttribute('stream_src');
 }
+
 function thumbnail_onmouseout(event) {
   var img = event.target;
+  img.src = '';
   img.src = img.getAttribute('still_src');
 }
 
-function initPage() {
-  if ( window.history.length == 1 ) {
-    $j('#controls').children().eq(0).html('');
-  }
+function initThumbAnimation() {
   $j('.colThumbnail img').each(function() {
     this.addEventListener('mouseover', thumbnail_onmouseover, false);
     this.addEventListener('mouseout', thumbnail_onmouseout, false);
   });
-  $j('input[name=eids\\[\\]]').each(function() {
-    this.addEventListener('click', configureButton, false);
-  });
-  document.getElementById("refreshLink").addEventListener("click", function onRefreshClick(evt) {
-    evt.preventDefault();
-    window.location.reload(true);
-  });
-  document.getElementById("backLink").addEventListener("click", function onBackClick(evt) {
-    evt.preventDefault();
-    window.history.back();
+}
+
+// Returns the event id's of the selected rows
+function getIdSelections() {
+  var table = $j('#eventTable');
+
+  return $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Id.replace(/(<([^>]+)>)/gi, ''); // strip the html from the element before sending
   });
 }
 
-$j(document).ready(initPage);
+// Returns a boolen to indicate at least one selected row is archived
+function getArchivedSelections() {
+  var table = $j('#eventTable');
+  var selection = $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Archived;
+  });
+  return selection.includes("Yes");
+}
+
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getDelConfirmModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
+      .done(function(data) {
+        if ( $j('#deleteConfirm').length ) {
+          $j('#deleteConfirm').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        manageDelConfirmModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEditEvents ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&action=delete&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
+}
+
+function getEventDetailModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
+      .done(function(data) {
+        if ( $j('#eventDetailModal').length ) {
+          $j('#eventDetailModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#eventDetailModal').modal('show');
+        // Manage the Save button
+        $j('#eventDetailSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#eventDetailForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function initPage() {
+  var backBtn = $j('#backBtn');
+  var viewBtn = $j('#viewBtn');
+  var archiveBtn = $j('#archiveBtn');
+  var unarchiveBtn = $j('#unarchiveBtn');
+  var editBtn = $j('#editBtn');
+  var exportBtn = $j('#exportBtn');
+  var downloadBtn = $j('#downloadBtn');
+  var deleteBtn = $j('#deleteBtn');
+  var table = $j('#eventTable');
+
+  // Load the delete confirmation modal into the DOM
+  getDelConfirmModal();
+
+  // Init the bootstrap-table
+  table.bootstrapTable({icons: icons});
+
+  // Hide these columns on first run when no cookie is saved
+  if ( !getCookie("zmEventsTable.bs.table.columns") ) {
+    table.bootstrapTable('hideColumn', 'Archived');
+    table.bootstrapTable('hideColumn', 'Emailed');
+  }
+
+  // enable or disable buttons based on current selection and user rights
+  table.on('check.bs.table uncheck.bs.table ' +
+  'check-all.bs.table uncheck-all.bs.table',
+  function() {
+    selections = table.bootstrapTable('getSelections');
+
+    viewBtn.prop('disabled', !(selections.length && canViewEvents));
+    archiveBtn.prop('disabled', !(selections.length && canEditEvents));
+    unarchiveBtn.prop('disabled', !(getArchivedSelections()) && canEditEvents);
+    editBtn.prop('disabled', !(selections.length && canEditEvents));
+    exportBtn.prop('disabled', !(selections.length && canViewEvents));
+    downloadBtn.prop('disabled', !(selections.length && canViewEvents));
+    deleteBtn.prop('disabled', !(selections.length && canEditEvents));
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Setup the thumbnail video animation
+  initThumbAnimation();
+
+  // Some toolbar events break the thumbnail animation, so re-init eventlistener
+  table.on('all.bs.table', initThumbAnimation);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the TIMELINE Button
+  document.getElementById("tlineBtn").addEventListener("click", function onTlineClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=timeline'+filterQuery);
+  });
+
+  // Manage the VIEW button
+  document.getElementById("viewBtn").addEventListener("click", function onViewClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    var filter = '&filter[Query][terms][0][attr]=Id&filter[Query][terms][0][op]=%3D%5B%5D&filter[Query][terms][0][val]='+selections.join('%2C');
+    window.location.href = thisUrl+'?view=event&eid='+selections[0]+filter+sortQuery+'&page=1&play=1';
+  });
+
+  // Manage the ARCHIVE button
+  document.getElementById("archiveBtn").addEventListener("click", function onArchiveClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&action=archive&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the UNARCHIVE button
+  document.getElementById("unarchiveBtn").addEventListener("click", function onUnarchiveClick(evt) {
+    if ( ! canEditEvents ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+    console.log(selections);
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&action=unarchive&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+
+    if ( openFilterWindow ) {
+      //opener.location.reload(true);
+      createPopup( '?view=filter&page='+thisPage+filterQuery, 'zmFilter', 'filter' );
+      location.replace( '?view='+currentView+'&page='+thisPage+filterQuery );
+    } else {
+      window.location.reload(true);
+    }
+  });
+
+  // Manage the EDIT button
+  document.getElementById("editBtn").addEventListener("click", function onEditClick(evt) {
+    if ( ! canEditEvents ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]='+selections.join('&eids[]='))
+        .done(function(data) {
+          if ( $j('#eventDetailModal').length ) {
+            $j('#eventDetailModal').replaceWith(data.html);
+          } else {
+            $j("body").append(data.html);
+          }
+          $j('#eventDetailModal').modal('show');
+          // Manage the Save button
+          $j('#eventDetailSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#eventDetailForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the EXPORT button
+  document.getElementById("exportBtn").addEventListener("click", function onExportClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    window.location.assign('?view=export&eids[]='+selections.join('&eids[]='));
+  });
+
+  // Manage the DOWNLOAD VIDEO button
+  document.getElementById("downloadBtn").addEventListener("click", function onDownloadClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    createPopup('?view=download&eids[]='+selections.join('&eids[]='), 'zmDownload', 'download');
+  });
+
+  // Manage the DELETE button
+  document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
+    if ( ! canEditEvents ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j('#deleteConfirm').modal('show');
+  });
+
+  // Manage the eventdetail links in the events list
+  $j(".eDetailLink").click(function(evt) {
+    evt.preventDefault();
+    var eid = $j(this).data('eid');
+    getEventDetailModal(eid);
+  });
+
+  // The table is initially given a hidden style, so now that we are done rendering, show it
+  table.show();
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/events.js.php b/web/skins/classic/views/js/events.js.php
index 8a49c00c3..0b96f12c5 100644
--- a/web/skins/classic/views/js/events.js.php
+++ b/web/skins/classic/views/js/events.js.php
@@ -1,9 +1,10 @@
+<?php
+  global $filterQuery;
+  global $sortQuery;
+?>
 //var openFilterWindow = <?php echo $_REQUEST['filter']?'true':'false' ?>;
 var openFilterWindow = false;
 
-var archivedEvents = <?php echo !empty($archived)?'true':'false' ?>;
-var unarchivedEvents = <?php echo !empty($unarchived)?'true':'false' ?>;
-
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
 var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
 
diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js
index 74e7d029b..dfe74ebe3 100644
--- a/web/skins/classic/views/js/export.js
+++ b/web/skins/classic/views/js/export.js
@@ -1,22 +1,31 @@
 var exportTimer = null;
 
-function configureExportButton( element ) {
+function configureExportButton(element) {
   var form = element.form;
 
-  var checkCount = 0;
-  var radioCount = 0;
-  for ( var i = 0; i < form.elements.length; i++ ) {
-    if ( form.elements[i].type == "checkbox" && form.elements[i].checked ) {
-      checkCount++;
-    } else if ( form.elements[i].type == "radio" && form.elements[i].checked ) {
-      radioCount++;
+  var eventCount = 0;
+  document.querySelectorAll('input[name="eids[]"]').forEach(function(el) {
+    if ( el.checked ) {
+      eventCount ++;
     }
-  }
-  form.elements['exportButton'].disabled = (checkCount == 0 || radioCount == 0);
+  });
+
+  form.elements['exportButton'].disabled = (
+    eventCount &&
+    (
+      form.elements['exportDetail'].checked ||
+      form.elements['exportFrames'].checked ||
+      form.elements['exportImages'].checked ||
+      form.elements['exportVideo'].checked ||
+      form.elements['exportMisc'].checked
+    ) &&
+    ( form.elements['exportFormat'][0].checked || form.elements['exportFormat'][1].checked ) &&
+    ( form.elements['exportCompress'][0].checked || form.elements['exportCompress'][1].checked )
+  );
 }
 
 function startDownload(file) {
-  console.log("Starting download of " + file);
+  console.log('Starting download of ' + file);
   window.location.replace(file);
 }
 
@@ -32,17 +41,12 @@ function exportProgress() {
 }
 
 function exportResponse(respObj, respText) {
-  //console.log(respText);
-
-  $clear(exportTimer);
+  clearInterval(exportTimer);
   if ( respObj.result != 'Ok' ) {
     $('exportProgressTicker').set('text', respObj.message);
   } else {
     $('exportProgressTicker').set('text', exportSucceededString);
-    console.log(respObj.exportFile);
-    console.log(encodeURIComponent(respObj.exportFile));
-
-    startDownload.pass(decodeURIComponent(respObj.exportFile)).delay( 1500 );
+    startDownload.pass(decodeURIComponent(respObj.exportFile)).delay(1500);
   }
   return;
 
@@ -59,7 +63,7 @@ function exportResponse(respObj, respText) {
   //window.location.replace( thisUrl+'?view='+currentView+'&'+eids.join('&')+'&exportFile='+respObj.exportFile+'&generated='+((respObj.result=='Ok')?1:0) );
 }
 
-function exportEvent( ) {
+function exportEvents( ) {
   var parms = 'view=event&request=event&action=export';
   parms += '&'+$('contentForm').toQueryString();
   var query = new Request.JSON( {
@@ -69,19 +73,43 @@ function exportEvent( ) {
     onSuccess: exportResponse
   } );
   query.send();
-  $('exportProgress').removeClass( 'hidden' );
-  $('exportProgress').setProperty( 'class', 'warnText' );
-  $('exportProgressText').set( 'text', exportProgressString );
-  exportProgress();
+  $('exportProgress').removeClass('hidden');
+  $('exportProgress').setProperty('class', 'warnText');
+  $('exportProgressText').set('text', exportProgressString);
+  //exportProgress();
   exportTimer = exportProgress.periodical( 500 );
 }
 
+function getEventDetailModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
+      .done(function(data) {
+        if ( $j('#eventDetailModal').length ) {
+          $j('#eventDetailModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#eventDetailModal').modal('show');
+        // Manage the Save button
+        $j('#eventDetailSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#eventDetailForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
 function initPage() {
   configureExportButton( $('exportButton') );
   if ( exportReady ) {
-    startDownload.pass(exportFile).delay( 1500 );
+    startDownload.pass(exportFile).delay(1500);
   }
-  document.getElementById('exportButton').addEventListener('click', exportEvent);
+  document.getElementById('exportButton').addEventListener('click', exportEvents);
+  // Manage the eventdetail link in the export list
+  $j(".eDetailLink").click(function(evt) {
+    evt.preventDefault();
+    var eid = $j(this).data('eid');
+    getEventDetailModal(eid);
+  });
 }
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 99e8a9c03..163a7fdde 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -2,12 +2,12 @@ function selectFilter(element) {
   element.form.submit();
 }
 
-function validateForm( form ) {
+function validateForm(form) {
   var rows = $j(form).find('tbody').eq(0).find('tr');
   var obrCount = 0;
   var cbrCount = 0;
   for ( var i = 0; i < rows.length; i++ ) {
-    if (rows.length > 2) {
+    if ( rows.length > 2 ) {
       obrCount += parseInt(form.elements['filter[Query][terms][' + i + '][obr]'].value);
       cbrCount += parseInt(form.elements['filter[Query][terms][' + i + '][cbr]'].value);
     }
@@ -22,21 +22,67 @@ function validateForm( form ) {
   }
   var numbers_reg = /\D/;
   if ( numbers_reg.test(form.elements['filter[Query][limit]'].value) ) {
-    alert("There appear to be non-numeric characters in your limit. Limit must be a positive integer value or empty.");
+    alert('There appear to be non-numeric characters in your limit. Limit must be a positive integer value or empty.');
     return false;
   }
+  if ( form.elements['filter[AutoDelete]'].checked ) {
+    // if Delete action is Enabled should also have an unarchived term
+    var have_archivestatus_term = false;
+    for ( var i = 0; i < rows.length; i++ ) {
+      if ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'Archived' ) {
+        have_archivestatus_term = true;
+      }
+    }
+    if ( ! have_archivestatus_term ) {
+      return confirm('You have enabled deleting events but do not have a term referencing the archived status of the event.  This filter may delete events that you want to save! Are you sure?');
+    }
+  } else if ( form.elements['filter[UpdateDiskSpace]'].checked ) {
+    var have_endtime_term = false;
+    for ( var i = 0; i < rows.length; i++ ) {
+      if (
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDateTime' )
+        ||
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndTime' )
+        ||
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDate' )
+      ) {
+        have_endtime_term = true;
+        break;
+      }
+    }
+    if ( ! have_endtime_term ) {
+      return confirm('You don\'t have an End Date/Time term in your filter.  This might match recordings that are still in progress and so the UpdateDiskSpace action will be a waste of time and resources.  Ideally you should have an End Date/Time IS NOT NULL term.  Do you want to continue?');
+    }
+  } else if ( form.elements['filter[Background]'].checked ) {
+    if ( ! (
+      form.elements['filter[AutoArchive]'].checked ||
+      form.elements['filter[UpdateDiskSpace]'].checked ||
+      form.elements['filter[AutoVideo]'].checked ||
+      form.elements['filter[AutoEmail]'].checked ||
+      form.elements['filter[AutoMessage]'].checked ||
+      form.elements['filter[AutoExecute]'].checked ||
+      form.elements['filter[AutoDelete]'].checked ||
+      form.elements['filter[AutoCopy]'].checked ||
+      form.elements['filter[AutoMove]'].checked
+    ) ) {
+      alert('You have chosen to run this filter in the background but not selected any actions.');
+    }
+  }
   return true;
 }
 
 function updateButtons(element) {
   var form = element.form;
-
   if ( element.type == 'checkbox' && element.checked ) {
     form.elements['executeButton'].disabled = false;
   } else {
     var canExecute = false;
     if ( form.elements['filter[AutoArchive]'] && form.elements['filter[AutoArchive]'].checked ) {
       canExecute = true;
+    } else if ( form.elements['filter[AutoCopy]'] && form.elements['filter[AutoCopy]'].checked ) {
+      canExecute = true;
+    } else if ( form.elements['filter[AutoMove]'] && form.elements['filter[AutoMove]'].checked ) {
+      canExecute = true;
     } else if ( form.elements['filter[AutoVideo]'] && form.elements['filter[AutoVideo]'].checked ) {
       canExecute = true;
     } else if ( form.elements['filter[AutoUpload]'] && form.elements['filter[AutoUpload]'].checked ) {
@@ -63,6 +109,15 @@ function updateButtons(element) {
   }
 }
 
+function click_AutoEmail(element) {
+  updateButtons(this);
+  if ( this.checked ) {
+    $j('#EmailOptions').show();
+  } else {
+    $j('#EmailOptions').hide();
+  }
+}
+
 function click_automove(element) {
   updateButtons(this);
   if ( this.checked ) {
@@ -96,15 +151,21 @@ function resetFilter( element ) {
   $j('#contentForm')[0].reset();
 }
 
-function submitToEvents( element ) {
+function submitToEvents(element) {
   var form = element.form;
-  form.action = thisUrl + '?view=events';
-  history.replaceState(null, null, '?view=filter&' + $j(form).serialize());
+  //form.action = '?view=events';
+  //form.submit();
+  //console.log(form);
+  //console.log($j(form).serialize());
+  //history.replaceState(null, null, '?view=filter&' + $j(form).serialize());
+  window.location.assign('?view=events&'+$j(form).serialize());
 }
-function submitToMontageReview( element ) {
+
+function submitToMontageReview(element) {
   var form = element.form;
   form.action = thisUrl + '?view=montagereview';
-  history.replaceState(null, null, '?view=filter&' + $j(form).serialize());
+  window.location.assign('?view=montagereview&'+$j(form).serialize());
+  history.replaceState(null, null, '?view=montagereview&live=0&' + $j(form).serialize());
 }
 
 function submitToExport(element) {
@@ -137,14 +198,19 @@ function deleteFilter( element ) {
     form.submit();
   }
 }
+var escape = document.createElement('textarea');
+function escapeHTML(html) {
+  escape.textContent = html;
+  return escape.innerHTML;
+}
 
 function parseRows(rows) {
-  for (var rowNum = 0; rowNum < rows.length; rowNum++) { //Each row is a term
+  for ( var rowNum = 0; rowNum < rows.length; rowNum++ ) { //Each row is a term
     var queryPrefix = 'filter[Query][terms][';
     var inputTds = rows.eq(rowNum).children();
 
-    if (rowNum == 0) inputTds.eq(0).html('&nbsp'); //Remove and from first term
-    if (rowNum > 0) { //add and/or to 1+
+    if ( rowNum == 0 ) inputTds.eq(0).html('&nbsp'); //Remove and from first term
+    if ( rowNum > 0 ) { //add and/or to 1+
       var cnjVal = inputTds.eq(0).children().val();
       var conjSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][cnj]').attr('id', queryPrefix + rowNum + '][cnj]');
       $j.each(conjTypes, function(i) {
@@ -154,33 +220,33 @@ function parseRows(rows) {
     }
 
     var brackets = rows.length - 2;
-    if (brackets > 0) { //add bracket select to all rows
+    if ( brackets > 0 ) { // add bracket select to all rows
       var obrSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][obr]').attr('id', queryPrefix + rowNum + '][obr]');
       var cbrSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][cbr]').attr('id', queryPrefix + rowNum + '][cbr]');
       obrSelect.append('<option value="0"</option>');
       cbrSelect.append('<option value="0"</option>');
-      for (var i = 1; i <= brackets; i++) {//build bracket options
+      for ( var i = 1; i <= brackets; i++ ) { // build bracket options
         obrSelect.append('<option value="' + i + '">' + '('.repeat(i) + '</option>');
         cbrSelect.append('<option value="' + i + '">' + ')'.repeat(i) + '</option>');
       }
-      var obrVal = inputTds.eq(1).children().val() != undefined ? inputTds.eq(1).children().val() : 0; //Save currently selected bracket option
+      var obrVal = inputTds.eq(1).children().val() != undefined ? inputTds.eq(1).children().val() : 0; // Save currently selected bracket option
       var cbrVal = inputTds.eq(5).children().val() != undefined ? inputTds.eq(5).children().val() : 0;
-      inputTds.eq(1).html(obrSelect).children().val(obrVal); //Set bracket contents and assign saved value
+      inputTds.eq(1).html(obrSelect).children().val(obrVal); // Set bracket contents and assign saved value
       inputTds.eq(5).html(cbrSelect).children().val(cbrVal);
     } else {
-      inputTds.eq(1).html('&nbsp'); //Blank if there aren't enough terms for brackets
+      inputTds.eq(1).html('&nbsp'); // Blank if there aren't enough terms for brackets
       inputTds.eq(5).html('&nbsp');
     }
 
-    if (rows.length == 1) {
-      inputTds.eq(6).find(':input[value="-"]').prop('disabled', true); //enable/disable remove row button
+    if ( rows.length == 1 ) {
+      inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', true); // enable/disable remove row button
     } else {
-      inputTds.eq(6).find(':input[value="-"]').prop('disabled', false);
+      inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', false);
     }
 
     var attr = inputTds.eq(2).children().val();
 
-    if ( attr == "Archived") { //Archived types
+    if ( attr == 'Archived' ) { //Archived types
       inputTds.eq(3).html('equal to<input type="hidden" name="filter[Query][terms][' + rowNum + '][op]" value="=">');
       var archiveSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
       for (var i = 0; i < archiveTypes.length; i++) {
@@ -188,6 +254,18 @@ function parseRows(rows) {
       }
       var archiveVal = inputTds.eq(4).children().val();
       inputTds.eq(4).html(archiveSelect).children().val(archiveVal).chosen({width: "101%"});
+    } else if ( attr == 'AlarmedZoneId' ) {
+      var zoneSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
+      for ( monitor_id in monitors ) {
+        for ( zone_id in zones ) {
+          var zone = zones[zone_id];
+          if ( monitor_id == zone.MonitorId ) {
+            zoneSelect.append('<option value="' + zone_id + '">' + zone.Name + '</option>');
+          }
+        } // end foreach zone
+      } // end foreach monitor
+      var zoneVal = inputTds.eq(4).children().val();
+      inputTds.eq(4).html(zoneSelect).children().val(zoneVal).chosen({width: "101%"});
     } else if ( attr.indexOf('Weekday') >= 0 ) { //Weekday selection
       var weekdaySelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
       for (var i = 0; i < weekdays.length; i++) {
@@ -218,22 +296,47 @@ function parseRows(rows) {
       inputTds.eq(4).html(storageSelect).children().val(storageVal).chosen({width: "101%"});
     } else if ( attr == 'MonitorName' ) { //Monitor names
       var monitorSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
-      for (var key in monitors) {
-        monitorSelect.append('<option value="' + key + '">' + monitors[key] + '</option>');
+      for ( var monitor_id in monitors ) {
+        monitorSelect.append('<option value="' + monitors[monitor_id].Name + '">' + escapeHTML(monitors[monitor_id].Name) + '</option>');
       }
       var monitorVal = inputTds.eq(4).children().val();
       inputTds.eq(4).html(monitorSelect).children().val(monitorVal);
-    } else { //Reset to regular text field and operator for everything that isn't special
-      var opSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][op]').attr('id', queryPrefix + rowNum + '][op]');
-      for (var key in opTypes) {
-        opSelect.append('<option value="' + key + '">' + opTypes[key] + '</option>');
+    } else if ( attr == 'ExistsInFileSystem' ) {
+      var select = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
+      for ( var booleanVal in booleanValues ) {
+        select.append('<option value="' + booleanVal + '">' + escapeHTML(booleanValues[booleanVal]) + '</option>');
       }
-      var opVal = inputTds.eq(3).children().val();
-      inputTds.eq(3).html(opSelect).children().val(opVal).chosen({width: "101%"});
+      var val = inputTds.eq(4).children().val();
+      if ( ! val ) val = 'false'; // default to the first option false
+      inputTds.eq(4).html(select).children().val(val);
+    } else { // Reset to regular text field and operator for everything that isn't special
       var textInput = $j('<input></input>').attr('type', 'text').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
       var textVal = inputTds.eq(4).children().val();
       inputTds.eq(4).html(textInput).children().val(textVal);
     }
+
+    // Validate the operator
+    var opSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][op]').attr('id', queryPrefix + rowNum + '][op]');
+    var opVal = inputTds.eq(3).children().val();
+    if ( attr == 'ExistsInFileSystem' ) {
+      if ( ! opVal ) {
+        // Default to equals so that something gets selected
+        opVal = 'IS';
+      }
+      for ( var key of ['IS', 'IS NOT'] ) {
+        opSelect.append('<option value="' + key + '"'+(key == opVal ? ' selected="selected"' : '')+'>' + opTypes[key] + '</option>');
+      }
+    } else {
+      if ( ! opVal ) {
+        // Default to equals so that something gets selected
+        console.log("No value for operator. Defaulting to =");
+        opVal = '=';
+      }
+      for ( var key in opTypes ) {
+        opSelect.append('<option value="' + key + '"'+(key == opVal ? ' selected="selected"' : '')+'>' + opTypes[key] + '</option>');
+      }
+    }
+    inputTds.eq(3).html(opSelect).children().val(opVal).chosen({width: "101%"});
     if ( attr.endsWith('DateTime') ) { //Start/End DateTime
       inputTds.eq(4).children().datetimepicker({timeFormat: "HH:mm:ss", dateFormat: "yy-mm-dd", maxDate: 0, constrainInput: false});
     } else if ( attr.endsWith('Date') ) { //Start/End Date
@@ -249,9 +352,9 @@ function parseRows(rows) {
     term[2] = rowNum;
     inputTds.eq(2).children().eq(0).attr('name', 'filter'+stringFilter(term));
     inputTds.eq(2).children().eq(0).attr('id', 'filter'+stringFilter(term));
-  }//End for each term/row
+  } //End for each term/row
   history.replaceState(null, null, '?view=filter&' + $j('#contentForm').serialize());
-}
+} // parseRows
 
 function stringFilter(term) {
   var termString = '';
@@ -270,11 +373,16 @@ function addTerm( element ) {
     this[0].selected = 'selected';
   }).chosen({width: '101%'});
   newRow.find('input[type="text"]').val('');
-  newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function attachOnClick(el) {
+  newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function(el) {
     var fnName = el.getAttribute("data-on-click-this");
     el.onclick = window[fnName].bind(el, el);
   });
 
+  newRow[0].querySelectorAll('select[data-on-change-this]').forEach(function(el) {
+    var fnName = el.getAttribute('data-on-change-this');
+    el.onchange = window[fnName].bind(el, el);
+  });
+
   var rows = $j(row).parent().children();
   parseRows(rows);
 }
@@ -287,11 +395,53 @@ function delTerm( element ) {
   parseRows(rows);
 }
 
+function debugFilter() {
+  getModal('filterdebug');
+}
+
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getModal(id) {
+  $j.getJSON(thisUrl + '?request=modal&modal='+id+'&fid='+filterid)
+      .done(function(data) {
+        if ( !data ) {
+          console.error("Get modal returned no data");
+          return;
+        }
+
+        if ( $j('#'+id).length ) {
+          console.log("replacing");
+          $j('#'+id).replaceWith(data.html);
+        } else {
+          console.log("Adding to body"+data.html);
+          $j('body').append(data.html);
+        }
+        manageModalBtns(id);
+        modal = $j('#'+id+'Modal');
+        if ( ! modal.length ) {
+          console.log("No modal found");
+        }
+        $j('#'+id+'Modal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function manageModalBtns(id) {
+  console.log(id);
+  // Manage the CANCEL modal button
+  var cancelBtn = document.getElementById(id+"CancelBtn");
+  if ( cancelBtn ) {
+    document.getElementById(id+"CancelBtn").addEventListener("click", function onCancelClick(evt) {
+      $j('#'+id).modal('hide');
+    });
+  }
+}
+
 function init() {
   updateButtons( $('executeButton') );
   $j('#Id').chosen();
   $j('#fieldsTable select').not("[name$='br\\]'], [name$='cnj\\]']").chosen({width: '101%'}); //Every select except brackets/and
   $j("#sortTable [name$='sort_field\\]']").chosen();
+  parseRows($j('#fieldsTable tbody').children());
 }
 
 window.addEventListener( 'DOMContentLoaded', init );
diff --git a/web/skins/classic/views/js/filter.js.php b/web/skins/classic/views/js/filter.js.php
index 15db50a32..f7f7547f2 100644
--- a/web/skins/classic/views/js/filter.js.php
+++ b/web/skins/classic/views/js/filter.js.php
@@ -1,3 +1,19 @@
+<?php
+  global $filterQuery;
+  global $sortQuery;
+  global $conjunctionTypes;
+  global $opTypes;
+  global $archiveTypes;
+  global $weekdays;
+  global $states;
+  global $servers;
+  global $storageareas;
+  global $monitors;
+  global $zones;
+  global $booleanValues;
+  global $filter;
+?>
+  var filterid = '<?php echo $filter->Id() ?>';
 var filterQuery = '<?php echo isset($filterQuery) ? validJsStr(htmlspecialchars_decode($filterQuery)) : '' ?>';
 var sortQuery = '<?php echo isset($sortQuery) ? validJsStr(htmlspecialchars_decode($sortQuery)) : '' ?>';
 
@@ -10,6 +26,8 @@ var states = <?php echo isset($states) ? json_encode($states) : '' ?>;
 var servers = <?php echo isset($servers) ? json_encode($servers) : '' ?>;
 var storageareas = <?php echo isset($storageareas) ? json_encode($storageareas) : '' ?>;
 var monitors = <?php echo isset($monitors) ? json_encode($monitors) : '' ?>;
+var zones = <?php echo isset($zones) ? json_encode($zones) : '' ?>;
+var booleanValues = <?php echo json_encode($booleanValues) ?>;
 
 var errorBrackets = '<?php echo translate('ErrorBrackets') ?>';
 var errorValue = '<?php echo translate('ErrorValidValue') ?>';
diff --git a/web/skins/classic/views/js/frame.js b/web/skins/classic/views/js/frame.js
index 03058ff8a..5375bb098 100644
--- a/web/skins/classic/views/js/frame.js
+++ b/web/skins/classic/views/js/frame.js
@@ -11,7 +11,7 @@ function changeScale() {
   if ( img ) {
     var baseWidth = $j('#base_width').val();
     var baseHeight = $j('#base_height').val();
-    if ( scale == 'auto' ) {
+    if ( ! parseInt(scale) ) {
       var newSize = scaleToFit(baseWidth, baseHeight, img, $j('#controls'));
       newWidth = newSize.width;
       newHeight = newSize.height;
@@ -24,16 +24,49 @@ function changeScale() {
     img.css('width', newWidth + 'px');
     img.css('height', newHeight + 'px');
   }
-  Cookie.write( 'zmWatchScale', scale, {duration: 10*365} );
+  Cookie.write('zmWatchScale', scale, {duration: 10*365});
   $j.each(controlsLinks, function(k, anchor) { //Make frames respect scale choices
-    anchor.prop('href', anchor.prop('href').replace(/scale=.*&/, 'scale=' + scale + '&'));
+    if ( anchor ) {
+      anchor.prop('href', anchor.prop('href').replace(/scale=.*&/, 'scale=' + scale + '&'));
+    }
   });
 }
 
-if (scale == 'auto') {
+if ( !scale ) {
   $j(document).ready(changeScale);
 }
 
 document.addEventListener('DOMContentLoaded', function onDCL() {
-  document.getElementById('scale').addEventListener('change', changeScale);
+  document.getElementById('scaleControl').addEventListener('change', changeScale);
+});
+
+function initPage() {
+  var backBtn = $j('#backBtn');
+
+  if ( scale == '0' || scale == 'auto' ) changeScale();
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the STATS button
+  document.getElementById("statsBtn").addEventListener("click", function onViewClick(evt) {
+    evt.preventDefault();
+    window.location.href = thisUrl+'?view=stats&eid='+eid+'&fid='+fid;
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
 });
diff --git a/web/skins/classic/views/js/frame.js.php b/web/skins/classic/views/js/frame.js.php
index 572587f82..9bd2f4236 100644
--- a/web/skins/classic/views/js/frame.js.php
+++ b/web/skins/classic/views/js/frame.js.php
@@ -1,3 +1,15 @@
+<?php
+  global $scale;
+  global $eid;
+  global $fid;
+  global $alarmFrame;
+?>
+
 var scale = '<?php echo validJsStr($scale); ?>';
 
 var SCALE_BASE = <?php echo SCALE_BASE ?>;
+
+var eid = <?php echo $eid ?>;
+var fid = <?php echo $fid ?>;
+var record_event_stats = <?php echo ZM_RECORD_EVENT_STATS ?>;
+var alarmFrame = <?php echo $alarmFrame ?>;
diff --git a/web/skins/classic/views/js/frames.js b/web/skins/classic/views/js/frames.js
new file mode 100644
index 000000000..57bf8e4b0
--- /dev/null
+++ b/web/skins/classic/views/js/frames.js
@@ -0,0 +1,78 @@
+function thumbnail_onmouseover(event) {
+  var img = event.target;
+  img.src = '';
+  img.src = img.getAttribute('full_img_src');
+}
+
+function thumbnail_onmouseout(event) {
+  var img = event.target;
+  img.src = '';
+  img.src = img.getAttribute('img_src');
+}
+
+function initThumbAnimation() {
+  $j('.colThumbnail img').each(function() {
+    this.addEventListener('mouseover', thumbnail_onmouseover, false);
+    this.addEventListener('mouseout', thumbnail_onmouseout, false);
+  });
+}
+
+function processClicks(event, field, value, row, $element) {
+  if ( field == 'FrameScore' ) {
+    window.location.assign('?view=stats&eid='+row.EventId+'&fid='+row.FrameId);
+  } else {
+    window.location.assign('?view=frame&eid='+row.EventId+'&fid='+row.FrameId);
+  }
+}
+
+// This function handles when the user clicks a "+" link to retrieve stats for a frame
+function detailFormatter(index, row, $detail) {
+  $detail.html('Please wait. Loading from ajax request...');
+  $j.get(thisUrl + '?request=stats&eid=' + row.EventId + '&fid=' + row.FrameId + '&row=' + index)
+      .done(function(data) {
+        $detail.html(data.html);
+      })
+      .fail(logAjaxFail);
+}
+function initPage() {
+  var backBtn = $j('#backBtn');
+  var table = $j('#framesTable');
+
+  // Init the bootstrap-table
+  table.bootstrapTable({icons: icons});
+
+  // Hide these columns on first run when no cookie is saved
+  if ( !getCookie("zmFramesTable.bs.table.columns") ) {
+    table.bootstrapTable('hideColumn', 'EventId');
+  }
+
+  // Hide the stats tables on init
+  $j(".contentStatsTable").hide();
+
+  // Disable the back button if there is nothing to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Setup the thumbnail animation
+  initThumbAnimation();
+
+  // Some toolbar events break the thumbnail animation, so re-init eventlistener
+  table.on('all.bs.table', initThumbAnimation);
+
+  // Load the associated frame image when the user clicks on a row
+  table.on('click-cell.bs.table', processClicks);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/group.js b/web/skins/classic/views/js/group.js
index 0f0bd064b..26aa9cae6 100644
--- a/web/skins/classic/views/js/group.js
+++ b/web/skins/classic/views/js/group.js
@@ -1,21 +1,20 @@
-function selectMonitors() {
-  createPopup( '?view=monitorselect&callForm=groupForm&callField=newGroup[MonitorIds]', 'zmMonitors', 'monitorselect' );
-}
-
-if ( refreshParent ) {
-  opener.location.reload(true);
-}
-
-function configureButtons( element ) {
-  if ( canEditGroups ) {
-    var form = element.form;
-    var disabled = false;
-
-    if ( form.elements['newGroup[Name]'].value == '' ) {
-      disabled = true;
-    }
-    form.saveBtn.disabled = disabled;
+function configureButtons() {
+  var form = $j('#groupForm')[0];
+  if ( !form ) {
+    console.log("No groupForm found");
+    return;
   }
+  if ( !canEditGroups ) {
+    console.log("Cannot edit groups");
+    form.elements['action'].disabled = disabled;
+    return;
+  }
+  var disabled = false;
+
+  if ( form.elements['newGroup[Name]'].value == '' ) {
+    disabled = true;
+  }
+  form.elements['action'].disabled = disabled;
 }
 
 window.focus();
diff --git a/web/skins/classic/views/js/groups.js b/web/skins/classic/views/js/groups.js
index 31c9402a2..8ff1b61ff 100644
--- a/web/skins/classic/views/js/groups.js
+++ b/web/skins/classic/views/js/groups.js
@@ -8,8 +8,13 @@ function setGroup( element ) {
   form.submit();
 }
 
-function editGroup( gid ) {
-  createPopup( '?view=group&gid='+gid, 'zmGroup', 'group' );
+function editGroup( element ) {
+  var gid = element.getAttribute('data-group-id');
+  if ( !gid ) {
+    console.log('No group id found in editGroup');
+  } else {
+    createPopup('?view=group&gid='+gid, 'zmGroup'+gid, 'group');
+  }
 }
 
 function deleteGroup( element ) {
diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index 369462a9d..53f197eab 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -1,4 +1,4 @@
-var logParms = "view=request&request=log&task=query";
+var logParms = 'view=request&request=log&task=query';
 var logReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: logResponse} );
 var logTimer = undefined;
 var logTable = undefined;
@@ -148,7 +148,7 @@ function logResponse( respObj ) {
 
 function refreshLog() {
   options = {};
-  logTable.empty();
+  $j('#logTable tbody').empty();
   firstLoad = true;
   maxLogTime = 0;
   minLogTime = 0;
@@ -163,15 +163,26 @@ function expandLog() {
   fetchPrevLogs();
 }
 
+function clearResponse() {
+  refreshLog();
+}
+function clearError() {
+}
 function clearLog() {
   logReq.cancel();
-  minLogTime = 0;
-  logCount = 0;
-  logTimeout = maxSampleTime;
-  displayLimit = initialDisplayLimit;
-  $('displayLogs').set('text', logCount);
-  options = {};
-  logTable.empty();
+
+  var clearParms = 'view=request&request=log&task=delete';
+  var clearReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: clearResponse});
+  var tbody = $(logTable).getElement('tbody');
+  var rows = tbody.getElements('tr');
+  if ( rows && rows.length ) {
+    var minTime = rows[0].getElement('td').get('text');
+    clearParms += "&minTime="+encodeURIComponent(minTime);
+    var maxTime = rows[rows.length-1].getElement('td').get('text');
+    clearParms += "&maxTime="+encodeURIComponent(maxTime);
+  }
+  var form = $('logForm');
+  clearReq.send(clearParms+"&"+form.toQueryString());
 }
 
 function filterLog() {
@@ -179,9 +190,9 @@ function filterLog() {
   filterFields.each(
       function( field ) {
         var selector = $('filter['+field+']');
-        if ( ! selector ) {
+        if ( !selector ) {
           if ( window.console && window.console.log ) {
-            window.console.log("No selector found for " + field );
+            window.console.log('No selector found for ' + field);
           }
           return;
         }
@@ -199,35 +210,50 @@ function resetLog() {
   refreshLog();
 }
 
-var exportFormValidator;
+var exportFormValidator = null;
 
 function exportLog() {
-  exportFormValidator.reset();
-  $('exportLog').overlayShow();
+  getModal('log_export');
+
+  if ( !exportFormValidator ) {
+    exportFormValidator = new Form.Validator.Inline($('exportForm'), {
+      useTitles: true,
+      warningPrefix: '',
+      errorPrefix: ''
+    });
+  } else {
+    exportFormValidator.reset();
+  }
 }
 
 function exportResponse( response ) {
-  $('exportLog').unspin();
+  $('log_exportModal').unspin();
   if ( response.result == 'Ok' ) {
     window.location.replace( thisUrl+'?view=request&request=log&task=download&key='+response.key+'&format='+response.format );
   }
 }
 
 function exportFail( request ) {
-  $('exportLog').unspin();
-  $('exportErrorText').set('text', request.status+" / "+request.statusText );
+  $('log_exportModal').unspin();
+  $('exportErrorText').set('text', request.status+' / '+request.statusText);
   $('exportError').show();
-  Error( "Export request failed: "+request.status+" / "+request.statusText );
+  Error('Export request failed: '+request.status+' / '+request.statusText);
 }
 
 function exportRequest() {
   var form = $('exportForm');
-  $('exportErrorText').set('text', "" );
+  console.log(form);
+  $('exportErrorText').set('text', '');
   $('exportError').hide();
   if ( form.validate() ) {
     var exportParms = "view=request&request=log&task=export";
-    var exportReq = new Request.JSON( {url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail} );
-    var selection = form.getElement('input[name=selector]:checked').get('value');
+    var exportReq = new Request.JSON({url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail});
+    var selector = form.querySelectorAll('input[name=selector]:checked');
+    if ( !selector.length ) {
+      alert("Please select how to filter logs");
+      return;
+    }
+    var selection = selector[0].get('value');
     if ( selection == 'filter' || selection == 'current' ) {
       $$('#filters select').each(
           function( select ) {
@@ -245,8 +271,8 @@ function exportRequest() {
         exportParms += "&maxTime="+encodeURIComponent(maxTime);
       }
     }
-    exportReq.send( exportParms+"&"+form.toQueryString() );
-    $('exportLog').spin();
+    exportReq.send(exportParms+"&"+form.toQueryString());
+    $('log_exportModal').spin();
   }
 }
 
@@ -254,9 +280,9 @@ function updateFilterSelectors() {
   Object.each(options,
       function( values, key ) {
         var selector = $('filter['+key+']');
-        if ( ! selector ) {
+        if ( !selector ) {
           if ( window.console && window.console.log ) {
-            window.console.log("No selector found for " + key );
+            window.console.log('No selector found for ' + key);
           }
           return;
         }
@@ -283,6 +309,8 @@ function updateFilterSelectors() {
         if ( filter[key] ) {
           selector.set('value', filter[key]);
         }
+        $j(selector).chosen('destroy');
+        $j(selector).chosen();
       }
   );
 }
@@ -300,12 +328,12 @@ function initPage() {
       }
   );
   logTable.addEvent( 'sort', function( tbody, index ) {
-    var header = tbody.getParent( 'table' ).getElement( 'thead' );
-    var columns = header.getElement( 'tr' ).getElements( 'th' );
+    var header = tbody.getParent('table').getElement('thead');
+    var columns = header.getElement('tr').getElements('th');
     var column = columns[index];
-    sortReversed = column.hasClass( 'table-th-sort-rev' );
+    sortReversed = column.hasClass('table-th-sort-rev');
     if ( logCount > displayLimit ) {
-      var rows = tbody.getElements( 'tr' );
+      var rows = tbody.getElements('tr');
       var startIndex;
       if ( sortReversed ) {
         startIndex = displayLimit;
@@ -320,14 +348,9 @@ function initPage() {
     } // end if loCount > displayLimit
   }
   );
-  exportFormValidator = new Form.Validator.Inline($('exportForm'), {
-    useTitles: true,
-    warningPrefix: "",
-    errorPrefix: ""
-  });
-  new Asset.css( "css/spinner.css" );
+  new Asset.css('css/spinner.css');
   fetchNextLogs();
 }
 
 // Kick everything off
-window.addEventListener( 'DOMContentLoaded', initPage );
+window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/login.js b/web/skins/classic/views/js/login.js
index 3adb244b1..5142ce310 100644
--- a/web/skins/classic/views/js/login.js
+++ b/web/skins/classic/views/js/login.js
@@ -1,5 +1,5 @@
 window.addEventListener( 'DOMContentLoaded', function() {
   if ( failed == true ) {
-    $('loginError').removeClass( 'hidden' );
+    $j('#loginError').show();
   }
 } );
diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index bf5e4d900..0bedf5303 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -1,29 +1,54 @@
-function updateMonitorDimensions( element ) {
+function updateMonitorDimensions(element) {
   var form = element.form;
-  var widthFactor = parseInt( defaultAspectRatio.replace( /:.*$/, '' ) );
-  var heightFactor = parseInt( defaultAspectRatio.replace( /^.*:/, '' ) );
+  if ( element.type == 'number' ) {
+    // either width or height
+
+    var widthFactor = parseInt(defaultAspectRatio.replace(/:.*$/, ''));
+    var heightFactor = parseInt(defaultAspectRatio.replace(/^.*:/, ''));
 
-  if ( form.elements['preserveAspectRatio'].checked ) {
     var monitorWidth = parseInt(form.elements['newMonitor[Width]'].value);
     var monitorHeight = parseInt(form.elements['newMonitor[Height]'].value);
-    switch ( element.name ) {
-      case 'newMonitor[Width]':
-        if ( monitorWidth >= 0 ) {
-          form.elements['newMonitor[Height]'].value = Math.round((monitorWidth * heightFactor) / widthFactor);
-        } else {
-          form.elements['newMonitor[Height]'].value = '';
-        }
-        break;
-      case 'newMonitor[Height]':
-        if ( monitorHeight >= 0 ) {
-          form.elements['newMonitor[Width]'].value = Math.round((monitorHeight * widthFactor) / heightFactor);
-        } else {
-          form.elements['newMonitor[Width]'].value = '';
-        }
-        break;
+
+    if ( form.elements['preserveAspectRatio'].checked ) {
+      switch ( element.name ) {
+        case 'newMonitor[Width]':
+          if ( monitorWidth >= 0 ) {
+            form.elements['newMonitor[Height]'].value = Math.round((monitorWidth * heightFactor) / widthFactor);
+          } else {
+            form.elements['newMonitor[Height]'].value = '';
+          }
+          monitorHeight = parseInt(form.elements['newMonitor[Height]'].value);
+          break;
+        case 'newMonitor[Height]':
+          if ( monitorHeight >= 0 ) {
+            form.elements['newMonitor[Width]'].value = Math.round((monitorHeight * widthFactor) / heightFactor);
+          } else {
+            form.elements['newMonitor[Width]'].value = '';
+          }
+          monitorWidth = parseInt(form.elements['newMonitor[Width]'].value);
+          break;
+      }
+    }
+    // If we find a matching option in the dropdown, select it or select custom
+
+    var option = $j('select[name="dimensions_select"] option[value="'+monitorWidth+'x'+monitorHeight+'"]');
+    if ( !option.size() ) {
+      $j('select[name="dimensions_select"]').val('');
+    } else {
+      $j('select[name="dimensions_select"]').val(monitorWidth+'x'+monitorHeight);
+    }
+  } else {
+    // For some reason we get passed the first option instead of the select
+    element = form.elements['dimensions_select'];
+
+    var value = element.options[element.selectedIndex].value;
+    if ( value != '' ) { // custom dimensions
+      var dimensions = value.split('x');
+      form.elements['newMonitor[Width]'].value = dimensions[0];
+      form.elements['newMonitor[Height]'].value = dimensions[1];
     }
   }
-  return ( false );
+  return false;
 }
 
 function loadLocations( element ) {
@@ -43,6 +68,9 @@ function loadLocations( element ) {
 }
 
 function initPage() {
+  var backBtn = $j('#backBtn');
+  var onvifBtn = $j('#onvifBtn');
+
   //var protocolSelector = $('contentForm').elements['newMonitor[Protocol]'];
   //if ( $(protocolSelector).getTag() == 'select' )
   //updateMethods( $(protocolSelector) );
@@ -94,8 +122,124 @@ function initPage() {
       }
     };
   });
+  document.querySelectorAll('input[name="newMonitor[Width]"]').forEach(function(el) {
+    el.oninput = window['updateMonitorDimensions'].bind(el, el);
+  });
+  document.querySelectorAll('input[name="newMonitor[Height]"]').forEach(function(el) {
+    el.oninput = window['updateMonitorDimensions'].bind(el, el);
+  });
+  document.querySelectorAll('select[name="dimensions_select"]').forEach(function(el) {
+    el.onchange = window['updateMonitorDimensions'].bind(el, el);
+  });
+  document.querySelectorAll('select[name="newMonitor[ControlId]"]').forEach(function(el) {
+    el.onchange = window['loadLocations'].bind(el, el);
+  });
+  document.querySelectorAll('input[name="newMonitor[WebColour]"]').forEach(function(el) {
+    el.onchange = window['change_WebColour'].bind(el);
+  });
+  document.querySelectorAll('select[name="newMonitor[Type]"]').forEach(function(el) {
+    el.onchange = function() {
+      var form = document.getElementById('contentForm');
+      form.tab.value = 'general';
+      form.submit();
+    };
+  });
+  document.querySelectorAll('input[name="newMonitor[ImageBufferCount]"],input[name="newMonitor[Width]"],input[name="newMonitor[Height]"]').forEach(function(el) {
+    el.oninput = window['update_estimated_ram_use'].bind(el);
+  });
 
   $j('.chosen').chosen();
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the PROBE button
+  $j('#probeBtn').click(function(evt) {
+    var mid = evt.currentTarget.getAttribute("data-mid");
+    evt.preventDefault();
+
+    //FIX-ME: MAKE THIS A MODAL
+    //$j('#modalFunction-'+mid).modal('show');
+    window.location.assign('?view=monitorprobe&mid='+mid);
+  });
+
+  // Manage the ONVIF button
+  $j('#onvifBtn').click(function(evt) {
+    var mid = evt.currentTarget.getAttribute("data-mid");
+    evt.preventDefault();
+
+    //FIX-ME: MAKE THIS A MODAL
+    //$j('#modalFunction-'+mid).modal('show');
+    window.location.assign('?view=onvifprobe&mid='+mid);
+  });
+
+  // Don't enable the onvif button if there is no previous zm page to go back to
+  onvifBtn.prop('disabled', !hasOnvif);
+
+  // Manage the PRESET button
+  $j('#presetBtn').click(function(evt) {
+    var mid = evt.currentTarget.getAttribute("data-mid");
+    evt.preventDefault();
+
+    //FIX-ME: MAKE THIS A MODAL
+    //$j('#modalFunction-'+mid).modal('show');
+    window.location.assign('?view=monitorpreset&mid='+mid);
+  });
+
+  // Manage the CANCEL Button
+  document.getElementById("cancelBtn").addEventListener("click", function onCancelClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=console');
+  });
 } // end function initPage()
 
+function change_WebColour() {
+  $j('#WebSwatch').css(
+      'backgroundColor',
+      $j('input[name="newMonitor[WebColour]"]').val()
+  );
+}
+
+function getRandomColour() {
+  var letters = '0123456789ABCDEF';
+  var colour = '#';
+  for (var i = 0; i < 6; i++) {
+    colour += letters[Math.floor(Math.random() * 16)];
+  }
+  return colour;
+}
+
+function random_WebColour() {
+  var new_colour = getRandomColour();
+  $j('input[name="newMonitor[WebColour]"]').val(new_colour);
+  $j('#WebSwatch').css(
+      'backgroundColor', new_colour
+  );
+}
+
+function update_estimated_ram_use() {
+  var buffer_count = document.querySelectorAll('input[name="newMonitor[ImageBufferCount]"]')[0].value;
+  console.log(buffer_count);
+  var width = document.querySelectorAll('input[name="newMonitor[Width]"]')[0].value;
+  console.log(width);
+  var height = document.querySelectorAll('input[name="newMonitor[Height]"]')[0].value;
+  console.log(height);
+  var colours = document.querySelectorAll('select[name="newMonitor[Colours]"]')[0].value;
+  console.log(colours);
+
+  document.getElementById('estimated_ram_use').innerHTML = human_filesize(buffer_count * width * height * colours, 0);
+}
+
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 6bb6f73ff..b59049f12 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -1,4 +1,5 @@
 var optControl = <?php echo ZM_OPT_CONTROL ?>;
+var hasOnvif = <?php echo ZM_HAS_ONVIF ?>;
 var defaultAspectRatio = '<?php echo ZM_DEFAULT_ASPECT_RATIO ?>';
 
 <?php
@@ -6,43 +7,28 @@ if ( ZM_OPT_CONTROL ) {
 ?>
 var controlOptions = new Object();
 <?php
-  global $controlTypes;
-  $controlTypes = array( ''=>translate('None') );
-  # Temporary workaround to show all ptz control types regardless of monitor source type
-  #    $sql = "select * from Controls where Type = '".$newMonitor['Type']."'";
-  $sql = "select * from Controls";
-  foreach( dbFetchAll( $sql ) as $row ) {
-    $controlTypes[$row['Id']] = $row['Name'];
-?>
-controlOptions[<?php echo $row['Id'] ?>] = new Array();
-<?php
-    if ( $row['HasHomePreset'] ) {
-?>
-controlOptions[<?php echo $row['Id'] ?>][0] = '<?php echo translate('Home') ?>';
-<?php
-    } else {
-?>
-controlOptions[<?php echo $row['Id'] ?>][0] = null;
-<?php
+  global $controls;
+  foreach ( $controls as $control ) {
+    echo '
+controlOptions['.$control->Id().'] = new Array();
+controlOptions['.$control->Id().'][0] = '.
+    ( $control->HasHomePreset() ? '\''.translate('Home').'\'' : 'null' ).PHP_EOL;
+    for ( $i = 1; $i <= $control->NumPresets(); $i++ ) {
+      echo 'controlOptions['. $control->Id().']['.$i.'] = \''.translate('Preset').' '.$i .'\';'.PHP_EOL;
     }
-    for ( $i = 1; $i <= $row['NumPresets']; $i++ ) {
-?>
-controlOptions[<?php echo $row['Id'] ?>][<?php echo $i ?>] = '<?php echo translate('Preset').' '.$i ?>';
-<?php
-    }
-  }
-}
+  } # end foreach row
+} # end if ZM_OPT_CONTROL
 ?>
 
 var monitorNames = new Object();
 <?php
 $query = empty($_REQUEST['mid']) ? dbQuery('SELECT Name FROM Monitors') : dbQuery('SELECT Name FROM Monitors WHERE Id != ?', array($_REQUEST['mid']) );
 if ( $query ) {
-while ( $name = dbFetchNext($query, 'Name') ) {
-?>
-monitorNames['<?php echo validJsStr($name) ?>'] = true;
-<?php
-} // end foreach
+  while ( $name = dbFetchNext($query, 'Name') ) {
+    echo '
+monitorNames[\''.validJsStr($name).'\'] = true;
+';
+  } // end foreach
 } # end if query
 ?>
 
@@ -70,6 +56,11 @@ function validateForm( form ) {
       errors[errors.length] = "<?php echo translate('BadPort') ?>";
     //if ( !form.elements['newMonitor[Path]'].value )
       //errors[errors.length] = "<?php echo translate('BadPath') ?>";
+  } else if ( form.elements['newMonitor[Type]'].value == 'Ffmpeg' ) {
+    if ( !form.elements['newMonitor[Path]'].value )
+//|| !form.elements['newMonitor[Path]'].value.match( /^\d+$/ ) ) // valid url
+      errors[errors.length] = "<?php echo translate('BadPath') ?>";
+
   } else if ( form.elements['newMonitor[Type]'].value == 'File' ) {
     if ( !form.elements['newMonitor[Path]'].value )
       errors[errors.length] = "<?php echo translate('BadPath') ?>";
@@ -132,22 +123,26 @@ function validateForm( form ) {
   }
 
   if ( errors.length ) {
-    alert( errors.join( "\n" ) );
+    alert(errors.join("\n"));
     return false;
   }
+
+  var warnings = new Array();
+  if ( (form.elements['newMonitor[Function]'].value != 'Monitor') && (form.elements['newMonitor[Function]'].value != 'None') ) {
+    if ( (form.elements['newMonitor[SaveJPEGs]'].value == '0') && (form.elements['newMonitor[VideoWriter]'].value == '0') ) {
+      warnings[warnings.length] = "<?php echo translate('BadNoSaveJPEGsOrVideoWriter'); ?>";
+    }
+  }
+  if ( warnings.length ) {
+    if ( !confirm(warnings.join("\n")) ) {
+      return false;
+    }
+  }
+
   return true;
 }
 
-function updateLinkedMonitors( element ) {
-  var form = element.form;
-  var monitorIds = new Array();
-  for ( var i = 0; i < element.options.length; i++ )
-    if ( element.options[i].selected )
-      monitorIds[monitorIds.length] = element.options[i].value;
-  form.elements['newMonitor[LinkedMonitors]'].value = monitorIds.join( ',' );
-}
-
-function updateMethods( element ) {
+function updateMethods(element) {
   var form = element.form;
 
   var origMethod = form.elements['origMethod'];
@@ -155,31 +150,29 @@ function updateMethods( element ) {
   methodSelector.options.length = 0;
   switch ( element.value ) {
     case 'http' :
-      {
-        <?php
-          foreach( $httpMethods as $value=>$label ) {
-            ?>
-              methodSelector.options[methodSelector.options.length] = new Option( "<?php echo htmlspecialchars($label) ?>", "<?php echo $value ?>" );
-            if ( origMethod.value == "<?php echo $value ?>" )
-              methodSelector.selectedIndex = methodSelector.options.length-1;
-            <?php
-          }
-        ?>
+      <?php
+        global $httpMethods;
+        foreach( $httpMethods as $value=>$label ) {
+          ?>
+            methodSelector.options[methodSelector.options.length] = new Option("<?php echo htmlspecialchars($label) ?>", "<?php echo $value ?>");
+          if ( origMethod.value == "<?php echo $value ?>" )
+            methodSelector.selectedIndex = methodSelector.options.length-1;
+          <?php
+        }
+      ?>
           break;
-      }
     case 'rtsp' :
-      {
-        <?php
-          foreach( $rtspMethods as $value=>$label ) {
-            ?>
-              methodSelector.options[methodSelector.options.length] = new Option( "<?php echo htmlspecialchars($label) ?>", "<?php echo $value ?>" );
-            if ( origMethod.value == "<?php echo $value ?>" )
-              methodSelector.selectedIndex = form.elements['newMonitor[Method]'].options.length-1;
-            <?php
-          }
-        ?>
-          break;
-      }
+      <?php
+        global $rtspMethods;
+        foreach( $rtspMethods as $value=>$label ) {
+          ?>
+            methodSelector.options[methodSelector.options.length] = new Option( "<?php echo htmlspecialchars($label) ?>", "<?php echo $value ?>" );
+          if ( origMethod.value == "<?php echo $value ?>" )
+            methodSelector.selectedIndex = form.elements['newMonitor[Method]'].options.length-1;
+          <?php
+        }
+      ?>
+    break;
   }
-  return( true );
+  return true;
 }
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 1599e0dd7..03fc5c3f8 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -2,228 +2,25 @@ var requestQueue = new Request.Queue({
   concurrent: monitorData.length,
   stopOnFailure: false
 });
-
-function Monitor(monitorData) {
-  this.id = monitorData.id;
-  this.connKey = monitorData.connKey;
-  this.url = monitorData.url;
-  this.status = null;
-  this.alarmState = STATE_IDLE;
-  this.lastAlarmState = STATE_IDLE;
-  this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
-  if ( auth_hash ) {
-    this.streamCmdParms += '&auth='+auth_hash;
-  }
-  this.streamCmdTimer = null;
-  this.type = monitorData.type;
-  this.refresh = monitorData.refresh;
-  this.start = function(delay) {
-    if ( this.streamCmdQuery ) {
-      this.streamCmdTimer = this.streamCmdQuery.delay(delay, this);
-    } else {
-      console.log("No streamCmdQuery");
-    }
-  };
-
-  this.eventHandler = function( event ) {
-    console.log(event);
-  };
-
-  this.onclick = function(evt) {
-    var el = evt.currentTarget;
-    var tag = 'watch';
-    var id = el.getAttribute("data-monitor-id");
-    var width = el.getAttribute("data-width");
-    var height = el.getAttribute("data-height");
-    var url = '?view=watch&mid='+id;
-    var name = 'zmWatch'+id;
-    evt.preventDefault();
-    createPopup(url, name, tag, width, height);
-  };
-
-  this.setup_onclick = function() {
-    var el = document.getElementById('imageFeed'+this.id);
-    if ( el ) el.addEventListener('click', this.onclick, false);
-  };
-  this.disable_onclick = function() {
-    document.getElementById('imageFeed'+this.id).removeEventListener('click', this.onclick );
-  };
-
-  this.setStateClass = function(element, stateClass) {
-    if ( !element.hasClass( stateClass ) ) {
-      if ( stateClass != 'alarm' ) {
-        element.removeClass('alarm');
-      }
-      if ( stateClass != 'alert' ) {
-        element.removeClass('alert');
-      }
-      if ( stateClass != 'idle' ) {
-        element.removeClass('idle');
-      }
-      element.addClass(stateClass);
-    }
-  };
-
-  this.onError = function(text, error) {
-    console.log('onerror: ' + text + ' error:'+error);
-    // Requeue, but want to wait a while.
-    var streamCmdTimeout = 10*statusRefreshTimeout;
-    this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this);
-  };
-  this.onFailure = function(xhr) {
-    console.log('onFailure: ' + this.connKey);
-    console.log(xhr);
-    if ( ! requestQueue.hasNext("cmdReq"+this.id) ) {
-      console.log("Not requeuing because there is one already");
-      requestQueue.addRequest("cmdReq"+this.id, this.streamCmdReq);
-    }
-    if ( 0 ) {
-    // Requeue, but want to wait a while.
-      if ( this.streamCmdTimer ) {
-        this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
-      }
-      var streamCmdTimeout = 1000*statusRefreshTimeout;
-      this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this, true );
-      requestQueue.resume();
-    }
-    console.log("done failure");
-  };
-
-  this.getStreamCmdResponse = function(respObj, respText) {
-    if ( this.streamCmdTimer ) {
-      this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
-    }
-
-    var stream = $j('#liveStream'+this.id)[0];
-
-    if ( respObj.result == 'Ok' ) {
-      if ( respObj.status ) {
-        this.status = respObj.status;
-        this.alarmState = this.status.state;
-
-        var stateClass = "";
-        if ( this.alarmState == STATE_ALARM ) {
-          stateClass = "alarm";
-        } else if ( this.alarmState == STATE_ALERT ) {
-          stateClass = "alert";
-        } else {
-          stateClass = "idle";
-        }
-
-        if ( (!COMPACT_MONTAGE) && (this.type != 'WebSite') ) {
-          $('fpsValue'+this.id).set('text', this.status.fps);
-          $('stateValue'+this.id).set('text', stateStrings[this.alarmState]);
-          this.setStateClass($('monitorState'+this.id), stateClass);
-        }
-        this.setStateClass($('monitor'+this.id), stateClass);
-
-        /*Stream could be an applet so can't use moo tools*/
-        stream.className = stateClass;
-
-        var isAlarmed = ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT );
-        var wasAlarmed = ( this.lastAlarmState == STATE_ALARM || this.lastAlarmState == STATE_ALERT );
-
-        var newAlarm = ( isAlarmed && !wasAlarmed );
-        var oldAlarm = ( !isAlarmed && wasAlarmed );
-
-        if ( newAlarm ) {
-          if ( false && SOUND_ON_ALARM ) {
-            // Enable the alarm sound
-            $('alarmSound').removeClass('hidden');
-          }
-          if ( POPUP_ON_ALARM ) {
-            windowToFront();
-          }
-        }
-        if ( false && SOUND_ON_ALARM ) {
-          if ( oldAlarm ) {
-            // Disable alarm sound
-            $('alarmSound').addClass('hidden');
-          }
-        }
-        if ( this.status.auth ) {
-          if ( this.status.auth != auth_hash ) {
-            // Try to reload the image stream.
-            if ( stream ) {
-              stream.src = stream.src.replace(/auth=\w+/i, 'auth='+this.status.auth);
-            }
-            console.log("Changed auth from " + auth_hash + " to " + this.status.auth);
-            auth_hash = this.status.auth;
-          }
-        } // end if have a new auth hash
-      } // end if has state
-    } else {
-      console.error(respObj.message);
-      // Try to reload the image stream.
-      if ( stream ) {
-        if ( stream.src ) {
-          console.log('Reloading stream: ' + stream.src);
-          stream.src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-        } else {
-        }
-      } else {
-        console.log('No stream to reload?');
-      }
-    } // end if Ok or not
-
-    var streamCmdTimeout = statusRefreshTimeout;
-    // The idea here is if we are alarmed, do updates faster.
-    // However, there is a timeout in the php side which isn't getting modified,
-    // so this may cause a problem. Also the server may only be able to update so fast.
-    //if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ) {
-    //streamCmdTimeout = streamCmdTimeout/5;
-    //}
-    this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this);
-    this.lastAlarmState = this.alarmState;
-  };
-
-  this.streamCmdQuery = function(resent) {
-    if ( resent ) {
-      console.log(this.connKey+": timeout: Resending");
-      this.streamCmdReq.cancel();
-    }
-    //console.log("Starting CmdQuery for " + this.connKey );
-    if ( this.type != 'WebSite' ) {
-      this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_QUERY);
-    }
-  };
-
-  if ( this.type != 'WebSite' ) {
-    this.streamCmdReq = new Request.JSON( {
-      url: this.url,
-      method: 'get',
-      timeout: AJAX_TIMEOUT,
-      onSuccess: this.getStreamCmdResponse.bind(this),
-      onTimeout: this.streamCmdQuery.bind(this, true),
-      onError: this.onError.bind(this),
-      onFailure: this.onFailure.bind(this),
-      link: 'cancel'
-    } );
-    console.log("queueing for " + this.id + " " + this.connKey + " timeout is: " + AJAX_TIMEOUT);
-    requestQueue.addRequest("cmdReq"+this.id, this.streamCmdReq);
-  }
-} // end function Monitor
-
 /**
  * called when the layoutControl select element is changed, or the page
  * is rendered
  * @param {*} element - the event data passed by onchange callback
  */
 function selectLayout(element) {
-  console.dir(element);
-  layout = $j(element).val();
+  var ddm = $j('#zmMontageLayout');
+  layout = ddm.val();
 
   if ( layout_id = parseInt(layout) ) {
     layout = layouts[layout];
-    console.log(layout);
 
     for ( var i = 0, length = monitors.length; i < length; i++ ) {
       monitor = monitors[i];
       // Need to clear the current positioning, and apply the new
 
       monitor_frame = $j('#monitorFrame'+monitor.id);
-      if ( ! monitor_frame ) {
-        console.log("Error finding frame for " + monitor.id);
+      if ( !monitor_frame ) {
+        console.log('Error finding frame for ' + monitor.id);
         continue;
       }
 
@@ -231,6 +28,7 @@ function selectLayout(element) {
       if ( layout.Positions['default'] ) {
         styles = layout.Positions['default'];
         for ( style in styles ) {
+          console.log("Applying " + style + ' ' + styles[style]);
           monitor_frame.css(style, styles[style]);
         }
       } else {
@@ -241,7 +39,6 @@ function selectLayout(element) {
         styles = layout.Positions['mId'+monitor.id];
         for ( style in styles ) {
           monitor_frame.css(style, styles[style]);
-          console.log("Applying " + style + ' : ' + styles[style]);
         }
       } else {
         console.log("No Monitor styles to apply");
@@ -253,35 +50,52 @@ function selectLayout(element) {
   }
   Cookie.write('zmMontageLayout', layout_id, {duration: 10*365});
   if ( layouts[layout_id].Name != 'Freeform' ) { // 'montage_freeform.css' ) {
-    Cookie.write( 'zmMontageScale', '', {duration: 10*365} );
+    Cookie.write('zmMontageScale', '', {duration: 10*365});
     $('scale').set('value', '');
-    $('width').set('value', '');
-    for ( var i = 0, length = monitors.length; i < length; i++ ) {
-      var monitor = monitors[i];
-      var streamImg = $('liveStream'+monitor.id);
-      if ( streamImg ) {
-        if ( streamImg.nodeName == 'IMG' ) {
-          var src = streamImg.src;
-          src = src.replace(/width=[\.\d]+/i, 'width=0' );
-          if ( src != streamImg.src ) {
-            streamImg.src = '';
-            streamImg.src = src;
-          }
-        } else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
-          // APPLET's and OBJECTS need to be re-initialized
-        }
-        streamImg.style.width = '100%';
-      }
-    } // end foreach monitor
+    $('width').set('value', '0');
+  } else {
+    // Is freeform, we don't touch the width/height/scale settings, but we may need to update sizing and scales
   }
+  var width = parseInt($('width').get('value'));
+  var height = parseInt($('height').get('value'));
+  var scale = $('scale').get('value');
+
+  for ( var i = 0, length = monitors.length; i < length; i++ ) {
+    var monitor = monitors[i];
+
+    if ( scale ) {
+      stream_scale = scale;
+    } else if ( width ) {
+      stream_scale = parseInt(100*width/monitor.width);
+    } else if ( height ) {
+      stream_scale = parseInt(100*height/monitor.height);
+    }
+    var streamImg = $('liveStream'+monitor.id);
+    if ( streamImg ) {
+      if ( streamImg.nodeName == 'IMG' ) {
+        var src = streamImg.src;
+        src = src.replace(/scale=\d*/i, 'scale='+scale);
+        if ( height == '0' ) {
+          streamImg.style.height = 'auto';
+        }
+        if ( src != streamImg.src ) {
+          streamImg.src = '';
+          streamImg.src = src;
+        }
+      } else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
+        // APPLET's and OBJECTS need to be re-initialized
+      }
+      streamImg.style.width = '100%';
+    }
+  } // end foreach monitor
 } // end function selectLayout(element)
 
 /**
  * called when the widthControl|heightControl select elements are changed
  */
 function changeSize() {
-  var width = $('width').get('value');
-  var height = $('height').get('value');
+  var width = parseInt($('width').get('value'));
+  var height = parseInt($('height').get('value'));
 
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     var monitor = monitors[i];
@@ -292,12 +106,8 @@ function changeSize() {
       console.log("Error finding frame for " + monitor.id);
       continue;
     }
-    if ( width ) {
-      monitor_frame.css('width', width);
-    }
-    if ( height ) {
-      monitor_frame.css('height', height);
-    }
+    monitor_frame.css('width', ( width ? width+'px' : 'auto'));
+    monitor_frame.css('height', ( height ? height+'px' : 'auto'));
 
     /*Stream could be an applet so can't use moo tools*/
     var streamImg = $('liveStream'+monitor.id);
@@ -305,13 +115,20 @@ function changeSize() {
       if ( streamImg.nodeName == 'IMG' ) {
         var src = streamImg.src;
         streamImg.src = '';
-        src = src.replace(/width=[\.\d]+/i, 'width='+width);
-        src = src.replace(/height=[\.\d]+/i, 'height='+height);
+        var scale = 100;
+        if ( width ) {
+          scale = parseInt(100*width/monitor.width);
+        } else if ( height ) {
+          scale = parseInt(100*height/monitor.height);
+        }
+        // Note zms ignores width and height
+        src = src.replace(/scale=\d*/i, 'scale='+scale);
+
         src = src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
         streamImg.src = src;
       }
-      streamImg.style.width = width ? width : null;
-      streamImg.style.height = height ? height : null;
+      streamImg.style.width = width ? width+'px' : null;
+      streamImg.style.height = height ? height+'px' : null;
       //streamImg.style.height = '';
     }
   }
@@ -319,7 +136,8 @@ function changeSize() {
   Cookie.write('zmMontageScale', '', {duration: 10*365});
   Cookie.write('zmMontageWidth', width, {duration: 10*365});
   Cookie.write('zmMontageHeight', height, {duration: 10*365});
-  selectLayout('#zmMontageLayout');
+  jQuery("#zmMontageLayout option:selected").removeAttr("selected");
+  //selectLayout('#zmMontageLayout');
 } // end function changeSize()
 
 /**
@@ -327,12 +145,12 @@ function changeSize() {
  */
 function changeScale() {
   var scale = $('scale').get('value');
-  $('width').set('value', 'auto');
-  $('height').set('value', 'auto');
+  $('width').set('value', '0'); //auto
+  $('height').set('value', '0'); //auto
   Cookie.write('zmMontageScale', scale, {duration: 10*365});
   Cookie.write('zmMontageWidth', '', {duration: 10*365});
   Cookie.write('zmMontageHeight', '', {duration: 10*365});
-  if ( !scale ) {
+  if ( scale == '' ) {
     selectLayout('#zmMontageLayout');
     return;
   }
@@ -347,8 +165,12 @@ function changeScale() {
       console.log("Error finding frame for " + monitor.id);
       continue;
     }
-    if ( newWidth ) {
-      monitor_frame.css('width', newWidth);
+    if ( scale != '0' ) {
+      if ( newWidth ) {
+        monitor_frame.css('width', newWidth);
+      }
+    } else {
+      monitor_frame.css('width', '100%');
     }
     // We don't set the frame height because it has the status bar as well
     //if ( height ) {
@@ -362,15 +184,22 @@ function changeScale() {
         streamImg.src = '';
 
         //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
-        src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
-        src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
-        src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
+        if ( scale != '0' ) {
+          src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
+        } else {
+          src = src.replace(/scale=[\.\d]+/i, 'scale=100');
+        }
         streamImg.src = src;
       }
-      streamImg.style.width = newWidth + "px";
-      streamImg.style.height = newHeight + "px";
-    }
-  }
+      if ( scale != '0' ) {
+        streamImg.style.width = newWidth + 'px';
+        streamImg.style.height = newHeight + 'px';
+      } else {
+        streamImg.style.width = '100%';
+        streamImg.style.height = 'auto';
+      }
+    } // end if StreamImg
+  } // end foreach Monitor
 }
 
 function toGrid(value) {
@@ -396,6 +225,17 @@ function edit_layout(button) {
 
 function save_layout(button) {
   var form = button.form;
+  var name = form.elements['Name'].value;
+
+  if ( !name ) {
+    name = form.elements['zmMontageLayout'].options[form.elements['zmMontageLayout'].selectedIndex].text;
+  }
+
+  if ( name=='Freeform' || name=='2 Wide' || name=='3 Wide' || name=='4 Wide' || name=='5 Wide' ) {
+    alert('You cannot edit the built in layouts.  Please give the layout a new name.');
+    return;
+  }
+
   // In fixed positioning, order doesn't matter.  In floating positioning, it does.
   var Positions = {};
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
@@ -450,10 +290,11 @@ function initPage() {
   }
 
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
-    monitors[i] = new Monitor(monitorData[i]);
+    monitors[i] = new MonitorStream(monitorData[i]);
 
     // Start the fps and status updates. give a random delay so that we don't assault the server
     var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+    console.log("delay: " + delay);
     monitors[i].start(delay);
 
     var interval = monitors[i].refresh;
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index fe298ab10..5a2aef2ed 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -28,15 +28,16 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
 var monitorData = new Array();
 <?php
+global $monitors;
 foreach ( $monitors as $monitor ) {
 ?>
 monitorData[monitorData.length] = { 
   'id': <?php echo $monitor->Id() ?>, 
   'connKey': <?php echo $monitor->connKey() ?>, 
-  'width': <?php echo $monitor->Width() ?>,
-  'height':<?php echo $monitor->Height() ?>,
-  'url': '<?php echo $monitor->UrlToIndex() ?>',
-  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?> );},
+  'width': <?php echo $monitor->ViewWidth() ?>,
+  'height':<?php echo $monitor->ViewHeight() ?>,
+  'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
+  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->ViewWidth(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->ViewHeight(), $monitor->PopupScale() ); ?> );},
   'type': '<?php echo $monitor->Type() ?>',
   'refresh': '<?php echo $monitor->Refresh() ?>'
 };
@@ -46,9 +47,10 @@ monitorData[monitorData.length] = {
 layouts = new Array();
 layouts[0] = {}; // reserved, should hold which fields to clear when transitioning
 <?php
+global $layouts;
 foreach ( $layouts as $layout ) {
 ?>
-layouts[<?php echo $layout->Id() ?>] = {"Name":"<?php echo $layout->Name()?>","Positions":<?php echo $layout->Positions() ?>};
+layouts[<?php echo $layout->Id() ?>] = {"Name":"<?php echo $layout->Name()?>","Positions":<?php echo json_decode($layout->Positions())?$layout->Positions():'{}' ?>};
 <?php
 } // end foreach layout
 ?>
diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js
index f95268e5a..5207f24d5 100644
--- a/web/skins/classic/views/js/montagereview.js
+++ b/web/skins/classic/views/js/montagereview.js
@@ -48,8 +48,7 @@ function evaluateLoadTimes() {
 function getFrame(monId, time, last_Frame) {
   if ( last_Frame ) {
     if (
-      (last_Frame.TimeStampSecs <= time)
-      &&
+      (last_Frame.TimeStampSecs <= time) &&
       (last_Frame.EndTimeStampSecs >= time)
     ) {
       return last_Frame;
@@ -104,12 +103,11 @@ function getFrame(monId, time, last_Frame) {
         continue;
       }
       if (
-        e.FramesById[frame_id].TimeStampSecs == time
-          || (
-            e.FramesById[frame_id].TimeStampSecs < time
-            && (
-              (!e.FramesById[frame_id].NextTimeStampSecs) // only if event.EndTime is null
-             ||
+        e.FramesById[frame_id].TimeStampSecs == time ||
+          (
+            e.FramesById[frame_id].TimeStampSecs < time &&
+            (
+              (!e.FramesById[frame_id].NextTimeStampSecs) || // only if event.EndTime is null
              (e.FramesById[frame_id].NextTimeStampSecs > time)
             )
           )
@@ -154,9 +152,11 @@ function getImageSource(monId, time) {
         var duration = Frame.NextTimeStampSecs - Frame.TimeStampSecs;
         frame_id = Frame.FrameId + parseInt( (NextFrame.FrameId-Frame.FrameId) * ( time-Frame.TimeStampSecs )/duration );
         //console.log("Have NextFrame: duration: " + duration + " frame_id = " + frame_id + " from " + NextFrame.FrameId + ' - ' + Frame.FrameId + " time: " + (time-Frame.TimeStampSecs)  );
+      } else {
+        frame_id = Frame.FrameId;
       }
     } else {
-      frame_id = Frame['Id'];
+      frame_id = Frame.FrameId;
       console.log("No NextFrame");
     }
     Event = events[Frame.EventId];
@@ -934,6 +934,10 @@ function changeDateTime(e) {
     }
   }
 
+  // Reloading can take a while, so stop interrupts to reduce load
+  clearInterval(timerObj);
+  timerObj = null;
+
   var uri = "?view=" + currentView + fitStr + minStr + maxStr + liveStr + zoomStr + "&scale=" + $j("#scaleslider")[0].value + "&speed=" + speeds[$j("#speedslider")[0].value];
   window.location = uri;
 }
@@ -965,6 +969,7 @@ function initPage() {
         imagedone(this, this.monId, false);
       };
       loadImage2Monitor(monId, monitorImageURL[monId]);
+      monitorCanvasObj[monId].addEventListener('click', clickMonitor, false);
     }
   } // end foreach monitor
 
@@ -980,15 +985,6 @@ function initPage() {
     ctx = canvas.getContext('2d');
     drawGraph();
   }
-  for ( i=0, len=monitorPtr.length; i < len; i += 1 ) {
-    var monitor_id = monitorPtr[i];
-    monitor_canvas = $('Monitor'+monitor_id);
-    if ( ! monitor_canvas ) {
-      console.log("No canvas found for monitor " + monitor_id);
-      continue;
-    }
-    monitor_canvas.addEventListener('click', clickMonitor, false);
-  }
   setSpeed(speedIndex);
   //setFit(fitMode);  // will redraw
   //setLive(liveMode);  // will redraw
@@ -1007,7 +1003,7 @@ function initPage() {
   $j('#maxTime').datetimepicker({
     timeFormat: "HH:mm:ss",
     dateFormat: "yy-mm-dd",
-    minDate: $j('#minTime').val(),
+    minDate: minTime,
     maxDate: +0,
     constrainInput: false,
     onClose: function(newDate, oldData) {
diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index 4fc8ef511..d2277b507 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -3,7 +3,21 @@ var server_utc_offset = <?php
 $TimeZone = new DateTimeZone( ini_get('date.timezone') );
 $now = new DateTime('now', $TimeZone);
 $offset = $TimeZone->getOffset($now);
-echo $offset . '; // ' . floor($offset / 3600) . ' hours ';
+echo $offset.'; // '.floor($offset / 3600).' hours ';
+
+global $defaultScale;
+global $liveMode;
+global $fitMode;
+global $speeds;
+global $speedIndex;
+global $initialDisplayInterval;
+global $minTimeSecs;
+global $maxTimeSecs;
+global $minTime;
+global $maxTime;
+global $monitors;
+global $eventsSql;
+global $framesSql;
 ?>
 
 var currentScale=<?php echo $defaultScale?>;
@@ -18,7 +32,7 @@ var speedIndex=<?php echo $speedIndex?>;
 // for history, and fps for live, and dynamically determined (in ms)
 
 var currentDisplayInterval=<?php echo $initialDisplayInterval?>;
-var playSecsperInterval=1;       // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
+var playSecsPerInterval=1;       // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
 var timerInterval;               // milliseconds between interrupts
 var timerObj;                    // object to hold timer interval;
 var freeTimeLastIntervals=[];    // Percentage of current interval used in loading most recent image
@@ -40,7 +54,7 @@ $maxScore = 0;
 if ( !$liveMode ) {
   $result = dbQuery($eventsSql);
   if ( !$result ) {
-    Fatal('SQL-ERR');
+    ZM\Fatal('SQL-ERR');
     return;
   }
 
@@ -50,7 +64,6 @@ if ( !$liveMode ) {
     $event_id = $event['Id'];
     $EventsById[$event_id] = $event;
   }
-
   $next_frames = array();
 
   if ( $result = dbQuery($framesSql) ) {
@@ -69,9 +82,9 @@ if ( !$liveMode ) {
         $frame['NextFrameId'] = $next_frames[$frame['EventId']]['Id'];
       }
       $event['FramesById'] += array($frame['Id']=>$frame);
-      $next_frames[$frame['EventId']] = $frame;
+      $next_frames[$frame['EventId']] = &$event['FramesById'][$frame['Id']];
     }
-  }
+  } // end if dbQuery
 
   $events_by_monitor_id = array();
 
@@ -147,7 +160,6 @@ foreach ( ZM\Server::find() as $Server ) {
   echo 'Servers[' . $Server->Id() . '] = new Server(' . $Server->to_json(). ");\n";
 }
 
-
 echo '
 var monitorName = [];
 var monitorLoading = [];
@@ -168,8 +180,8 @@ var monitorCanvasCtx = [];
 var monitorPtr = []; // monitorName[monitorPtr[0]] is first monitor
 ';
 
-$numMonitors=0;  // this array is indexed by the monitor ID for faster access later, so it may be sparse
-$avgArea=floatval(0);  // Calculations the normalizing scale
+$numMonitors = 0;  // this array is indexed by the monitor ID for faster access later, so it may be sparse
+$avgArea = floatval(0);  // Calculations the normalizing scale
 
 foreach ( $monitors as $m ) {
   $avgArea = $avgArea + floatval($m->Width() * $m->Height());
@@ -183,18 +195,18 @@ foreach ( $monitors as $m ) {
   echo "  monitorLoading["         . $m->Id() . "]=false;\n";
   echo "  monitorImageURL["        . $m->Id() . "]='".$m->getStreamSrc( array('mode'=>'single','scale'=>$defaultScale*100), '&' )."';\n";
   echo "  monitorLoadingStageURL[" . $m->Id() . "] = '';\n";
-  echo "  monitorColour["          . $m->Id() . "]=\"" . $m->WebColour() . "\";\n";
-  echo "  monitorWidth["           . $m->Id() . "]=" . $m->Width() . ";\n";
-  echo "  monitorHeight["          . $m->Id() . "]=" . $m->Height() . ";\n";
+  echo "  monitorColour["          . $m->Id() . "]=\"" . validHtmlStr($m->WebColour()) . "\";\n";
+  echo "  monitorWidth["           . $m->Id() . "]=" . validHtmlStr($m->ViewWidth()) . ";\n";
+  echo "  monitorHeight["          . $m->Id() . "]=" . validHtmlStr($m->ViewHeight()) . ";\n";
   echo "  monitorIndex["           . $m->Id() . "]=" . $numMonitors . ";\n";
   echo "  monitorServerId["        . $m->Id() . "]='" .($m->ServerId() ?  $m->ServerId() : '0'). "';\n";
-  echo "  monitorName["            . $m->Id() . "]=\"" . $m->Name() . "\";\n";
+  echo "  monitorName["            . $m->Id() . "]=\"" . validHtmlStr($m->Name()) . "\";\n";
   echo "  monitorLoadStartTimems[" . $m->Id() . "]=0;\n";
   echo "  monitorLoadEndTimems["   . $m->Id() . "]=0;\n";
   echo "  monitorNormalizeScale["  . $m->Id() . "]=" . sqrt($avgArea / ($m->Width() * $m->Height() )) . ";\n";
   $zoomScale=1.0;
-  if(isset($_REQUEST[ 'z' . $m->Id() ]) )
-      $zoomScale = floatval( validHtmlStr($_REQUEST[ 'z' . $m->Id() ]) );
+  if ( isset($_REQUEST['z'.$m->Id()]) )
+      $zoomScale = floatval(validHtmlStr($_REQUEST['z'.$m->Id()]));
   echo "  monitorZoomScale["       . $m->Id() . "]=" . $zoomScale . ";\n";
   echo "  monitorPtr["         . $numMonitors . "]=" . $m->Id() . ";\n";
   $numMonitors += 1;
@@ -203,15 +215,17 @@ echo "
 var numMonitors = $numMonitors;
 var minTimeSecs=parseInt($minTimeSecs);
 var maxTimeSecs=parseInt($maxTimeSecs);
+var minTime='$minTime';
+var maxTime='$maxTime';
 ";
-echo "var rangeTimeSecs="   . ( $maxTimeSecs - $minTimeSecs + 1) . ";\n";
-if(isset($defaultCurrentTime))
-  echo "var currentTimeSecs=parseInt(" . strtotime($defaultCurrentTime) . ");\n";
+echo 'var rangeTimeSecs='.($maxTimeSecs - $minTimeSecs + 1).";\n";
+if ( isset($defaultCurrentTime) )
+  echo 'var currentTimeSecs=parseInt('.strtotime($defaultCurrentTime).");\n";
 else
-  echo "var currentTimeSecs=parseInt(" . ($minTimeSecs + $maxTimeSecs)/2 . ");\n";
+  echo 'var currentTimeSecs=parseInt('.(($minTimeSecs + $maxTimeSecs)/2).");\n";
 
 echo 'var speeds=[';
-for ($i=0; $i<count($speeds); $i++)
+for ( $i=0; $i < count($speeds); $i++ )
   echo (($i>0)?', ':'') . $speeds[$i];
 echo "];\n";
 ?>
diff --git a/web/skins/classic/views/js/newlog.js b/web/skins/classic/views/js/newlog.js
new file mode 100644
index 000000000..f0b827912
--- /dev/null
+++ b/web/skins/classic/views/js/newlog.js
@@ -0,0 +1,101 @@
+var table = $j('#logTable');
+
+/*
+This is the format of the json object sent by bootstrap-table
+
+var params =
+{
+"type":"get",
+"data":
+  {
+  "search":"some search text",
+  "sort":"DateTime",
+  "order":"asc",
+  "offset":0,
+  "limit":25
+  "filter":
+    {
+    "message":"some advanced search text"
+    "level":"some more advanced search text"
+    }
+  },
+"cache":true,
+"contentType":"application/json",
+"dataType":"json"
+};
+*/
+
+// Called by bootstrap-table to retrieve zm log data
+function ajaxRequest(params) {
+  $j.getJSON(thisUrl + '?view=request&request=newlog&task=query', params.data)
+      .done(function(data) {
+        //console.log('Ajax parameters: ' + JSON.stringify(params));
+        // rearrange the result into what bootstrap-table expects
+        params.success({total: data.total, totalNotFiltered: data.totalNotFiltered, rows: data.rows});
+        updateHeaderStats(data);
+      })
+      .fail(logAjaxFail);
+}
+
+function updateHeaderStats(data) {
+  var pageNum = table.bootstrapTable('getOptions').pageNumber;
+  var pageSize = table.bootstrapTable('getOptions').pageSize;
+  var startRow = ( (pageNum - 1 ) * pageSize ) + 1;
+  var stopRow = pageNum * pageSize;
+  var newClass = (data.logstate == 'ok') ? 'text-success' : (data.logstate == 'alert' ? 'text-warning' : ((data.logstate == 'alarm' ? 'text-danger' : '')));
+
+  $j('#logState').text(data.logstate);
+  $j('#logState').removeClass('text-success');
+  $j('#logState').removeClass('text-warning');
+  $j('#logState').removeClass('text-danger');
+  $j('#logState').addClass(newClass);
+
+  $j('#totalLogs').text(data.total);
+  $j('#availLogs').text(data.totalNotFiltered);
+  $j('#lastUpdate').text(data.updated);
+  $j('#displayLogs').text(startRow + ' to ' + stopRow);
+}
+
+function initPage() {
+  var backBtn = $j('#backBtn');
+
+  // Init the bootstrap-table with custom icons
+  table.bootstrapTable({icons: icons});
+
+  // Assign inf, err, fat, dbg color classes to the rows in the table
+  table.on('post-body.bs.table', function(data) {
+    $j('#logTable tr').each(function(ndx, row) {
+      var row = $j(row);
+      var level = row.find('td:eq(4)').text();
+
+      if (( level == 'FAT' ) || ( level == 'PNC' )) {
+        row.addClass('log-fat');
+      } else if ( level == 'ERR' ) {
+        row.addClass('log-err');
+      } else if ( level == 'WAR' ) {
+        row.addClass('log-war');
+      } else if ( level == 'DBG' ) {
+        row.addClass('log-dbg');
+      }
+    });
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/onvifprobe.js b/web/skins/classic/views/js/onvifprobe.js
index b49ac5754..4f10e5c29 100644
--- a/web/skins/classic/views/js/onvifprobe.js
+++ b/web/skins/classic/views/js/onvifprobe.js
@@ -1,6 +1,6 @@
 function submitCamera( element ) {
   var form = element.form;
-  form.target = opener.name;
+  form.target = self.name;
   form.view.value = 'monitor';
   form.submit();
   closeWindow.delay( 250 );
@@ -22,14 +22,18 @@ function gotoStep2( element ) {
   form.submit();
 }
 
-function configureButtons( element ) {
+function configureButtons(element) {
   var form = element.form;
-  if (form.elements.namedItem("nextBtn")) {
+  if (form.elements.namedItem('nextBtn')) {
     form.nextBtn.disabled = (form.probe.selectedIndex==0) ||
-      (form.username == "") || (form.username == null) ||
-      (form.password == "") || (form.password == null);
+      (form.Username == '') || (form.Username == null) ||
+      (form.Password == '') || (form.Password == null);
   }
-  if (form.elements.namedItem("saveBtn")) {
+  if (form.elements.namedItem('saveBtn')) {
     form.saveBtn.disabled = (form.probe.selectedIndex==0);
   }
 }
+
+function changeInterface(element) {
+  gotoStep1(element);
+}
diff --git a/web/skins/classic/views/js/options.js b/web/skins/classic/views/js/options.js
new file mode 100644
index 000000000..843225a67
--- /dev/null
+++ b/web/skins/classic/views/js/options.js
@@ -0,0 +1,76 @@
+// Load the Server Modal HTML via Ajax call
+function getServerModal(sid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=server&id=' + sid)
+      .done(function(data) {
+        if ( $j('#ServerModal').length ) {
+          $j('#ServerModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#ServerModal').modal('show');
+        // Manage the Save button
+        $j('#serverSubmitBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#serverModalForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function enableServerModal() {
+  $j(".serverCol").click(function(evt) {
+    evt.preventDefault();
+    var sid = $j(this).data('sid');
+    getServerModal(sid);
+  });
+  $j('#NewServerBtn').click(function(evt) {
+    evt.preventDefault();
+    getServerModal(0);
+  });
+}
+
+// Load the Storage Modal HTML via Ajax call
+function getStorageModal(sid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=storage&id=' + sid)
+      .done(function(data) {
+        if ( $j('#storageModal').length ) {
+          $j('#storageModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#storageModal').modal('show');
+        // Manage the Save button
+        $j('#storageSubmitBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#storageModalForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function enableStorageModal() {
+  $j(".storageCol").click(function(evt) {
+    evt.preventDefault();
+    var sid = $j(this).data('sid');
+    getStorageModal(sid);
+  });
+  $j('#NewStorageBtn').click(function(evt) {
+    evt.preventDefault();
+    getStorageModal(0);
+  });
+}
+
+function initPage() {
+  var NewStorageBtn = $j('#NewStorageBtn');
+  var NewServerBtn = $j('#NewServerBtn');
+
+  if ( canEditSystem ) enableStorageModal();
+  if ( canEditSystem ) enableServerModal();
+
+  NewStorageBtn.prop('disabled', !canEditSystem);
+  NewServerBtn.prop('disabled', !canEditSystem);
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/options.js.php b/web/skins/classic/views/js/options.js.php
index 88387134a..5281cde8c 100644
--- a/web/skins/classic/views/js/options.js.php
+++ b/web/skins/classic/views/js/options.js.php
@@ -1,4 +1,7 @@
+<?php global $restartWarning; ?>
 var restartWarning = <?php echo empty($restartWarning)?'false':'true' ?>;
 if ( restartWarning ) {
   alert( "<?php echo translate('OptionRestartWarning') ?>" );
 }
+
+var canEditSystem = <?php echo canEdit('System') ? 'true' : 'false' ?>;
diff --git a/web/skins/classic/views/js/postlogin.js.php b/web/skins/classic/views/js/postlogin.js.php
index 6fa681fad..b5d712477 100644
--- a/web/skins/classic/views/js/postlogin.js.php
+++ b/web/skins/classic/views/js/postlogin.js.php
@@ -6,25 +6,29 @@
 // will save the GET request via the postLoginQuery variable.  After logging in, this
 // view receives the postLoginQuery via the login form submission, and we can then
 // redirect the user to his original intended destination by appending it to the URL.
+//
 ?>
 
-(
+$j(
 	function () {
 		// Append '?(GET query)' to URL if the GET query is not empty.
-		var querySuffix = "<?php
-			if (!empty($_POST['postLoginQuery'])) {
-        parse_str($_POST['postLoginQuery'], $queryParams);
+		var querySuffix = '<?php
+			if ( !empty($_SESSION['postLoginQuery']) ) {
+        parse_str($_SESSION['postLoginQuery'], $queryParams);
         echo '?' . http_build_query($queryParams);
+        zm_session_start();
+        unset($_SESSION['postLoginQuery']);
+        session_write_close();
       }
-			?>";
+			?>';
 
-    if ( querySuffix == '?view=login' ) {
+    if ( querySuffix == '?view=login' || querySuffix == '' ) {
       // If we didn't redirect elsewhere, then don't show login page, go to console
       querySuffix = '?view=console';
     }
     var newUrl = querySuffix;
-
-console.log("Redirecting to" + newUrl + ' ' + thisUrl);
+console.log("Current location: " + window.location);
+console.log("Redirecting to (" + newUrl + ') from :' + thisUrl);
 		window.location.replace(newUrl);
 	}
 ).delay( 500 );
diff --git a/web/skins/classic/views/js/state.js b/web/skins/classic/views/js/state.js
deleted file mode 100644
index 7165c690c..000000000
--- a/web/skins/classic/views/js/state.js
+++ /dev/null
@@ -1,62 +0,0 @@
-$j(document).ready(function() {
-  // Enable or disable the Delete button depending on the selected run state
-  $j("#runState").change(function() {
-    runstate = $j(this).val();
-
-    if ( (runstate == 'stop') || (runstate == 'restart') || (runstate == 'start') || (runstate == 'default') ) {
-      $j("#btnDelete").prop("disabled", true);
-    } else {
-      $j("#btnDelete").prop("disabled", false);
-    }
-  });
-
-  // Enable or disable the Save button when entering a new state
-  $j("#newState").keyup(function() {
-    length = $j(this).val().length;
-    if ( length < 1 ) {
-      $j("#btnSave").prop("disabled", true);
-    } else {
-      $j("#btnSave").prop("disabled", false);
-    }
-  });
-
-
-  // Delete a state
-  $j("#btnDelete").click(function() {
-    stateStuff('delete', $j("#runState").val());
-  });
-
-
-  // Save a new state
-  $j("#btnSave").click(function() {
-    stateStuff('save', undefined, $j("#newState").val());
-  });
-
-  // Change state
-  $j("#btnApply").click(function() {
-    stateStuff('state', $j("#runState").val());
-  });
-
-  function stateStuff(action, runState, newState) {
-    // the state action will redirect to console
-    var formData = {
-      'view': 'state',
-      'action': action,
-      'apply': 1,
-      'runState': runState,
-      'newState': newState
-    };
-
-    $j("#pleasewait").toggleClass("hidden");
-
-    $j.ajax({
-      type: 'POST',
-      url: thisUrl,
-      data: formData,
-      dataType: 'html',
-      enocde: true
-    }).done(function(data) {
-      location.reload();
-    });
-  }
-});
diff --git a/web/skins/classic/views/js/state.js.php b/web/skins/classic/views/js/state.js.php
deleted file mode 100644
index a7c14a0dc..000000000
--- a/web/skins/classic/views/js/state.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var running = <?php echo daemonCheck()?'true':'false' ?>;
-var applying = <?php echo !empty($_REQUEST['apply'])?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/stats.js b/web/skins/classic/views/js/stats.js
new file mode 100644
index 000000000..ede551e31
--- /dev/null
+++ b/web/skins/classic/views/js/stats.js
@@ -0,0 +1,21 @@
+function initPage() {
+  var backBtn = $j('#backBtn');
+
+  // Disable the back button if there is nothing to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js
index 23f7b806e..85c73baa6 100644
--- a/web/skins/classic/views/js/timeline.js
+++ b/web/skins/classic/views/js/timeline.js
@@ -1,6 +1,8 @@
 var events = {};
 
-function showEvent( eid, fid, width, height ) {
+function showEvent(e) {
+  eid = e.getAttribute('data-event-id');
+  fid = e.getAttribute('data-frame-id');
   var url = '?view=event&eid='+eid+'&fid='+fid;
   url += filterQuery;
   window.location.href = url;
@@ -13,73 +15,109 @@ function showEvent( eid, fid, width, height ) {
   vid.pause();*/
 }
 
-function createEventHtml( event, frame ) {
-  var eventHtml = new Element( 'div' );
+function createEventHtml(zm_event, frame) {
+  var eventHtml = new Element('div');
 
-  if ( event.Archived > 0 ) {
-    eventHtml.addClass( 'archived' );
+  if ( zm_event.Archived > 0 ) {
+    eventHtml.addClass('archived');
   }
 
-  new Element( 'p' ).inject( eventHtml ).set( 'text', monitors[event.MonitorId].Name );
-  new Element( 'p' ).inject( eventHtml ).set( 'text', event.Name+(frame?("("+frame.FrameId+")"):"") );
-  new Element( 'p' ).inject( eventHtml ).set( 'text', event.StartTime+" - "+event.Length+"s" );
-  new Element( 'p' ).inject( eventHtml ).set( 'text', event.Cause );
-  if ( event.Notes ) {
-    new Element( 'p' ).inject( eventHtml ).set( 'text', event.Notes );
+  new Element('p').inject(eventHtml).set('text', monitors[zm_event.MonitorId].Name);
+  new Element('p').inject(eventHtml).set('text', zm_event.Name+(frame?('('+frame.FrameId+')'):''));
+  new Element('p').inject(eventHtml).set('text', zm_event.StartTime+' - '+zm_event.Length+'s');
+  new Element('p').inject(eventHtml).set('text', zm_event.Cause);
+  if ( zm_event.Notes ) {
+    new Element('p').inject(eventHtml).set('text', zm_event.Notes);
   }
-  if ( event.Archived > 0 ) {
-    new Element( 'p' ).inject( eventHtml ).set( 'text', archivedString );
+  if ( zm_event.Archived > 0 ) {
+    new Element('p').inject(eventHtml).set( 'text', archivedString);
   }
 
-  return ( eventHtml );
+  return eventHtml;
 }
 
-function showEventDetail( eventHtml ) {
-  $('instruction').addClass( 'hidden' );
+function showEventDetail(eventHtml) {
+  $('instruction').addClass('hidden');
   $('eventData').empty();
-  $('eventData').adopt( eventHtml );
-  $('eventData').removeClass( 'hidden' );
+  $('eventData').adopt(eventHtml);
+  $('eventData').removeClass('hidden');
 }
 
-function eventDataResponse( respObj, respText ) {
-  var event = respObj.event;
-  if ( !event ) {
-    console.log( "Null event" );
+function eventDataResponse(respObj, respText) {
+  var zm_event = respObj.event;
+  if ( !zm_event ) {
+    console.log('Null event');
     return;
   }
-  events[event.Id] = event;
+  events[zm_event.Id] = zm_event;
 
   if ( respObj.loopback ) {
-    requestFrameData( event.Id, respObj.loopback );
+    requestFrameData(zm_event.Id, respObj.loopback);
   }
 }
 
 function frameDataResponse( respObj, respText ) {
   var frame = respObj.frameimage;
   if ( !frame.FrameId ) {
-    console.log( "Null frame" );
+    console.log('Null frame');
     return;
   }
 
-  var event = events[frame.EventId];
-  if ( !event ) {
-    console.error( "No event "+frame.eventId+" found" );
+  var zm_event = events[frame.EventId];
+  if ( !zm_event ) {
+    console.error('No event '+frame.eventId+' found');
     return;
   }
 
-  if ( !event['frames'] ) {
+  if ( !zm_event['frames'] ) {
     console.log("No frames data in event response");
-    event['frames'] = {};
+    console.log(zm_event);
+    console.log(respObj);
+    zm_event['frames'] = {};
   }
 
-  event['frames'][frame.FrameId] = frame;
-  event['frames'][frame.FrameId]['html'] = createEventHtml( event, frame );
+  zm_event['frames'][frame.FrameId] = frame;
+  zm_event['frames'][frame.FrameId]['html'] = createEventHtml( zm_event, frame );
 
-  previewEvent(frame.EventId, frame.FrameId);
+  showEventData(frame.EventId, frame.FrameId);
 }
 
-var eventQuery = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: eventDataResponse} );
-var frameQuery = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: frameDataResponse} );
+function showEventData(eventId, frameId) {
+  if ( events[eventId] ) {
+    var zm_event = events[eventId];
+    if ( zm_event['frames'] ) {
+      if ( zm_event['frames'][frameId] ) {
+        showEventDetail( zm_event['frames'][frameId]['html'] );
+        var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId;
+        var videoName = zm_event.DefaultVideo;
+        loadEventImage( imagePath, eventId, frameId, zm_event.Width, zm_event.Height, zm_event.Frames/zm_event.Length, videoName, zm_event.Length, zm_event.StartTime, monitors[zm_event.MonitorId]);
+        return;
+      } else {
+        console.log('No frames for ' + frameId);
+      }
+    } else {
+      console.log('No frames');
+    }
+  } else {
+    console.log('No event for ' + eventId);
+  }
+}
+
+var eventQuery = new Request.JSON({
+  url: thisUrl,
+  method: 'get',
+  timeout: AJAX_TIMEOUT,
+  link: 'cancel',
+  onSuccess: eventDataResponse
+});
+
+var frameQuery = new Request.JSON({
+  url: thisUrl,
+  method: 'get',
+  timeout: AJAX_TIMEOUT,
+  link: 'cancel',
+  onSuccess: frameDataResponse
+});
 
 function requestFrameData( eventId, frameId ) {
   if ( !events[eventId] ) {
@@ -91,24 +129,18 @@ function requestFrameData( eventId, frameId ) {
   }
 }
 
-function previewEvent(eventId, frameId) {
+function previewEvent(slot) {
+  eventId = slot.getAttribute('data-event-id');
+  frameId = slot.getAttribute('data-frame-id');
   if ( events[eventId] ) {
-    var event = events[eventId];
-    if ( event['frames'] ) {
-      if ( event['frames'][frameId] ) {
-        showEventDetail( event['frames'][frameId]['html'] );
-        var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId;
-        var videoName = event.DefaultVideo;
-        loadEventImage( imagePath, eventId, frameId, event.Width, event.Height, event.Frames/event.Length, videoName, event.Length, event.StartTime, monitors[event.MonitorId]);
-        return;
-      }
-    }
+    showEventData(eventId, frameId);
+  } else {
+    requestFrameData(eventId, frameId);
   }
-  requestFrameData( eventId, frameId );
 }
 
 function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, duration, startTime, Monitor ) {
-  var vid= $('preview');
+  var vid = $('preview');
   var imageSrc = $('imageSrc');
   if ( videoName && vid ) {
     vid.show();
@@ -137,24 +169,75 @@ function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, dur
     if ( vid ) vid.hide();
     imageSrc.show();
     imageSrc.setProperty('src', imagePath);
-    imageSrc.removeEvent('click');
-    imageSrc.addEvent('click', showEvent.pass([eid, fid, width, height]));
+    imageSrc.setAttribute('data-event-id', eid);
+    imageSrc.setAttribute('data-frame-id', fid);
+    imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc);
   }
 
   var eventData = $('eventData');
   eventData.removeEvent('click');
-  eventData.addEvent('click', showEvent.pass([eid, fid, width, height]));
+  eventData.addEvent('click', showEvent.pass());
 }
 
-function tlZoomBounds( minTime, maxTime ) {
-  console.log( "Zooming" );
+function tlZoomBounds(event) {
+  var target = event.target;
+  var minTime = target.getAttribute('data-zoom-min-time');
+  var maxTime = target.getAttribute('data-zoom-max-time');
   location.replace('?view='+currentView+filterQuery+'&minTime='+minTime+'&maxTime='+maxTime);
 }
 
-function tlZoomRange( midTime, range ) {
-  location.replace('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+range);
+function tlZoomOut() {
+  location.replace('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+zoomout_range);
 }
 
-function tlPan( midTime, range ) {
-  location.replace('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+range);
+function tlPanLeft() {
+  location.replace('?view='+currentView+filterQuery+'&midTime='+minTime+'&range='+range);
 }
+function tlPanRight() {
+  location.replace('?view='+currentView+filterQuery+'&midTime='+maxTime+'&range='+range);
+}
+
+window.addEventListener('DOMContentLoaded', function() {
+  // These look like the code in skin.js, but that code doesn't select for divs.
+  document.querySelectorAll('div.event').forEach(function(el) {
+    el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
+    el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
+  });
+  document.querySelectorAll('div.activity').forEach(function(el) {
+    el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
+    el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
+  });
+  document.querySelectorAll('div.zoom').forEach(function(el) {
+    el.onclick = function(ev) {
+      window[el.getAttribute('data-on-click')](ev);
+    };
+  });
+});
+
+function initPage() {
+  var backBtn = $j('#backBtn');
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+  // Manage the LIST Button
+  document.getElementById("listBtn").addEventListener("click", function onListClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=events'+filterQuery);
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/timeline.js.php b/web/skins/classic/views/js/timeline.js.php
index 79f17918d..474e403e0 100644
--- a/web/skins/classic/views/js/timeline.js.php
+++ b/web/skins/classic/views/js/timeline.js.php
@@ -1,3 +1,12 @@
+<?php
+  global $filterQuery;
+  global $monitors;
+  global $minTime;
+  global $midTime;
+  global $maxTime;
+  global $range;
+  global $majXScale;
+?>
 var filterQuery = '<?php echo validJsStr($filterQuery) ?>';
 
 <?php
@@ -5,15 +14,19 @@ $jsMonitors = array();
 
 $fields = array('Name', 'LabelFormat', 'SaveJPEGs', 'VideoWriter');
 foreach ( $monitors as $monitor ) {
-  if ( !empty($monitorIds[$monitor['Id']]) ) {
-    $jsMonitor = array();
-    foreach ($fields as $field) {
-      $jsMonitor[$field] = $monitor[$field];
-    }
-    $jsMonitors[$monitor['Id']] = $jsMonitor;
+  $jsMonitor = array();
+  foreach ($fields as $field) {
+    $jsMonitor[$field] = $monitor->$field();
   }
+  $jsMonitors[$monitor->Id()] = $jsMonitor;
 }
 ?>
 var monitors = <?php echo json_encode($jsMonitors) ?>;
 
 var archivedString = "<?php echo translate('Archived') ?>";
+
+var minTime = '<?php echo $minTime?>';
+var midTime = '<?php echo $midTime?>';
+var maxTime = '<?php echo $maxTime?>';
+var range = '<?php echo $range?>';
+var zoomout_range = '<?php (int)($range*$majXScale['zoomout']) ?>';
diff --git a/web/skins/classic/views/js/user.js b/web/skins/classic/views/js/user.js
index 65c05c546..d491514e3 100644
--- a/web/skins/classic/views/js/user.js
+++ b/web/skins/classic/views/js/user.js
@@ -12,16 +12,22 @@ function validateForm( form, newUser ) {
   } else if ( newUser ) {
     errors[errors.length] = "You must supply a password";
   }
-  var monitorIds = new Array();
-  for ( var i = 0; i < form.elements['monitorIds'].options.length; i++ ) {
-    if ( form.elements['monitorIds'].options[i].selected ) {
-      monitorIds[monitorIds.length] = form.elements['monitorIds'].options[i].value;
-    }
-  }
-  form.elements['newUser[MonitorIds]'].value = monitorIds.join( ',' );
   if ( errors.length ) {
-    alert( errors.join( "\n" ) );
-    return ( false );
+    alert(errors.join("\n"));
+    return false;
   }
-  return ( true );
+  return true;
 }
+
+function initPage() {
+  $j('#contentForm').submit(function(event) {
+    if ( validateForm(this) ) {
+      $j('#contentButtons').hide();
+      return true;
+    } else {
+      return false;
+    };
+  });
+} // end function initPage
+
+window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/video.js b/web/skins/classic/views/js/video.js
index cfe2b2384..5f2df6ee3 100644
--- a/web/skins/classic/views/js/video.js
+++ b/web/skins/classic/views/js/video.js
@@ -1,9 +1,11 @@
-function deleteVideo( index ) {
-  window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&deleteIndex='+index );
+function deleteVideo(e) {
+  index = e.getAttribute('data-file-index');
+  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&deleteIndex='+index);
 }
 
-function downloadVideo( index ) {
-  window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&downloadIndex='+index );
+function downloadVideo(e) {
+  index = e.getAttribute('data-file-index');
+  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&downloadIndex='+index);
 }
 
 var generateVideoTimer = null;
@@ -11,24 +13,25 @@ var generateVideoTimer = null;
 function generateVideoProgress() {
   var tickerText = $('videoProgressTicker').get('text');
   if ( tickerText.length < 1 || tickerText.length > 4 ) {
-    $('videoProgressTicker').set( 'text', '.' );
+    $('videoProgressTicker').set('text', '.');
   } else {
-    $('videoProgressTicker').appendText( '.' );
+    $('videoProgressTicker').appendText('.');
   }
 }
 
 function generateVideoResponse( respObj, respText ) {
-  window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0) );
+  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0));
 }
 
-function generateVideo( form ) {
+function generateVideo() {
+  form = $j('#contentForm')[0];
   var parms = 'view=request&request=event&action=video';
   parms += '&'+$(form).toQueryString();
-  var query = new Request.JSON( {url: thisUrl, method: 'post', data: parms, onSuccess: generateVideoResponse} );
+  var query = new Request.JSON({url: thisUrl, method: 'post', data: parms, onSuccess: generateVideoResponse});
   query.send();
-  $('videoProgress').removeClass( 'hidden' );
-  $('videoProgress').setProperty( 'class', 'warnText' );
-  $('videoProgressText').set( 'text', videoGenProgressString );
+  $('videoProgress').removeClass('hidden');
+  $('videoProgress').setProperty('class', 'warnText');
+  $('videoProgressText').set('text', videoGenProgressString);
   generateVideoProgress();
-  generateVideoTimer = generateVideoProgress.periodical( 500 );
+  generateVideoTimer = generateVideoProgress.periodical(500);
 }
diff --git a/web/skins/classic/views/js/video.js.php b/web/skins/classic/views/js/video.js.php
index cd12fef7b..e9bb78878 100644
--- a/web/skins/classic/views/js/video.js.php
+++ b/web/skins/classic/views/js/video.js.php
@@ -1,4 +1,7 @@
-var eventId = '<?php echo $event['Id'] ?>';
+<?php
+  global $event;
+?>
+var eventId = '<?php echo $event->Id() ?>';
 
 var videoGenSuccessString = '<?php echo addslashes(translate('VideoGenSucceeded')) ?>';
 var videoGenFailedString = '<?php echo addslashes(translate('VideoGenFailed')) ?>';
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index eceb994cc..7fb92fed5 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -1,39 +1,33 @@
-function setButtonState(element, butClass) {
-  if ( element ) {
-    element.className = butClass;
-    element.disabled = (butClass != 'inactive');
-  }
-}
 
 function showEvents() {
-  $('ptzControls').addClass( 'hidden' );
-  $('events').removeClass( 'hidden' );
+  $('ptzControls').addClass('hidden');
+  $('events').removeClass('hidden');
   if ( $('eventsControl') ) {
     $('eventsControl').addClass('hidden');
   }
   if ( $('controlControl') ) {
     $('controlControl').removeClass('hidden');
   }
-  showMode = "events";
+  showMode = 'events';
 }
 
 function showPtzControls() {
-  $('events').addClass( 'hidden' );
-  $('ptzControls').removeClass( 'hidden' );
+  $('events').addClass('hidden');
+  $('ptzControls').removeClass('hidden');
   if ( $('eventsControl') ) {
     $('eventsControl').removeClass('hidden');
   }
   if ( $('controlControl') ) {
     $('controlControl').addClass('hidden');
   }
-  showMode = "control";
+  showMode = 'control';
 }
 
 function changeScale() {
   var scale = $('scale').get('value');
   var newWidth;
   var newHeight;
-  if (scale == "auto") {
+  if ( scale == '0' || scale == 'auto' ) {
     var newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
     newWidth = newSize.width;
     newHeight = newSize.height;
@@ -44,17 +38,17 @@ function changeScale() {
     newHeight = monitorHeight * scale / SCALE_BASE;
   }
 
-  Cookie.write( 'zmWatchScale'+monitorId, scale, {duration: 10*365} );
+  Cookie.write('zmWatchScale'+monitorId, scale, {duration: 10*365});
 
   /*Stream could be an applet so can't use moo tools*/
   var streamImg = $('liveStream'+monitorId);
   if ( streamImg ) {
-    streamImg.style.width = newWidth + "px";
-    streamImg.style.height = newHeight + "px";
+    streamImg.style.width = newWidth + 'px';
+    streamImg.style.height = newHeight + 'px';
 
     streamImg.src = streamImg.src.replace(/scale=\d+/i, 'scale='+(scale== 'auto' ? autoScale : scale));
   } else {
-    console.error("No element found for liveStream.");
+    console.error('No element found for liveStream'+monitorId);
   }
 }
 
@@ -64,17 +58,17 @@ var lastAlarmState = STATE_IDLE;
 function setAlarmState( currentAlarmState ) {
   alarmState = currentAlarmState;
 
-  var stateClass = "";
+  var stateClass = '';
   if ( alarmState == STATE_ALARM ) {
-    stateClass = "alarm";
+    stateClass = 'alarm';
   } else if ( alarmState == STATE_ALERT ) {
-    stateClass = "alert";
+    stateClass = 'alert';
   }
-  $('stateValue').set( 'text', stateStrings[alarmState] );
+  $('stateValue').set('text', stateStrings[alarmState]);
   if ( stateClass ) {
-    $('stateValue').setProperty( 'class', stateClass );
+    $('stateValue').setProperty('class', stateClass);
   } else {
-    $('stateValue').removeProperty( 'class' );
+    $('stateValue').removeProperty('class');
   }
 
   var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
@@ -87,7 +81,7 @@ function setAlarmState( currentAlarmState ) {
     if ( SOUND_ON_ALARM ) {
       // Enable the alarm sound
       if ( !canPlayPauseAudio ) {
-        $('alarmSound').removeClass( 'hidden' );
+        $('alarmSound').removeClass('hidden');
       } else {
         $('MediaPlayer').Play();
       }
@@ -96,25 +90,23 @@ function setAlarmState( currentAlarmState ) {
       window.focus();
     }
   }
-  if ( SOUND_ON_ALARM ) {
-    if ( oldAlarm ) {
+  if ( oldAlarm ) { // done with an event do a refresh
+    if ( SOUND_ON_ALARM ) {
       // Disable alarm sound
       if ( !canPlayPauseAudio ) {
-        $('alarmSound').addClass( 'hidden' );
+        $('alarmSound').addClass('hidden');
       } else {
         $('MediaPlayer').Stop();
       }
     }
-  }
-  if (oldAlarm) { // done with an event do a refresh
     eventCmdQuery();
   }
 
   lastAlarmState = alarmState;
-}
+} // end function setAlarmState( currentAlarmState )
 
 if ( monitorType != 'WebSite' ) {
-  var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+  var streamCmdParms = 'view=request&request=stream&connkey='+connKey;
   if ( auth_hash ) {
     streamCmdParms += '&auth='+auth_hash;
   }
@@ -141,7 +133,7 @@ function getStreamCmdFailure(xhr) {
   console.log(xhr);
 }
 function getStreamCmdResponse(respObj, respText) {
-  watchdogOk("stream");
+  watchdogOk('stream');
   if ( streamCmdTimer ) {
     streamCmdTimer = clearTimeout(streamCmdTimer);
   }
@@ -155,11 +147,11 @@ function getStreamCmdResponse(respObj, respText) {
 
       $('levelValue').set('text', streamStatus.level);
       if ( streamStatus.level > 95 ) {
-        $('levelValue').className = "alarm";
+        $('levelValue').className = 'alarm';
       } else if ( streamStatus.level > 80 ) {
-        $('levelValue').className = "alert";
+        $('levelValue').className = 'alert';
       } else {
-        $('levelValue').className = "ok";
+        $('levelValue').className = 'ok';
       }
 
       var delayString = secsToTime(streamStatus.delay);
@@ -194,51 +186,55 @@ function getStreamCmdResponse(respObj, respText) {
           }
         } // rate
       } else {
-        $('modeValue').set( 'text', "Live" );
+        $('modeValue').set( 'text', 'Live' );
         $('rate').addClass( 'hidden' );
         $('delay').addClass( 'hidden' );
         $('level').addClass( 'hidden' );
-        streamCmdPlay( false );
+        streamCmdPlay(false);
       } // end if paused or delayed
 
-      $('zoomValue').set( 'text', streamStatus.zoom );
-      if ( streamStatus.zoom == "1.0" ) {
-        setButtonState( $('zoomOutBtn'), 'unavail' );
+      $('zoomValue').set('text', streamStatus.zoom);
+      if ( streamStatus.zoom == '1.0' ) {
+        setButtonState('zoomOutBtn', 'unavail');
       } else {
-        setButtonState( $('zoomOutBtn'), 'inactive' );
+        setButtonState('zoomOutBtn', 'inactive');
       }
 
       if ( canEditMonitors ) {
         if ( streamStatus.enabled ) {
-          $('enableAlarmsLink').addClass( 'hidden' );
-          $('disableAlarmsLink').removeClass( 'hidden' );
+          $('enableAlarmsLink').addClass('hidden');
+          $('disableAlarmsLink').removeClass('hidden');
           if ( streamStatus.forced ) {
-            $('forceAlarmLink').addClass( 'hidden' );
-            $('cancelAlarmLink').removeClass( 'hidden' );
+            $('forceAlarmLink').addClass('hidden');
+            $('cancelAlarmLink').removeClass('hidden');
           } else {
-            $('forceAlarmLink').removeClass( 'hidden' );
-            $('cancelAlarmLink').addClass( 'hidden' );
+            $('forceAlarmLink').removeClass('hidden');
+            $('cancelAlarmLink').addClass('hidden');
           }
-          $('forceCancelAlarm').removeClass( 'hidden' );
+          $('forceCancelAlarm').removeClass('hidden');
         } else {
-          $('enableAlarmsLink').removeClass( 'hidden' );
-          $('disableAlarmsLink').addClass( 'hidden' );
-          $('forceCancelAlarm').addClass( 'hidden' );
+          $('enableAlarmsLink').removeClass('hidden');
+          $('disableAlarmsLink').addClass('hidden');
+          $('forceCancelAlarm').addClass('hidden');
         }
-        $('enableDisableAlarms').removeClass( 'hidden' );
+        $('enableDisableAlarms').removeClass('hidden');
       } // end if canEditMonitors
 
       if ( streamStatus.auth ) {
-        console.log("Have a new auth hash" + streamStatus.auth);
+        auth_hash = streamStatus.auth;
         // Try to reload the image stream.
         var streamImg = $('liveStream');
         if ( streamImg ) {
           streamImg.src = streamImg.src.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
         }
+        streamCmdParms = streamCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+        statusCmdParms = statusCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+        eventCmdParms = eventCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+        controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
       } // end if have a new auth hash
     } // end if respObj.status
   } else {
-    checkStreamForErrors("getStreamCmdResponse", respObj);//log them
+    checkStreamForErrors('getStreamCmdResponse', respObj);//log them
     // Try to reload the image stream.
     // If it's an auth error, we should reload the whole page.
     window.location.reload();
@@ -246,9 +242,9 @@ function getStreamCmdResponse(respObj, respText) {
       var streamImg = $('liveStream'+monitorId);
       if ( streamImg ) {
         streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-        console.log("Changing livestream src to " + streamImg.src);
+        console.log('Changing livestream src to ' + streamImg.src);
       } else {
-        console.log("Unable to find streamImg liveStream");
+        console.log('Unable to find streamImg liveStream');
       }
     }
   }
@@ -257,132 +253,152 @@ function getStreamCmdResponse(respObj, respText) {
   if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
     streamCmdTimeout = streamCmdTimeout/5;
   }
-  streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout );
+  streamCmdTimer = streamCmdQuery.delay(streamCmdTimeout);
 }
 
 function streamCmdPause( action ) {
-  setButtonState( $('pauseBtn'), 'active' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('stopBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
+  setButtonState('pauseBtn', 'active');
+  setButtonState('playBtn', 'inactive');
+  setButtonState('stopBtn', 'inactive');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'inactive');
+    setButtonState('slowFwdBtn', 'inactive');
+    setButtonState('slowRevBtn', 'inactive');
+    setButtonState('fastRevBtn', 'inactive');
+  }
   if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_PAUSE );
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_PAUSE);
   }
 }
 
 function streamCmdPlay( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'active' );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'active');
   if ( streamStatus.delayed == true ) {
-    setButtonState( $('stopBtn'), 'inactive' );
-    setButtonState( $('fastFwdBtn'), 'inactive' );
-    setButtonState( $('slowFwdBtn'), 'inactive' );
-    setButtonState( $('slowRevBtn'), 'inactive' );
-    setButtonState( $('fastRevBtn'), 'inactive' );
+    setButtonState('stopBtn', 'inactive');
+    if ( monitorStreamReplayBuffer ) {
+      setButtonState('fastFwdBtn', 'inactive');
+      setButtonState('slowFwdBtn', 'inactive');
+      setButtonState('slowRevBtn', 'inactive');
+      setButtonState('fastRevBtn', 'inactive');
+    }
   } else {
-    setButtonState( $('stopBtn'), 'unavail' );
-    setButtonState( $('fastFwdBtn'), 'unavail' );
-    setButtonState( $('slowFwdBtn'), 'unavail' );
-    setButtonState( $('slowRevBtn'), 'unavail' );
-    setButtonState( $('fastRevBtn'), 'unavail' );
+    setButtonState('stopBtn', 'unavail');
+    if ( monitorStreamReplayBuffer ) {
+      setButtonState('fastFwdBtn', 'unavail');
+      setButtonState('slowFwdBtn', 'unavail');
+      setButtonState('slowRevBtn', 'unavail');
+      setButtonState('fastRevBtn', 'unavail');
+    }
   }
   if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_PLAY );
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_PLAY);
   }
 }
 
 function streamCmdStop( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'unavail' );
-  setButtonState( $('stopBtn'), 'active' );
-  setButtonState( $('fastFwdBtn'), 'unavail' );
-  setButtonState( $('slowFwdBtn'), 'unavail' );
-  setButtonState( $('slowRevBtn'), 'unavail' );
-  setButtonState( $('fastRevBtn'), 'unavail' );
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_STOP );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'unavail');
+  setButtonState('stopBtn', 'active');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'unavail');
+    setButtonState('slowFwdBtn', 'unavail');
+    setButtonState('slowRevBtn', 'unavail');
+    setButtonState('fastRevBtn', 'unavail');
   }
-  setButtonState( $('stopBtn'), 'unavail' );
-  setButtonState( $('playBtn'), 'active' );
+  if ( action ) {
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_STOP);
+  }
+  setButtonState('stopBtn', 'unavail');
+  setButtonState('playBtn', 'active');
 }
 
 function streamCmdFastFwd( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('stopBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'inactive');
+  setButtonState('stopBtn', 'inactive');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'inactive');
+    setButtonState('slowFwdBtn', 'inactive');
+    setButtonState('slowRevBtn', 'inactive');
+    setButtonState('fastRevBtn', 'inactive');
+  }
   if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_FASTFWD );
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTFWD);
   }
 }
 
 function streamCmdSlowFwd( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('stopBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'active' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_SLOWFWD );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'inactive');
+  setButtonState('stopBtn', 'inactive');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'inactive');
+    setButtonState('slowFwdBtn', 'active');
+    setButtonState('slowRevBtn', 'inactive');
+    setButtonState('fastRevBtn', 'inactive');
+  }
+  if ( action ) {
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWFWD);
+  }
+  setButtonState('pauseBtn', 'active');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('slowFwdBtn', 'inactive');
   }
-  setButtonState( $('pauseBtn'), 'active' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
 }
 
 function streamCmdSlowRev( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('stopBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'active' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_SLOWREV );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'inactive');
+  setButtonState('stopBtn', 'inactive');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'inactive');
+    setButtonState('slowFwdBtn', 'inactive');
+    setButtonState('slowRevBtn', 'active');
+    setButtonState('fastRevBtn', 'inactive');
+  }
+  if ( action ) {
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWREV);
+  }
+  setButtonState('pauseBtn', 'active');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('slowRevBtn', 'inactive');
   }
-  setButtonState( $('pauseBtn'), 'active' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
 }
 
 function streamCmdFastRev( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('stopBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'inactive');
+  setButtonState('stopBtn', 'inactive');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'inactive');
+    setButtonState('slowFwdBtn', 'inactive');
+    setButtonState('slowRevBtn', 'inactive');
+    setButtonState('fastRevBtn', 'inactive');
+  }
   if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_FASTREV );
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTREV);
   }
 }
 
 function streamCmdZoomIn( x, y ) {
-  streamCmdReq.send( streamCmdParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y );
+  streamCmdReq.send(streamCmdParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y);
 }
 
 function streamCmdZoomOut() {
-  streamCmdReq.send( streamCmdParms+"&command="+CMD_ZOOMOUT );
+  streamCmdReq.send(streamCmdParms+"&command="+CMD_ZOOMOUT);
 }
 
 function streamCmdScale( scale ) {
-  streamCmdReq.send( streamCmdParms+"&command="+CMD_SCALE+"&scale="+scale );
+  streamCmdReq.send(streamCmdParms+"&command="+CMD_SCALE+"&scale="+scale);
 }
 
 function streamCmdPan( x, y ) {
-  streamCmdReq.send( streamCmdParms+"&command="+CMD_PAN+"&x="+x+"&y="+y );
+  streamCmdReq.send(streamCmdParms+"&command="+CMD_PAN+"&x="+x+"&y="+y);
 }
 
 function streamCmdQuery() {
-  streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY );
+  streamCmdReq.send(streamCmdParms+"&command="+CMD_QUERY);
 }
 
 if ( monitorType != 'WebSite' ) {
@@ -390,12 +406,18 @@ if ( monitorType != 'WebSite' ) {
   if ( auth_hash ) {
     statusCmdParms += '&auth='+auth_hash;
   }
-  var statusCmdReq = new Request.JSON( {url: monitorUrl, method: 'get', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse} );
+  var statusCmdReq = new Request.JSON( {
+    url: monitorUrl,
+    method: 'get',
+    timeout: AJAX_TIMEOUT,
+    link: 'cancel',
+    onSuccess: getStatusCmdResponse
+  } );
   var statusCmdTimer = null;
 }
 
 function getStatusCmdResponse(respObj, respText) {
-  watchdogOk("status");
+  watchdogOk('status');
   if ( statusCmdTimer ) {
     statusCmdTimer = clearTimeout(statusCmdTimer);
   }
@@ -404,22 +426,22 @@ function getStatusCmdResponse(respObj, respText) {
     $('fpsValue').set('text', respObj.monitor.FrameRate);
     setAlarmState(respObj.monitor.Status);
   } else {
-    checkStreamForErrors("getStatusCmdResponse", respObj);
+    checkStreamForErrors('getStatusCmdResponse', respObj);
   }
 
   var statusCmdTimeout = statusRefreshTimeout;
   if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
     statusCmdTimeout = statusCmdTimeout/5;
   }
-  statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout );
+  statusCmdTimer = statusCmdQuery.delay(statusCmdTimeout);
 }
 
 function statusCmdQuery() {
-  statusCmdReq.send();
+  statusCmdReq.send(statusCmdParms);
 }
 
 if ( monitorType != 'WebSite' ) {
-  var alarmCmdParms = "view=request&request=alarm&id="+monitorId;
+  var alarmCmdParms = 'view=request&request=alarm&id='+monitorId;
   if ( auth_hash ) {
     alarmCmdParms += '&auth='+auth_hash;
   }
@@ -434,8 +456,8 @@ if ( monitorType != 'WebSite' ) {
   var alarmCmdFirst = true;
 }
 
-function getAlarmCmdResponse( respObj, respText ) {
-  checkStreamForErrors("getAlarmCmdResponse", respObj);
+function getAlarmCmdResponse(respObj, respText) {
+  checkStreamForErrors('getAlarmCmdResponse', respObj);
 }
 
 function cmdDisableAlarms() {
@@ -448,14 +470,14 @@ function cmdEnableAlarms() {
 
 function cmdForceAlarm() {
   alarmCmdReq.send(alarmCmdParms+"&command=forceAlarm");
-  if (window.event) {
+  if ( window.event ) {
     window.event.preventDefault();
   }
 }
 
 function cmdCancelForcedAlarm() {
   alarmCmdReq.send(alarmCmdParms+"&command=cancelForcedAlarm");
-  if (window.event) {
+  if ( window.event ) {
     window.event.preventDefault();
   }
   return false;
@@ -471,16 +493,18 @@ function getActResponse( respObj, respText ) {
   eventCmdQuery();
 }
 
-function deleteEvent( event, eventId ) {
-  var actParms = "view=request&request=event&action=delete&id="+eventId;
+function deleteEvent(event, eventId) {
+  var actParms = 'view=request&request=event&action=delete&id='+eventId;
+  if ( auth_hash ) {
+    actParms += '&auth='+auth_hash;
+  }
   var actReq = new Request.JSON( {
     url: thisUrl,
     method: 'post',
     timeout: 3000,
-    data: actParms,
     onSuccess: getActResponse
   } );
-  actReq.send();
+  actReq.send(actParms);
   event.stop();
 }
 
@@ -493,7 +517,6 @@ if ( monitorType != 'WebSite' ) {
     url: monitorUrl,
     method: 'get',
     timeout: AJAX_TIMEOUT,
-    data: eventCmdParms,
     link: 'cancel',
     onSuccess: getEventCmdResponse,
     onTimeout: eventCmdQuery
@@ -507,58 +530,78 @@ function highlightRow( row ) {
 }
 
 function getEventCmdResponse( respObj, respText ) {
-  watchdogOk("event");
+  watchdogOk('event');
   if ( eventCmdTimer ) {
-    eventCmdTimer = clearTimeout( eventCmdTimer );
+    eventCmdTimer = clearTimeout(eventCmdTimer);
   }
 
   if ( respObj.result == 'Ok' ) {
     var dbEvents = respObj.events.reverse();
     var eventList = $('eventList');
-    var eventListBody = $(eventList).getElement( 'tbody' );
-    var eventListRows = $(eventListBody).getElements( 'tr' );
+    var eventListBody = $(eventList).getElement('tbody');
+    var eventListRows = $(eventListBody).getElements('tr');
 
-    eventListRows.each( function( row ) {
-      row.removeClass( 'updated' );
+    eventListRows.each( function(row) {
+      row.removeClass('updated');
     } );
 
     for ( var i = 0; i < dbEvents.length; i++ ) {
-      var event = dbEvents[i];
-      var row = $('event'+event.Id);
+      var zm_event = dbEvents[i];
+      var row = $('event'+zm_event.Id);
       var newEvent = (row == null ? true : false);
       if ( newEvent ) {
-        row = new Element( 'tr', {'id': 'event'+event.Id} );
-        new Element( 'td', {'class': 'colId'} ).inject( row );
-        new Element( 'td', {'class': 'colName'} ).inject( row );
-        new Element( 'td', {'class': 'colTime'} ).inject( row );
-        new Element( 'td', {'class': 'colSecs'} ).inject( row );
-        new Element( 'td', {'class': 'colFrames'} ).inject( row );
-        new Element( 'td', {'class': 'colScore'} ).inject( row );
-        new Element( 'td', {'class': 'colDelete'} ).inject( row );
+        row = new Element('tr', {'id': 'event'+zm_event.Id});
+        new Element('td', {'class': 'colId'}).inject(row);
+        new Element('td', {'class': 'colName'}).inject(row);
+        new Element('td', {'class': 'colTime'}).inject(row);
+        new Element('td', {'class': 'colSecs'}).inject(row);
+        new Element('td', {'class': 'colFrames'}).inject(row);
+        new Element('td', {'class': 'colScore'}).inject(row);
+        new Element('td', {'class': 'colDelete'}).inject(row);
 
-        var link = new Element( 'a', {'href': '#', 'events': {'click': createEventPopup.pass( [event.Id, '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId+'&page=1&popup=1', event.Width, event.Height] )}});
-        link.set( 'text', event.Id );
-        link.inject( row.getElement( 'td.colId' ) );
+        var link = new Element('a', {
+          'href': '#',
+          'events': {
+            'click': createEventPopup.pass( [
+              zm_event.Id,
+              '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId+'&page=1&popup=1',
+              zm_event.Width,
+              zm_event.Height
+            ] )
+          }
+        });
+        link.set('text', zm_event.Id);
+        link.inject(row.getElement('td.colId'));
 
-        link = new Element( 'a', {'href': '#', 'events': {'click': createEventPopup.pass( [event.Id, '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId+'&page=1&popup=1', event.Width, event.Height] )}});
-        link.set( 'text', event.Name );
-        link.inject( row.getElement( 'td.colName' ) );
+        link = new Element('a', {
+          'href': '#',
+          'events': {
+            'click': createEventPopup.pass( [
+              zm_event.Id,
+              '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId+'&page=1&popup=1',
+              zm_event.Width,
+              zm_event.Height
+            ] )
+          }
+        });
+        link.set('text', zm_event.Name);
+        link.inject(row.getElement('td.colName'));
 
-        row.getElement( 'td.colTime' ).set( 'text', event.StartTime );
-        row.getElement( 'td.colSecs' ).set( 'text', event.Length );
+        row.getElement('td.colTime').set('text', zm_event.StartTime);
+        row.getElement('td.colSecs').set('text', zm_event.Length);
 
-        link = new Element( 'a', {'href': '#', 'events': {'click': createFramesPopup.pass( [event.Id, event.Width, event.Height] )}});
-        link.set( 'text', event.Frames+'/'+event.AlarmFrames );
-        link.inject( row.getElement( 'td.colFrames' ) );
+        link = new Element('a', {'href': '#', 'events': {'click': createFramesPopup.pass( [zm_event.Id, zm_event.Width, zm_event.Height] )}});
+        link.set('text', zm_event.Frames+'/'+zm_event.AlarmFrames);
+        link.inject(row.getElement('td.colFrames'));
 
-        link = new Element( 'a', {'href': '#', 'events': {'click': createFramePopup.pass( [event.Id, '0', event.Width, event.Height] )}});
-        link.set( 'text', event.AvgScore+'/'+event.MaxScore );
-        link.inject( row.getElement( 'td.colScore' ) );
+        link = new Element('a', {'href': '#', 'events': {'click': createFramePopup.pass( [zm_event.Id, '0', zm_event.Width, zm_event.Height] )}});
+        link.set('text', zm_event.AvgScore+'/'+zm_event.MaxScore);
+        link.inject(row.getElement('td.colScore'));
 
-        link = new Element( 'button', {
+        link = new Element('button', {
           'type': 'button',
           'title': deleteString,
-          'data-event-id': event.Id,
+          'data-event-id': zm_event.Id,
           'events': {
             'click': function(e) {
               var event_id = e.target.getAttribute('data-event-id');
@@ -573,30 +616,30 @@ function getEventCmdResponse( respObj, respText ) {
             'mouseout': highlightRow.pass(row)
           }
         });
-        link.set( 'text', 'X' );
-        link.inject( row.getElement( 'td.colDelete' ) );
+        link.set('text', 'X');
+        link.inject(row.getElement('td.colDelete'));
 
         if ( i == 0 ) {
-          row.inject( $(eventListBody) );
+          row.inject($(eventListBody));
         } else {
-          row.inject( $(eventListBody), 'top' );
+          row.inject($(eventListBody), 'top');
           if ( !eventCmdFirst ) {
-            row.addClass( 'recent' );
+            row.addClass('recent');
           }
         }
       } else {
-        row.getElement( 'td.colName a' ).set( 'text', event.Name );
-        row.getElement( 'td.colSecs' ).set( 'text', event.Length );
-        row.getElement( 'td.colFrames a' ).set( 'text', event.Frames+'/'+event.AlarmFrames );
-        row.getElement( 'td.colScore a' ).set( 'text', event.AvgScore+'/'+event.MaxScore );
-        row.removeClass( 'recent' );
+        row.getElement('td.colName a').set('text', zm_event.Name);
+        row.getElement('td.colSecs').set('text', zm_event.Length);
+        row.getElement('td.colFrames a').set('text', zm_event.Frames+'/'+zm_event.AlarmFrames);
+        row.getElement('td.colScore a').set('text', zm_event.AvgScore+'/'+zm_event.MaxScore);
+        row.removeClass('recent');
       }
-      row.addClass( 'updated' );
-    }
+      row.addClass('updated');
+    } // end foreach event
 
-    var rows = $(eventListBody).getElements( 'tr' );
+    var rows = $(eventListBody).getElements('tr');
     for ( var i = 0; i < rows.length; i++ ) {
-      if ( !rows[i].hasClass( 'updated' ) ) {
+      if ( !rows[i].hasClass('updated') ) {
         rows[i].destroy();
         rows.splice( i, 1 );
         i--;
@@ -607,46 +650,56 @@ function getEventCmdResponse( respObj, respText ) {
       rows.length--;
     }
   } else {
-    checkStreamForErrors("getEventCmdResponse", respObj);
-  }
+    checkStreamForErrors('getEventCmdResponse', respObj);
+  } // end if objresult == ok
 
   var eventCmdTimeout = eventsRefreshTimeout;
   if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
     eventCmdTimeout = eventCmdTimeout/5;
   }
-  eventCmdTimer = eventCmdQuery.delay( eventCmdTimeout );
+  eventCmdTimer = eventCmdQuery.delay(eventCmdTimeout);
   eventCmdFirst = false;
 }
 
 function eventCmdQuery() {
   if ( eventCmdTimer ) { // avoid firing another if we are firing one
-    eventCmdTimer = clearTimeout( eventCmdTimer );
+    eventCmdTimer = clearTimeout(eventCmdTimer);
   }
-  eventCmdReq.send();
+  eventCmdReq.send(eventCmdParms);
 }
 
 if ( monitorType != 'WebSite' ) {
-  var controlParms = "view=request&request=control&id="+monitorId;
+  var controlParms = 'view=request&request=control&id='+monitorId;
   if ( auth_hash ) {
     controlParms += '&auth='+auth_hash;
   }
-  var controlReq = new Request.JSON( {url: monitorUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getControlResponse} );
+  var controlReq = new Request.JSON( {
+    url: monitorUrl,
+    method: 'post',
+    timeout: AJAX_TIMEOUT,
+    link: 'cancel',
+    onSuccess: getControlResponse
+  } );
 }
 
-function getControlResponse( respObj, respText ) {
+function getControlResponse(respObj, respText) {
   if ( !respObj ) {
     return;
   }
   //console.log( respText );
   if ( respObj.result != 'Ok' ) {
-    alert( "Control response was status = "+respObj.status+"\nmessage = "+respObj.message );
+    alert("Control response was status = "+respObj.status+"\nmessage = "+respObj.message);
   }
 }
 
-function controlCmd( control, event, xtell, ytell ) {
-  var locParms = "";
+function controlCmd(event) {
+  button = event.target;
+  control = button.getAttribute('value');
+  xtell = button.getAttribute('data-xtell');
+  ytell = button.getAttribute('data-ytell');
+
+  var locParms = '';
   if ( event && (xtell || ytell) ) {
-    console.log(event);
     var target = event.target;
     var coords = $(target).getCoordinates();
 
@@ -654,37 +707,37 @@ function controlCmd( control, event, xtell, ytell ) {
     var y = event.pageY - coords.top;
 
     if ( xtell ) {
-      var xge = parseInt( (x*100)/coords.width );
+      var xge = parseInt((x*100)/coords.width);
       if ( xtell == -1 ) {
         xge = 100 - xge;
       } else if ( xtell == 2 ) {
         xge = 2*(50 - xge);
       }
-      locParms += "&xge="+xge;
+      locParms += '&xge='+xge;
     }
     if ( ytell ) {
-      var yge = parseInt( (y*100)/coords.height );
+      var yge = parseInt((y*100)/coords.height);
       if ( ytell == -1 ) {
         yge = 100 - yge;
       } else if ( ytell == 2 ) {
         yge = 2*(50 - yge);
       }
-      locParms += "&yge="+yge;
+      locParms += '&yge='+yge;
     }
   }
-  controlReq.send( controlParms+"&control="+control+locParms );
-  if ( streamMode == "single" ) {
-    fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 );
+  controlReq.send(controlParms+"&control="+control+locParms);
+  if ( streamMode == 'single' ) {
+    fetchImage.pass($('imageFeed').getElement('img')).delay(1000);
   }
 }
 
 function controlCmdImage( x, y ) {
   var imageControlParms = controlParms;
-  imageControlParms += "&scale="+scale;
-  imageControlParms += "&control="+imageControlMode;
+  imageControlParms += '&scale='+scale;
+  imageControlParms += '&control='+imageControlMode;
 
   controlReq.send( imageControlParms+"&x="+x+"&y="+y );
-  if ( streamMode == "single" ) {
+  if ( streamMode == 'single' ) {
     fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 );
   }
 }
@@ -694,30 +747,35 @@ function fetchImage( streamImage ) {
 }
 
 function handleClick( event ) {
-  var target = event.target;
-  var x = event.page.x - $(target).getLeft();
-  var y = event.page.y - $(target).getTop();
+  var $target = $(event.target);
+  var scaleX = parseInt(monitorWidth / $target.getWidth());
+  var scaleY = parseInt(monitorHeight / $target.getHeight());
+  var x = (event.page.x - $target.getLeft()) * scaleX;
+  var y = (event.page.y - $target.getTop()) * scaleY;
 
-  if ( showMode == "events" || !imageControlMode ) {
+  if ( showMode == 'events' || !imageControlMode ) {
     if ( event.shift ) {
       streamCmdPan( x, y );
     } else if ( event.event.ctrlKey ) {
-      console.log("Zooming out");
       streamCmdZoomOut();
     } else {
-      streamCmdZoomIn( x, y );
+      streamCmdZoomIn(x, y);
     }
   } else {
-    controlCmdImage( x, y );
+    controlCmdImage(x, y);
   }
 }
 
 function appletRefresh() {
   if ( streamStatus && (!streamStatus.paused && !streamStatus.delayed) ) {
-    var streamImg = $('liveStream');
-    var parent = streamImg.getParent();
-    streamImg.dispose();
-    streamImg.inject( parent );
+    var streamImg = $('liveStream'+monitorId);
+    if ( streamImg ) {
+      var parent = streamImg.getParent();
+      streamImg.dispose();
+      streamImg.inject( parent );
+    } else {
+      console.error("Nothing found for liveStream"+monitorId);
+    }
     if ( appletRefreshTime ) {
       appletRefresh.delay( appletRefreshTime*1000 );
     }
@@ -759,7 +817,7 @@ function reloadWebSite() {
 
 function initPage() {
   if ( monitorType != 'WebSite' ) {
-    if ( streamMode == "single" ) {
+    if ( streamMode == 'single' ) {
       statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
       watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
     } else {
@@ -770,28 +828,35 @@ function initPage() {
     eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
     watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2);
 
-    if ( canStreamNative || streamMode == "single" ) {
+    if ( canStreamNative || (streamMode == 'single') ) {
       var streamImg = $('imageFeed').getElement('img');
       if ( !streamImg ) {
         streamImg = $('imageFeed').getElement('object');
       }
-      if ( streamMode == "single" ) {
-        streamImg.addEvent('click', fetchImage.pass(streamImg));
-        fetchImage.pass(streamImg).periodical(imageRefreshTimeout);
+      if ( !streamImg ) {
+        console.error('No streamImg found for imageFeed');
       } else {
-        streamImg.addEvent('click', function(event) {
-          handleClick(event);
-        });
-      }
-    }
+        if ( streamMode == 'single' ) {
+          streamImg.addEvent('click', fetchImage.pass(streamImg));
+          fetchImage.pass(streamImg).periodical(imageRefreshTimeout);
+        } else {
+          streamImg.addEvent('click', function(event) {
+            handleClick(event);
+          });
+        }
+      } // end if have streamImg
+    } // streamMode native or single
 
     if ( refreshApplet && appletRefreshTime ) {
       appletRefresh.delay(appletRefreshTime*1000);
     }
-    if ( scale == "auto" ) changeScale();
+    if ( scale == '0' || scale == 'auto' ) changeScale();
     if ( window.history.length == 1 ) {
       $j('#closeControl').html('');
     }
+    document.querySelectorAll('select[name="scale"]').forEach(function(el) {
+      el.onchange = window['changeScale'];
+    });
   } else if ( monitorRefresh > 0 ) {
     setInterval(reloadWebSite, monitorRefresh*1000);
   }
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 15a43a6ce..365d62aed 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -1,3 +1,10 @@
+<?php 
+  global $streamMode;
+  global $showPtzControls;
+  global $connkey;
+  global $monitor;
+  global $scale;
+?>
 //
 // Import constants
 //
@@ -44,13 +51,13 @@ var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"eve
 var connKey = '<?php echo $connkey ?>';
 var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
 
-
 var monitorId = <?php echo $monitor->Id() ?>;
-var monitorWidth = <?php echo $monitor->Width() ?>;
-var monitorHeight = <?php echo $monitor->Height() ?>;
-var monitorUrl = '<?php echo $monitor->UrlToIndex(); ?>';
-var monitorType = '<?php echo ( $monitor->Type() ) ?>';
-var monitorRefresh = '<?php echo ( $monitor->Refresh() ) ?>';
+var monitorWidth = <?php echo $monitor->ViewWidth() ?>;
+var monitorHeight = <?php echo $monitor->ViewHeight() ?>;
+var monitorUrl = '<?php echo $monitor->UrlToIndex() ?>';
+var monitorType = '<?php echo $monitor->Type() ?>';
+var monitorRefresh = '<?php echo $monitor->Refresh() ?>';
+var monitorStreamReplayBuffer = <?php echo $monitor->StreamReplayBuffer() ?>;
 
 var scale = '<?php echo $scale ?>';
 
@@ -63,11 +70,13 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
 var canPlayPauseAudio = Browser.ie;
 
-<?php if ( $monitor->CanMoveMap() ) { ?>
+<?php 
+  $control = $monitor->Control();
+  if ( $control->CanMoveMap() ) { ?>
 var imageControlMode = "moveMap";
-<?php } elseif ( $monitor->CanMoveRel() ) { ?>
+<?php } elseif ( $control->CanMoveRel() ) { ?>
 var imageControlMode = "movePseudoMap";
-<?php } elseif ( $monitor->CanMoveCon() ) { ?>
+<?php } elseif ( $control->CanMoveCon() ) { ?>
 var imageControlMode = "moveConMap";
 <?php } else { ?>
 var imageControlMode = null;
diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 8ed5d4544..22c7689cb 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -1,3 +1,7 @@
+var requestQueue = new Request.Queue({
+  concurrent: monitorData.length,
+  stopOnFailure: false
+});
 function validateForm( form ) {
   var errors = new Array();
   if ( selfIntersecting ) {
@@ -48,13 +52,13 @@ function validateForm( form ) {
     }
   }
   if ( errors.length ) {
-    alert( errors.join( "\n" ) );
+    alert(errors.join("\n"));
     return false;
   }
   return true;
 }
 
-function submitForm( form ) {
+function submitForm(form) {
   form.elements['newZone[AlarmRGB]'].value = (form.newAlarmRgbR.value<<16)|(form.newAlarmRgbG.value<<8)|form.newAlarmRgbB.value;
   form.elements['newZone[NumCoords]'].value = zone['Points'].length;
   form.elements['newZone[Coords]'].value = getCoordString();
@@ -175,16 +179,25 @@ function applyPreset() {
   }
 }
 
-function toPixels( field, maxValue ) {
+function toPixels(field, maxValue) {
   if ( field.value != '' ) {
     field.value = Math.round((field.value*maxValue)/100);
+    if ( field.value > maxValue ) field.value = maxValue;
   }
+  field.setAttribute('step', 1);
+  field.setAttribute('max', maxValue);
 }
 
-function toPercent( field, maxValue ) {
+// maxValue is the max Pixels value which is normally the max area
+function toPercent(field, maxValue) {
   if ( field.value != '' ) {
     field.value = Math.round((100*100*field.value)/maxValue)/100;
+    if ( field.value > 100 ) {
+      field.value = 100;
+    }
   }
+  field.setAttribute('step', 0.01);
+  field.setAttribute('max', 100);
 }
 
 function applyZoneUnits() {
@@ -193,62 +206,77 @@ function applyZoneUnits() {
   var form = document.zoneForm;
   if ( form.elements['newZone[Units]'].value == 'Pixels' ) {
     form.elements['newZone[TempArea]'].value = area;
-    toPixels( form.elements['newZone[MinAlarmPixels]'], area );
-    toPixels( form.elements['newZone[MaxAlarmPixels]'], area );
-    toPixels( form.elements['newZone[MinFilterPixels]'], area );
-    toPixels( form.elements['newZone[MaxFilterPixels]'], area );
-    toPixels( form.elements['newZone[MinBlobPixels]'], area );
-    toPixels( form.elements['newZone[MaxBlobPixels]'], area );
+    toPixels(form.elements['newZone[MinAlarmPixels]'], area);
+    toPixels(form.elements['newZone[MaxAlarmPixels]'], area);
+    toPixels(form.elements['newZone[MinFilterPixels]'], area);
+    toPixels(form.elements['newZone[MaxFilterPixels]'], area);
+    toPixels(form.elements['newZone[MinBlobPixels]'], area);
+    toPixels(form.elements['newZone[MaxBlobPixels]'], area);
   } else {
-    form.elements['newZone[TempArea]'].value = Math.round( area/monitorArea * 100 );
-    toPercent( form.elements['newZone[MinAlarmPixels]'], area );
-    toPercent( form.elements['newZone[MaxAlarmPixels]'], area );
-    toPercent( form.elements['newZone[MinFilterPixels]'], area );
-    toPercent( form.elements['newZone[MaxFilterPixels]'], area );
-    toPercent( form.elements['newZone[MinBlobPixels]'], area );
-    toPercent( form.elements['newZone[MaxBlobPixels]'], area );
+    form.elements['newZone[TempArea]'].value = Math.round(area/monitorArea * 100);
+    toPercent(form.elements['newZone[MinAlarmPixels]'], area);
+    toPercent(form.elements['newZone[MaxAlarmPixels]'], area);
+    toPercent(form.elements['newZone[MinFilterPixels]'], area);
+    toPercent(form.elements['newZone[MaxFilterPixels]'], area);
+    toPercent(form.elements['newZone[MinBlobPixels]'], area);
+    toPercent(form.elements['newZone[MaxBlobPixels]'], area);
   }
 }
 
-function limitRange( field, minValue, maxValue ) {
+function limitRange(field, minValue, maxValue) {
   if ( field.value != '' ) {
-    field.value = constrainValue( parseInt(field.value), parseInt(minValue), parseInt(maxValue) );
+    field.value = constrainValue(
+        parseInt(field.value),
+        parseInt(minValue),
+        parseInt(maxValue)
+    );
   }
 }
 
-function limitFilter( field ) {
+function limitRangeToUnsignedByte(field) {
+  if ( field.value != '' ) {
+    field.value = constrainValue(parseInt(field.value), 0, 255);
+  }
+}
+
+function limitFilter(field) {
   field.value = (Math.floor((field.value-1)/2)*2) + 1;
   field.value = constrainValue(parseInt(field.value), 3, 15);
 }
 
-function limitArea( field ) {
+function limitArea(field) {
   var minValue = 0;
   var maxValue = zone.Area;
-  if ( document.zoneForm.elements['newZone[Units]'].value == "Percent" ) {
+  if ( document.zoneForm.elements['newZone[Units]'].value == 'Percent' ) {
     maxValue = 100;
   }
-  limitRange( field, minValue, maxValue );
+  limitRange(field, minValue, maxValue);
 }
 
-function highlightOn( index ) {
-  $('row'+index).addClass( 'highlight' );
-  $('point'+index).addClass( 'highlight' );
+function highlightOn(index) {
+  $('row'+index).addClass('highlight');
+  $('point'+index).addClass('highlight');
 }
 
-function highlightOff( index ) {
-  $('row'+index).removeClass( 'highlight' );
-  $('point'+index).removeClass( 'highlight' );
+function highlightOff(index) {
+  row = $('row'+index);
+  if ( row ) {
+    row.removeClass('highlight');
+  } else {
+    console.log("No row for index " + index);
+  }
+  $('point'+index).removeClass('highlight');
 }
 
-function setActivePoint( index ) {
-  highlightOff( index );
-  $('row'+index).addClass( 'active' );
-  $('point'+index).addClass( 'active' );
+function setActivePoint(index) {
+  highlightOff(index);
+  $('row'+index).addClass('active');
+  $('point'+index).addClass('active');
 }
 
-function unsetActivePoint( index ) {
-  $('row'+index).removeClass( 'active' );
-  $('point'+index).removeClass( 'active' );
+function unsetActivePoint(index) {
+  $('row'+index).removeClass('active');
+  $('point'+index).removeClass('active');
 }
 
 function getCoordString() {
@@ -256,28 +284,33 @@ function getCoordString() {
   for ( var i = 0; i < zone['Points'].length; i++ ) {
     coords[coords.length] = zone['Points'][i].x+','+zone['Points'][i].y;
   }
-  return ( coords.join( " " ) );
+  return coords.join(' ');
 }
 
 function updateZoneImage() {
+  var imageFrame = $('imageFrame');
+  var style = imageFrame.currentStyle || window.getComputedStyle(imageFrame);
+
+  scale = (imageFrame.clientWidth - ( style.paddingLeft.toInt() + style.paddingRight.toInt() )) / maxX;
   var SVG = $('zoneSVG');
   var Poly = $('zonePoly');
   Poly.points.clear();
   for ( var i = 0; i < zone['Points'].length; i++ ) {
     var Point = SVG.createSVGPoint();
     Point.x = zone['Points'][i].x;
-    Point.y = zone['Points'][i].y;
-    Poly.points.appendItem( Point );
+    //+ 2*padding_left;
+    Point.y = zone['Points'][i].y;// + 2*padding_top;
+    Poly.points.appendItem(Point);
   }
 }
 
-function fixActivePoint( index ) {
-  updateActivePoint( index );
-  unsetActivePoint( index );
+function fixActivePoint(index) {
+  updateActivePoint(index);
+  unsetActivePoint(index);
   updateZoneImage();
 }
 
-function constrainValue( value, loVal, hiVal ) {
+function constrainValue(value, loVal, hiVal) {
   if ( value < loVal ) {
     return loVal;
   }
@@ -287,45 +320,59 @@ function constrainValue( value, loVal, hiVal ) {
   return value;
 }
 
-function updateActivePoint( index ) {
+function updateActivePoint(index) {
   var point = $('point'+index);
-  var x = constrainValue( point.getStyle( 'left' ).toInt(), 0, maxX );
-  var y = constrainValue( point.getStyle( 'top' ).toInt(), 0, maxY );
+  var imageFrame = $('imageFrame');
+  var style = imageFrame.currentStyle || window.getComputedStyle(imageFrame);
+  var padding_left = style.paddingLeft.toInt();
+  var padding_top = style.paddingTop.toInt();
 
-  $('newZone[Points]['+index+'][x]').value = x;
-  $('newZone[Points]['+index+'][y]').value = y;
-  zone['Points'][index].x = x;
-  zone['Points'][index].y = y;
+  scale = (imageFrame.clientWidth - ( style.paddingLeft.toInt() + style.paddingRight.toInt() )) / maxX;
+  var left = point.getStyle('left').toInt();
+
+  if ( left < padding_left ) {
+    point.setStyle('left', style.paddingLeft);
+    left = padding_left.toInt();
+  }
+  var top = point.getStyle('top').toInt();
+  if ( top < padding_top ) {
+    point.setStyle('top', style.paddingTop);
+    top = padding_top;
+  }
+
+  var x = constrainValue(Math.ceil(left / scale)-Math.ceil(padding_left/scale), 0, maxX);
+  var y = constrainValue(Math.ceil(top / scale)-Math.ceil(padding_top/scale), 0, maxY);
+
+  zone['Points'][index].x = $('newZone[Points]['+index+'][x]').value = x;
+  zone['Points'][index].y = $('newZone[Points]['+index+'][y]').value = y;
   var Point = $('zonePoly').points.getItem(index);
-  Point.x =x;
-  Point.y =y;
+  Point.x = x;
+  Point.y = y;
   updateArea();
-}
+} // end function updateActivePoint(index)
 
-function addPoint( index ) {
+function addPoint(index) {
   var nextIndex = index+1;
   if ( index >= (zone['Points'].length-1) ) {
     nextIndex = 0;
   }
+
   var newX = parseInt(Math.round((zone['Points'][index]['x']+zone['Points'][nextIndex]['x'])/2));
   var newY = parseInt(Math.round((zone['Points'][index]['y']+zone['Points'][nextIndex]['y'])/2));
   if ( nextIndex == 0 ) {
     zone['Points'][zone['Points'].length] = {'x': newX, 'y': newY};
   } else {
-    zone['Points'].splice( nextIndex, 0, {'x': newX, 'y': newY} );
+    zone['Points'].splice(nextIndex, 0, {'x': newX, 'y': newY});
   }
   drawZonePoints();
-  // drawZonePoints calls updateZoneImage
-  //updateZoneImage();
-  //setActivePoint( nextIndex );
 }
 
-function delPoint( index ) {
-  zone['Points'].splice( index, 1 );
+function delPoint(index) {
+  zone['Points'].splice(index, 1);
   drawZonePoints();
 }
 
-function limitPointValue( point, loVal, hiVal ) {
+function limitPointValue(point, loVal, hiVal) {
   point.value = constrainValue(point.value, loVal, hiVal);
 }
 
@@ -339,42 +386,45 @@ function updateArea( ) {
   } else if ( form.elements['newZone[Units]'].value == 'Pixels' ) {
     form.elements['newZone[TempArea]'].value = area;
   } else {
-    alert("Unknown units: " + form.elements['newZone[Units]'].value);
+    alert('Unknown units: ' + form.elements['newZone[Units]'].value);
   }
 }
 
-function updateX( index ) {
-  limitPointValue( $('newZone[Points]['+index+'][x]'), 0, maxX );
+function updateX(input) {
+  index = input.getAttribute('data-point-index');
+
+  limitPointValue(input, 0, maxX);
 
   var point = $('point'+index);
-  var x = $('newZone[Points]['+index+'][x]').get('value');
+  var x = input.value;
 
-  point.setStyle( 'left', x+'px' );
+  point.setStyle('left', x+'px');
   zone['Points'][index].x = x;
   var Point = $('zonePoly').points.getItem(index);
   Point.x = x;
   updateArea();
 }
 
-function updateY( index ) {
-  limitPointValue( $('newZone[Points]['+index+'][y]'), 0, maxY );
+function updateY(input) {
+  index = input.getAttribute('data-point-index');
+  limitPointValue(input, 0, maxY);
 
   var point = $('point'+index);
-  var y = $('newZone[Points]['+index+'][y]').get('value');
+  var y = input.value;
 
-  point.setStyle( 'top', y+'px' );
+  point.setStyle('top', y+'px');
   zone['Points'][index].y = y;
   var Point = $('zonePoly').points.getItem(index);
   Point.y = y;
   updateArea();
 }
 
-function saveChanges( element ) {
+function saveChanges(element) {
   var form = element.form;
   if ( validateForm(form) ) {
     submitForm(form);
     if ( form.elements['newZone[Type]'].value == 'Privacy' ) {
-      alert( 'Capture process for this monitor will be restarted for the Privacy zone changes to take effect.' );
+      alert('Capture process for this monitor will be restarted for the Privacy zone changes to take effect.');
     }
     return true;
   }
@@ -382,286 +432,124 @@ function saveChanges( element ) {
 }
 
 function drawZonePoints() {
-  $('imageFrame').getElements( 'div.zonePoint' ).each( function( element ) {
-    element.destroy();
-  } );
+  var imageFrame = $('imageFrame');
+  imageFrame.getElements('.zonePoint').each(
+      function(element) {
+        element.destroy();
+      });
+  var style = imageFrame.currentStyle || window.getComputedStyle(imageFrame);
+  scale = (imageFrame.clientWidth - ( style.paddingLeft.toInt() + style.paddingRight.toInt() )) / maxX;
+  console.log("Scale = width: " + imageFrame.clientWidth);
+
   for ( var i = 0; i < zone['Points'].length; i++ ) {
-    var div = new Element( 'div', {
+    console.log("scale: " + scale + " x " + zone['Points'][i].x + " = " + Math.round(zone['Points'][i].x * scale));
+    var div = new Element('div', {
       'id': 'point'+i,
+      'data-point-index': i,
       'class': 'zonePoint',
       'title': 'Point '+(i+1),
       'styles': {
-        'left': zone['Points'][i].x,
-        'top': zone['Points'][i].y
+        'left': (Math.round(zone['Points'][i].x * scale) + style.paddingLeft.toInt())+"px",
+        'top': ((zone['Points'][i].y * scale).toInt() + style.paddingTop.toInt()) +"px"
       }
-    } );
-    div.addEvent( 'mouseover', highlightOn.pass( i ) );
-    div.addEvent( 'mouseout', highlightOff.pass( i ) );
-    div.inject( $('imageFrame') );
+    });
+    div.addEvent('mouseover', highlightOn.pass(i));
+    div.addEvent('mouseout', highlightOff.pass(i));
+    div.inject(imageFrame);
     div.makeDraggable( {
-      'container': $('imageFrame'),
-      'onStart': setActivePoint.pass( i ),
-      'onComplete': fixActivePoint.pass( i ),
-      'onDrag': updateActivePoint.pass( i )
+      'container': imageFrame,
+      'onStart': setActivePoint.pass(i),
+      'onComplete': fixActivePoint.pass(i),
+      'onDrag': updateActivePoint.pass(i)
     } );
-  }
+  } // end foreach point
 
-  var tables = $('zonePoints').getElements( 'table' );
-  tables.each( function( table ) {
-    table.getElement( 'tbody' ).empty();
+  var tables = $('zonePoints').getElement('table').getElements('table');
+  tables.each( function(table) {
+    table.getElement('tbody').empty();
   } );
+
   for ( var i = 0; i < zone['Points'].length; i++ ) {
-    var row = new Element( 'tr', {'id': 'row'+i} );
-    row.addEvents( {'mouseover': highlightOn.pass( i ), 'mouseout': highlightOff.pass( i )} );
-    var cell = new Element( 'td' );
-    cell.set( 'text', i+1 );
-    cell.inject( row );
+    var row;
+    row = new Element('tr', {'id': 'row'+i});
+    row.addEvent('mouseover', highlightOn.pass(i));
+    row.addEvent('mouseout', highlightOff.pass(i));
+    //row.onmouseover = highlightOn.pass(i)
+    //row.onmouseout = window['highlightOff'].bind(div, div);
+    var cell = new Element('td');
+    cell.set('text', i+1);
+    cell.inject(row);
 
-    cell = new Element( 'td' );
-    var input = new Element( 'input', {'id': 'newZone[Points]['+i+'][x]', 'name': 'newZone[Points]['+i+'][x]', 'value': zone['Points'][i].x, 'size': 5} );
-    input.addEvent( 'input', updateX.pass( i ) );
-    input.inject( cell );
-    cell.inject( row );
+    cell = new Element('td');
+    var input = new Element('input', {
+      'id': 'newZone[Points]['+i+'][x]',
+      'name': 'newZone[Points]['+i+'][x]',
+      'value': zone['Points'][i].x,
+      'type': 'number',
+      'class': 'ZonePoint',
+      'min': '0',
+      'max': maxX,
+      'data-point-index': i
+    });
+    input.oninput = window['updateX'].bind(input, input);
+    input.inject(cell);
+    cell.inject(row);
 
-    cell = new Element( 'td' );
-    input = new Element( 'input', {'id': 'newZone[Points]['+i+'][y]', 'name': 'newZone[Points]['+i+'][y]', 'value': zone['Points'][i].y, 'size': 5} );
-    input.addEvent( 'input', updateY.pass( i ) );
-    input.inject( cell );
-    cell.inject( row );
+    cell = new Element('td');
+    input = new Element('input', {
+      'id': 'newZone[Points]['+i+'][y]',
+      'name': 'newZone[Points]['+i+'][y]',
+      'value': zone['Points'][i].y,
+      'type': 'number',
+      'class': 'ZonePoint',
+      'min': '0',
+      'max': maxY,
+      'data-point-index': i
+    } );
+    input.oninput = window['updateY'].bind(input, input);
+    input.inject(cell);
+    cell.inject(row);
 
-    cell = new Element( 'td' );
-    new Element( 'button', {
+    cell = new Element('td');
+    new Element('button', {
       'type': 'button',
       'events': {'click': addPoint.pass(i)}
-    }).set( 'text', '+' ).inject( cell );
+    }).set('text', '+').inject(cell);
     if ( zone['Points'].length > 3 ) {
       cell.appendText(' ');
-      new Element( 'button', {
+      new Element('button', {
         'id': 'delete'+i,
         'type': 'button',
         'events': {'click': delPoint.pass(i)}
-      } ).set( 'text', '-' ).inject( cell );
+      }).set('text', '-').inject(cell);
     }
-    cell.inject( row );
+    cell.inject(row);
 
-    row.inject( tables[i%tables.length].getElement( 'tbody' ) );
-  }
+    row.inject(tables[i%tables.length].getElement('tbody'));
+  } // end foreach point
   // Sets up the SVG polygon
   updateZoneImage();
 }
 
-//
-// Imported from watch.js and modified for new zone edit view
-//
-
-var alarmState = STATE_IDLE;
-var lastAlarmState = STATE_IDLE;
-
-function setAlarmState( currentAlarmState ) {
-  alarmState = currentAlarmState;
-
-  var stateClass = "";
-  if ( alarmState == STATE_ALARM ) {
-    stateClass = "alarm";
-  } else if ( alarmState == STATE_ALERT ) {
-    stateClass = "alert";
+function streamCmdPause() {
+  for ( var i = 0, length = monitors.length; i < length; i++ ) {
+    monitors[i].pause();
   }
-  $('stateValue').set( 'text', stateStrings[alarmState] );
-  if ( stateClass ) {
-    $('stateValue').setProperty( 'class', stateClass );
-  } else {
-    $('stateValue').removeProperty( 'class' );
-  }
-
-  var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
-  var wasAlarmed = ( lastAlarmState == STATE_ALARM || lastAlarmState == STATE_ALERT );
-
-  var newAlarm = ( isAlarmed && !wasAlarmed );
-  var oldAlarm = ( !isAlarmed && wasAlarmed );
-
-  if ( newAlarm ) {
-    if ( SOUND_ON_ALARM ) {
-      // Enable the alarm sound
-      if ( !canPlayPauseAudio ) {
-        $('alarmSound').removeClass( 'hidden' );
-      } else {
-        $('MediaPlayer').Play();
-      }
-    }
-  }
-  if ( SOUND_ON_ALARM ) {
-    if ( oldAlarm ) {
-      // Disable alarm sound
-      if ( !canPlayPauseAudio ) {
-        $('alarmSound').addClass( 'hidden' );
-      } else {
-        $('MediaPlayer').Stop();
-      }
-    }
-  }
-  lastAlarmState = alarmState;
+  document.getElementById('pauseBtn').style.display = 'none';
+  document.getElementById('playBtn').style.display = 'inline';
 }
 
-var streamCmdParms = "view=request&request=stream&connkey="+connKey;
-if ( auth_hash ) {
-  streamCmdParms += '&auth='+auth_hash;
-}
-var streamCmdReq = new Request.JSON( {
-  url: monitorUrl,
-  method: 'get',
-  timeout: AJAX_TIMEOUT,
-  link: 'cancel',
-  onSuccess: getStreamCmdResponse
-} );
-var streamCmdTimer = null;
-
-var streamStatus;
-
-function getStreamCmdResponse( respObj, respText ) {
-  watchdogOk("stream");
-  if ( streamCmdTimer ) {
-    streamCmdTimer = clearTimeout( streamCmdTimer );
-  }
-
-  if ( respObj.result == 'Ok' ) {
-    streamStatus = respObj.status;
-    $('fpsValue').set( 'text', streamStatus.fps );
-
-    setAlarmState( streamStatus.state );
-
-    if ( streamStatus.paused == true ) {
-      streamCmdPause( false );
-    } else if ( streamStatus.delayed == true && streamStatus.rate == 1 ) {
-      streamCmdPlay( false );
-    }
-  } else {
-    checkStreamForErrors("getStreamCmdResponse", respObj);//log them
-    if ( ! streamPause ) {
-      // Try to reload the image stream.
-      var streamImg = $('liveStream'+monitorId);
-      if ( streamImg ) {
-        streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-      }
-    }
-  }
-
-  if ( ! streamPause ) {
-    var streamCmdTimeout = statusRefreshTimeout;
-    if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
-      streamCmdTimeout = streamCmdTimeout/5;
-    }
-    streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout );
+function streamCmdPlay() {
+  for ( var i = 0, length = monitors.length; i < length; i++ ) {
+    monitors[i].play();
   }
+  document.getElementById('playBtn').style.display = 'none';
+  document.getElementById('pauseBtn').style.display = 'inline';
 }
 
-var streamPause = false;
-
-function streamCmdPauseToggle() {
-  if ( streamPause == true ) {
-    streamCmdPlay( true );
-    streamPause = false;
-    document.getElementById("pauseBtn").value = pauseString;
-  } else {
-    streamCmdPause( true );
-    streamPause = true;
-    document.getElementById("pauseBtn").value = playString;
-  }
-}
-
-function streamCmdPause( action ) {
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_PAUSE );
-  }
-}
-
-function streamCmdPlay( action ) {
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_PLAY );
-  }
-}
-
-function streamCmdStop( action ) {
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_STOP );
-  }
-}
-
-function streamCmdQuery() {
-  streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY );
-}
-
-var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
-if ( auth_hash ) {
-  statusCmdParms += '&auth='+auth_hash;
-}
-var statusCmdReq = new Request.JSON( {
-  url: monitorUrl,
-  method: 'get',
-  data: statusCmdParms,
-  timeout: AJAX_TIMEOUT,
-  link: 'cancel',
-  onSuccess: getStatusCmdResponse
-} );
-var statusCmdTimer = null;
-
-function getStatusCmdResponse( respObj, respText ) {
-  watchdogOk("status");
-  if ( statusCmdTimer ) {
-    statusCmdTimer = clearTimeout( statusCmdTimer );
-  }
-
-  if ( respObj.result == 'Ok' ) {
-    $('fpsValue').set( 'text', respObj.monitor.FrameRate );
-    setAlarmState( respObj.monitor.Status );
-  } else {
-    checkStreamForErrors("getStatusCmdResponse", respObj);
-  }
-
-  if ( ! streamPause ) {
-    var statusCmdTimeout = statusRefreshTimeout;
-    if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
-      statusCmdTimeout = statusCmdTimeout/5;
-    }
-    statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout );
-  }
-}
-
-function statusCmdQuery() {
-  statusCmdReq.send();
-}
-
-function fetchImage( streamImage ) {
-  streamImage.src = streamImage.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-}
-
-function appletRefresh() {
-  if ( streamStatus && (!streamStatus.paused && !streamStatus.delayed) ) {
-    var streamImg = $('liveStream');
-    var parent = streamImg.getParent();
-    streamImg.dispose();
-    streamImg.inject( parent );
-    if ( appletRefreshTime ) {
-      appletRefresh.delay( appletRefreshTime*1000 );
-    }
-  } else {
-    appletRefresh.delay( 15*1000 ); //if we are paused or delayed check every 15 seconds if we are live yet...
-  }
-}
-
-var watchdogInactive = {
-  'stream': false,
-  'status': false
-};
-
-var watchdogFunctions = {
-  'stream': streamCmdQuery,
-  'status': statusCmdQuery
-};
-
 //Make sure the various refreshes are still taking effect
-function watchdogCheck( type ) {
+function watchdogCheck(type) {
   if ( watchdogInactive[type] ) {
-    console.log( "Detected streamWatch of type: " + type + " stopped, restarting" );
     watchdogFunctions[type]();
     watchdogInactive[type] = false;
   } else {
@@ -669,9 +557,14 @@ function watchdogCheck( type ) {
   }
 }
 
-function watchdogOk( type ) {
+function watchdogOk(type) {
   watchdogInactive[type] = false;
 }
+function presetSelectorBlur() {
+  this.selectedIndex = 0;
+}
+
+var monitors = new Array();
 
 function initPage() {
   var form = document.zoneForm;
@@ -679,19 +572,59 @@ function initPage() {
   //form.elements['newZone[Name]'].disabled = true;
   //form.elements['newZone[Type]'].disabled = true;
   form.presetSelector.disabled = true;
+  form.presetSelector.onblur = window['presetSelectorBlur'].bind(form.presetSelector, form.presetSelector);
   //form.elements['newZone[Units]'].disabled = true;
-  form.newAlarmRgbR.disabled = true;
-  form.newAlarmRgbG.disabled = true;
-  form.newAlarmRgbB.disabled = true;
-  form.elements['newZone[CheckMethod]'].disabled = true;
-  form.elements['newZone[MinPixelThreshold]'].disabled = true;
-  form.elements['newZone[MaxPixelThreshold]'].disabled = true;
-  form.elements['newZone[MinAlarmPixels]'].disabled = true;
-  form.elements['newZone[MaxAlarmPixels]'].disabled = true;
-  form.elements['newZone[FilterX]'].disabled = true;
-  form.elements['newZone[FilterY]'].disabled = true;
-  form.elements['newZone[MinFilterPixels]'].disabled = true;
-  form.elements['newZone[MaxFilterPixels]'].disabled = true;
+  if ( CheckMethod = form.elements['newZone[CheckMethod]'] ) {
+    CheckMethod.disabled = true;
+    CheckMethod.onchange = window['applyCheckMethod'].bind(CheckMethod, CheckMethod);
+  }
+
+  [
+    'newZone[MinPixelThreshold]',
+    'newZone[MaxPixelThreshold]',
+    'newAlarmRgbR',
+    'newAlarmRgbG',
+    'newAlarmRgbB',
+  ].forEach(
+      function(element_name, index) {
+        var el = form.elements[element_name];
+        if ( el ) {
+          el.oninput = window['limitRangeToUnsignedByte'].bind(el, el);
+          el.disabled = true;
+        } else {
+          console.error("Element " + element_name + " not found in zone edit form");
+        }
+      });
+  [
+    'newZone[FilterX]',
+    'newZone[FilterY]'
+  ].forEach(
+      function(element_name, index) {
+        var el = form.elements[element_name];
+        if ( el ) {
+          el.oninput = window['limitFilter'].bind(el, el);
+          el.disabled = true;
+        } else {
+          console.error("Element " + element_name + " not found in zone edit form");
+        }
+      }
+  );
+  [
+    'newZone[MinAlarmPixels]',
+    'newZone[MaxAlarmPixels]',
+    'newZone[MinFilterPixels]',
+    'newZone[MaxFilterPixels]'
+  ].forEach(function(element_name, index) {
+    var el = form.elements[element_name];
+    if ( el ) {
+      el.oninput = window['limitArea'].bind(el, el);
+      el.disabled = true;
+    } else {
+      console.error("Element " + element_name + " not found in zone edit form");
+    }
+  }
+  );
+
   form.elements['newZone[MinBlobPixels]'].disabled = true;
   form.elements['newZone[MaxBlobPixels]'].disabled = true;
   form.elements['newZone[MinBlobs]'].disabled = true;
@@ -705,39 +638,64 @@ function initPage() {
   }
 
   applyCheckMethod();
+
+  $('pauseBtn').onclick = function() {
+    streamCmdPause();
+  };
+  $('playBtn').style.display = 'none'; // hide pause initially
+  $('playBtn').onclick = function() {
+    streamCmdPlay();
+  };
+
+  if ( el = $('saveBtn') ) {
+    el.onclick = window['saveChanges'].bind(el, el);
+  }
+  if ( el = $('cancelBtn') ) {
+    el.onclick = function() {
+      refreshParentWindow();
+      closeWindow();
+    };
+  }
+
+  for ( var i = 0, length = monitorData.length; i < length; i++ ) {
+    monitors[i] = new MonitorStream(monitorData[i]);
+
+    // Start the fps and status updates. give a random delay so that we don't assault the server
+    var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+    monitors[i].start(delay);
+  }
+
+  document.querySelectorAll('#imageFrame img').forEach(function(el) {
+    el.addEventListener("load", imageLoadEvent, {passive: true});
+  });
+  window.addEventListener("resize", drawZonePoints, {passive: true});
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+} // initPage
+
+function imageLoadEvent() {
+  // We only need this event on the first image load to set dimensions.
+  // Turn it off after it has been called.
+  document.querySelectorAll('#imageFrame img').forEach(function(el) {
+    el.removeEventListener("load", imageLoadEvent, {passive: true});
+  });
   drawZonePoints();
-
-  //
-  // Imported from watch.js and modified for new zone edit view
-  //
-
-  var delay = (Math.random()+0.1)*statusRefreshTimeout;
-  //console.log("Delay for status updates is: " + delay );
-  if ( streamMode == "single" ) {
-    statusCmdTimer = statusCmdQuery.delay( delay );
-    watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
-  } else {
-    streamCmdTimer = streamCmdQuery.delay( delay );
-    watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2);
-  }
-
-  if ( canStreamNative || streamMode == "single" ) {
-    var streamImg = $('imageFrame').getElement('img');
-    if ( !streamImg ) {
-      streamImg = $('imageFrame').getElement('object');
-    }
-    if ( streamMode == "single" ) {
-      streamImg.addEvent( 'click', fetchImage.pass( streamImg ) );
-      fetchImage.pass( streamImg ).periodical( imageRefreshTimeout );
-    }
-  }
-
-  if ( refreshApplet && appletRefreshTime ) {
-    appletRefresh.delay( appletRefreshTime*1000 );
-  }
 }
 
-function Polygon_calcArea( coords ) {
+function Polygon_calcArea(coords) {
   var n_coords = coords.length;
   var float_area = 0.0;
 
@@ -748,7 +706,7 @@ function Polygon_calcArea( coords ) {
   }
   float_area += (coords[n_coords-1].x*coords[0].y - coords[0].x*coords[n_coords-1].y) / 2;
 
-  return Math.round( Math.abs( float_area ) );
+  return Math.round(Math.abs(float_area));
 }
 
-window.addEventListener( 'DOMContentLoaded', initPage );
+window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 069a0de54..9fadea32c 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -1,3 +1,14 @@
+<?php
+  global $presets;
+  global $zone;
+  global $newZone;
+  global $monitor;
+  global $selfIntersecting;
+  global $streamMode;
+  global $connkey;
+  global $streamSrc;
+?>
+
 var presets = new Object();
 <?php
 foreach ( $presets as $preset ) {
@@ -21,7 +32,7 @@ presets[<?php echo $preset['Id'] ?>] = {
     'ExtendAlarmFrames': '<?php echo $preset['ExtendAlarmFrames'] ?>'
 };
 <?php
-}
+} # end foreach preset
 ?>
 
 var zone = {
@@ -44,10 +55,22 @@ zone['Points'][<?php echo $i ?>] = { 'x': <?php echo $newZone['Points'][$i]['x']
 }
 ?>
 
-var maxX = <?php echo $monitor->Width()-1 ?>;
-var maxY = <?php echo $monitor->Height()-1 ?>;
-var monitorArea = <?php echo $monitor->Width() * $monitor->Height() ?>;
-var selfIntersecting = <?php echo $selfIntersecting?'true':'false' ?>;
+var maxX = <?php echo $monitor->ViewWidth()-1 ?>;
+var maxY = <?php echo $monitor->ViewHeight()-1 ?>;
+var monitorArea = <?php echo $monitor->ViewWidth() * $monitor->ViewHeight() ?>;
+
+var monitorData = new Array();
+monitorData[monitorData.length] = {
+  'id': <?php echo $monitor->Id() ?>,
+  'connKey': <?php echo $monitor->connKey() ?>,
+  'width': <?php echo $monitor->ViewWidth() ?>,
+  'height':<?php echo $monitor->ViewHeight() ?>,
+  'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
+  'type': '<?php echo $monitor->Type() ?>',
+  'refresh': '<?php echo $monitor->Refresh() ?>'
+};
+
+var selfIntersecting = <?php echo $selfIntersecting ? 'true' : 'false' ?>;
 
 var selfIntersectingString = '<?php echo addslashes(translate('SelfIntersecting')) ?>';
 var alarmRGBUnsetString = '<?php echo addslashes(translate('AlarmRGBUnset')) ?>';
@@ -65,6 +88,7 @@ var minBlobLtMinFilterString = '<?php echo addslashes(translate('MinBlobLtMinFil
 var minBlobsUnsetString = '<?php echo addslashes(translate('MinBlobsUnset')) ?>';
 var minBlobsLtMaxString = '<?php echo addslashes(translate('MinBlobsLtMax')) ?>';
 
+var deleteString = "<?php echo translate('Delete') ?>";
 //
 // Imported from watch.js.php and modified for new zone edit view
 //
@@ -82,10 +106,6 @@ stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
 stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
 stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 
-var pauseString = "<?php echo translate('Pause') ?>";
-var playString = "<?php echo translate('Play') ?>";
-
-var deleteString = "<?php echo translate('Delete') ?>";
 
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
 var CMD_PLAY = <?php echo CMD_PLAY ?>;
diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
index 3e5306930..a0eec294e 100644
--- a/web/skins/classic/views/js/zones.js
+++ b/web/skins/classic/views/js/zones.js
@@ -1,9 +1,46 @@
-var streamCmdParms = "view=request&request=stream&connkey="+connKey;
-var streamCmdReq = new Request.JSON( {url: monitorUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel'} );
 
-function streamCmdQuit( action ) {
+var requestQueue = new Request.Queue({
+  concurrent: monitorData.length,
+  stopOnFailure: false
+});
+function streamCmdQuit( ) {
   if ( action ) {
     streamCmdReq.send( streamCmdParms+"&command="+CMD_QUIT );
   }
 }
 
+// Manage the Add New Zone button
+function AddNewZone(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
+var monitors = new Array();
+
+function initPage() {
+  for ( var i = 0, length = monitorData.length; i < length; i++ ) {
+    monitors[i] = new MonitorStream(monitorData[i]);
+
+    // Start the fps and status updates. give a random delay so that we don't assault the server
+    var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
+    monitors[i].start(delay);
+  }
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+}
+
+window.addEventListener('DOMContentLoaded', initPage);
+
diff --git a/web/skins/classic/views/js/zones.js.php b/web/skins/classic/views/js/zones.js.php
index 6bd9c402c..180a19d81 100644
--- a/web/skins/classic/views/js/zones.js.php
+++ b/web/skins/classic/views/js/zones.js.php
@@ -1,4 +1,40 @@
-var connKey = '<?php echo $connkey ?>';
-var monitorUrl = '<?php echo ( $monitor->UrlToIndex() ) ?>';
+var monitorData = new Array();
+<?php
+  global $monitors;
+  foreach ( $monitors as $monitor ) {
+?>
+monitorData[monitorData.length] = {
+  'id': <?php echo $monitor->Id() ?>,
+  'connKey': <?php echo $monitor->connKey() ?>,
+  'width': <?php echo $monitor->ViewWidth() ?>,
+  'height':<?php echo $monitor->ViewHeight() ?>,
+  'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
+  'type': '<?php echo $monitor->Type() ?>',
+  'refresh': '<?php echo $monitor->Refresh() ?>'
+};
+<?php
+  }
+?>
+
+var STATE_IDLE = <?php echo STATE_IDLE ?>;
+var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
+var STATE_ALARM = <?php echo STATE_ALARM ?>;
+var STATE_ALERT = <?php echo STATE_ALERT ?>;
+var STATE_TAPE = <?php echo STATE_TAPE ?>;
+
+var stateStrings = new Array();
+stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
+stateStrings[STATE_PREALARM] = "<?php echo translate('Idle') ?>";
+stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
+stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
+stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
+
+
+var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
+var CMD_PLAY = <?php echo CMD_PLAY ?>;
+var CMD_STOP = <?php echo CMD_STOP ?>;
+var CMD_QUERY = <?php echo CMD_QUERY ?>;
 var CMD_QUIT = <?php echo CMD_QUIT ?>;
 
+
+var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index c2ce0262e..8d2e9f293 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -25,122 +25,75 @@ if ( !canView('System') ) {
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('SystemLog') );
+xhtmlHeaders(__FILE__, translate('SystemLog'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
     <div id="header">
-      <table class="table">
-     	  <tr class="row">
-          <td class="col text-center">
-		        <div id="logSummary">
-            <?php echo translate('State') ?>: <span id="logState"></span>/
-            <?php echo translate('Total') ?>: <span id="totalLogs"></span>/
-            <?php echo translate('Available') ?>: <span id="availLogs"></span>/
-            <?php echo translate('Displaying') ?>: <span id="displayLogs"></span>/
-            <?php echo translate('Updated') ?>: <span id="lastUpdate"></span>
-            </div>
-          </td>
-        </tr>
-        <tr class="row">
-	        <td class="col text-center">
-            <div class="btn-group">
-              <button type="button" data-on-click="expandLog"><?php echo translate('More') ?></button>
-              <button type="button" data-on-click="clearLog"><?php echo translate('Clear') ?></button>
-              <button type="button" data-on-click="refreshLog"><?php echo translate('Refresh') ?></button>
-              <button type="button" data-on-click="exportLog"><?php echo translate('Export') ?></button>
-              <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-            </div> <!--btn-->
-          </td>
-        </tr>
-      </table>
+      <div id="logSummary" class="text-center">
+      <?php echo translate('State') ?>: <span id="logState"></span>/
+      <?php echo translate('Total') ?>: <span id="totalLogs"></span>/
+      <?php echo translate('Available') ?>: <span id="availLogs"></span>/
+      <?php echo translate('Displaying') ?>: <span id="displayLogs"></span>/
+      <?php echo translate('Updated') ?>: <span id="lastUpdate"></span>
+      </div>
+      <div class="btn-toolbar justify-content-center py-1">
+        <button type="button" data-on-click="expandLog"><?php echo translate('More') ?></button>
+        <button type="button" data-on-click="clearLog"><?php echo translate('Clear') ?></button>
+        <button type="button" data-on-click="refreshLog"><?php echo translate('Refresh') ?></button>
+        <button type="button" data-on-click="exportLog"><?php echo translate('Export') ?></button>
+        <button type="reset" data-on-click="resetLog"><?php echo translate('Reset') ?></button>
+      </div> <!--btn-->
     </div> <!--header-->
-  <div id="content">
-    <div id="filters">
-
-      <table class="table-condensed">
-        <tr class="row">
-          <td class="col">
-            <?php echo translate('Component') ?>
-            <select class="form-control chosen" id="filter[Component]" data-on-change="filterLog"><option value="">-----</option></select>
-          </td>
-          <td class="col">
-            <?php echo translate('Server') ?>
-            <select class="form-control chosen" id="filter[ServerId]" data-on-change="filterLog"><option value="">-----</option></select>
-          </td>
-          <td class="col">
-            <?php echo translate('Pid') ?>
-            <select class="form-control chosen" id="filter[Pid]" data-on-change="filterLog"><option value="">-----</option></select>
-          </td>
-        </tr>
-        <tr class="row">
-          <td class="col">
-            <?php echo translate('Level') ?>
-            <select class="form-control chosen" id="filter[Level]" data-on-change="filterLog"><option value="">---</option></select>
-          </td>
-          <td class="col">
-            <?php echo translate('File') ?>
-            <select class="form-control chosen" id="filter[File]" data-on-change="filterLog"><option value="">------</option></select>
-          </td>
-          <td  class="col">
-            <?php echo translate('Line') ?>
-            <select class="form-control chosen" id="filter[Line]" data-on-change="filterLog"><option value="">----</option></select>
-          </td>
-        </tr>
-      </table>
-      <button type="reset" data-on-click="resetLog"><?php echo translate('Reset') ?></button>
-    </div>
-    <form name="logForm" method="post" action="?">
-      <input type="hidden" name="view" value="<?php echo $view ?>"/>
-      <table id="logTable" class="major">
-        <thead class="thead-highlight">
-          <tr>
-            <th><?php echo translate('DateTime') ?></th>
-            <th class="table-th-nosort"><?php echo translate('Component') ?></th>
-            <th class="table-th-nosort"><?php echo translate('Server') ?></th>
-            <th class="table-th-nosort"><?php echo translate('Pid') ?></th>
-            <th class="table-th-nosort"><?php echo translate('Level') ?></th>
-            <th class="table-th-nosort"><?php echo translate('Message') ?></th>
-            <th class="table-th-nosort"><?php echo translate('File') ?></th>
-            <th class="table-th-nosort"><?php echo translate('Line') ?></th>
-          </tr>
-        </thead>
-        <tbody>
-        </tbody>
-      </table>
-      <div id="contentButtons">
-      </div>
-    </form>
-  </div>
-</div>
-  <div id="exportLog" class="overlay">
-    <div class="overlayHeader">
-      <div class="overlayTitle"><?php echo translate('ExportLog') ?></div>
-    </div>
-    <div class="overlayBody">
-      <div class="overlayContent">
-        <form id="exportForm" action="" method="post">
-          <fieldset>
-            <legend><?php echo translate('SelectLog') ?></legend>
-            <label for="selectorAll"><?php echo translate('All') ?></label><input type="radio" id="selectorAll" name="selector" value="all"/>
-            <label for="selectorFilter"><?php echo translate('Filter') ?></label><input type="radio" id="selectorFilter" name="selector" value="filter"/>
-            <label for="selectorCurrent"><?php echo translate('Current') ?></label><input type="radio" id="selectorCurrent" name="selector" value="current" title="<?php echo translate('ChooseLogSelection') ?>" data-validators="validate-one-required"/>
-          </fieldset>
-          <fieldset>
-            <legend><?php echo translate('SelectFormat') ?></legend>
-            <label for="formatText">TXT</label><input type="radio" id="formatText" name="format" value="text"/>
-            <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
-            <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
-            <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" title="<?php echo translate('ChooseLogFormat') ?>" class="validate-one-required"/>
-          </fieldset>
-          <div id="exportError">
-            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
-          </div>
-          <button type="button" id="exportButton" value="Export" data-on-click="exportRequest"><?php echo translate('Export') ?></button>
-          <button type="button" value="Cancel" class="overlayCloser"><?php echo translate('Cancel') ?></button>
-        </form>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
+    <div id="content">
+      <form id="logForm" name="logForm" method="post" action="?">
+        <input type="hidden" name="view" value="<?php echo $view ?>"/>
+        <div class="container" id="filters">
+          <div class="row">
+            <div class="col">
+              <label><?php echo translate('Component') ?></label>
+              <select class="form-control chosen" id="filter[Component]" data-on-change="filterLog"><option value="">-----</option></select>
+            </div>
+            <div class="col">
+              <label><?php echo translate('Server') ?></label>
+              <select class="form-control chosen" id="filter[ServerId]" data-on-change="filterLog"><option value="">-----</option></select>
+            </div>
+            <div class="col">
+              <label><?php echo translate('Pid') ?></label>
+              <select class="form-control chosen" id="filter[Pid]" data-on-change="filterLog"><option value="">-----</option></select>
+            </div>
+            <div class="col">
+              <label><?php echo translate('Level') ?></label>
+              <select class="form-control chosen" id="filter[Level]" data-on-change="filterLog"><option value="">---</option></select>
+            </div>
+            <div class="col">
+              <label><?php echo translate('File') ?></label>
+              <select class="form-control chosen" id="filter[File]" data-on-change="filterLog"><option value="">------</option></select>
+            </div>
+            <div class="col">
+              <label><?php echo translate('Line') ?></label>
+              <select class="form-control chosen" id="filter[Line]" data-on-change="filterLog"><option value="">----</option></select>
+            </div>
+          </div><!--row-->
+        </div><!--container-->
+        <table id="logTable" class="major">
+          <thead class="thead-highlight">
+            <tr>
+              <th><?php echo translate('DateTime') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Component') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Server') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Pid') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Level') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Message') ?></th>
+              <th class="table-th-nosort"><?php echo translate('File') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Line') ?></th>
+            </tr>
+          </thead>
+          <tbody>
+          </tbody>
+        </table>
+      </form>
+    </div><!--content-->
+  </div><!--page-->
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/login.php b/web/skins/classic/views/login.php
index 42a4090fc..e08bf91bc 100644
--- a/web/skins/classic/views/login.php
+++ b/web/skins/classic/views/login.php
@@ -1,5 +1,5 @@
 <?php
-xhtmlHeaders(__FILE__, translate('Login') );
+xhtmlHeaders(__FILE__, translate('Login'));
 ?>
 <body>
 <?php echo getNavBarHTML(); ?>
@@ -7,7 +7,6 @@ xhtmlHeaders(__FILE__, translate('Login') );
 		<form class="center-block" name="loginForm" id="loginForm" method="post" action="?">
 			<input type="hidden" name="action" value="login"/>
 			<input type="hidden" name="view" value="login"/>
-			<input type="hidden" name="postLoginQuery" value="<?php echo isset($_SERVER['QUERY_STRING']) ? htmlspecialchars($_SERVER['QUERY_STRING']) : ''?>">
 
 			<div id="loginError" class="hidden alarm" role="alert">
 				<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
@@ -19,24 +18,22 @@ xhtmlHeaders(__FILE__, translate('Login') );
         <h1><i class="material-icons md-36">account_circle</i> <?php echo validHtmlStr(ZM_WEB_TITLE) . ' ' . translate('Login') ?></h1>
 	
 				<label for="inputUsername" class="sr-only"><?php echo translate('Username') ?></label>
-				<input type="text" id="inputUsername" name="username" class="form-control" placeholder="Username" required autofocus autocomplete="username"/>
+				<input type="text" id="inputUsername" name="username" class="form-control" autocapitalize="none" placeholder="Username" required autofocus autocomplete="username"/>
 	
 				<label for="inputPassword" class="sr-only"><?php echo translate('Password') ?></label>
 				<input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required autocomplete="current-password"/>
-	
-				<?php
-				if (defined('ZM_OPT_USE_GOOG_RECAPTCHA') 
-				&& defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY') 
-				&& defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
-				&& ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY)
-				{
-				echo "<div class='g-recaptcha'  data-sitekey='".ZM_OPT_GOOG_RECAPTCHA_SITEKEY."'></div>";
-				} ?>
-	
-				<input class="btn btn-lg btn-primary btn-block" type="submit" value="<?php echo translate('Login') ?>"/>
-
+<?php
+if (
+  defined('ZM_OPT_USE_GOOG_RECAPTCHA') 
+  && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY') 
+  && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
+  && ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY
+) {
+  echo '<div class="g-recaptcha" data-sitekey="'.ZM_OPT_GOOG_RECAPTCHA_SITEKEY.'"></div>
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>';
+} ?>
+				<button class="btn btn-lg btn-primary btn-block" type="submit"><?php echo translate('Login') ?></button>
 			</div>
 		</form>
 	</div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/logout.php b/web/skins/classic/views/logout.php
deleted file mode 100644
index d68bd2b82..000000000
--- a/web/skins/classic/views/logout.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-//
-// ZoneMinder web logout view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Logout') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h1><?php echo validHtmlStr(ZM_WEB_TITLE) . ' ' . translate('Logout') ?></h1>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="action" value="logout"/>
-        <input type="hidden" name="view" value="logout"/>
-        <p><?php echo sprintf( $CLANG['CurrentLogin'], $user['Username'] ) ?></p>
-        <p>
-          <input type="submit" value="<?php echo translate('Logout') ?>"/>
-<?php
-if ( ZM_USER_SELF_EDIT ) {
-  echo makePopupButton('?view=user&uid=' . $user['Id'], 'zmUser', 'user', translate('Config'));
-}
-?>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
-        </p>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index fb10b1b5f..bab87da40 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -21,7 +21,7 @@
 require_once('includes/Server.php');
 require_once('includes/Storage.php');
 
-if ( !canView('Monitors') ) {
+if ( !canEdit('Monitors', empty($_REQUEST['mid'])?0:$_REQUEST['mid']) ) {
   $view = 'error';
   return;
 }
@@ -35,13 +35,13 @@ if ( !$Server ) {
 }
 
 $monitor = null;
-if ( ! empty($_REQUEST['mid']) ) {
-  $monitor = new ZM\Monitor( $_REQUEST['mid'] );
+if ( !empty($_REQUEST['mid']) ) {
+  $monitor = new ZM\Monitor($_REQUEST['mid']);
   if ( $monitor and ZM_OPT_X10 )
     $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']));
 }
-if ( ! $monitor ) {
 
+if ( !$monitor ) {
   $nextId = getTableAutoInc('Monitors');
   if ( isset($_REQUEST['dupId']) ) {
     $monitor = new ZM\Monitor($_REQUEST['dupId']);
@@ -49,86 +49,12 @@ if ( ! $monitor ) {
     if ( ZM_OPT_X10 )
       $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
     $clonedName = $monitor->Name();
-    $monitor->Name(translate('Monitor').'-'.$nextId);
     $monitor->Id(0);
   } else {
     $monitor = new ZM\Monitor();
-    $monitor->set( array(
-          'Id' => 0,
-          'Name' => translate('Monitor').'-'.$nextId,
-          'Function' => 'Mocord',
-          'Enabled' => true,
-          'LinkedMonitors' => '',
-          'Type' => 'Ffmpeg',
-          'Device' => '/dev/video0',
-          'Channel' => '0',
-          'Format' => 0x000000ff,
-          'Protocol' => '',
-          'Method' => '',
-          'Host' => '',
-          'Path' => '',
-          'Options' => '',
-          'Port' => '80',
-          'User' => '',
-          'Pass' => '',
-          'Colours' => 4,
-          'Palette' => 0,
-          'Width' => '',
-          'Height' => '',
-          'Orientation' => '0',
-          'Deinterlacing' => 0,
-          'RTSPDescribe' => 0,
-          'SaveJPEGs' => '0',
-          'VideoWriter' => '1',
-          'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
-          'RecordAudio' => '0',
-          'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
-          'LabelX' => 0,
-          'LabelY' => 0,
-          'LabelSize' => 1,
-          'ImageBufferCount' => 20,
-          'WarmupCount' => 0,
-          'PreEventCount' => 0,
-          'PostEventCount' => 5,
-          'StreamReplayBuffer' => 0,
-          'AlarmFrameCount' => 1,
-          'Controllable' => 0,
-          'ControlId' => '',
-          'ControlType' => 0,
-          'ControlDevice' => '',
-          'ControlAddress' => '',
-          'AutoStopTimeout' => '',
-          'TrackMotion' => 0,
-          'TrackDelay' => '',
-          'ReturnLocation' => -1,
-          'ReturnDelay' => '',
-          'SectionLength' => 600,
-          'MinSectionLength' => 10,
-          'FrameSkip' => 0,
-          'MotionFrameSkip' => 0,
-          'EventPrefix' => 'Event-',
-          'AnalysisFPSLimit' => '',
-          'AnalysisUpdateDelay' => 0,
-          'MaxFPS' => null,
-          'AlarmMaxFPS' => null,
-          'FPSReportInterval' => 100,
-          'RefBlendPerc' => 6,
-          'AlarmRefBlendPerc' => 6,
-          'DefaultRate' => '100',
-          'DefaultScale' => '100',
-          'DefaultCodec' => 'auto',
-          'SignalCheckPoints' => '10',
-          'SignalCheckColour' => '#0000c0',
-          'WebColour' => 'red',
-          'Exif' => '0',
-          'Triggers' => '',
-          'V4LMultiBuffer'  =>  '',
-          'V4LCapturesPerFrame'  =>  1,
-          'ServerId'  =>  'auto',
-          'StorageId'  => '1',
-          'Refresh' => '',
-          ) );
-    } # end if $_REQUEST['dupID']
+  } # end if $_REQUEST['dupID']
+  $monitor->Name(translate('Monitor').'-'.$nextId);
+  $monitor->WebColour(random_colour());
 } # end if $_REQUEST['mid']
 
 if ( ZM_OPT_X10 && empty($x10Monitor) ) {
@@ -142,7 +68,6 @@ if ( ZM_OPT_X10 && empty($x10Monitor) ) {
 function fourcc($a, $b, $c, $d) {
   return ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24);
 }
-
 if ( isset($_REQUEST['newMonitor']) ) {
   # Update the monitor object with whatever has been set so far.
   $monitor->set($_REQUEST['newMonitor']);
@@ -150,8 +75,6 @@ if ( isset($_REQUEST['newMonitor']) ) {
   if ( ZM_OPT_X10 )
     $newX10Monitor = $_REQUEST['newX10Monitor'];
 } else {
-  # FIXME: Triggers in the db is a comma separated string.  Needs to be an array.
-  #$monitor->Triggers()= explode( ',', isset($monitor->Triggers())?$monitor->Triggers:"" );
   if ( ZM_OPT_X10 )
     $newX10Monitor = $x10Monitor;
 }
@@ -168,8 +91,9 @@ if ( !empty($_REQUEST['preset']) ) {
   $preset = dbFetchOne( 'SELECT Type, Device, Channel, Format, Protocol, Method, Host, Port, Path, Width, Height, Palette, MaxFPS, Controllable, ControlId, ControlDevice, ControlAddress, DefaultRate, DefaultScale FROM MonitorPresets WHERE Id = ?', NULL, array($_REQUEST['preset']) );
   foreach ( $preset as $name=>$value ) {
     # Does isset handle NULL's?  I don't think this code is correct.
+    # Icon: It does, but this means we can't set a null value.
     if ( isset($value) ) {
-      $monitor->$name = $value;
+      $monitor->$name($value);
     }
   }
 } # end if preset
@@ -199,7 +123,8 @@ $sourceTypes = array(
     'Libvlc' => translate('Libvlc'),
     'cURL'   => 'cURL (HTTP(S) only)',
     'WebSite'=> 'Web Site',
-    'NVSocket'	=> translate('NVSocket')
+    'NVSocket'	=> translate('NVSocket'),
+    'VNC' => translate('VNC'),
     );
 if ( !ZM_HAS_V4L )
   unset($sourceTypes['Local']);
@@ -246,14 +171,14 @@ unset($httpMethods['jpegTags']);
 
 if ( ZM_HAS_V4L1 ) {
   $v4l1DeviceFormats = array(
-      'PAL'   => 0,
-      'NTSC'  => 1,
-      'SECAM' => 2,
-      'AUTO'  => 3,
-      'FMT4'  => 4,
-      'FMT5'  => 5,
-      'FMT6'  => 6,
-      'FMT7'  => 7
+      0 => 'PAL',
+      1 => 'NTSC',
+      2 => 'SECAM',
+      3 => 'AUTO',
+      4 => 'FMT4',
+      5 => 'FMT5',
+      6 => 'FMT6',
+      7 => 'FMT7'
       );
 
   $v4l1MaxChannels = 15;
@@ -262,48 +187,48 @@ if ( ZM_HAS_V4L1 ) {
     $v4l1DeviceChannels[$i] = $i;
 
   $v4l1LocalPalettes = array(
-      translate('Grey')    => 1,
-      'BGR32'              => 5,
-      'BGR24'              => 4,
-      '*YUYV'              => 8,
-      '*RGB565'            => 3,
-      '*RGB555'            => 6,
-      '*YUV422'            => 7,
-      '*YUV422P'           => 13,
-      '*YUV420P'           => 15
+      1  => translate('Grey'),
+      5  => 'BGR32',
+      4  => 'BGR24',
+      8  => '*YUYV',
+      3  => '*RGB565',
+      6  => '*RGB555',
+      7  => '*YUV422',
+      13 => '*YUV422P',
+      15 => '*YUV420P',
       );
 }
 
 if ( ZM_HAS_V4L2 ) {
   $v4l2DeviceFormats = array(
-      'PAL'         => 0x000000ff,
-      'NTSC'        => 0x0000b000,
-      'PAL B'       => 0x00000001,
-      'PAL B1'      => 0x00000002,
-      'PAL G'       => 0x00000004,
-      'PAL H'       => 0x00000008,
-      'PAL I'       => 0x00000010,
-      'PAL D'       => 0x00000020,
-      'PAL D1'      => 0x00000040,
-      'PAL K'       => 0x00000080,
-      'PAL M'       => 0x00000100,
-      'PAL N'       => 0x00000200,
-      'PAL Nc'      => 0x00000400,
-      'PAL 60'      => 0x00000800,
-      'NTSC M'      => 0x00001000,
-      'NTSC M JP'   => 0x00002000,
-      'NTSC 443'    => 0x00004000,
-      'NTSC M KR'   => 0x00008000,
-      'SECAM B'     => 0x00010000,
-      'SECAM D'     => 0x00020000,
-      'SECAM G'     => 0x00040000,
-      'SECAM H'     => 0x00080000,
-      'SECAM K'     => 0x00100000,
-      'SECAM K1'    => 0x00200000,
-      'SECAM L'     => 0x00400000,
-      'SECAM LC'    => 0x00800000,
-      'ATSC 8 VSB'  => 0x01000000,
-      'ATSC 16 VSB' => 0x02000000,
+    0x000000ff => 'PAL',
+    0x0000b000 => 'NTSC',
+    0x00000001 => 'PAL B',
+    0x00000002 => 'PAL B1',
+    0x00000004 => 'PAL G',
+    0x00000008 => 'PAL H',
+    0x00000010 => 'PAL I',
+    0x00000020 => 'PAL D',
+    0x00000040 => 'PAL D1',
+    0x00000080 => 'PAL K',
+    0x00000100 => 'PAL M',
+    0x00000200 => 'PAL N',
+    0x00000400 => 'PAL Nc',
+    0x00000800 => 'PAL 60',
+    0x00001000 => 'NTSC M',
+    0x00002000 => 'NTSC M JP',
+    0x00004000 => 'NTSC 443',
+    0x00008000 => 'NTSC M KR',
+    0x00010000 => 'SECAM B',
+    0x00020000 => 'SECAM D',
+    0x00040000 => 'SECAM G',
+    0x00080000 => 'SECAM H',
+    0x00100000 => 'SECAM K',
+    0x00200000 => 'SECAM K1',
+    0x00400000 => 'SECAM L',
+    0x00800000 => 'SECAM LC',
+    0x01000000 => 'ATSC 8 VSB',
+    0x02000000 => 'ATSC 16 VSB',
       );
 
   $v4l2MaxChannels = 31;
@@ -312,57 +237,58 @@ if ( ZM_HAS_V4L2 ) {
     $v4l2DeviceChannels[$i] = $i;
 
   $v4l2LocalPalettes = array(
-      'Auto' => 0, /* Automatic palette selection */
+      0 => 'Auto', /* Automatic palette selection */
 
-      /*      Pixel format         FOURCC                        depth  Description  */
-      translate('Grey') =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
-      'BGR32' =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
-      'RGB32' =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
-      'BGR24' =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
-      'RGB24' =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
-      '*YUYV' =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
+      /*  FOURCC              =>  Pixel format         depth  Description  */
+      fourcc('G','R','E','Y') =>  translate('Grey'), /*  8  Greyscale     */
+      fourcc('B','G','R','4') => 'BGR32', /* 32  BGR-8-8-8-8   */
+      fourcc('R','G','B','4') => 'RGB32', /* 32  RGB-8-8-8-8   */
+      fourcc('B','G','R','3') => 'BGR24', /* 24  BGR-8-8-8     */
+      fourcc('R','G','B','3') => 'RGB24', /* 24  RGB-8-8-8     */
+      fourcc('Y','U','Y','V') => '*YUYV', /* 16  YUV 4:2:2     */
 
       /* compressed formats */
-      '*JPEG' =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
-      '*MJPEG' =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
-      //'DV' =>       fourcc('d','v','s','d'), /* 1394          */
-      //'MPEG' =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
+      fourcc('J','P','E','G') => '*JPEG',  /* JFIF JPEG     */
+      fourcc('M','J','P','G') => '*MJPEG', /* Motion-JPEG   */
+      // fourcc('d','v','s','d') => 'DV',  /* 1394          */
+      // fourcc('M','P','E','G') => 'MPEG', /* MPEG-1/2/4    */
 
-      //'RGB332' =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
-      '*RGB444' =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
-      '*RGB555' =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
-      '*RGB565' =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
-      //'RGB555X' =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
-      //'RGB565X' =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
-      //'Y16' =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
-      //'PAL8' =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
-      //'YVU410' =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
-      //'YVU420' =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
+      //
+      fourcc('R','G','B','1') =>  'RGB332', /*  8  RGB-3-3-2     */
+      fourcc('R','4','4','4') => '*RGB444', /* 16  xxxxrrrr ggggbbbb */
+      fourcc('R','G','B','O') => '*RGB555', /* 16  RGB-5-5-5     */
+      fourcc('R','G','B','P') => '*RGB565', /* 16  RGB-5-6-5     */
+      // fourcc('R','G','B','Q') => 'RGB555X', /* 16  RGB-5-5-5 BE  */
+      // fourcc('R','G','B','R') => 'RGB565X', /* 16  RGB-5-6-5 BE  */
+      // fourcc('Y','1','6','')  => 'Y16',     /* 16  Greyscale     */
+      // fourcc('P','A','L','8') => 'PAL8',    /*  8  8-bit palette */
+      // fourcc('Y','V','U','9') => 'YVU410',  /*  9  YVU 4:1:0     */
+      // fourcc('Y','V','1','2') => 'YVU420',  /* 12  YVU 4:2:0     */
 
-      '*UYVY' =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
-      '*YUV422P' =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
-      '*YUV411P' =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
-      //'Y41P' =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
-      '*YUV444' =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
-      //'YUV555' =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
-      //'YUV565' =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
-      //'YUV32' =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
+      fourcc('U','Y','V','Y') => '*UYVY',      /* 16  YUV 4:2:2     */
+      fourcc('4','2','2','P') => '*YUV422P',   /* 16  YVU422 planar */
+      fourcc('4','1','1','P') => '*YUV411P',   /* 16  YVU411 planar */
+      // fourcc('Y','4','1','P') => 'Y41P',    /* 12  YUV 4:1:1     */
+      fourcc('Y','4','4','4') => '*YUV444',    /* 16  xxxxyyyy uuuuvvvv */
+      // fourcc('Y','U','V','O') => 'YUV555',  /* 16  YUV-5-5-5     */
+      // fourcc('Y','U','V','P') => 'YUV565',  /* 16  YUV-5-6-5     */
+      // fourcc('Y','U','V','4') => 'YUV32',   /* 32  YUV-8-8-8-8   */
 
       /* two planes -- one Y, one Cr + Cb interleaved  */
-      //'NV12' =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
-      //'NV21' =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
+      fourcc('N','V','1','2') => 'NV12', /* 12  Y/CbCr 4:2:0  */
+      // fourcc('N','V','2','1') => 'NV21', /* 12  Y/CrCb 4:2:0  */
 
       /*  The following formats are not defined in the V4L2 specification */
-      '*YUV410' =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
-      '*YUV420' =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
-      //'YYUV' =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
-      //'HI240' =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
-      //'HM12' =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
+      fourcc('Y','U','V','9') => '*YUV410', /*  9  YUV 4:1:0     */
+      fourcc('Y','U','1','2') => '*YUV420', /* 12  YUV 4:2:0     */
+      // fourcc('Y','Y','U','V') => 'YYUV', /* 16  YUV 4:2:2     */
+      // fourcc('H','I','2','4') => 'HI240',   /*  8  8-bit color   */
+      // fourcc('H','M','1','2') => 'HM12',  /*  8  YUV 4:2:0 16x16 macroblocks */
 
       /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
-      //'SBGGR8' =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
-      //'SGBRG8' =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
-      //'SBGGR16' =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
+      // fourcc('B','A','8','1') => 'SBGGR8', /*  8  BGBG.. GRGR.. */
+      // fourcc('G','B','R','G') => 'SGBRG8', /*  8  GBGB.. RGRG.. */
+      // fourcc('B','Y','R','2') => 'SBGGR16', /* 16  BGBG.. GRGR.. */
 
       /*  Vendor-specific formats   */
       //'WNVA' =>     fourcc('W','N','V','A'), /* Winnov hw compress */
@@ -387,71 +313,64 @@ $Colours = array(
     );
 
 $orientations = array(
-    '0' => translate('Normal'),
-    '90' => translate('RotateRight'),
-    '180' => translate('Inverted'),
-    '270' => translate('RotateLeft'),
-    'hori' => translate('FlippedHori'),
-    'vert' => translate('FlippedVert')
+    'ROTATE_0' => translate('Normal'),
+    'ROTATE_90' => translate('RotateRight'),
+    'ROTATE_180' => translate('Inverted'),
+    'ROTATE_270' => translate('RotateLeft'),
+    'FLIP_HORI' => translate('FlippedHori'),
+    'FLIP_VERT' => translate('FlippedVert')
     );
 
 $deinterlaceopts = array(
-    'Disabled'                                            => 0x00000000,
-    'Four field motion adaptive - Soft'                   => 0x00001E04, /* 30 change */
-    'Four field motion adaptive - Medium'                 => 0x00001404, /* 20 change */
-    'Four field motion adaptive - Hard'                   => 0x00000A04, /* 10 change */
-    'Discard'                                             => 0x00000001,
-    'Linear'                                              => 0x00000002,
-    'Blend'                                               => 0x00000003,
-    'Blend (25%)'                                         => 0x00000205
-    );
+  0x00000000 => 'Disabled',
+  0x00001E04 => 'Four field motion adaptive - Soft', /* 30 change */
+  0x00001404 => 'Four field motion adaptive - Medium', /* 20 change */
+  0x00000A04 => 'Four field motion adaptive - Hard', /* 10 change */
+  0x00000001 => 'Discard',
+  0x00000002 => 'Linear',
+  0x00000003 => 'Blend',
+  0x00000205 => 'Blend (25%)',
+);
 
 $deinterlaceopts_v4l2 = array(
-    'Disabled'                                            => 0x00000000,
-    'Four field motion adaptive - Soft'                   => 0x00001E04, /* 30 change */
-    'Four field motion adaptive - Medium'                 => 0x00001404, /* 20 change */
-    'Four field motion adaptive - Hard'                   => 0x00000A04, /* 10 change */
-    'Discard'                                             => 0x00000001,
-    'Linear'                                              => 0x00000002,
-    'Blend'                                               => 0x00000003,
-    'Blend (25%)'                                         => 0x00000205,
-    'V4L2: Capture top field only'                        => 0x02000000,
-    'V4L2: Capture bottom field only'                     => 0x03000000,
-    'V4L2: Alternate fields (Bob)'                        => 0x07000000,
-    'V4L2: Progressive'                                   => 0x01000000,
-    'V4L2: Interlaced'                                    => 0x04000000
-    );
+  0x00000000 => 'Disabled',
+  0x00001E04 => 'Four field motion adaptive - Soft',   /* 30 change */
+  0x00001404 => 'Four field motion adaptive - Medium', /* 20 change */
+  0x00000A04 => 'Four field motion adaptive - Hard',   /* 10 change */
+  0x00000001 => 'Discard',
+  0x00000002 => 'Linear',
+  0x00000003 => 'Blend',
+  0x00000205 => 'Blend (25%)',
+  0x02000000 => 'V4L2: Capture top field only',
+  0x03000000 => 'V4L2: Capture bottom field only',
+  0x07000000 => 'V4L2: Alternate fields (Bob)',
+  0x01000000 => 'V4L2: Progressive',
+  0x04000000 => 'V4L2: Interlaced',
+);
 
 $fastblendopts = array(
-    'No blending'                                         => 0,
-    '1.5625%'                                             => 1,
-    '3.125%'                                              => 3,
-    '6.25% (Indoor)'                                      => 6,
-    '12.5% (Outdoor)'                                     => 12,
-    '25%'                                                 => 25,
-    '50%'                                                 => 50
+    0  => 'No blending',
+    1  => '1.5625%',
+    3  => '3.125%',
+    6  => '6.25% (Indoor)',
+    12 => '12.5% (Outdoor)',
+    25 => '25%',
+    50 => '50%',
     );
 
 $fastblendopts_alarm = array(
-    'No blending (Alarm lasts forever)'                   => 0,
-    '1.5625%'                                             => 1,
-    '3.125%'                                              => 3,
-    '6.25%'                                               => 6,
-    '12.5%'                                               => 12,
-    '25%'                                                 => 25,
-    '50% (Alarm lasts a moment)'                          => 50
+    0  => 'No blending (Alarm lasts forever)',
+    1  => '1.5625%',
+    3  => '3.125%',
+    6  => '6.25%',
+    12 => '12.5%',
+    25 => '25%',
+    50 => '50% (Alarm lasts a moment)',
     );
 
 $label_size = array(
-    'Default'                                             => 1,
-    'Large'                                               => 2
-    );
-
-$savejpegopts = array(
-    'Disabled'                                            => 0,
-    'Frames only'                                         => 1,
-    'Analysis images only (if available)'                 => 2,
-    'Frames + Analysis images (if available)'             => 3,
+    1 => translate('Default'),
+    2 => translate('Large'),
     );
 
 $codecs = array(
@@ -460,41 +379,22 @@ $codecs = array(
   'MJPEG' => translate('MJPEG'),
 );
 
+$controls = ZM\Control::find(null, array('order'=>'lower(Name)'));
+
 xhtmlHeaders(__FILE__, translate('Monitor').' - '.validHtmlStr($monitor->Name()));
 getBodyTopHTML();
+echo getNavBarHTML();
 ?>
-  <div id="page">
-    <div id="header">
-<?php
-if ( canEdit('Monitors') ) {
-  if ( isset($_REQUEST['dupId']) ) {
-?>
-    <div class="alert alert-info">
-      Configuration cloned from Monitor: <?php echo validHtmlStr($clonedName) ?>
-    </div>
-<?php
-  }
-?>
-    <div id="headerButtons">
-      <?php echo makePopupLink('?view=monitorprobe&mid='.$monitor->Id(), 'zmMonitorProbe'.$monitor->Id(), 'monitorprobe', translate('Probe')); ?>
-<?php
-  if ( ZM_HAS_ONVIF ) {
-       echo makePopupLink('?view=onvifprobe&mid='.$monitor->Id(), 'zmOnvifProbe'.$monitor->Id(), 'onvifprobe', translate('OnvifProbe'));
-  }
-?>
-      <?php echo makePopupLink('?view=monitorpreset&mid=' . $monitor->Id(), 'zmMonitorPreset' . $monitor->Id(), 'monitorpreset', translate('Presets')); ?>
-    </div>
-<?php
-} // end if canEdit('Monitors')
-?>
-    <h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor->Name()) ?><?php if ( $monitor->Id() ) { ?> (<?php echo $monitor->Id()?>)<?php } ?></h2>
-  </div>
-  <div id="content">
-    <ul class="tabList">
+  <div id="page" class="container-fluid">
+
+  <div class="row flex-nowrap">
+    <nav>  <!-- BEGIN PILL LIST -->
+    <ul class="nav nav-pills flex-column h-100" id="pills-tab" role="tabList" aria-orientation="vertical">
 <?php
 $tabs = array();
 $tabs['general'] = translate('General');
 $tabs['source'] = translate('Source');
+$tabs['onvif'] = translate('ONVIF');
 if ( $monitor->Type() != 'WebSite' ) {
   $tabs['storage'] = translate('Storage');
   $tabs['timestamp'] = translate('Timestamp');
@@ -512,183 +412,80 @@ else
   $tab = 'general';
 
 foreach ( $tabs as $name=>$value ) {
-  if ( $tab == $name ) {
 ?>
-      <li class="active"><?php echo $value ?></li>
+    <li class="nav-item form-control-sm my-1">
+      <a 
+        id="<?php echo $name?>-tab"
+        role="tab"
+        data-toggle="pill"
+        class="nav-link<?php echo $tab == $name ? ' active' : '' ?>"
+          href="#pills-<?php echo $name?>"
+        aria-controls="pills-<?php echo $name?>"
+        aria-selected="<?php echo $tab == $name ? 'true':'false'?>"
+      ><?php echo $value ?></a></li>
 <?php
-  } else {
-?>
-      <li><a href="#" data-tab-name="<?php echo $name ?>"><?php echo $value ?></a></li>
-<?php
-  }
 }
   ?>
     </ul>
-    <div class="clear"></div>
-    <form name="contentForm" id="contentForm" method="post" action="?">
-      <input type="hidden" name="view" value="<?php echo $view ?>"/>
-      <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-      <input type="hidden" name="action" value="monitor"/>
-      <input type="hidden" name="mid" value="<?php echo $monitor->Id()?>"/>
-      <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo (null !== $monitor->LinkedMonitors())?validHtmlStr($monitor->LinkedMonitors()):'' ?>"/>
-      <input type="hidden" name="origMethod" value="<?php echo ( null !== $monitor->Method())?validHtmlStr($monitor->Method()):'' ?>"/>
+    </nav> <!-- END PILL LIST -->
+
+<div class="d-flex flex-column col-sm-offset-2 container-fluid">
+    <!-- BEGIN MINI HEADER -->
+    <div class="d-flex flex-row justify-content-between px-3 py-1">
+      <div class="" id="toolbar" >
+        <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      
+    <h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor->Name()) ?><?php if ( $monitor->Id() ) { ?> (<?php echo $monitor->Id()?>)<?php } ?></h2>
 <?php
-if ( $tab != 'general' ) {
+if ( canEdit('Monitors') ) {
+  if ( isset($_REQUEST['dupId']) ) {
 ?>
-      <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>"/>
-      <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($monitor->ServerId() ) ?>"/>
-      <input type="hidden" name="newMonitor[StorageId]" value="<?= validHtmlStr($monitor->StorageId() ) ?>"/>
+    <div class="alert alert-info">
+      Configuration cloned from Monitor: <?php echo validHtmlStr($clonedName) ?>
+    </div>
 <?php
-foreach ( $monitor->GroupIds() as $group_id ) {
-echo '<input type="hidden" name="newMonitor[GroupIds][]" value="'.$group_id.'"/>';
-}
-?>
-      <input type="hidden" name="newMonitor[Type]" value="<?php echo validHtmlStr($monitor->Type()) ?>"/>
-      <input type="hidden" name="newMonitor[Function]" value="<?php echo validHtmlStr($monitor->Function()) ?>"/>
-      <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($monitor->Enabled()) ?>"/>
-      <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>"/>
-      <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>"/>
-<?php
-  if ( null !== $monitor->Triggers() ) {
-    foreach( explode(',', $monitor->Triggers()) as $newTrigger ) {
-?>
-      <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
-<?php
-    }
   }
-}
-if ( ZM_HAS_V4L && ($tab != 'source' || $monitor->Type() != 'Local') ) {
 ?>
-      <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>"/>
-      <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($monitor->Channel()) ?>"/>
-      <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($monitor->Format()) ?>"/>
-      <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($monitor->Palette()) ?>"/>
-      <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($monitor->V4LMultiBuffer()) ?>"/>
-      <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()) ?>"/>
+    <div>
+      <button id="probeBtn" class="btn btn-normal" data-mid="<?php echo $monitor->Id() ?>" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Probe') ?>" ><i class="fa fa-rss-square"></i></button>
+      <button id="onvifBtn" class="btn btn-normal" data-mid="<?php echo $monitor->Id() ?>" data-toggle="tooltip" data-placement="top" title="<?php echo translate('OnvifProbe') ?>" ><i class="fa fa-rss"></i></button>
+      <button id="presetBtn" class="btn btn-normal" data-mid="<?php echo $monitor->Id() ?>" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Presets') ?>" ><i class="fa fa-list-ol"></i></button>
+    </div>
 <?php
-}
-if ( $tab != 'source' || $monitor->Type()!= 'Remote' ) {
+} // end if canEdit('Monitors')
 ?>
-      <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($monitor->Protocol()) ?>"/>
-      <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>"/>
-      <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>"/>
+  </div>
+
+    <!-- BEGIN ITEM LIST -->
+    <div class="d-flex flex-row container-fluid pr-0">
+    <form name="contentForm" id="contentForm" method="post" action="?view=monitor">
+      <input type="hidden" name="tab" value="<?php echo $tab?>"/>
+      <input type="hidden" name="mid" value="<?php echo $monitor->Id()?>"/>
+      <input type="hidden" name="origMethod" value="<?php echo ( null !== $monitor->Method())?validHtmlStr($monitor->Method()):'' ?>"/>
+<div class="tab-content" id="pills-tabContent">
 <?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Local' && $monitor->Type()!= 'Remote' && $monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc') ) {
+foreach ( $tabs as $name=>$value ) {
+  echo '<div id="pills-'.$name.'" class="tab-pane fade'.($name==$tab ? ' show active' : '').'" role="tabpanel" area-labelledby="'.$name.'-tab">';
 ?>
-      <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr(null !== $monitor->Method() ? $monitor->Method() : 'rtpRtsp' ) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc' )) {
-?>
-      <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Remote' && $monitor->Type()!= 'File' && $monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc' && $monitor->Type()!= 'cURL' && $monitor->Type() != 'WebSite') ) {
-?>
-      <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/>
-      <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/>
-      <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/>
-<?php
-}
-if ( $tab != 'source' ) {
-?>
-      <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($monitor->Colours()) ?>"/>
-      <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>"/>
-      <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>"/>
-      <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($monitor->Orientation()) ?>"/>
-      <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($monitor->Deinterlacing()) ?>"/>
-<?php
-}
-if ( $tab != 'storage' ) {
-?>
-      <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($monitor->SaveJPEGs()) ?>"/>
-      <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($monitor->VideoWriter()) ?>"/>
-      <input type="hidden" name="newMonitor[OutputCodec]" value="<?php echo validHtmlStr($monitor->OutputCodec()) ?>"/>
-      <input type="hidden" name="newMonitor[Encoder]" value="<?php echo validHtmlStr($monitor->Encoder()) ?>"/>
-      <input type="hidden" name="newMonitor[OutputContainer]" value="<?php echo validHtmlStr($monitor->OutputContainer()) ?>"/>
-      <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($monitor->EncoderParameters()) ?>"/>
-      <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($monitor->RecordAudio()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type() != 'Remote' && $monitor->Protocol()!= 'rtsp') ) {
-?>
-      <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($monitor->RTSPDescribe()) ?>"/>
-<?php
-}
-if ( $tab != 'timestamp' ) {
-?>
-      <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($monitor->LabelSize()) ?>"/>
-<?php
-}
-if ( $tab != 'buffers' ) {
-?>
-      <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount()) ?>"/>
-      <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount()) ?>"/>
-      <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount()) ?>"/>
-      <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount()) ?>"/>
-      <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>"/>
-<?php
-}
-if ( ZM_OPT_CONTROL && $tab != 'control' ) {
-?>
-      <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($monitor->Controllable()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($monitor->ControlId()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ?>"/>
-      <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout()) ?>"/>
-      <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($monitor->TrackMotion()) ?>"/>
-      <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay()) ?>"/>
-      <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($monitor->ReturnLocation()) ?>"/>
-      <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay()) ?>"/>
-<?php
-}
-if ( ZM_OPT_X10 && $tab != 'x10' ) {
-?>
-      <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
-      <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
-      <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
-<?php
-}
-if ( $tab != 'misc' ) {
-?>
-      <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix()) ?>"/>
-      <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>"/>
-      <input type="hidden" name="newMonitor[MinSectionLength]" value="<?php echo validHtmlStr($monitor->MinSectionLength()) ?>"/>
-      <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>"/>
-      <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>"/>
-      <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($monitor->DefaultRate()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($monitor->DefaultScale()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultCodec]" value="<?php echo validHtmlStr($monitor->DefaultCodec()) ?>"/>
-      <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>"/>
-      <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($monitor->Exif()) ?>"/>
-<?php
-}
-if ( $tab != 'misc' ) {
-?>
-      <input type="hidden" name="newMonitor[SignalCheckPoints]" value="<?php echo validHtmlStr($monitor->SignalCheckPoints()) ?>"/>
-      <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>"/>
-<?php
-}
-?>
-      <table id="contentTable" class="major">
+      <table class="major">
         <tbody>
 <?php
-switch ( $tab ) {
+switch ( $name ) {
   case 'general' :
     {
 ?>
-          <tr class="Name"><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>" /></td></tr>
-          <tr><td><?php echo translate('Server') ?></td><td>
+          <tr class="Name">
+            <td class="text-right pr-3"><?php echo translate('Name') ?></td>
+            <td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>"/></td>
+          </tr>
+          <tr class="Notes">
+            <td class="text-right pr-3"><?php echo translate('Notes') ?></td>
+            <td><textarea name="newMonitor[Notes]" rows="4"><?php echo validHtmlStr($monitor->Notes()) ?></textarea></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('Server') ?></td><td>
 <?php
       $servers = array(''=>'None','auto'=>'Auto');
       foreach ( ZM\Server::find(NULL, array('order'=>'lower(Name)')) as $Server ) {
@@ -696,206 +493,297 @@ switch ( $tab ) {
       }
       echo htmlSelect( 'newMonitor[ServerId]', $servers, $monitor->ServerId() );
 ?>
-          </td></tr>
-          <tr><td><?php echo translate('StorageArea') ?></td><td>
+            </td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('SourceType') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Type]', $sourceTypes, $monitor->Type()); ?></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('Function') ?></td>
+            <td>
 <?php
-      $storage_areas = array(0=>'Default');
-      foreach ( ZM\Storage::find( NULL, array('order'=>'lower(Name)') ) as $Storage ) {
-        $storage_areas[$Storage->Id()] = $Storage->Name();
+      $function_options = array();
+      foreach ( getEnumValues('Monitors', 'Function') as $f ) {
+        $function_options[$f] = translate("Fn$f");
       }
-      echo htmlSelect( 'newMonitor[StorageId]', $storage_areas, $monitor->StorageId() );
+      echo htmlSelect('newMonitor[Function]', $function_options, $monitor->Function());
 ?>
-          </td></tr>
-          <tr><td><?php echo translate('SourceType') ?></td><td><?php echo htmlSelect('newMonitor[Type]', $sourceTypes, $monitor->Type()); ?></td></tr>
-          <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
-<?php
-      foreach ( getEnumValues('Monitors', 'Function') as $optFunction ) {
-?>
-            <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor->Function()) { ?> selected="selected"<?php } ?>><?php echo translate('Fn'.$optFunction) ?></option>
-<?php
-      }
-?>
-        </select></td></tr>
-        <tr><td><?php echo translate('Enabled') ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( $monitor->Enabled() ) { ?> checked="checked"<?php } ?>/></td></tr>
-<?php
-      if ( $monitor->Type != 'WebSite' ) {
-?>
-        <tr>
-          <td><?php echo translate('LinkedMonitors') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_LINKED_MONITORS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
-          <td>
-            <select name="monitorIds" class="chosen" multiple="multiple" onchange="updateLinkedMonitors( this )">
-<?php
-      $monitors = dbFetchAll( 'select Id,Name from Monitors order by Sequence asc' );
-      if ( $monitor->LinkedMonitors() )
-        $monitorIds = array_flip( explode( ',', $monitor->LinkedMonitors()) );
-      else
-        $monitorIds = array();
-      foreach ( $monitors as $linked_monitor ) {
-        if ( (!$monitor->Id() || ($monitor->Id()!= $linked_monitor['Id'])) && visibleMonitor( $linked_monitor['Id'] ) ) {
-?>
-              <option value="<?php echo validHtmlStr($linked_monitor['Id']); ?>"<?php if ( array_key_exists( $linked_monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($linked_monitor['Name']) ?></option>
-<?php
-        }
-      }
-?>
-            </select>
           </td>
         </tr>
-<tr><td><?php echo translate('Groups'); ?></td><td><select name="newMonitor[GroupIds][]" multiple="multiple" class="chosen"><?php
-echo htmlOptions(ZM\Group::get_dropdown_options( ), $monitor->GroupIds() );
-?></td></tr>
-        <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>" size="6"/></td></tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Enabled') ?></td>
+          <td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php echo $monitor->Enabled() ? ' checked="checked"' : '' ?>/></td>
+        </tr>
+<?php
+      if ( $monitor->Type() != 'WebSite' ) {
+?>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('LinkedMonitors'); echo makeHelpLink('OPTIONS_LINKED_MONITORS') ?></td>
+          <td>
+<?php
+      $monitors = dbFetchAll('SELECT Id, Name FROM Monitors ORDER BY Sequence ASC');
+      $monitor_options = array();
+      foreach ( $monitors as $linked_monitor ) {
+        if ( (!$monitor->Id() || ($monitor->Id()!= $linked_monitor['Id'])) && visibleMonitor($linked_monitor['Id']) ) {
+          $monitor_options[$linked_monitor['Id']] = validHtmlStr($linked_monitor['Name']);
+        }
+      }
+
+      echo htmlSelect(
+        'newMonitor[LinkedMonitors][]',
+        $monitor_options,
+        ( $monitor->LinkedMonitors() ? explode(',', $monitor->LinkedMonitors()) : array() ),
+        array('class'=>'chosen','multiple'=>'multiple')
+      );
+?>
+          </td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Groups'); ?></td>
+          <td><select name="newMonitor[GroupIds][]" multiple="multiple" class="chosen"><?php
+            echo htmlOptions(ZM\Group::get_dropdown_options(), $monitor->GroupIds());
+            ?></select></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('AnalysisFPS') ?></td>
+          <td><input type="number" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>" min="0" step="any"/></td>
+        </tr>
 <?php
       if ( $monitor->Type() != 'Local' && $monitor->Type() != 'File' && $monitor->Type() != 'NVSocket' ) {
 ?>
             <tr>
-              <td><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td class="text-right pr-3"><?php echo translate('MaximumFPS'); echo makeHelpLink('OPTIONS_MAXFPS') ?></td>
               <td>
-                <input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>" size="5"/>
+                <input type="number" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>" min="0" step="any"/>
                 <span id="newMonitor[MaxFPS]" style="color:red;<?php echo $monitor->MaxFPS() ? '' : 'display:none;' ?>">CAUTION: See the help text</span>
               </td>
             </tr>
             <tr>
-              <td><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td class="text-right pr-3"><?php echo translate('AlarmMaximumFPS'); echo makeHelpLink('OPTIONS_MAXFPS') ?></td>
               <td>
-                <input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>" size="5"/>
+                <input type="number" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>" min="0" step="any"/>
                 <span id="newMonitor[AlarmMaxFPS]" style="color:red;<?php echo $monitor->AlarmMaxFPS() ? '' : 'display:none;' ?>">CAUTION: See the help text</span>
               </td>
             </tr>
 <?php
       } else {
 ?>
-            <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>" size="5"/></td></tr>
-            <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>" size="5"/></td></tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('MaximumFPS') ?></td>
+              <td><input type="number" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>" min="0" step="any"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('AlarmMaximumFPS') ?></td>
+              <td><input type="number" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>" min="0" step="any"/></td>
+            </tr>
 <?php
       }
       if ( ZM_FAST_IMAGE_BLENDS ) {
 ?>
           <tr>
-            <td><?php echo translate('RefImageBlendPct') ?></td>
-            <td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->RefBlendPerc() ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td>
+            <td class="text-right pr-3"><?php echo translate('RefImageBlendPct') ?></td>
+            <td><?php echo htmlSelect('newMonitor[RefBlendPerc]', $fastblendopts, $monitor->RefBlendPerc()); ?></td>
           </tr>
           <tr>
-            <td><?php echo translate('AlarmRefImageBlendPct') ?></td>
-            <td>
-              <select name="newMonitor[AlarmRefBlendPerc]">
-                <?php foreach ( $fastblendopts_alarm as $name => $value ) { ?>
-                  <option value="<?php echo $value ?>"<?php if ( $value == $monitor->AlarmRefBlendPerc() ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option>
-                <?php } ?>
-              </select></td></tr>
+            <td class="text-right pr-3"><?php echo translate('AlarmRefImageBlendPct') ?></td>
+            <td><?php echo htmlSelect('newMonitor[AlarmRefBlendPerc]', $fastblendopts_alarm, $monitor->AlarmRefBlendPerc()); ?></td>
+          </tr>
           <?php
       } else {
 ?>
-            <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc()) ?>" size="4"/></td></tr>
+            <tr><td class="text-right pr-3"><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc()) ?>" size="4"/></td></tr>
+            <tr><td class="text-right pr-3"><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc()) ?>" size="4"/></td></tr>
 <?php
       }
 ?>
-            <tr><td><?php echo translate('Triggers') ?></td><td>
+            <tr><td class="text-right pr-3"><?php echo translate('Triggers') ?></td><td>
 <?php
-      $optTriggers = getSetValues( 'Monitors', 'Triggers' );
+      $optTriggers = getSetValues('Monitors', 'Triggers');
       $breakCount = (int)(ceil(count($optTriggers)));
-      $breakCount = min( 3, $breakCount );
+      $breakCount = min(3, $breakCount);
       $optCount = 0;
-      foreach( $optTriggers as $optTrigger ) {
-        if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
+      foreach ( $optTriggers as $optTrigger ) {
+        if ( $optTrigger == 'X10' and !ZM_OPT_X10 )
           continue;
         if ( $optCount && ($optCount%$breakCount == 0) )
           echo '</br>';
+        echo '<input type="checkbox" name="newMonitor[Triggers][]" value="'.$optTrigger.'"'.
+          (( ('' !== $monitor->Triggers()) && in_array($optTrigger, $monitor->Triggers()) ) ? ' checked="checked"' : ''). '/> '. $optTrigger;
+        $optCount ++;
+      } # end foreach trigger option
+      if ( !$optCount ) {
+        echo '<em>'.translate('NoneAvailable').'</em>';
+      }
 ?>
-              <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( ( null !== $monitor->Triggers() ) && in_array( $optTrigger, $monitor->Triggers() ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
-<?php
-          $optCount ++;
-        }
-        if ( !$optCount ) {
-        ?>
-          <em><?php echo translate('NoneAvailable') ?></em>
-          <?php
-        }
-      ?>
         </td></tr>
         <?php
         }
         break;
     }
-  case 'source' :
+    case 'onvif' :
+    {
+?>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ONVIF_URL') ?></td>
+              <td><input type="text" name="newMonitor[ONVIF_URL]" value="<?php echo validHtmlStr($monitor->ONVIF_URL()) ?>"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('Username') ?></td>
+              <td><input type="text" name="newMonitor[ONVIF_Username]" value="<?php echo validHtmlStr($monitor->ONVIF_Username()) ?>"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('Password') ?></td>
+              <td><input type="text" name="newMonitor[ONVIF_Password]" value="<?php echo validHtmlStr($monitor->ONVIF_Password()) ?>"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ONVIF_Options') ?></td>
+              <td><input type="text" name="newMonitor[ONVIF_Options]" value="<?php echo validHtmlStr($monitor->ONVIF_Options()) ?>"/></td>
+            </tr>
+<?php
+        break;
+    }
+    case 'source' :
     {
       if ( ZM_HAS_V4L && $monitor->Type() == 'Local' ) {
 ?>
-          <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>" size="24"/></td></tr>
-          <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $localMethods, $monitor->Method(), "submitTab( '$tab' );" ); ?></td></tr>
+          <tr><td class="text-right pr-3"><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>"/></td></tr>
+          <tr>
+            <td><?php echo translate('CaptureMethod') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Method]', $localMethods, $monitor->Method(), array('onchange'=>'submitTab', 'data-tab-name'=>$tab) ); ?></td>
+          </tr>
 <?php
         if ( ZM_HAS_V4L1 && $monitor->Method() == 'v4l1' ) {
 ?>
           <tr>
-            <td><?php echo translate('DeviceChannel') ?></td>
-            <td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Channel()) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td>
+            <td class="text-right pr-3"><?php echo translate('DeviceChannel') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Channel]', $v4l1DeviceChannels, $monitor->Channel()); ?></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('DeviceFormat') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Format]', $v4l1DeviceFormats, $monitor->Format()); ?></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('CapturePalette') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Palette]', $v4l1LocalPalettes, $monitor->Palette()); ?></td>
           </tr>
-          <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Format()) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-          <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Palette()) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
         } else {
 ?>
-          <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Channel()) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-          <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Format()) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-          <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Palette()) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('DeviceChannel') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Channel]', $v4l2DeviceChannels, $monitor->Channel()); ?></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('DeviceFormat') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Format]', $v4l2DeviceFormats, $monitor->Format()); ?></td>
+          </tr>
+         <tr>
+            <td class="text-right pr-3"><?php echo translate('CapturePalette') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Palette]', $v4l2LocalPalettes, $monitor->Palette()); ?></td>
+          </tr>
 <?php
         }
 ?>
-          <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
+          <tr><td class="text-right pr-3"><?php echo translate('V4LMultiBuffer') ?></td><td>
             <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $monitor->V4LMultiBuffer() == '1' ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
             <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $monitor->V4LMultiBuffer() == '0' ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]0">No</label>
-            <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( $monitor->V4LMultiBuffer() ? 'checked="checked"' : '' ) ?>/>
+            <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( $monitor->V4LMultiBuffer() == '' ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
           </td></tr>
-          <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()); ?>"/></td></tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('V4LCapturesPerFrame') ?></td>
+            <td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()); ?>" min="1"/></td>
+          </tr>
 <?php
 
       } else if ( $monitor->Type() == 'NVSocket' ) {
 include('_monitor_source_nvsocket.php');
+      } else if ( $monitor->Type() == 'VNC' ) {
+?>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('RemoteHostName') ?></td>
+          <td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('RemoteHostPort') ?></td>
+          <td><input type="number" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>" size="6"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Username') ?></td>
+          <td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Password') ?></td>
+          <td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/></td>
+        </tr>
+<?php
       } else if ( $monitor->Type() == 'Remote' ) {
 ?>
-          <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo htmlSelect( "newMonitor[Protocol]", $remoteProtocols, $monitor->Protocol(), "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('RemoteProtocol') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Protocol]', $remoteProtocols, $monitor->Protocol(), "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('RemoteMethod') ?></td>
+            <td>
 <?php
         if ( !$monitor->Protocol() || $monitor->Protocol() == 'http' ) {
-?>
-          <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $httpMethods, $monitor->Method() ); ?></td></tr>
-<?php
+          echo htmlSelect('newMonitor[Method]', $httpMethods, $monitor->Method());
         } else {
-?>
-          <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $rtspMethods, $monitor->Method() ); ?></td></tr>
-<?php
+          echo htmlSelect('newMonitor[Method]', $rtspMethods, $monitor->Method());
         }
 ?>
-          <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>" size="36"/></td></tr>
-          <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="number" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>" size="6"/></td></tr>
-          <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
+            </td>
+          </tr>
+          <tr><td class="text-right pr-3"><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>"/></td></tr>
+          <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="number" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>" min="0" max="65535"/></td></tr>
+          <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td></tr>
 <?php
       } else if ( $monitor->Type() == 'File' ) {
 ?>
-          <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
+          <tr><td class="text-right pr-3"><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td></tr>
 <?php
       } elseif ( $monitor->Type() == 'cURL' ) {
 ?>
-          <tr><td><?php echo 'URL' ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
-          <tr><td><?php echo 'Username' ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>" size="12"/></td></tr>
-          <tr><td><?php echo 'Password' ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>" size="12"/></td></tr>
+          <tr><td class="text-right pr-3"><?php echo 'URL' ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td></tr>
+          <tr><td class="text-right pr-3"><?php echo 'Username' ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/></td></tr>
+          <tr><td class="text-right pr-3"><?php echo 'Password' ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/></td></tr>
 <?php
       } elseif ( $monitor->Type() == 'WebSite' ) {
 ?>
-          <tr><td><?php echo translate('WebSiteUrl') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
-          <tr><td><?php echo translate('Width') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" size="4";"/></td></tr>
-        <tr><td><?php echo translate('Height') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" size="4";"/></td></tr>
-        <tr><td><?php echo 'Web Site Refresh (Optional)' ?></td><td><input type="number" name="newMonitor[Refresh]" value="<?php echo validHtmlStr($monitor->Refresh()); ?>"/></td></tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('WebSiteUrl') ?></td>
+            <td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td>
+          </tr>
+          <tr>
+            <td><?php echo translate('Width') ?> (<?php echo translate('Pixels') ?>)</td>
+            <td><input type="number" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" min="1"/></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('Height') ?> (<?php echo translate('Pixels') ?>)</td>
+            <td><input type="number" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" min="1"/></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"<?php echo 'Web Site Refresh (Optional)' ?></td>
+            <td><input type="number" name="newMonitor[Refresh]" value="<?php echo validHtmlStr($monitor->Refresh()) ?>" min="1"/></td>
+          </tr>
 <?php
-      } elseif ( $monitor->Type() == 'Ffmpeg' || $monitor->Type() == 'Libvlc' ) {
+      } else if ( $monitor->Type() == 'Ffmpeg' || $monitor->Type() == 'Libvlc' ) {
 ?>
-          <tr class="SourcePath"><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" /></td></tr>
-          <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo htmlSelect( "newMonitor[Method]", $rtspFFMpegMethods, $monitor->Method() ); ?></td></tr>
+          <tr class="SourcePath">
+            <td class="text-right pr-3"><?php echo translate('SourcePath') ?></td>
+            <td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" /></td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3">
+              <?php echo translate('RemoteMethod'); echo makeHelpLink('OPTIONS_RTSPTrans') ?></td>
+            <td><?php echo htmlSelect('newMonitor[Method]', $rtspFFMpegMethods, $monitor->Method()) ?></td>
+          </tr>
           <tr class="SourceOptions">
-            <td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($monitor->Type()), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+            <td class="text-right pr-3"><?php echo translate('Options'); echo makeHelpLink('OPTIONS_'.strtoupper($monitor->Type())) ?></td>
             <td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options()) ?>"/></td>
           </tr>
 <?php
@@ -903,66 +791,132 @@ include('_monitor_source_nvsocket.php');
       if ( $monitor->Type() == 'Ffmpeg' ) {
 ?>
           <tr class="DecoderHWAccelName">
-            <td><?php echo translate('DecoderHWAccelName') ?>
-                (<?php echo makePopupLink('?view=optionhelp&amp;option=DECODERHWACCELNAME', 'zmOptionHelp', 'optionhelp', '?') ?>)
+            <td class="text-right pr-3">
+              <?php echo translate('DecoderHWAccelName'); echo makeHelpLink('OPTIONS_DECODERHWACCELNAME') ?>
             </td>
             <td><input type="text" name="newMonitor[DecoderHWAccelName]" value="<?php echo validHtmlStr($monitor->DecoderHWAccelName()) ?>"/></td>
           </tr>
           <tr class="DecoderHWAccelDevice">
-            <td><?php echo translate('DecoderHWAccelDevice') ?>
-                (<?php echo makePopupLink('?view=optionhelp&amp;option=DECODERHWACCELDEVIC', 'zmOptionHelp', 'optionhelp', '?') ?>)
+            <td class="text-right pr-3"><?php echo translate('DecoderHWAccelDevice') ?>
+                <?php echo makeHelpLink('OPTIONS_DECODERHWACCELDEVICE') ?>
             </td>
             <td><input type="text" name="newMonitor[DecoderHWAccelDevice]" value="<?php echo validHtmlStr($monitor->DecoderHWAccelDevice()) ?>"/></td>
           </tr>
 <?php
       }
-if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {
+      if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {
 ?>
-        <tr><td><?php echo translate('TargetColorspace') ?></td><td><?php echo htmlSelect('newMonitor[Colours]', $Colours, $monitor->Colours() ); ?>
-</td></tr>
-        <tr><td><?php echo translate('CaptureWidth') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
-        <tr><td><?php echo translate('CaptureHeight') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
-        <tr><td><?php echo translate('PreserveAspect') ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr>
-	<tr><td><?php echo translate('Orientation') ?></td><td><?php echo htmlselect( 'newMonitor[Orientation]', $orientations, $monitor->Orientation() );?></td></tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('TargetColorspace') ?></td>
+          <td><?php echo htmlSelect('newMonitor[Colours]', $Colours, $monitor->Colours()) ?></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('CaptureResolution') ?> (<?php echo translate('Pixels') ?>)</td>
+          <td>
+            <input type="number" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" min="1"/>
+            <input type="number" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" min="1"/>
+<?php echo htmlselect('dimensions_select', array(
+  ''=>translate('Custom'),
+  '176x120'=>'176x120 QCIF',
+  '176x144'=>'176x14',
+  '320x240'=>'320x240',
+  '320x200'=>'320x200',
+  '352x240'=>'352x240 CIF',
+  '640x480'=>'640x480',
+  '640x400'=>'640x400',
+  '704x240'=>'704x240 2CIF',
+  '704x480'=>'704x480 4CIF',
+  '720x480'=>'720x480 D1',
+  '1280x720'=>'1280x720 720p',
+  '1280x800'=>'1280x800',
+  '1280x960'=>'1280x960 960p',
+  '1280x1024'=>'1280x1024 1MP',
+  '1600x1200'=>'1600x1200 2MP',
+  '1920x1080'=>'1920x1080 1080p',
+  '2048x1536'=>'2048x1536 3MP',
+  '2592x1944'=>'2592x1944 5MP',
+  '3840x2160'=>'3840x2160 4K UHD',
+), $monitor->Width().'x'.$monitor->Height()
+);
+?>
+          </td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('PreserveAspect') ?></td>
+          <td><input type="checkbox" name="preserveAspectRatio" value="1"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Orientation') ?></td>
+          <td><?php echo htmlselect('newMonitor[Orientation]', $orientations, $monitor->Orientation());?></td>
+        </tr>
 <?php
       }
-if ( $monitor->Type() == 'Local' ) {
+      if ( $monitor->Type() == 'Local' ) {
 ?>
-            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->Deinterlacing()) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
-            <?php
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('Deinterlacing') ?></td>
+              <td><?php echo htmlselect('newMonitor[Deinterlacing]', $deinterlaceopts_v4l2, $monitor->Deinterlacing())?></td>
+            </tr>
+<?php
         } else if ( $monitor->Type() != 'WebSite' ) {
 ?>
-            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->Deinterlacing()) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('Deinterlacing') ?></td>
+              <td><?php echo htmlselect('newMonitor[Deinterlacing]', $deinterlaceopts, $monitor->Deinterlacing())?></td>
+            </tr>
 <?php
         }
-      ?>
-        <?php
         if ( $monitor->Type() == 'Remote' ) {
           ?>
-            <tr id="RTSPDescribe"<?php if ( $monitor->Protocol()!= 'rtsp' ) { echo ' style="display:none;"'; } ?>><td><?php echo translate('RTSPDescribe') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_RTSPDESCRIBE', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( $monitor->RTSPDescribe() ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr id="RTSPDescribe"<?php if ( $monitor->Protocol()!= 'rtsp' ) { echo ' style="display:none;"'; } ?>>
+              <td class="text-right pr-3"><?php echo translate('RTSPDescribe'); echo makeHelpLink('OPTIONS_RTSPDESCRIBE') ?></td>
+              <td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( $monitor->RTSPDescribe() ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
 <?php
-      }
+      } # end if monitor->Type() == 'Remote'
       break;
     }
   case 'storage' :
 ?>
-            <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->SaveJPEGs() ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo translate('VideoWriter') ?></td><td>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('StorageArea') ?></td>
+            <td>
+<?php
+      $storage_areas = array(0=>'Default');
+      foreach ( ZM\Storage::find(array('Enabled'=>true), array('order'=>'lower(Name)')) as $Storage ) {
+        $storage_areas[$Storage->Id()] = $Storage->Name();
+      }
+      echo htmlSelect('newMonitor[StorageId]', $storage_areas, $monitor->StorageId());
+?>
+            </td>
+          </tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('SaveJPEGs') ?></td>
+            <td>
+<?php
+      $savejpegopts = array(
+        0 => 'Disabled',
+        1 => 'Frames only',
+        2 => 'Analysis images only (if available)',
+        3 => 'Frames + Analysis images (if available)',
+      );
+      echo htmlSelect('newMonitor[SaveJPEGs]', $savejpegopts, $monitor->SaveJPEGs());
+?>
+             </td>
+            </tr>
+            <tr><td class="text-right pr-3"><?php echo translate('VideoWriter') ?></td><td>
 <?php
 	$videowriteropts = array(
 			0 => 'Disabled',
 			);
 
-  if (stripos(php_uname('m'), 'arm') === false )
-    $videowriteropts[1] = 'X264 Encode';
-  else
-    $videowriteropts[1] = array('text'=>'X264 Encode - Not compatible on Arm','disabled'=>1);
+  $videowriteropts[1] = 'X264 Encode';
 
-  if ($monitor->Type() == 'Ffmpeg' )
+  if ( $monitor->Type() == 'Ffmpeg' )
     $videowriteropts[2] = 'H264 Camera Passthrough';
   else
     $videowriteropts[2] = array('text'=>'H264 Camera Passthrough - only for FFMPEG','disabled'=>1);
-	echo htmlselect('newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter());
+	echo htmlSelect('newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter());
 ?>
               </td>
             </tr>
@@ -1007,8 +961,13 @@ echo htmlSelect('newMonitor[OutputContainer]', $videowriter_containers, $monitor
 ?>
               </td>
             </tr>
-            <tr><td><?php echo translate('OptionalEncoderParam') ?></td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($monitor->EncoderParameters()) ?></textarea></td></tr>
-            <tr><td><?php echo translate('RecordAudio') ?></td><td>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('OptionalEncoderParam'); echo makeHelpLink('OPTIONS_ENCODER_PARAMETERS') ?></td>
+              <td>
+              <textarea name="newMonitor[EncoderParameters]" rows="<?php echo count(explode("\n", $monitor->EncoderParameters())); ?>"><?php echo validHtmlStr($monitor->EncoderParameters()) ?></textarea>
+              </td>
+            </tr>
+            <tr><td class="text-right pr-3"><?php echo translate('RecordAudio') ?></td><td>
 <?php if ( $monitor->Type() == 'Ffmpeg' ) { ?>
               <input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( $monitor->RecordAudio() ) { ?> checked="checked"<?php } ?>/>
 <?php } else { ?>
@@ -1022,53 +981,125 @@ echo htmlSelect('newMonitor[OutputContainer]', $videowriter_containers, $monitor
   case 'timestamp' :
     {
 ?>
-            <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat()) ?>" size="32"/></td></tr>
-            <tr><td><?php echo translate('TimestampLabelX') ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('TimestampLabelY') ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('TimestampLabelSize') ?></td><td><select name="newMonitor[LabelSize]"><?php foreach ( $label_size as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->LabelSize() ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('TimestampLabelFormat') ?></td>
+              <td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat()) ?>"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('TimestampLabelX') ?></td>
+              <td><input type="number" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>" min="0"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('TimestampLabelY') ?></td>
+              <td><input type="number" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>" min="0"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('TimestampLabelSize') ?></td>
+              <td><?php echo htmlselect('newMonitor[LabelSize]', $label_size, $monitor->LabelSize()) ?></td>
+            </tr>
 <?php
       break;
     }
   case 'buffers' :
     {
 ?>
-            <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount()) ?>" size="6"/></td></tr>
-            <tr><td><?php echo translate('WarmupFrames') ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('PreEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('PostEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('StreamReplayBuffer') ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer()) ?>" size="6"/></td></tr>
-<tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>" size="4"/></td></tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ImageBufferSize') ?></td>
+              <td><input type="number" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount()) ?>" min="1"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('WarmupFrames') ?></td>
+              <td><input type="number" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount()) ?>" min="0"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('PreEventImageBuffer') ?></td>
+              <td><input type="number" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount()) ?>" min="0"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('PostEventImageBuffer') ?></td>
+              <td><input type="number" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount()) ?>" min="0"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('StreamReplayBuffer') ?></td>
+              <td><input type="number" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer()) ?>" min="0"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('AlarmFrameCount') ?></td>
+              <td><input type="number" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>" min="1"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('EstimatedRamUse') ?></td>
+              <td id="estimated_ram_use"><?php echo human_filesize($monitor->ImageBufferCount() * $monitor->Width() * $monitor->Height() * $monitor->Colours(), 0) ?></td>
+            </tr>
 <?php
       break;
     }
   case 'control' :
     {
 ?>
-            <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( $monitor->Controllable() ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><td><?php echo translate('ControlType') ?></td><td><?php echo buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<?php echo makePopupLink('?view=controlcaps', 'zmControlCaps', 'controlcaps', translate('Edit')); ?></a><?php } ?></td></tr>
-            <tr><td><?php echo translate('ControlDevice') ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice()) ?>" size="32"/></td></tr>
-            <tr><td><?php echo translate('ControlAddress') ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ?>" size="32"/></td></tr>
-            <tr><td><?php echo translate('AutoStopTimeout') ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('TrackMotion') ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( $monitor->TrackMotion() ) { ?> checked="checked"<?php } ?>/></td></tr>
-<?php
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('Controllable') ?></td>
+              <td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( $monitor->Controllable() ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ControlType') ?></td>
+              <td>
+<?php 
+                  $controlTypes = array(''=>translate('None'));
+                  foreach ( $controls as $control ) {
+                    $controlTypes[$control->Id()] = $control->Name();
+                  }
+
+                  echo htmlSelect('newMonitor[ControlId]', $controlTypes, $monitor->ControlId());
+                  if ( canEdit('Control') ) {
+                    echo '&nbsp;'.makePopupLink('?view=controlcaps', 'zmControlCaps', 'controlcaps', translate('Edit'));
+                  }
+?>
+              </td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ControlDevice') ?></td>
+              <td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice()) ?>"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ControlAddress') ?></td>
+              <td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ? : 'user:port@ip' ?>"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('AutoStopTimeout') ?></td>
+              <td><input type="number" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout()) ?>" min="0" step="any"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('TrackMotion') ?></td>
+              <td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( $monitor->TrackMotion() ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('TrackDelay') ?></td>
+              <td><input type="number" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay()) ?>" min="0" step="any"/></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ReturnLocation') ?></td>
+              <td><?php
       $return_options = array(
           '-1' => translate('None'),
           '0' => translate('Home'),
-          '1' => translate('Preset')." 1",
+          '1' => translate('Preset').' 1',
       );
-?>
-            <tr><td><?php echo translate('TrackDelay') ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay()) ?>" size="4"/></td></tr>
-            <tr><td><?php echo translate('ReturnLocation') ?></td><td><?php echo buildSelect( "newMonitor[ReturnLocation]", $return_options ); ?></td></tr>
-            <tr><td><?php echo translate('ReturnDelay') ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay()) ?>" size="4"/></td></tr>
+echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnLocation()); ?></td>
+            </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ReturnDelay') ?></td>
+              <td><input type="number" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay()) ?>" min="0" step="any"/></td>
+            </tr>
 <?php
       break;
     }
   case 'x10' :
     {
 ?>
-            <tr><td><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
-            <tr><td><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
-            <tr><td><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
+            <tr><td class="text-right pr-3"><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
+            <tr><td class="text-right pr-3"><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
+            <tr><td class="text-right pr-3"><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
 <?php
       break;
     }
@@ -1076,84 +1107,86 @@ echo htmlSelect('newMonitor[OutputContainer]', $videowriter_containers, $monitor
     {
 ?>
         <tr>
-          <td><?php echo translate('EventPrefix') ?></td>
+          <td class="text-right pr-3"><?php echo translate('EventPrefix') ?></td>
           <td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix()) ?>"/></td>
         </tr>
         <tr>
-          <td><?php echo translate('Sectionlength') ?></td>
+          <td class="text-right pr-3"><?php echo translate('Sectionlength') ?></td>
           <td>
-            <input type="number" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>"/>
+            <input type="number" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>" min="0"/>
             <?php echo translate('seconds')?>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('MinSectionlength') ?></td>
+          <td class="text-right pr-3"><?php echo translate('MinSectionlength') ?></td>
           <td>
-            <input type="number" name="newMonitor[MinSectionLength]" value="<?php echo validHtmlStr($monitor->MinSectionLength()) ?>"/>
+            <input type="number" name="newMonitor[MinSectionLength]" value="<?php echo validHtmlStr($monitor->MinSectionLength()) ?>" min="0"/>
             <?php echo translate('seconds')?>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('FrameSkip') ?></td>
+          <td class="text-right pr-3"><?php echo translate('FrameSkip') ?></td>
           <td>
-            <input type="number" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>"/>
+            <input type="number" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>" min="0"/>
             <?php echo translate('frames')?>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('MotionFrameSkip') ?></td>
+          <td class="text-right pr-3"><?php echo translate('MotionFrameSkip') ?></td>
           <td>
-            <input type="number" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>"/>
+            <input type="number" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>" min="0"/>
             <?php echo translate('frames')?>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('AnalysisUpdateDelay') ?></td>
+          <td class="text-right pr-3"><?php echo translate('AnalysisUpdateDelay') ?></td>
           <td>
-            <input type="number" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>"/>
+            <input type="number" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>" min="0"/>
             <?php echo translate('seconds')?>
           </td></tr>
         <tr>
-          <td><?php echo translate('FPSReportInterval') ?></td>
+          <td class="text-right pr-3"><?php echo translate('FPSReportInterval') ?></td>
           <td>
-            <input type="number" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>"/>
+            <input type="number" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>" min="0"/>
             <?php echo translate('frames')?>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('DefaultRate') ?></td>
+          <td class="text-right pr-3"><?php echo translate('DefaultRate') ?></td>
           <td><?php echo htmlSelect('newMonitor[DefaultRate]', $rates, $monitor->DefaultRate()); ?></td>
         </tr>
         <tr>
-          <td><?php echo translate('DefaultScale') ?></td>
+          <td class="text-right pr-3"><?php echo translate('DefaultScale') ?></td>
           <td><?php echo htmlSelect('newMonitor[DefaultScale]', $scales, $monitor->DefaultScale()); ?></td>
         </tr>
         <tr>
-          <td><?php echo translate('DefaultCodec') ?></td>
+          <td class="text-right pr-3"><?php echo translate('DefaultCodec') ?></td>
           <td><?php echo htmlSelect('newMonitor[DefaultCodec]', $codecs, $monitor->DefaultCodec()); ?></td>
         </tr>
         <tr>
-          <td><?php echo translate('SignalCheckPoints') ?></td>
+          <td class="text-right pr-3"><?php echo translate('SignalCheckPoints') ?></td>
           <td>
-            <input type="number" name="newMonitor[SignalCheckPoints]" value="<?php echo validInt($monitor->SignalCheckPoints()) ?>"/>
+            <input type="number" name="newMonitor[SignalCheckPoints]" value="<?php echo validInt($monitor->SignalCheckPoints()) ?>" min="0"/>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('SignalCheckColour') ?></td>
+          <td class="text-right pr-3"><?php echo translate('SignalCheckColour') ?></td>
           <td>
-            <input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>"/>
+            <input type="color" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>"/>
             <span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($monitor->SignalCheckColour()); ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('WebColour') ?></td>
+          <td class="text-right pr-3"><?php echo translate('WebColour') ?></td>
           <td>
-            <input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/>
+            <input type="color" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>"/>
             <span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($monitor->WebColour()) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <i class="material-icons" data-on-click="random_WebColour">sync</i>
+
           </td>
         </tr>
         <tr>
-          <td><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+          <td class="text-right pr-3"><?php echo translate('Exif'); echo makeHelpLink('OPTIONS_EXIF') ?></td>
           <td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( $monitor->Exif() ) { ?> checked="checked"<?php } ?>/></td>
         </tr>
 <?php
@@ -1163,12 +1196,18 @@ echo htmlSelect('newMonitor[OutputContainer]', $videowriter_containers, $monitor
 ?>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <button type="submit" value="Save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+</div>
+<?php 
+} # end foreach tab
+?>
+</div><!--tab-content-->
+        <div id="contentButtons" class="pr-3">
+          <button type="submit" name="action" value="save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+          <button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
     </div>
-  </body>
-</html>
+    </div>
+  </div>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/monitorpreset.php b/web/skins/classic/views/monitorpreset.php
index ef5a6ac01..22c960587 100644
--- a/web/skins/classic/views/monitorpreset.php
+++ b/web/skins/classic/views/monitorpreset.php
@@ -36,10 +36,9 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('MonitorPreset') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
       <h2><?php echo translate('MonitorPreset') ?></h2>
-    </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
@@ -57,5 +56,4 @@ xhtmlHeaders(__FILE__, translate('MonitorPreset') );
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php
index 8fb626516..d670e0fcc 100644
--- a/web/skins/classic/views/monitorprobe.php
+++ b/web/skins/classic/views/monitorprobe.php
@@ -39,16 +39,18 @@ function probeV4L() {
   }
 
   $monitors = array();
-  foreach ( dbFetchAll("SELECT Id, Name, Device,Channel FROM Monitors WHERE Type = 'Local' ORDER BY Device, Channel" ) as $monitor )
+  foreach ( dbFetchAll("SELECT Id, Name, Device, Channel FROM Monitors WHERE Type = 'Local' ORDER BY Device, Channel" ) as $monitor )
     $monitors[$monitor['Device'].':'.$monitor['Channel']] = $monitor;
 
   $devices = array();
   $preferredStandards = array('PAL', 'NTSC');
   $preferredFormats = array('BGR3', 'RGB3', 'YUYV', 'UYVY', 'JPEG', 'MJPG', '422P', 'YU12', 'GREY');
   foreach ( $output as $line ) {
-    if ( !preg_match('/^d:([^|]+).*S:([^|]*).*F:([^|]+).*I:(\d+)\|(.+)$/', $line, $deviceMatches) )
-      ZM\Fatal("Can't parse command output '$line'");
-    $standards = explode('/',$deviceMatches[2]);
+    if ( !preg_match('/^d:([^|]+).*S:([^|]*).*F:([^|]+).*I:(\d+)\|(.+)$/', $line, $deviceMatches) ) {
+      ZM\Error("Can't parse command output '$line'");
+      continue;
+    }
+    $standards = explode('/', $deviceMatches[2]);
     $preferredStandard = false;
     foreach ( $preferredStandards as $standard ) {
       if ( in_array( $standard, $standards ) ) {
@@ -56,7 +58,7 @@ function probeV4L() {
         break;
       }
     }
-    $formats = explode('/',$deviceMatches[3]);
+    $formats = explode('/', $deviceMatches[3]);
     $preferredFormat = false;
     foreach ( $preferredFormats as $format ) {
       if ( in_array($format, $formats) ) {
@@ -73,8 +75,10 @@ function probeV4L() {
     );
     $inputs = array();
     for ( $i = 0; $i < $deviceMatches[4]; $i++ ) {
-      if ( !preg_match('/i'.$i.':([^|]+)\|i'.$i.'T:([^|]+)\|/', $deviceMatches[5], $inputMatches) )
-        ZM\Fatal("Can't parse input '".$deviceMatches[5]."'");
+      if ( !preg_match('/i'.$i.':([^|]+)\|i'.$i.'T:([^|]+)\|/', $deviceMatches[5], $inputMatches) ) {
+        ZM\Error("Can't parse input '".$deviceMatches[5]."'");
+        continue;
+      }
       if ( $inputMatches[2] == 'Camera' ) {
         $input = array(
           'index' => $i,
@@ -101,7 +105,7 @@ function probeV4L() {
           $inputMonitor['Colours'] = 1;
           $inputMonitor['SignalCheckColour'] = '#000023';
         }
-        $inputDesc = base64_encode(serialize($inputMonitor));
+        $inputDesc = base64_encode(json_encode($inputMonitor));
         $inputString = $deviceMatches[1].', chan '.$i.($input['free']?(' - '.translate('Available')):(' ('.$monitors[$input['id']]['Name'].')'));
         $inputs[] = $input;
         $cameras[$inputDesc] = $inputString;
@@ -247,18 +251,18 @@ function probeNetwork() {
   $arp_command = ZM_PATH_ARP;
   $result = explode(' ', $arp_command);
   if ( !is_executable($result[0]) ) {
-    ZM\Error("ARP compatible binary not found or not executable by the web user account. Verify ZM_PATH_ARP points to a valid arp tool.");
-    return;
+    ZM\Error('ARP compatible binary not found or not executable by the web user account. Verify ZM_PATH_ARP points to a valid arp tool.');
+    return $cameras;
   }
 
   $result = exec(escapeshellcmd($arp_command), $output, $status);
   if ( $status ) {
     ZM\Error("Unable to probe network cameras, status is '$status'");
-    return;
+    return $cameras;
   }
 
   $monitors = array();
-  foreach ( dbFetchAll("SELECT Id, Name, Host FROM Monitors WHERE Type = 'Remote' ORDER BY Host") as $monitor ) {
+  foreach ( dbFetchAll("SELECT `Id`, `Name`, `Host` FROM `Monitors` WHERE `Type` = 'Remote' ORDER BY `Host`") as $monitor ) {
     if ( preg_match('/^(.+)@(.+)$/', $monitor['Host'], $matches) ) {
       //echo "1: ".$matches[2]." = ".gethostbyname($matches[2])."<br/>";
       $monitors[gethostbyname($matches[2])] = $monitor;
@@ -277,29 +281,29 @@ function probeNetwork() {
     '78:a5:dd' => array('type'=>'Wansview','probeFunc'=>'probeWansview')
   );
 
-    foreach ( $output as $line ) {
-      if ( !preg_match('/(\d+\.\d+\.\d+\.\d+).*(([0-9a-f]{2}:){5})/', $line, $matches) )
-        continue;
-      $ip = $matches[1];
-      $host = $ip;
-      $mac = $matches[2];
-      //echo "I:$ip, H:$host, M:$mac<br/>";
-      $macRoot = substr($mac,0,8);
-      if ( isset($macBases[$macRoot]) ) {
-        $macBase = $macBases[$macRoot];
-        $camera = call_user_func($macBase['probeFunc'], $ip);
-        $sourceDesc = base64_encode(serialize($camera['monitor']));
-        $sourceString = $camera['model'].' @ '.$host;
-        if ( isset($monitors[$ip]) ) {
-          $monitor = $monitors[$ip];
-          $sourceString .= ' ('.$monitor['Name'].')';
-        } else {
-          $sourceString .= ' - '.translate('Available');
-        }
-        $cameras[$sourceDesc] = $sourceString;
+  foreach ( $output as $line ) {
+    if ( !preg_match('/(\d+\.\d+\.\d+\.\d+).*(([0-9a-f]{2}:){5})/', $line, $matches) )
+      continue;
+    $ip = $matches[1];
+    $host = $ip;
+    $mac = $matches[2];
+    //echo "I:$ip, H:$host, M:$mac<br/>";
+    $macRoot = substr($mac,0,8);
+    if ( isset($macBases[$macRoot]) ) {
+      $macBase = $macBases[$macRoot];
+      $camera = call_user_func($macBase['probeFunc'], $ip);
+      $sourceDesc = base64_encode(json_encode($camera['monitor']));
+      $sourceString = $camera['model'].' @ '.$host;
+      if ( isset($monitors[$ip]) ) {
+        $monitor = $monitors[$ip];
+        $sourceString .= ' ('.$monitor['Name'].')';
+      } else {
+        $sourceString .= ' - '.translate('Available');
       }
-    } # end foreach output line
-    return $cameras;
+      $cameras[$sourceDesc] = $sourceString;
+    }
+  } # end foreach output line
+  return $cameras;
 } # end function probeNetwork()
 
 $cameras = array();
@@ -317,10 +321,9 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('MonitorProbe') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('MonitorProbe') ?></h2>
-    </div>
+    <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
@@ -330,7 +333,7 @@ xhtmlHeaders(__FILE__, translate('MonitorProbe') );
         </p>
         <p>
           <label for="probe"><?php echo translate('DetectedCameras') ?></label>
-          <?php echo buildSelect('probe', $cameras, 'configureButtons(this)'); ?>
+          <?php echo htmlSelect('probe', $cameras, null, array('data-on-change-this'=>'configureButtons(this)')); ?>
         </p>
         <div id="contentButtons">
         <button type="button" name="saveBtn" value="Save" data-on-click-this="submitCamera" disabled="disabled">
@@ -340,5 +343,4 @@ xhtmlHeaders(__FILE__, translate('MonitorProbe') );
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index d8bd27ae6..1c62fddf4 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -33,46 +33,43 @@ if ( isset($_REQUEST['showZones']) ) {
   }
 }
 $widths = array( 
-  'auto'  => 'auto',
-  '160px' => '160px',
-  '320px' => '320px',
-  '352px' => '352px',
-  '640px' => '640px',
-  '1280px' => '1280px' );
+  '0'  => 'auto',
+  '160' => '160px',
+  '320' => '320px',
+  '352' => '352px',
+  '640' => '640px',
+  '1280' => '1280px' );
 
 $heights = array( 
-  'auto'  => 'auto',
-  '240px' => '240px',
-  '320px' => '320px',
-  '480px' => '480px',
-  '720px' => '720px',
-  '1080px' => '1080px',
+  '0'  => 'auto',
+  '240' => '240px',
+  '320' => '320px',
+  '480' => '480px',
+  '720' => '720px',
+  '1080' => '1080px',
 );
 
-$scale = '100';   # actual
-
-if ( isset( $_REQUEST['scale'] ) ) {
-  $scale = validInt($_REQUEST['scale']);
-} else if ( isset($_COOKIE['zmMontageScale']) ) {
-  $scale = $_COOKIE['zmMontageScale'];
-}
-
-if ( ! $scale ) 
-  $scale = 100;
 
 $layouts = ZM\MontageLayout::find(NULL, array('order'=>"lower('Name')"));
 $layoutsById = array();
 foreach ( $layouts as $l ) {
-  $layoutsById[$l->Id()] = $l;
+  if ( $l->Name() == 'Freeform' ) {
+    $layoutsById[$l->Id()] = $l;
+    break;
+  }
+}
+foreach ( $layouts as $l ) {
+  if ( $l->Name() != 'Freeform' )
+    $layoutsById[$l->Id()] = $l;
 }
 
-session_start();
+zm_session_start();
 
 $layout_id = '';
 if ( isset($_COOKIE['zmMontageLayout']) ) {
   $layout_id = $_SESSION['zmMontageLayout'] = $_COOKIE['zmMontageLayout'];
-#} elseif ( isset($_SESSION['zmMontageLayout']) ) {
-  #$layout_id = $_SESSION['zmMontageLayout'];
+} elseif ( isset($_SESSION['zmMontageLayout']) ) {
+  $layout_id = $_SESSION['zmMontageLayout'];
 }
 
 $options = array();
@@ -81,27 +78,37 @@ $Positions = '';
 if ( $layout_id and is_numeric($layout_id) and isset($layoutsById[$layout_id]) ) {
   $Layout = $layoutsById[$layout_id];
   $Positions = json_decode($Layout->Positions(), true);
+} else {
+  ZM\Logger::Debug('Layout not found');
 }
 if ( $Layout and ( $Layout->Name() != 'Freeform' ) ) {
   // Use layout instead of other options
 }
 
-if ( isset($_COOKIE['zmMontageWidth']) and $_COOKIE['zmMontageWidth'] ) {
-  $_SESSION['zmMontageWidth'] = $options['width'] = $_COOKIE['zmMontageWidth'];
+if ( isset($_COOKIE['zmMontageWidth']) ) {
+  $_SESSION['zmMontageWidth'] = $options['width'] = validInt($_COOKIE['zmMontageWidth']);
 #} elseif ( isset($_SESSION['zmMontageWidth']) and $_SESSION['zmMontageWidth'] ) {
   #$options['width'] = $_SESSION['zmMontageWidth'];
-} else
-  $options['width'] = '';
+} else {
+  $options['width'] = 0;
+}
 
-if ( isset($_COOKIE['zmMontageHeight']) and $_COOKIE['zmMontageHeight'] )
-  $_SESSION['zmMontageHeight'] = $options['height'] = $_COOKIE['zmMontageHeight'];
+if ( isset($_COOKIE['zmMontageHeight']) ) {
+  $_SESSION['zmMontageHeight'] = $options['height'] = validInt($_COOKIE['zmMontageHeight']);
 #else if ( isset($_SESSION['zmMontageHeight']) and $_SESSION['zmMontageHeight'] )
   #$options['height'] = $_SESSION['zmMontageHeight'];
-else
-  $options['height'] = '';
+} else {
+  $options['height'] = 0;
+}
 
-if ( $scale ) 
-  $options['scale'] = $scale;
+$scale = '100';   # actual
+
+if ( isset($_REQUEST['scale']) ) {
+  $scale = validInt($_REQUEST['scale']);
+} else if ( isset($_COOKIE['zmMontageScale']) ) {
+  $scale = validInt($_COOKIE['zmMontageScale']);
+}
+$options['scale'] = $scale;
 
 session_write_close();
 
@@ -111,21 +118,20 @@ $filterbar = ob_get_contents();
 ob_end_clean();
 
 $monitors = array();
-foreach( $displayMonitors as &$row ) {
+foreach ( $displayMonitors as &$row ) {
   if ( $row['Function'] == 'None' )
     continue;
 
   $row['Scale'] = $scale;
-  $row['PopupScale'] = reScale( SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+  $row['PopupScale'] = reScale(SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
 
   if ( ZM_OPT_CONTROL && $row['ControlId'] && $row['Controllable'] )
     $showControl = true;
-  $row['connKey'] = generateConnKey();
   if ( ! isset($widths[$row['Width']]) ) {
-    $widths[$row['Width'].'px'] = $row['Width'].'px';
+    $widths[$row['Width']] = $row['Width'].'px';
   }
   if ( ! isset($heights[$row['Height']]) ) {
-    $heights[$row['Height'].'px'] = $row['Height'].'px';
+    $heights[$row['Height']] = $row['Height'].'px';
   }
   $monitors[] = new ZM\Monitor($row);
 } # end foreach Monitor
@@ -135,9 +141,14 @@ xhtmlHeaders(__FILE__, translate('Montage'));
 <body>
   <div id="page">
     <?php echo getNavBarHTML() ?>
-    <div id="header">&nbsp;&nbsp;
-      <a href="#"><span id="hdrbutton" class="glyphicon glyphicon-menu-up pull-right" title="Toggle Filters"></span></a>
-      <div id="flipMontageHeader">
+    <div id="header">
+<?php
+    $html = '';
+    $flip = ( (!isset($_COOKIE['zmMonitorFilterBarFlip'])) or ($_COOKIE['zmMonitorFilterBarFlip'] == 'up')) ? 'down' : 'up';
+    $html .= '<a class="flip" href="#"><i id="mfbflip" class="material-icons md-18">keyboard_arrow_' .$flip. '</i></a>'.PHP_EOL;
+    $html .= '<div class="container-fluid" id="mfbpanel"'.( ( $flip == 'down' ) ? ' style="display:none;"' : '' ) .'>'.PHP_EOL;
+    echo $html;
+?>
         <div id="headerButtons">
 <?php
 if ( $showControl ) {
@@ -145,11 +156,11 @@ if ( $showControl ) {
 }
 if ( $showZones ) {
 ?>
-        <a id="ShowZones" href="?view=montage&showZones=0">Hide Zones</a>
+  <a id="HideZones" href="?view=montage&amp;showZones=0"><?php echo translate('Hide Zones')?></a>
 <?php
 } else {
 ?>
-        <a id="ShowZones" href="?view=montage&showZones=1">Show Zones</a>
+  <a id="ShowZones" href="?view=montage&amp;showZones=1"><?php echo translate('Show Zones')?></a>
 <?php
 }
 ?>
@@ -159,32 +170,32 @@ if ( $showZones ) {
         <?php echo $filterbar ?>
       </form>
       <div id="sizeControl">
-        <form action="index.php?view=montage" method="post">
+        <form action="?view=montage" method="post">
           <input type="hidden" name="object" value="MontageLayout"/>
           <input type="hidden" name="action" value="Save"/>
 
           <span id="widthControl">
-            <label><?php echo translate('Width') ?>:</label>
-            <?php echo htmlSelect('width', $widths, $options['width'], 'changeSize(this);'); ?>
+            <label><?php echo translate('Width') ?></label>
+            <?php echo htmlSelect('width', $widths, $options['width'], array('id'=>'width', 'data-on-change-this'=>'changeSize')); ?>
           </span>
           <span id="heightControl">
-            <label><?php echo translate('Height') ?>:</label>
-            <?php echo htmlSelect('height', $heights, $options['height'], 'changeSize(this);'); ?>
+            <label><?php echo translate('Height') ?></label>
+            <?php echo htmlSelect('height', $heights, $options['height'], array('id'=>'height', 'data-on-change-this'=>'changeSize')); ?>
           </span>
           <span id="scaleControl">
-            <label><?php echo translate('Scale') ?>:</label>
-            <?php echo htmlSelect('scale', $scales, $scale, 'changeScale(this);'); ?>
+            <label><?php echo translate('Scale') ?></label>
+            <?php echo htmlSelect('scale', $scales, $scale, array('id'=>'scale', 'data-on-change-this'=>'changeScale')); ?>
           </span> 
           <span id="layoutControl">
-            <label for="layout"><?php echo translate('Layout') ?>:</label>
-            <?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('onchange'=>'selectLayout(this);')); ?>
+            <label for="layout"><?php echo translate('Layout') ?></label>
+            <?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('id'=>'zmMontageLayout', 'data-on-change'=>'selectLayout')); ?>
           </span>
           <input type="hidden" name="Positions"/>
-          <input type="button" id="EditLayout" value="<?php echo translate('EditLayout') ?>" data-on-click-this="edit_layout"/>
+          <button type="button" id="EditLayout" data-on-click-this="edit_layout"><?php echo translate('EditLayout') ?></button>
           <span id="SaveLayout" style="display:none;">
-            <input type="text" name="Name" placeholder="Enter new name for layout if desired" />
-            <input type="button" value="<?php echo translate('Save') ?>" data-on-click-this="save_layout"/>
-            <input type="button" value="Cancel" data-on-click-this="cancel_layout"/>
+            <input type="text" name="Name" placeholder="Enter new name for layout if desired"/>
+            <button type="button" value="Save" data-on-click-this="save_layout"><?php echo translate('Save') ?></button>
+            <button type="button" value="Cancel" data-on-click-this="cancel_layout"><?php echo translate('Cancel') ?></button>
           </span>
         </form>
       </div>
@@ -194,38 +205,35 @@ if ( $showZones ) {
     <div id="monitors">
 <?php
 foreach ( $monitors as $monitor ) {
-  $connkey = $monitor->connKey(); // Minor hack
 ?>
-        <div id="monitorFrame<?php echo $monitor->Id() ?>" class="monitorFrame" title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>" style="<?php echo $options['width'] ? 'width:'.$options['width'].';':''?>">
+        <div
+          id="monitorFrame<?php echo $monitor->Id() ?>"
+          class="monitorFrame"
+          title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>"
+          style="<?php echo $options['width'] ? 'width:'.$options['width'].'px;':''?>"
+        >
           <div id="monitor<?php echo $monitor->Id() ?>" class="monitor idle">
             <div
               id="imageFeed<?php echo $monitor->Id() ?>"
               class="imageFeed"
               data-monitor-id="<?php echo $monitor->Id() ?>"
-              data-width="<?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>"
-              data-height="<?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?>">
+              data-width="<?php echo reScale($monitor->ViewWidth(), $monitor->PopupScale()); ?>"
+              data-height="<?php echo reScale($monitor->ViewHeight(), $monitor->PopupScale()); ?>"
+            >
             <?php
   $monitor_options = $options;
-  if (0 and $Positions ) {
-    $monitor_options['width'] = '100%';
-    $monitor_options['height'] = '100%';
-    if ( 0 ) {
-    if ( isset($Positions[$monitor->Id()]) ) {
-      $monitor_options = array();
-      #$monitor_options = $Positions[$monitor->Id()];
-    } else if ( isset($Positions['default']) ) {
-      $monitor_options = array();
-      #$monitor_options = $Positions['default'];
-    }
-    }
-  }
+  $monitor_options['width'] = $monitor_options['width'].'px';
+  $monitor_options['height'] = $monitor_options['height']?$monitor_options['height'].'px' : null;
+  $monitor_options['connkey'] = $monitor->connKey();
+
+  #ZM\Warning('Options: ' . print_r($monitor_options,true));
 
   if ( $monitor->Type() == 'WebSite' ) {
     echo getWebSiteUrl(
       'liveStream'.$monitor->Id(),
       $monitor->Path(),
-      (isset($options['width']) ? $options['width'] : reScale($monitor->Width(), $scale).'px' ),
-      ( isset($options['height']) ? $options['height'] : reScale($monitor->Height(), $scale).'px' ),
+      (isset($options['width']) ? $options['width'].'px' : reScale($monitor->ViewWidth(), $scale).'px' ),
+      ( isset($options['height']) ? $options['height'].'px' : reScale($monitor->ViewHeight(), $scale).'px' ),
       $monitor->Name()
     );
   } else {
@@ -238,17 +246,17 @@ foreach ( $monitors as $monitor ) {
       $width = $options['width'];
       if ( !$options['height'] ) {
         $scale = (int)( 100 * $options['width'] / $monitor->Width() );
-        $height = reScale($monitor->Height(), $scale).'px';
+        $height = reScale($monitor->Height(), $scale);
       }
     } else if ( $options['height'] ) {
       $height = $options['height'];
       if ( !$options['width'] ) {
         $scale = (int)( 100 * $options['height'] / $monitor->Height() );
-        $width = reScale($monitor->Width(), $scale).'px';
+        $width = reScale($monitor->Width(), $scale);
       }
     } else if ( $scale ) {
-      $width = reScale($monitor->Width(), $scale).'px';
-      $height = reScale($monitor->Height(), $scale).'px';
+      $width = reScale($monitor->Width(), $scale);
+      $height = reScale($monitor->Height(), $scale);
     } 
 
     $zones = array();
@@ -259,8 +267,8 @@ foreach ( $monitors as $monitor ) {
         limitPoints($row['Points'], 0, 0, $monitor->Width(), $monitor->Height());
       } else {
         limitPoints($row['Points'], 0, 0, 
-            ( $width ? $width-1 : $monitor->Width()-1 ),
-            ( $height ? $height-1 : $monitor->Height()-1 )
+            ( $width ? $width-1 : $monitor->ViewWidth()-1 ),
+            ( $height ? $height-1 : $monitor->ViewHeight()-1 )
             );
       }
       $row['Coords'] = pointsToCoords($row['Points']);
@@ -269,9 +277,9 @@ foreach ( $monitors as $monitor ) {
     } // end foreach Zone
 ?>
 
-<svg class="zones" id="zones<?php echo $monitor->Id() ?>" style="position:absolute; top: 0; left: 0; background: none; width: 100%; height: 100%;" viewBox="0 0 <?php echo  $monitor->Width() ?> <?php echo  $monitor->Height() ?>" preserveAspectRatio="none">
+<svg class="zones" id="zones<?php echo $monitor->Id() ?>" style="position:absolute; top: 0; left: 0; background: none; width: 100%; height: 100%;" viewBox="0 0 <?php echo $monitor->ViewWidth() ?> <?php echo $monitor->ViewHeight() ?>" preserveAspectRatio="none">
 <?php
-foreach( array_reverse($zones) as $zone ) {
+foreach ( array_reverse($zones) as $zone ) {
   echo '<polygon points="'. $zone['AreaCoords'] .'" class="'. $zone['Type'].'" />';
 } // end foreach zone
 ?>
@@ -296,4 +304,5 @@ foreach( array_reverse($zones) as $zone ) {
       </div>
     </div>
   </div>
+  <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 29c32deaf..615a04c0c 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -62,6 +62,17 @@ ob_end_clean();
 $filter = array();
 if ( isset($_REQUEST['filter']) ) {
   $filter = $_REQUEST['filter'];
+
+	# Try to guess min/max time from filter
+	foreach ( $filter['Query'] as $term ) {
+		if ( $term['attr'] == 'StartDateTime' ) {
+			if ( $term['op'] == '<=' or $term['op'] == '<' ) {
+				$maxTime = $term['val'];
+			} else if ( $term['op'] == '>=' or $term['op'] == '>' ) {
+				$minTime = $term['val'];
+			}
+		}
+	}
 } else {
 
   if ( isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && (count($displayMonitors) != 0) ) {
@@ -88,12 +99,13 @@ if ( isset($_REQUEST['filter']) ) {
       }
     }
   } # end if REQUEST[Filter]
+}
+if ( count($filter) ) {
   parseFilter($filter);
   # This is to enable the download button
-  session_start();
+  zm_session_start();
   $_SESSION['montageReviewFilter'] = $filter;
   session_write_close();
-  $filterQuery = $filter['query'];
 }
 
 // Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame
@@ -308,7 +320,7 @@ getBodyTopHTML();
 <?php
   // Monitor images - these had to be loaded after the monitors used were determined (after loading events)
   foreach ( $monitors as $m ) {
-    echo '<canvas title="'.$m->Id().' ' .$m->Name().'" width="' . $m->Width() * $defaultScale . '" height="'  . $m->Height() * $defaultScale . '" id="Monitor' . $m->Id() . '" style="border:1px solid ' . $m->WebColour() . '" monitor_id="'.$m->Id().'">No Canvas Support!!</canvas>
+    echo '<canvas title="'.$m->Id().' '.validHtmlStr($m->Name()).'" width="'.($m->Width() * $defaultScale).'" height="'.($m->Height() * $defaultScale).'" id="Monitor'.$m->Id().'" style="border:1px solid '.$m->WebColour().'" monitor_id="'.$m->Id().'">No Canvas Support!!</canvas>
 ';
   }
 ?>
diff --git a/web/skins/classic/views/newlog.php b/web/skins/classic/views/newlog.php
new file mode 100644
index 000000000..d706365c3
--- /dev/null
+++ b/web/skins/classic/views/newlog.php
@@ -0,0 +1,91 @@
+<?php
+//
+// ZoneMinder web log view file, $Date: 2010-02-23 09:10:36 +0000 (Tue, 23 Feb 2010) $, $Revision: 3030 $
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+
+if ( !canView('System') ) {
+  $view = 'error';
+  return;
+}
+
+xhtmlHeaders(__FILE__, translate('SystemLog'));
+?>
+<body>
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="px-3">
+
+    <div id="logSummary" class="text-center">
+      <?php echo translate('State') ?>:&nbsp;<span id="logState"></span>&nbsp;-&nbsp;
+      <?php echo translate('Total') ?>:&nbsp;<span id="totalLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Available') ?>:&nbsp;<span id="availLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Displaying') ?>:&nbsp;<span id="displayLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Updated') ?>:&nbsp;<span id="lastUpdate"></span>
+    </div>
+
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+    </div>
+
+    <table
+      id="logTable"
+      class="table-sm table-borderless"
+      data-side-pagination="server"
+      data-ajax="ajaxRequest"
+      data-pagination="true"
+      data-page-list="[10, 25, 50, 100, 200, 300, 400, 500]"
+      data-search="true"
+      data-advanced-search="true"
+      data-id-table="advancedTable"
+      data-cookie="true"
+      data-cookie-id-table="zmLogsTable"
+      data-cookie-expire="2y"
+      data-remember-order="true"
+      data-show-columns="true"
+      data-show-export="true"
+      data-toolbar="#toolbar"
+      data-show-fullscreen="true"
+      data-maintain-meta-data="true"
+      data-mobile-responsive="true"
+      data-buttons-class="btn btn-normal"
+      data-show-jump-to="true"
+      data-auto-refresh="true"
+      data-auto-refresh-silent="true"
+      data-show-refresh="true"
+      data-auto-refresh-interval="5"
+    >
+      <thead class="thead-highlight">
+        <tr>
+          <th data-sortable="true" data-field="DateTime"><?php echo translate('DateTime') ?></th>
+          <th data-sortable="true" data-field="Component"><?php echo translate('Component') ?></th>
+          <th data-sortable="false" data-field="Server"><?php echo translate('Server') ?></th>
+          <th data-sortable="true" data-field="Pid"><?php echo translate('Pid') ?></th>
+          <th data-sortable="true" data-field="Code"><?php echo translate('Level') ?></th>
+          <th data-sortable="true" data-field="Message"><?php echo translate('Message') ?></th>
+          <th data-sortable="true" data-field="File"><?php echo translate('File') ?></th>
+          <th data-sortable="true" data-field="Line"><?php echo translate('Line') ?></th>
+        </tr>
+      </thead>
+
+      <tbody>
+      <!-- Row data populated via Ajax -->
+      </tbody>
+
+    </table>
+  </div><!--page-->
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/none.php b/web/skins/classic/views/none.php
index 1213b44d5..7e2702399 100644
--- a/web/skins/classic/views/none.php
+++ b/web/skins/classic/views/none.php
@@ -18,6 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
+  global $cspNonce;
 $skinJsPhpFile = getSkinFile('js/skin.js.php');
 $skinJsFile = getSkinFile('js/skin.js');
 ?>
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index e1c4c8ef7..900313e46 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -29,30 +29,32 @@ $cameras[0] = translate('ChooseDetectedCamera');
 $profiles = array();
 $profiles[0] = translate('ChooseDetectedProfile');
 
-function execONVIF( $cmd ) {
+function execONVIF($cmd) {
   $shell_command = escapeshellcmd(ZM_PATH_BIN . "/zmonvif-probe.pl $cmd");
 
-  exec( $shell_command, $output, $status );
+  exec($shell_command, $output, $status);
 
   if ( $status ) {
-    $html_output = implode( '<br/>', $output );
-    ZM\Fatal( "Unable to probe network cameras, status is '$status'. Output was:<br/><br/>
-        $html_output<br/><br/>
-        Please the following command from a command line for more information:<br/><br/>$shell_command"
+    $html_output = implode('<br/>', $output);
+    ZM\Error("Unable to probe network cameras, status is '$status'. Output was:
+        $html_output
+        Please run the following command from a command line for more information:
+        $shell_command"
         );
   } else {
-    ZM\Logger::Debug( "Results from probe: " . implode( '<br/>', $output ) );
+    ZM\Logger::Debug('Results from probe: '.implode('<br/>', $output));
   }
 
   return $output;
 }
 
-function probeCameras( $localIp ) {
+function probeCameras($localIp) {
   $cameras = array();
-  if ( $lines = @execONVIF( 'probe' ) ) {
+  $lines = @execONVIF('probe 1.1,1.2'.(isset($_REQUEST['interface']) ? ' '.isset($_REQUEST['interface']) : '' ));
+  if ( $lines ) {
     foreach ( $lines as $line ) {
-      $line = rtrim( $line );
-      if ( preg_match( '|^(.+),(.+),\s\((.*)\)$|', $line, $matches ) ) {
+      $line = rtrim($line);
+      if ( preg_match('|^(.+),(.+),\s\((.*)\)$|', $line, $matches) ) {
         $device_ep = $matches[1];
         $soapversion = $matches[2];
         $camera = array(
@@ -62,18 +64,23 @@ function probeCameras( $localIp ) {
               'Type'     => 'Ffmpeg',
               'Host'     => $device_ep,
               'SOAP'     => $soapversion,
+              'ConfigURL' => $device_ep,
+              'ConfigOptions' => 'SOAP' . $soapversion,
+              'Notes'     =>  '',
               ),
             );
         foreach ( preg_split('|,\s*|', $matches[3]) as $attr_val ) {
-          if ( preg_match( '|(.+)=\'(.*)\'|', $attr_val, $tokens ) ) {
+          if ( preg_match('|(.+)=\'(.*)\'|', $attr_val, $tokens) ) {
             if ( $tokens[1] == 'hardware' ) {
               $camera['model'] = $tokens[2];
-            } elseif ( $tokens[1] == 'name' ) {
+            } else if ( $tokens[1] == 'name' ) {
               $camera['monitor']['Name'] = $tokens[2];
-            } elseif ( $tokens[1] == 'location' ) {
-              //                      $camera['location'] = $tokens[2];
+            } else if ( $tokens[1] == 'type' ) {
+            } else if ( $tokens[1] == 'location' or $tokens[1] == 'location/city' or $tokens[1] == 'location/country' ) {
+              $camera['monitor']['Notes'] .= $tokens[1].'='.$tokens[2]."\n";
+              // $camera['location'] = $tokens[2];
             } else {
-              ZM\Logger::Debug('Unknown token ' . $tokens[1]);
+              ZM\Logger::Debug('Unknown token '.$tokens[1].' = '.$tokens[2]);
             }
           }
         } // end foreach token
@@ -84,17 +91,19 @@ function probeCameras( $localIp ) {
   return $cameras;
 } // end function probeCameras
 
-function probeProfiles( $device_ep, $soapversion, $username, $password ) {
+function probeProfiles($device_ep, $soapversion, $username, $password) {
   $profiles = array();
   if ( $lines = @execONVIF("profiles $device_ep $soapversion $username $password") ) {
     foreach ( $lines as $line ) {
       $line = rtrim( $line );
-      if ( preg_match('|^(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+)\s*$|', $line, $matches) ) {
-        $stream_uri = $matches[7];
+
+      if ( preg_match('|^([^,]+),\s*([^,]+),\s*([^,]+),\s*(\d+),\s*(\d+),\s*(\d+),\s*([^,]+),\s*(.+)\s*$|', $line, $matches) ) {
+        $stream_uri = $matches[8];
         // add user@pass to URI
         if ( preg_match('|^(\S+://)(.+)$|', $stream_uri, $tokens) ) {
           $stream_uri = $tokens[1].$username.':'.$password.'@'.$tokens[2];
-      }
+        }
+	ZM\Warning(print_r($matches,1));
 
         $profile = array(  # 'monitor' part of camera
             'Type'        => 'Ffmpeg',
@@ -106,6 +115,7 @@ function probeProfiles( $device_ep, $soapversion, $username, $password ) {
             'Profile'     => $matches[1],
             'Name'        => $matches[2],
             'Encoding'    => $matches[3],
+	    'Transport'	  => $matches[7],
             );
         $profiles[] = $profile;
       } else {
@@ -120,13 +130,14 @@ function probeProfiles( $device_ep, $soapversion, $username, $password ) {
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('MonitorProbe') );
+xhtmlHeaders(__FILE__, translate('MonitorProbe'));
+getBodyTopHTML();
 
 if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
 
   $monitors = array();
-  foreach ( dbFetchAll("SELECT Id, Name, Host FROM Monitors WHERE Type = 'Remote' ORDER BY Host") as $monitor ) {
-    if ( preg_match( '/^(.+)@(.+)$/', $monitor['Host'], $matches ) ) {
+  foreach ( dbFetchAll("SELECT Id, Name, Host FROM Monitors WHERE Type='Remote' ORDER BY Host") as $monitor ) {
+    if ( preg_match('/^(.+)@(.+)$/', $monitor['Host'], $matches) ) {
       //echo "1: ".$matches[2]." = ".gethostbyname($matches[2])."<br/>";
       $monitors[gethostbyname($matches[2])] = $monitor;
     } else {
@@ -137,26 +148,12 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
 
   $detcameras = probeCameras('');
   foreach ( $detcameras as $camera ) {
-    if ( preg_match( '|([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|', $camera['monitor']['Host'], $matches ) ) {
+    if ( preg_match('|([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|', $camera['monitor']['Host'], $matches) ) {
       $ip = $matches[1];
     }
     $host = $ip;
-/*
-        if ( isset($monitors[$ip]) )
-        {
-            $monitor = $monitors[$ip];
-            $sourceString .= " (".$monitor['Name'].")";
-        }
-        else
-        {
-            $sourceString .= " - ".translate('Available');
-        }
-        $cameras[$sourceDesc] = $sourceString;
-    }
-*/
-//       $sourceDesc = htmlspecialchars(serialize($camera['monitor']));
     $sourceDesc = base64_encode(json_encode($camera['monitor']));
-    $sourceString = $camera['model'].' @ '.$host . ' using version ' . $camera['monitor']['SOAP'] ;
+    $sourceString = $camera['model'].' @ '.$host.' using version '.$camera['monitor']['SOAP'];
     $cameras[$sourceDesc] = $sourceString;
   }
 
@@ -164,11 +161,9 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
     $cameras[0] = translate('NoDetectedCameras');
 
 ?>
-<body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('MonitorProbe') ?></h2>
-    </div>
+    <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
@@ -177,41 +172,82 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
         <p>
           <?php echo translate('OnvifProbeIntro') ?>
         </p>
+        <p><label for="interface"><?php echo translate('Interface') ?></label>
+          <?php 
+  $interfaces = array();
+  $default_interface = null;
+
+  exec('ip link', $output, $status);
+  if ( $status ) {
+    $html_output = implode('<br/>', $output);
+    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
+  } else {
+    foreach ( $output as $line ) {
+      if ( preg_match('/^\d+: ([[:alnum:]]+):/', $line, $matches ) ) {
+        if ( $matches[1] != 'lo' ) {
+          $interfaces[$matches[1]] = $matches[1];
+        } else {
+          ZM\Logger::Debug("No match for $line");
+        }
+      }
+    }
+  }
+  $routes = array();
+  exec('ip route', $output, $status);
+  if ( $status ) {
+    $html_output = implode('<br/>', $output);
+    ZM\Error("Unable to list network interfaces, status is '$status'. Output was:<br/><br/>$html_output");
+  } else {
+    foreach ( $output as $line ) {
+      if ( preg_match('/^default via [.[:digit:]]+ dev ([[:alnum:]]+)/', $line, $matches) ) {
+        $default_interface = $matches[1];
+      } else if ( preg_match('/^([.\/[:digit:]]+) dev ([[:alnum:]]+)/', $line, $matches) ) {
+        $interfaces[$matches[2]] .= ' ' . $matches[1];
+      }
+    } # end foreach line of output
+  }
+
+  echo htmlSelect('interface', $interfaces, 
+    (isset($_REQUEST['interface']) ? $_REQUEST['interface'] : $default_interface),
+    array('data-on-change-this'=>'changeInterface') );
+
+?>
+        </p>
+<div id="DetectedCameras">
         <p>
           <label for="probe"><?php echo translate('DetectedCameras') ?></label>
-          <?php echo htmlSelect('probe', $cameras, null, array('onchange'=>'configureButtons(this)')); ?>
+          <?php echo htmlSelect('probe', $cameras, null, array('data-on-change-this'=>'configureButtons')); ?>
         </p>
         <p>
           <?php echo translate('OnvifCredentialsIntro') ?>
         </p>
         <p>
-          <label for="username"><?php echo translate('Username') ?></label>
-          <input type="text" name="username" value="" onChange="configureButtons(this)"/>
+          <label for="Username"><?php echo translate('Username') ?></label>
+          <input type="text" name="Username" data-on-change-this="configureButtons"/>
         </p>
         <p>
-          <label for="password"><?php echo translate('Password') ?></label>
-          <input type="password" name="password" value="" onChange="configureButtons(this)"/>
+          <label for="Password"><?php echo translate('Password') ?></label>
+          <input type="password" name="Password" data-on-change-this="configureButtons"/>
         </p>
+</div>
         <div id="contentButtons">
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
-          <input type="submit" name="nextBtn" value="<?php echo translate('Next') ?>" data-on-click-this="gotoStep2" disabled="disabled"/>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" name="nextBtn" data-on-click-this="gotoStep2" disabled="disabled"><?php echo translate('Next') ?></button>
         </div>
       </form>
     </div>
   </div>
-</body>
-</html>
 <?php
 
 //==== STEP 2 ============================================================
-} else if($_REQUEST['step'] == '2') {
+} else if ( $_REQUEST['step'] == '2' ) {
   if ( empty($_REQUEST['probe']) ) 
     ZM\Fatal('No probe passed in request. Please go back and try again.');
 #|| empty($_REQUEST['username']) || 
        #empty($_REQUEST['password']) )
     
   $probe = json_decode(base64_decode($_REQUEST['probe']));
-  ZM\Logger::Debug(print_r($probe,true));
+  ZM\Logger::Debug(print_r($probe, true));
   foreach ( $probe as $name=>$value ) {
     if ( isset($value) ) {
       $monitor[$name] = $value;
@@ -221,15 +257,22 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
 
   //print $monitor['Host'].", ".$_REQUEST['username'].", ".$_REQUEST['password']."<br/>";
 
-  $detprofiles = probeProfiles($monitor['Host'], $monitor['SOAP'], $_REQUEST['username'], $_REQUEST['password']);
+  $detprofiles = probeProfiles($monitor['Host'], $monitor['SOAP'], $_REQUEST['Username'], $_REQUEST['Password']);
   foreach ( $detprofiles as $profile ) {
     $monitor = $camera['monitor'];
 
     $sourceString = "${profile['Name']} : ${profile['Encoding']}" .
-      " (${profile['Width']}x${profile['Height']} @ ${profile['MaxFPS']}fps)";
+      " (${profile['Width']}x${profile['Height']} @ ${profile['MaxFPS']}fps ${profile['Transport']})";
     // copy technical details
     $monitor['Width']  = $profile['Width'];
     $monitor['Height'] = $profile['Height'];
+    if ( $profile['Transport'] == 'RTP-Multicast' ) {
+	    $monitor['Method'] = 'rtpMulti';
+    } else if ( $profile['Transport'] == 'RTP-Unicast' ) {
+	    $monitor['Method'] = 'rtpUni';
+    } else {
+	    $monitor['Method'] = 'rtpRtsp';
+    }
     // The maxfps fields do not work for ip streams. Can re-enable if that is fixed.
     //       $monitor['MaxFPS'] = $profile['MaxFPS'];
     //       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
@@ -243,7 +286,6 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
     $profiles[0] = translate('NoDetectedProfiles');
 
 ?>
-<body>
   <div id="page">
     <div id="header">
       <h2><?php echo translate('ProfileProbe') ?></h2>
@@ -258,18 +300,17 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
         </p>
         <p>
           <label for="probe"><?php echo translate('DetectedProfiles') ?></label>
-          <?php echo htmlSelect('probe', $profiles, null, array('onchange'=>'configureButtons(this)')); ?>
+          <?php echo htmlSelect('probe', $profiles, null, array('data-on-change-this'=>'configureButtons')); ?>
         </p>
         <div id="contentButtons">
-          <input type="button" name="prevBtn" value="<?php echo translate('Prev') ?>" data-on-click-this="gotoStep1"/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
-          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" data-on-click-this="submitCamera" disabled="disabled"/>
+          <button type="button" name="prevBtn" data-on-click-this="gotoStep1"><?php echo translate('Prev') ?></button>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" name="saveBtn" data-on-click-this="submitCamera" disabled="disabled"><?php echo translate('Save') ?></button>
         </div>
       </form>
     </div>
   </div>
-</body>
-</html>
 <?php
 } // end if step 1 or 2
 ?>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index ea400339a..6dba8a3c9 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -53,88 +53,63 @@ $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('Options'));
 
-# Have to do this stuff up here before including header.php because fof the cookie setting
-$skin_options = array_map('basename', glob('skins/*',GLOB_ONLYDIR));
-if ( $tab == 'skins' ) {
-  $current_skin = $_COOKIE['zmSkin'];
-  $reload = false;
-  if ( isset($_GET['skin-choice']) && ( $_GET['skin-choice'] != $current_skin ) ) {
-    setcookie('zmSkin',$_GET['skin-choice'], time()+3600*24*30*12*10 );
-    //header("Location: index.php?view=options&tab=skins&reset_parent=1");
-    $reload = true;
-  }
-  $current_css = $_COOKIE['zmCSS'];
-  if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) {
-    setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 );
-    array_map('unlink', glob(ZM_PATH_WEB.'/cache/*')); //cleanup symlinks from cache_bust
-    //header("Location: index.php?view=options&tab=skins&reset_parent=1");
-    $reload = true;
-  }
-  if ( $reload )
-    echo "<script nonce=\"$cspNonce\">if (window.opener) {
-window.opener.location.reload();
-}
-window.location.href=\"?view={$view}&tab={$tab}\";
-</script>";
-} # end if tab == skins
-
 ?>
 <body>
   <?php echo getNavBarHTML(); ?>
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-sm-2 sidebar">
-        <ul class="nav nav-pills nav-stacked">
+  <div class="container-fluid h-100">
+    <div class="row flex-nowrap h-100">
+      <nav id="sidebar" class="h-100">
+        <ul class="nav nav-pills flex-column h-100">
 <?php
 foreach ( $tabs as $name=>$value ) {
 ?>
-          <li<?php echo $tab == $name ? ' class="active"' : '' ?>><a href="?view=<?php echo $view ?>&amp;tab=<?php echo $name ?>"><?php echo $value ?></a></li>
+          <li class="nav-item form-control-sm my-1"><a class="nav-link<?php echo $tab == $name ? ' active' : '' ?>" href="?view=<?php echo $view ?>&amp;tab=<?php echo $name ?>"><?php echo $value ?></a></li>
 <?php
 }
 ?>
         </ul>
-      </div>
-      <div class="col-sm-10 col-sm-offset-2">
+      </nav>
+      <div class="container-fluid col-sm-offset-2 h-100 pr-0">
         <br/>
         <div id="options">
 <?php 
 if ( $tab == 'skins' ) {
 ?>
-          <form name="optionsForm" class="form-horizontal" method="get" action="?">
+          <form name="optionsForm" method="get" action="?">
             <input type="hidden" name="view" value="<?php echo $view ?>"/>
             <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-            <div class="form-group">
-              <label for="skin-choice" class="col-sm-3 control-label">SKIN</label>
+            <div class="form-group row">
+            <label for="skin" class="col-sm-3 col-form-label"><?php echo translate('Skin')?></label>
               <div class="col-sm-6">
-                <select name="skin-choice" class="form-control chosen">
+                <select name="skin" class="form-control chosen">
 <?php
+  # Have to do this stuff up here before including header.php because fof the cookie setting
+$skin_options = array_map('basename', glob('skins/*', GLOB_ONLYDIR));
 foreach ( $skin_options as $dir ) {
-  echo '<option value="'.$dir.'" '.($current_skin==$dir ? 'SELECTED="SELECTED"' : '').'>'.$dir.'</option>';
+  echo '<option value="'.$dir.'" '.($skin==$dir ? 'SELECTED="SELECTED"' : '').'>'.$dir.'</option>';
 }
 ?>
                 </select>
-                <span class="help-block"><?php echo translate('SkinDescription'); ?></span>
+                <span class="form-text"><?php echo translate('SkinDescription'); ?></span>
               </div>
             </div>
-            <div class="form-group">
-              <label for="css-choice" class="col-sm-3 control-label">CSS</label>
+            <div class="form-group row">
+              <label for="css" class="col-sm-3 col-form-label">CSS</label>
               <div class="col-sm-6">
-                <select name="css-choice" class="form-control chosen">
+                <select name="css" class="form-control chosen">
 <?php
-foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDIR)) as $dir ) {
-  echo '<option value="'.$dir.'" '.($current_css==$dir ? 'SELECTED="SELECTED"' : '').'>'.$dir.'</option>';
+foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $dir ) {
+  echo '<option value="'.$dir.'" '.($css==$dir ? 'SELECTED="SELECTED"' : '').'>'.$dir.'</option>';
 }
 ?>
                 </select>
-                <span class="help-block"><?php echo translate('CSSDescription'); ?></span>
+                <span class="form-text"><?php echo translate('CSSDescription'); ?></span>
               </div>
             </div>
             <div id="contentButtons">
-              <button value="Save" type="submit"<?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+              <button value="Save" type="submit"><?php echo translate('Save') ?></button>
             </div>
          </form>
-	
-
 <?php
 } else if ( $tab == 'users' ) {
 ?>
@@ -164,36 +139,37 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
 <?php
     $sql = 'SELECT * FROM Monitors ORDER BY Sequence ASC';
     $monitors = array();
-    foreach( dbFetchAll($sql) as $monitor ) {
+    foreach ( dbFetchAll($sql) as $monitor ) {
       $monitors[$monitor['Id']] = $monitor;
     }
 
     $sql = 'SELECT * FROM Users ORDER BY Username';
-    foreach( dbFetchAll($sql) as $row ) {
+    foreach ( dbFetchAll($sql) as $user_row ) {
       $userMonitors = array();
-      if ( !empty($row['MonitorIds']) ) {
-        foreach ( explode(',', $row['MonitorIds']) as $monitorId ) {
+      if ( !empty($user_row['MonitorIds']) ) {
+        foreach ( explode(',', $user_row['MonitorIds']) as $monitorId ) {
           // A deleted monitor will cause an error since we don't update 
           // the user monitors list on monitor delete
-          if ( ! isset($monitors[$monitorId]) ) continue;
+          if ( !isset($monitors[$monitorId]) ) continue;
           $userMonitors[] = $monitors[$monitorId]['Name'];
         }
       }
+      ZM\Logger::Debug("monitors: ".$user_row['Username'] . ' ' . $user_row['MonitorIds']. ' :' . print_r($userMonitors, true));
 ?>
             <tr>
-              <td class="colUsername"><?php echo makePopupLink('?view=user&amp;uid='.$row['Id'], 'zmUser', 'user', validHtmlStr($row['Username']).($user['Username']==$row['Username']?"*":""), $canEdit) ?></td>
-              <td class="colLanguage"><?php echo $row['Language']?validHtmlStr($row['Language']):'default' ?></td>
-              <td class="colEnabled"><?php echo $row['Enabled']?translate('Yes'):translate('No') ?></td>
-              <td class="colStream"><?php echo validHtmlStr($row['Stream']) ?></td>
-              <td class="colEvents"><?php echo validHtmlStr($row['Events']) ?></td>
-              <td class="colControl"><?php echo validHtmlStr($row['Control']) ?></td>
-              <td class="colMonitors"><?php echo validHtmlStr($row['Monitors']) ?></td>
-              <td class="colGroups"><?php echo validHtmlStr($row['Groups']) ?></td>
-              <td class="colSystem"><?php echo validHtmlStr($row['System']) ?></td>
-              <td class="colBandwidth"><?php echo $row['MaxBandwidth']?$bandwidth_options[$row['MaxBandwidth']]:'&nbsp;' ?></td>
-              <td class="colMonitor"><?php echo $row['MonitorIds']?(join( ", ", $userMonitors )):"&nbsp;" ?></td>
-              <?php if ( ZM_OPT_USE_API ) { ?><td class="colAPIEnabled"><?php echo $row['APIEnabled']?translate('Yes'):translate('No') ?></td><?php } ?>
-              <td class="colMark"><input type="checkbox" name="markUids[]" value="<?php echo $row['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
+              <td class="colUsername"><?php echo makeLink('?view=user&amp;uid='.$user_row['Id'], validHtmlStr($user_row['Username']).($user['Username']==$user_row['Username']?'*':''), $canEdit) ?></td>
+              <td class="colLanguage"><?php echo $user_row['Language']?validHtmlStr($user_row['Language']):'default' ?></td>
+              <td class="colEnabled"><?php echo translate($user_row['Enabled']?'Yes':'No') ?></td>
+              <td class="colStream"><?php echo validHtmlStr($user_row['Stream']) ?></td>
+              <td class="colEvents"><?php echo validHtmlStr($user_row['Events']) ?></td>
+              <td class="colControl"><?php echo validHtmlStr($user_row['Control']) ?></td>
+              <td class="colMonitors"><?php echo validHtmlStr($user_row['Monitors']) ?></td>
+              <td class="colGroups"><?php echo validHtmlStr($user_row['Groups']) ?></td>
+              <td class="colSystem"><?php echo validHtmlStr($user_row['System']) ?></td>
+              <td class="colBandwidth"><?php echo $user_row['MaxBandwidth']?$bandwidth_options[$user_row['MaxBandwidth']]:'&nbsp;' ?></td>
+              <td class="colMonitor"><?php echo count($userMonitors)?(join(', ', $userMonitors)):'&nbsp;' ?></td>
+              <?php if ( ZM_OPT_USE_API ) { ?><td class="colAPIEnabled"><?php echo translate($user_row['APIEnabled']?'Yes':'No') ?></td><?php } ?>
+              <td class="colMark"><input type="checkbox" name="markUids[]" value="<?php echo $user_row['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
 <?php
     }
@@ -205,8 +181,9 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
-<?php
-} else if ( $tab == 'servers' ) { ?>
+      <?php
+} else if ( $tab == 'servers' ) {
+      ?>
       <form name="serversForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -233,47 +210,42 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
 			</tr>
           </thead>
           <tbody>
-<?php
-  $monitor_counts = dbFetchAssoc('SELECT Id,(SELECT COUNT(Id) FROM Monitors WHERE ServerId=Servers.Id) AS MonitorCount FROM Servers', 'Id', 'MonitorCount');
-  foreach ( ZM\Server::find() as $Server ) {
-?>
+          <?php
+          $monitor_counts = dbFetchAssoc('SELECT Id,(SELECT COUNT(Id) FROM Monitors WHERE ServerId=Servers.Id) AS MonitorCount FROM Servers', 'Id', 'MonitorCount');
+          foreach ( ZM\Server::find() as $Server ) {
+            $svr_opt = 'class="serverCol" data-sid="'.$Server->Id().'"';
+            ?>
             <tr>
-              <td class="colName"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Name()), $canEdit) ?></td>
-              <td class="colUrl"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Url()), $canEdit) ?></td>
-              <td class="colPathToIndex"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToIndex()), $canEdit) ?></td>
-              <td class="colPathToZMS"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToZMS()), $canEdit) ?></td>
-              <td class="colPathToApi"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToApi()), $canEdit) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Server->Name()), $canEdit, $svr_opt ) ?></td>
+              <td class="colUrl"><?php echo makeLink('#', validHtmlStr($Server->Url()), $canEdit, $svr_opt ) ?></td>
+              <td class="colPathToIndex"><?php echo makeLink('#', validHtmlStr($Server->PathToIndex()), $canEdit, $svr_opt ) ?></td>
+              <td class="colPathToZMS"><?php echo makeLink('#', validHtmlStr($Server->PathToZMS()), $canEdit, $svr_opt ) ?></td>
               <td class="colStatus <?php if ( $Server->Status() == 'NotRunning' ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Status()), $canEdit) ?></td>
-              <td class="colMonitorCount">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit) ?>
-              </td>
-              <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server',$Server->CpuLoad(), $canEdit) ?>
-              </td>
+                  <?php echo makeLink('#', validHtmlStr($Server->Status()), $canEdit, $svr_opt) ?></td>
+              <td class="colMonitorCount"><?php echo makeLink('#', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit, $svr_opt) ?></td>
+              <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>"><?php echo makeLink('#', $Server->CpuLoad(), $canEdit, $svr_opt) ?></td>
               <td class="colMemory <?php if ( (!$Server->TotalMem()) or ($Server->FreeMem()/$Server->TotalMem() < .1) ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit) ?>
-              </td>
+                  <?php echo makeLink('#', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit, $svr_opt) ?></td>
               <td class="colSwap <?php if ( (!$Server->TotalSwap()) or ($Server->FreeSwap()/$Server->TotalSwap() < .1) ) { echo 'danger'; } ?>">
-                <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeSwap()) . ' / ' . human_filesize($Server->TotalSwap()) , $canEdit) ?>
-              </td>
-              <td class="colStats"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmstats() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colAudit"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmaudit() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colTrigger"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmtrigger() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colEventNotification"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit) ?></td>
+                  <?php echo makeLink('#', human_filesize($Server->FreeSwap()) . ' / ' . human_filesize($Server->TotalSwap()) , $canEdit, $svr_opt) ?></td>
+              <td class="colStats"><?php echo makeLink('#', $Server->zmstats() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
+              <td class="colAudit"><?php echo makeLink('#', $Server->zmaudit() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
+              <td class="colTrigger"><?php echo makeLink('#', $Server->zmtrigger() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
+              <td class="colEventNotification"><?php echo makeLink('#', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
 
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
-			</tr>
+            </tr>
 <?php } #end foreach Server ?>
           </tbody>
         </table>
         <div id="contentButtons">
-        <?php echo makePopupButton('?view=server&id=0', 'zmServer', 'server', translate('AddNewServer'), canEdit('System')); ?>
+          <button type="button" id="NewServerBtn" value="<?php echo translate('AddNewServer') ?>" disabled="disabled"><?php echo translate('AddNewServer') ?></button>
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
-<?php
-} else if ( $tab == 'storage' ) { ?>
+      <?php
+} else if ( $tab == 'storage' ) { 
+      ?>
       <form name="storageForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -289,27 +261,31 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
               <th class="colScheme"><?php echo translate('StorageScheme') ?></th>
               <th class="colServer"><?php echo translate('Server') ?></th>
               <th class="colDiskSpace"><?php echo translate('DiskSpace') ?></th>
+              <th class="colEvents"><?php echo translate('Events') ?></th>
               <th class="colMark"><?php echo translate('Mark') ?></th>
             </tr>
           </thead>
           <tbody>
-<?php foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { ?>
+          <?php
+          foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { 
+            $str_opt = 'class="storageCol" data-sid="'.$Storage->Id().'"';
+            ?>
             <tr>
-              <td class="colId"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Id()), $canEdit ) ?></td>
-              <td class="colName"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Name()), $canEdit ) ?></td>
-              <td class="colPath"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Path()), $canEdit ) ?></td>
-              <td class="colType"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Type()), $canEdit ) ?></td>
-              <td class="colScheme"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Scheme()), $canEdit ) ?></td>
-              <td class="colServer"><?php
-              echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?></td>
+              <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt ) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt ) ?></td>
+              <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt ) ?></td>
+              <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt ) ?></td>
+              <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt ) ?></td>
+              <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt ) ?></td>
               <td class="colDiskSpace"><?php echo human_filesize($Storage->disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?></td>
-              <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
+              <td class="ColEvents"><?php echo $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space()) ?></td>
+              <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( $Storage->EventCount() or !$canEdit ) { ?> disabled="disabled"<?php } ?><?php echo $Storage->EventCount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/></td>
             </tr>
 <?php } #end foreach Server ?>
           </tbody>
         </table>
         <div id="contentButtons">
-          <?php echo makePopupButton('?view=storage&id=0', 'zmStorage', 'storage', translate('AddNewStorage'), canEdit('System')); ?>
+          <button type="button" id="NewStorageBtn" value="<?php echo translate('AddNewStorage') ?>" disabled="disabled"><?php echo translate('AddNewStorage') ?></button>
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
@@ -325,40 +301,42 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
   ?>
 
     <form name="userForm" method="post" action="?">
-      <button class="pull-left" type="submit" name="updateSelected" id="updateSelected"><?php echo translate("Update")?> </button><button class="btn-danger pull-right" type="submit" name="revokeAllTokens" id="revokeAllTokens"> <?php echo translate("RevokeAllTokens")?></button><br/>
-      
+      <button class="float-left" type="submit" name="updateSelected" id="updateSelected"><?php echo translate('Update')?></button>
+      <button class="btn-danger float-right" type="submit" name="revokeAllTokens" id="revokeAllTokens"><?php echo translate('RevokeAllTokens')?></button>
+      <br/>
       <?php
-      function revokeAllTokens()
-      {
+      function revokeAllTokens() {
         $minTokenTime = time();
-        dbQuery ('UPDATE Users SET TokenMinExpiry=?', array ($minTokenTime));
-        echo "<span class='timedSuccessBox'>".translate('AllTokensRevoked')."</span>";
+        dbQuery('UPDATE `Users` SET `TokenMinExpiry`=?', array($minTokenTime));
+        echo '<span class="timedSuccessBox">'.translate('AllTokensRevoked').'</span>';
       }
 
-      function updateSelected()
-      {
-        dbQuery("UPDATE Users SET APIEnabled=0");
-        foreach( $_REQUEST["tokenUids"] as $markUid ) {
-          $minTime = time();
-          dbQuery('UPDATE Users SET TokenMinExpiry=? WHERE Id=?', array($minTime, $markUid));
+      function updateSelected() {
+        # Turn them all off, then selectively turn the checked ones back on
+        dbQuery('UPDATE `Users` SET `APIEnabled`=0');
+
+        if ( isset($_REQUEST['tokenUids']) ) {
+          foreach ( $_REQUEST['tokenUids'] as $markUid ) {
+            $minTime = time();
+            dbQuery('UPDATE `Users` SET `TokenMinExpiry`=? WHERE `Id`=?', array($minTime, $markUid));
+          }
         }
-        foreach( $_REQUEST["apiUids"] as $markUid ) {
-          dbQuery('UPDATE Users SET APIEnabled=1 WHERE Id=?', array($markUid));
-      
+        if ( isset($_REQUEST['apiUids']) ) {
+          foreach ( $_REQUEST['apiUids'] as $markUid ) {
+            dbQuery('UPDATE `Users` SET `APIEnabled`=1 WHERE `Id`=?', array($markUid));
+          }
         }
-        echo "<span class='timedSuccessBox'>".translate('Updated')."</span>";
+        echo '<span class="timedSuccessBox">'.translate('Updated').'</span>';
       }
 
-      if(array_key_exists('revokeAllTokens',$_POST)){
+      if ( array_key_exists('revokeAllTokens', $_POST) ) {
         revokeAllTokens();
       }
 
-      if(array_key_exists('updateSelected',$_POST)){
+      if ( array_key_exists('updateSelected', $_POST) ) {
         updateSelected();
       }
     ?>
-      
-      
       <br/><br/>
       <input type="hidden" name="view" value="<?php echo $view ?>"/>
       <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -373,9 +351,8 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
         </thead>
         <tbody>
         <?php
-          
             $sql = 'SELECT * FROM Users ORDER BY Username';
-            foreach( dbFetchAll($sql) as $row ) {
+            foreach ( dbFetchAll($sql) as $row ) {
         ?>
                 <tr>
                   <td class="colUsername"><?php echo validHtmlStr($row['Username']) ?></td>
@@ -398,10 +375,10 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
     $configCat = array();
     $configCats = array();
 
-    $result = $dbConn->query('SELECT * FROM Config ORDER BY Id ASC');
+    $result = $dbConn->query('SELECT * FROM `Config` ORDER BY `Id` ASC');
     if ( !$result )
       echo mysql_error();
-    while( $row = dbFetchNext($result) ) {
+    while ( $row = dbFetchNext($result) ) {
       $config[$row['Name']] = $row;
       if ( !($configCat = &$configCats[$row['Category']]) ) {
         $configCats[$row['Category']] = array();
@@ -411,31 +388,65 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
     }
 
     if ( $tab == 'system' ) {
-        $configCats[$tab]['ZM_LANG_DEFAULT']['Hint'] = join( '|', getLanguages() );
-        $configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = join( '|', $skin_options );
-        $configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = join( '|', array_map ( 'basename', glob('skins/'.ZM_SKIN_DEFAULT.'/css/*',GLOB_ONLYDIR) ) );
+        $configCats[$tab]['ZM_LANG_DEFAULT']['Hint'] = join('|', getLanguages());
+        $configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = join('|', array_map('basename', glob('skins/*',GLOB_ONLYDIR)));
+        $configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = join('|', array_map ( 'basename', glob('skins/'.ZM_SKIN_DEFAULT.'/css/*',GLOB_ONLYDIR) ));
         $configCats[$tab]['ZM_BANDWIDTH_DEFAULT']['Hint'] = $bandwidth_options;
-    }
+
+        function timezone_list() {
+          static $timezones = null;
+
+          if ( $timezones === null ) {
+            $timezones = [];
+            $offsets = [];
+            $now = new DateTime('now', new DateTimeZone('UTC'));
+
+            foreach ( DateTimeZone::listIdentifiers() as $timezone ) {
+              $now->setTimezone(new DateTimeZone($timezone));
+              $offsets[] = $offset = $now->getOffset();
+              $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            }
+
+            array_multisort($offsets, $timezones);
+          }
+
+          return $timezones;
+        }
+
+        function format_GMT_offset($offset) {
+          $hours = intval($offset / 3600);
+          $minutes = abs(intval($offset % 3600 / 60));
+          return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+        }
+
+        function format_timezone_name($name) {
+          $name = str_replace('/', ', ', $name);
+          $name = str_replace('_', ' ', $name);
+          $name = str_replace('St ', 'St. ', $name);
+          return $name;
+        }
+        $configCats[$tab]['ZM_TIMEZONE']['Hint'] = array(''=> translate('TZUnset')) + timezone_list();
+    } # end if tab == system
 ?>
-      <form name="optionsForm" class="form-horizontal" method="post" action="?">
+      <form name="optionsForm" class="" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
         <input type="hidden" name="action" value="options"/>
 <?php
-    $configCat = $configCats[$tab];
-    foreach ( $configCat as $name=>$value ) {
-        $shortName = preg_replace( '/^ZM_/', '', $name );
-        $optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]['Prompt']:$value['Prompt'];
+        $configCat = $configCats[$tab];
+        foreach ( $configCat as $name=>$value ) {
+          $shortName = preg_replace( '/^ZM_/', '', $name );
+          $optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]['Prompt']:$value['Prompt'];
 ?>
-            <div class="form-group">
-              <label for="<?php echo $name ?>" class="col-sm-3 control-label"><?php echo $shortName ?></label>
-              <div class="col-sm-6">
+            <div class="form-group form-row">
+              <label for="<?php echo $name ?>" class="col-md-4 control-label text-md-right"><?php echo $shortName ?></label>
+              <div class="col-md">
 <?php   
         if ( $value['Type'] == 'boolean' ) {
 ?>
               <input type="checkbox" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="1"<?php if ( $value['Value'] ) { ?> checked="checked"<?php } ?><?php echo $canEdit?'':' disabled="disabled"' ?>/>
 <?php
-        } elseif ( is_array( $value['Hint'] ) ) {
+        } elseif ( is_array($value['Hint']) ) {
           echo htmlSelect("newConfig[$name]", $value['Hint'], $value['Value']);
         } elseif ( preg_match('/\|/', $value['Hint']) ) {
 ?>
@@ -444,7 +455,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
             $options = explode('|', $value['Hint']);
             if ( count($options) > 3 ) {
 ?>
-                <select class="form-control" name="newConfig[<?php echo $name ?>]"<?php echo $canEdit?'':' disabled="disabled"' ?>>
+                <select class="form-control-sm" name="newConfig[<?php echo $name ?>]"<?php echo $canEdit?'':' disabled="disabled"' ?>>
 <?php
                 foreach ( $options as $option ) {
                   if ( preg_match('/^([^=]+)=(.+)$/', $option, $matches) ) {
@@ -469,7 +480,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
                     $optionLabel = $optionValue = $option;
                   }
 ?>
-                <label>
+                <label class="font-weight-bold  form-control-sm">
                   <input type="radio" id="<?php echo $name.'_'.preg_replace('/[^a-zA-Z0-9]/', '', $optionValue) ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo $optionValue ?>"<?php if ( $value['Value'] == $optionValue ) { ?> checked="checked"<?php } ?><?php echo $canEdit?'':' disabled="disabled"' ?>/>
                   <?php echo htmlspecialchars($optionLabel) ?>
                 </label>
@@ -480,27 +491,27 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
 <?php
         } else if ( $value['Type'] == 'text' ) {
 ?>
-              <textarea class="form-control" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" rows="5" cols="40"<?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo validHtmlStr($value['Value']) ?></textarea>
+              <textarea class="form-control-sm" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" rows="5" cols="40"<?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo validHtmlStr($value['Value']) ?></textarea>
 <?php
         } else if ( $value['Type'] == 'integer' ) {
 ?>
-              <input type="number" class="form-control small" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
+              <input type="number" class="form-control-sm" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
 <?php
         } else if ( $value['Type'] == 'hexadecimal' ) {
 ?>
-              <input type="text" class="form-control medium" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
+              <input type="text" class="form-control-sm" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
 <?php
         } else if ( $value['Type'] == 'decimal' ) {
 ?>
-              <input type="text" class="form-control small" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
+              <input type="text" class="form-control-sm" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
 <?php
         } else {
 ?>
-              <input type="text" class="form-control large" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
+              <input type="text" class="form-control-sm" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" <?php echo $canEdit?'':' disabled="disabled"' ?>/>
 <?php
         }
 ?>
-              <span class="help-block"><?php echo validHtmlStr($optionPromptText) ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option='.$name, 'zmOptionHelp', 'optionhelp', '?' ) ?>)</span>
+              <span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText); echo makeHelpLink($name) ?></span>
 	    </div><!-- End .col-sm-9 -->
             </div><!-- End .form-group -->
 <?php
@@ -508,7 +519,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
 ?>
 
         <div id="contentButtons">
-          <button type="submit" value="Save"<?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+          <button type="submit" <?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
         </div>
       </form>
 <?php
diff --git a/web/skins/classic/views/postlogin.php b/web/skins/classic/views/postlogin.php
index f183aa62f..935014fed 100644
--- a/web/skins/classic/views/postlogin.php
+++ b/web/skins/classic/views/postlogin.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web logging in view file, $Date$, $Revision$
+// ZoneMinder web logging in view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-xhtmlHeaders(__FILE__, translate('LoggingIn') );
+xhtmlHeaders(__FILE__, translate('LoggingIn'));
 ?>
 <body>
   <div id="page">
@@ -29,5 +29,4 @@ xhtmlHeaders(__FILE__, translate('LoggingIn') );
       <h2><?php echo translate('LoggingIn') ?></h2>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/privacy.php b/web/skins/classic/views/privacy.php
index d82e4327f..2e6e4ef03 100644
--- a/web/skins/classic/views/privacy.php
+++ b/web/skins/classic/views/privacy.php
@@ -38,7 +38,7 @@ xhtmlHeaders(__FILE__, translate('Privacy'));
       <h2><?php echo translate('Privacy') ?></h2>
       <h1>ZoneMinder - <?php echo translate('Privacy') ?></h1>
     </div>
-    <div id="content">
+    <div id="content" class="container pt-3">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="privacy"/>
         <input type="hidden" name="action" value="privacy"/>
@@ -61,13 +61,12 @@ xhtmlHeaders(__FILE__, translate('Privacy'));
         <p><?php echo translate('PrivacyTelemetryList') ?></p>
         <p><?php echo translate('PrivacyMonitorList') ?></p>
         <p><?php echo translate('PrivacyConclusionText') ?></p>
-        <p><?php echo htmlSelect('option', $options, ZM_TELEMETRY_DATA); ?></p>
 
-        <div id="contentButtons">
+        <div id="contentButtons" class="pb-3">
+          <?php echo htmlSelect('option', $options, ZM_TELEMETRY_DATA); ?>
           <button type="submit" value="Apply"><?php echo translate('Apply') ?></button>
         </div>
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/report_event_audit.php b/web/skins/classic/views/report_event_audit.php
index f3f508623..6cafaf67e 100644
--- a/web/skins/classic/views/report_event_audit.php
+++ b/web/skins/classic/views/report_event_audit.php
@@ -25,12 +25,12 @@ $filterbar = ob_get_contents();
 ob_end_clean();
 
 noCacheHeaders();
-xhtmlHeaders( __FILE__, translate('Console') );
+xhtmlHeaders( __FILE__, translate('Console'));
 
 if ( isset($_REQUEST['minTime']) ) {
   $minTime = validHtmlStr($_REQUEST['minTime']);
 } else {
-  $minTime = strftime('%FT%T',time() - (2*3600) );
+  $minTime = strftime('%FT%T', time() - (2*3600));
 }
 if ( isset($_REQUEST['maxTime']) ) {
   $maxTime = validHtmlStr($_REQUEST['maxTime']);
@@ -47,13 +47,13 @@ $filter = array(
     ),
   );
 if ( count($selected_monitor_ids) ) {
-  $filter['Query']['terms'][] = (array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',',$selected_monitor_ids), 'cnj'=>'and'));
+  $filter['Query']['terms'][] = (array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',', $selected_monitor_ids), 'cnj'=>'and'));
 } else if ( ( $group_id != 0 || isset($_SESSION['ServerId']) || isset($_SESSION['StorageId']) || isset($_SESSION['Status']) ) ) {
 # this should be redundant
-  for ($i=0; $i < count($displayMonitors); $i++) {
-    if ($i == '0') {
+  for ( $i=0; $i < count($displayMonitors); $i++ ) {
+    if ( $i == 0 ) {
       $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'and', 'obr'=>'1');
-    } else if ($i == (count($displayMonitors)-1)) {
+    } else if ( $i == count($displayMonitors)-1 ) {
       $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or', 'cbr'=>'1');
     } else {
       $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or');
@@ -70,11 +70,11 @@ $eventsSql = 'SELECT *,
   FROM Events AS E
   WHERE 1 > 0 
 ';
-if ( ! empty($user['MonitorIds']) ) {
+if ( !empty($user['MonitorIds']) ) {
   $eventsSql .= ' AND MonitorId IN ('.$user['MonitorIds'].')';
 }
 if ( count($selected_monitor_ids) ) {
-  $eventsSql .= ' AND MonitorId IN (' . implode(',',$selected_monitor_ids).')';
+  $eventsSql .= ' AND MonitorId IN ('.implode(',', $selected_monitor_ids).')';
 }
 if ( isset($minTime) && isset($maxTime) ) {
   $eventsSql .= " AND EndTime > '" . $minTime . "' AND StartTime < '" . $maxTime . "'";
@@ -87,10 +87,10 @@ if ( !$result ) {
   return;
 }
 $EventsByMonitor = array();
-while( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
+while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
   $Event = new ZM\Event($event);
   if ( ! isset($EventsByMonitor[$event['MonitorId']]) )
-    $EventsByMonitor[$event['MonitorId']] = array( 'Events'=>array(), 'MinGap'=>0, 'MaxGap'=>0, 'FileMissing'=>array(), 'ZeroSize'=>array() );
+    $EventsByMonitor[$event['MonitorId']] = array('Events'=>array(), 'MinGap'=>0, 'MaxGap'=>0, 'FileMissing'=>array(), 'ZeroSize'=>array());
 
   if ( count($EventsByMonitor[$event['MonitorId']]['Events']) ) {
     $last_event = end($EventsByMonitor[$event['MonitorId']]['Events']);
@@ -103,7 +103,7 @@ while( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
       $EventsByMonitor[$event['MonitorId']]['MaxGap'] = $gap;
 
   } # end if has previous events
-  if ( ! $Event->file_exists() ) {
+  if ( !$Event->file_exists() ) {
     $EventsByMonitor[$event['MonitorId']]['FileMissing'][] = $Event;
   } else if ( ! $Event->file_size() ) {
     $EventsByMonitor[$event['MonitorId']]['ZeroSize'][] = $Event;
@@ -122,8 +122,8 @@ while( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
       <?php echo $filterbar ?>
       <div id="DateTimeDiv">
         <label>Event Start Time</label>
-        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime ) ?>" oninput="this.form.submit();"/> to 
-        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime ) ?>" oninput="this.form.submit();"/>
+        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime) ?>" oninput="this.form.submit();"/> to 
+        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime) ?>" oninput="this.form.submit();"/>
       </div>
     </div><!--FilterBar-->
 
@@ -145,10 +145,10 @@ while( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
         </thead>
         <tbody>
 <?php
-for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
+for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   $monitor = $displayMonitors[$monitor_i];
   $Monitor = new ZM\Monitor($monitor);
-  $montagereview_link = "?view=montagereview&live=0&MonitorId=". $monitor['Id'] . '&minTime='.$minTime.'&maxTime='.$maxTime;
+  $montagereview_link = '?view=montagereview&live=0&MonitorId='.$monitor['Id'].'&minTime='.$minTime.'&maxTime='.$maxTime;
 
   $monitor_filter = addFilterTerm(
       $filter,
@@ -178,7 +178,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
     $FileMissing_filter = array(
         'Query' => array(
           'terms' => array(
-            array('attr'=>'Id','op'=>'IN', 'val'=>implode(',',array_map(function($Event){return $Event->Id();},$FileMissing)))
+            array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $FileMissing)))
             )
           )
         );
@@ -188,7 +188,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
     $ZeroSize_filter = array(
         'Query' => array(
           'terms' => array(
-            array('attr'=>'Id','op'=>'IN', 'val'=>implode(',',array_map(function($Event){return $Event->Id();},$ZeroSize)))
+            array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $ZeroSize)))
             )
           )
         );
@@ -198,27 +198,28 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
           <tr id="<?php echo 'monitor_id-'.$monitor['Id'] ?>" title="<?php echo $monitor['Id'] ?>">
             <td class="colId"><a href="<?php echo $montagereview_link ?>"><?php echo $monitor['Id'] ?></a></td>
             <td class="colName">
-              <a href="<?php echo $montagereview_link ?>"><?php echo $monitor['Name'] ?></a><br/><div class="small text-nowrap text-muted">
+              <a href="<?php echo $montagereview_link ?>"><?php echo validHtmlStr($monitor['Name']) ?></a><br/>
+              <div class="small text-nowrap text-muted">
               <?php echo implode('<br/>',
                   array_map(function($group_id){
                     $Group = new ZM\Group($group_id);
                     $Groups = $Group->Parents();
                     array_push($Groups, $Group);
                     return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&GroupId='.$Group->Id().'">'.$Group->Name().'</a>'; }, $Groups ));
-                    }, $Monitor->GroupIds() ) ); 
+                    }, $Monitor->GroupIds())); 
 ?>
             </div></td>
-            <td class="colServer"><?php echo $Monitor->Server()->Name()?></td>
+            <td class="colServer"><?php echo validHtmlStr($Monitor->Server()->Name())?></td>
             <td class="colEvents"><a href="?view=<?php echo ZM_WEB_EVENTS_VIEW ?>&amp;page=1<?php echo $monitor_filter['query'] ?>"><?php echo isset($EventsByMonitor[$Monitor->Id()])?count($EventsByMonitor[$Monitor->Id()]['Events']):0 ?></a></td>
-            <td class="colFirstEvent"><?php echo $FirstEvent ? $FirstEvent->link_to($FirstEvent->Id().' at ' . $FirstEvent->StartTime()) : 'none'?></td>
-            <td class="colLastEvent"><?php echo $LastEvent ? $LastEvent->link_to($LastEvent->Id().' at ' . $LastEvent->StartTime()) : 'none'?></td>
+            <td class="colFirstEvent"><?php echo $FirstEvent ? $FirstEvent->link_to($FirstEvent->Id().' at '.$FirstEvent->StartTime()) : 'none'?></td>
+            <td class="colLastEvent"><?php echo $LastEvent ? $LastEvent->link_to($LastEvent->Id().' at '.$LastEvent->StartTime()) : 'none'?></td>
             <td class="colMinGap"><?php echo $MinGap ?></td>
             <td class="colMaxGap"><?php echo $MaxGap ?></td>
             <td class="colFileMissing<?php echo count($FileMissing) ? ' errorText' : ''?>">
-            <?php echo count($FileMissing) ?  '<a href="?view='.ZM_WEB_EVENTS_VIEW .'&amp;page=1'.$FileMissing_filter['query'].'">'.count($FileMissing).'</a>' : '0' ?>
+            <?php echo count($FileMissing) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$FileMissing_filter['query'].'">'.count($FileMissing).'</a>' : '0' ?>
             </td>
             <td class="colZeroSize<?php echo count($ZeroSize) ? ' errorText' : ''?>">
-            <?php echo count($ZeroSize) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW .'&amp;page=1'.$ZeroSize_filter['query'].'">'.count($ZeroSize).'</a>' : '0' ?>
+            <?php echo count($ZeroSize) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$ZeroSize_filter['query'].'">'.count($ZeroSize).'</a>' : '0' ?>
             </td>
           </tr>
 <?php
diff --git a/web/skins/classic/views/settings.php b/web/skins/classic/views/settings.php
index 7a19c00cf..0c51add26 100644
--- a/web/skins/classic/views/settings.php
+++ b/web/skins/classic/views/settings.php
@@ -26,12 +26,14 @@ $monitor = ZM\Monitor::find_one(array('Id'=>$_REQUEST['mid']));
 
 $zmuCommand = getZmuCommand(' -m '.escapeshellarg($_REQUEST['mid']).' -B -C -H -O');
 $zmuOutput = exec( $zmuCommand );
-list($brightness, $contrast, $hue, $colour) = explode(' ', $zmuOutput);
+if ( $zmuOutput ) {
+  list($brightness, $contrast, $hue, $colour) = explode(' ', $zmuOutput);
 
-$monitor->Brightness() = $brightness;
-$monitor->Contrast() = $contrast;
-$monitor->Hue() = $hue;
-$monitor->Colour() = $colour;
+  $monitor->Brightness($brightness);
+  $monitor->Contrast($contrast);
+  $monitor->Hue($hue);
+  $monitor->Colour($colour);
+}
 
 $focusWindow = true;
 
@@ -47,23 +49,23 @@ xhtmlHeaders(__FILE__, validHtmlStr($monitor->Name()).' - '.translate('Settings'
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="settings"/>
         <input type="hidden" name="mid" value="<?php echo validInt($_REQUEST['mid']) ?>"/>
-        <table id="contentTable" class="major" cellspacing="0">
+        <table id="contentTable" class="major">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('Brightness') ?></th>
-              <td><input type="number" name="newBrightness" value="<?php echo $monitor->Brightness() ?>" <?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
+              <td><input type="number" name="newBrightness" value="<?php echo $monitor->Brightness() ?>" <?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?> /></td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('Contrast') ?></th>
-              <td><input type="number" name="newContrast" value="<?php echo $monitor->Contrast() ?>" <?php  echo canView('Control') ? '' : ' disabled="disabled"' ?>/></td>
+              <td><input type="number" name="newContrast" value="<?php echo $monitor->Contrast() ?>" <?php  echo canView('Control') ? '' : ' disabled="disabled"' ?> /></td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('Hue') ?></th>
-              <td><input type="number" name="newHue" value="<?php echo $monitor->Hue() ?>" <?php echo canView('Control') ? '' : ' disabled="disabled"' ?>/></td>
+              <td><input type="number" name="newHue" value="<?php echo $monitor->Hue() ?>" <?php echo canView('Control') ? '' : ' disabled="disabled"' ?> /></td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('Colour') ?></th>
-              <td><input type="number" name="newColour" value="<?php echo $monitor->Colour() ?>" <?php echo canView('Control') ? '' : ' disabled="disabled"' ?>/></td>
+              <td><input type="number" name="newColour" value="<?php echo $monitor->Colour() ?>" <?php echo canView('Control') ? '' : ' disabled="disabled"' ?> /></td>
             </tr>
           </tbody>
         </table>
@@ -74,5 +76,4 @@ xhtmlHeaders(__FILE__, validHtmlStr($monitor->Name()).' - '.translate('Settings'
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/shutdown.php b/web/skins/classic/views/shutdown.php
index 5e032cd1c..25d5d3d34 100644
--- a/web/skins/classic/views/shutdown.php
+++ b/web/skins/classic/views/shutdown.php
@@ -33,15 +33,23 @@ xhtmlHeaders(__FILE__, translate('Shutdown').' '.translate('Restart'));
       <h2><?php echo translate('Shutdown').' '.translate('Restart') ?></h2>
     </div>
     <div id="content">
+<?php
+  if ( !defined('ZM_PATH_SHUTDOWN') or ZM_PATH_SHUTDOWN == '' ) {
+      echo '<div class="error">ZM_PATH_SHUTDOWN is not defined. This is normally configured in /etc/zm/conf.d/01-system-paths.conf</div>';
+  } else if ( !file_exists(ZM_PATH_SHUTDOWN) ) {
+      echo '<div class="error">Path does not exist for ZM_PATH_SHUTDOWN. Current value is '.ZM_PATH_SHUTDOWN.'</div>';
+  } else {
+?>
+  
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="shutdown"/>
 <?php
-  if ( isset($output) ) {
-    echo '<p>'.implode('<br/>', $output).'</p>';
-  }
-  if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
-    echo '<p>You may cancel this shutdown by clicking '.translate('Cancel').'</p>';
-  }
+    if ( isset($output) ) {
+      echo '<p>'.implode('<br/>', $output).'</p>';
+    }
+    if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
+      echo '<p>You may cancel this shutdown by clicking '.translate('Cancel').'</p>';
+    }
 ?>
         <p class="warning"><h2>Warning</h2>
           This command will either shutdown or restart all ZoneMinder Servers<br/>
@@ -52,18 +60,20 @@ xhtmlHeaders(__FILE__, translate('Shutdown').' '.translate('Restart'));
         </p>
         <div id="contentButtons">
 <?php 
-  if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
+    if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
 ?>
           <button type="submit" name="action" value="cancel"><?php echo translate('Cancel') ?></button>
 <?php 
-  }
+    }
 ?>
           <button type="submit" name="action" value="restart"><?php echo translate('Restart') ?></button>
           <button type="submit" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
           <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
         </div>
       </form>
+<?php 
+  } # end if PATH_SHUTDOWN looks value
+?>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/state.php b/web/skins/classic/views/state.php
deleted file mode 100644
index 12180000d..000000000
--- a/web/skins/classic/views/state.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-//
-// ZoneMinder web run state view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
-?>
-<div id="modalState" class="modal fade">
-  <form class="form-horizontal" name="contentForm" id="contentForm" method="get" action="?view=state">
-    <div class="modal-dialog">
-      <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>
-          <h2 class="modal-title"><?php echo translate('RunState') ?></h2>
-        </div>
-        <div class="modal-body">
-          <input type="hidden" name="view" value="state"/>
-          <input type="hidden" name="action" value="state"/>
-          <input type="hidden" name="apply" value="1"/>
-
-	        <div class="form-group">
-	          <label for="runState" class="col-sm-3 control-label">Change State</label>
-	          <div class="col-sm-9">
-              <select id="runState" name="runState" class="form-control">
-<?php 
-if ( $running ) {
-?>
-                <option value="stop" selected="selected"><?php echo translate('Stop') ?></option>
-                <option value="restart"><?php echo translate('Restart') ?></option>
-<?php
-} else {
-?>
-                <option value="start" selected="selected"><?php echo translate('Start') ?></option>
-<?php
-}
-$states = dbFetchAll('SELECT * FROM States');
-foreach ( $states as $state ) {
-?>
-                <option value="<?php echo validHtmlStr($state['Name']) ?>" <?php echo $state['IsActive'] ? 'selected="selected"' : '' ?>>
-                <?php echo validHtmlStr($state['Name']); ?>
-                </option>
-<?php
-}
-?>
-              </select>
-	          </div><!--col-sm-9-->
-	        </div><!--form-group-->
-	        <div class="form-group">
-            <label for="newState" class="col-sm-3 control-label"><?php echo translate('NewState') ?></label>
-		        <div class="col-sm-9">
-              <input class="form-control" type="text" id="newState"/>
-		        </div>
-	        </div>
-        </div> <!-- modal-body -->
-        <div class="modal-footer">
-          <button class="btn btn-primary" type="button" id="btnApply"><?php echo translate('Apply') ?></button>
-          <button class="btn btn-primary" type="button" id="btnSave" disabled><?php echo translate('Save') ?></button>
-          <button class="btn btn-danger" type="button" id="btnDelete" disabled><?php echo translate('Delete') ?></button>
-          <p class="pull-left hidden" id="pleasewait"><?php echo translate('PleaseWait') ?></p>
-	      </div><!-- footer -->
-      </div> <!-- content -->
-    </div> <!-- dialog -->
-  </form>
-</div> <!-- state -->
diff --git a/web/skins/classic/views/stats.php b/web/skins/classic/views/stats.php
index 6ad8edc1c..2cd5c69e4 100644
--- a/web/skins/classic/views/stats.php
+++ b/web/skins/classic/views/stats.php
@@ -27,85 +27,27 @@ if ( !canView( 'Events' ) )
 $eid = validInt($_REQUEST['eid']);
 $fid = validInt($_REQUEST['fid']);
 
-$sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId';
-$stats = dbFetchAll( $sql, NULL, array( $eid, $fid ) );
-
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('Stats')." - ".$eid." - ".$fid );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
-      </div>
-      <h2><?php echo translate('Stats') ?> - <?php echo $eid ?> - <?php echo $fid ?></h2>
+
+    <!-- Toolbar button placement and styling handled by bootstrap-tables -->
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
     </div>
-    <div id="content">
+
+    <div id="content" class="row justify-content-center">
       <form name="contentForm" id="contentForm" method="get" action="?">
         <input type="hidden" name="view" value="none"/>
-        <table id="contentTable" class="major" cellspacing="0">
-          <thead>
-            <tr>
-              <th class="colZone"><?php echo translate('Zone') ?></th>
-              <th class="colPixelDiff"><?php echo translate('PixelDiff') ?></th>
-              <th class="colAlarmPx"><?php echo translate('AlarmPx') ?></th>
-              <th class="colFilterPx"><?php echo translate('FilterPx') ?></th>
-              <th class="colBlobPx"><?php echo translate('BlobPx') ?></th>
-              <th class="colBlobs"><?php echo translate('Blobs') ?></th>
-              <th class="colBlobSizes"><?php echo translate('BlobSizes') ?></th>
-              <th class="colAlarmLimits"><?php echo translate('AlarmLimits') ?></th>
-              <th class="colScore"><?php echo translate('Score') ?></th>
-            </tr>
-          </thead>
-          <tbody>
-<?php
-if ( count($stats) )
-{
-    foreach ( $stats as $stat )
-    {
-?>
-            <tr>
-              <td class="colZone"><?php echo validHtmlStr($stat['ZoneName']) ?></td>
-              <td class="colPixelDiff"><?php echo validHtmlStr($stat['PixelDiff']) ?></td>
-              <td class="colAlarmPx"><?php echo sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ) ?></td>
-              <td class="colFilterPx"><?php echo sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ) ?></td>
-              <td class="colBlobPx"><?php echo sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ) ?></td>
-              <td class="colBlobs"><?php echo validHtmlStr($stat['Blobs']) ?></td>
-<?php
-if ( $stat['Blobs'] > 1 )
-{
-?>
-              <td class="colBlobSizes"><?php echo sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ) ?></td>
-<?php
-}
-else
-{
-?>
-              <td class="colBlobSizes"><?php echo sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ) ?></td>
-<?php
-}
-?>
-              <td class="colAlarmLimits"><?php echo validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']) ?></td>
-              <td class="colScore"><?php echo $stat['Score'] ?></td>
-            </tr>
-<?php
-    }
-}
-else
-{
-?>
-            <tr>
-              <td class="rowNoStats" colspan="9"><?php echo translate('NoStatisticsRecorded') ?></td>
-            </tr>
-<?php
-}
-?>
-          </tbody>
-        </table>
+        <?php echo getStatsTableHTML($eid, $fid) ?>
       </form>
     </div>
   </div>
 </body>
 </html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/status.php b/web/skins/classic/views/status.php
index cb4d3016a..f244bf53b 100644
--- a/web/skins/classic/views/status.php
+++ b/web/skins/classic/views/status.php
@@ -76,5 +76,4 @@ foreach ( $output as $row ) {
       </table>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/storage.php b/web/skins/classic/views/storage.php
deleted file mode 100644
index 8cfd5cb88..000000000
--- a/web/skins/classic/views/storage.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-//
-// ZoneMinder web user view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// 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.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
-
-if ( $_REQUEST['id'] ) {
-  if ( !($newStorage = dbFetchOne('SELECT * FROM Storage WHERE Id=?', NULL, ARRAY($_REQUEST['id'])) ) ) {
-    $view = 'error';
-    return;
-    $newStorage['ServerId'] = '';
-  }
-} else {
-  $newStorage = array();
-  $newStorage['Name'] = translate('NewStorage');
-  $newStorage['Path'] = '';
-  $newStorage['Type'] = 'local';
-  $newStorage['Url'] = '';
-  $newStorage['Scheme'] = 'Medium';
-  $newStorage['StorageId'] = '';
-  $newStorage['ServerId'] = '';
-  $newStorage['DoDelete'] = 1;
-}
-
-$type_options = array( 'local' => translate('Local'), 's3fs' => translate('s3fs') );
-$scheme_options = array(
-  'Deep' => translate('Deep'),
-  'Medium' => translate('Medium'),
-  'Shallow' => translate('Shallow'),
-);
-
-$servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
-$ServersById = array();
-foreach ( $servers as $S ) {
-  $ServersById[$S->Id()] = $S;
-}
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Storage').' - '.$newStorage['Name']);
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Storage').' - '.$newStorage['Name'] ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="post" action="?" class="validateFormOnSubmit">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="object" value="storage"/>
-        <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage['Name'] ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Path') ?></th>
-              <td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage['Path'] ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Url') ?></th>
-              <td><input type="text" name="newStorage[Url]" value="<?php echo $newStorage['Url'] ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Server') ?></th>
-              <td><?php echo htmlSelect( 'newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage['ServerId'] ); ?></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Type') ?></th>
-              <td><?php echo htmlSelect( 'newStorage[Type]', $type_options, $newStorage['Type'] ); ?></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('StorageScheme') ?></th>
-              <td><?php echo htmlSelect( 'newStorage[Scheme]', $scheme_options, $newStorage['Scheme'] ); ?></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('StorageDoDelete') ?></th>
-              <td>
-              <input type="radio" name="newStorage[DoDelete]" value="1"<?php echo $newStorage['DoDelete'] ? 'checked="checked"' : '' ?>/>Yes
-              <input type="radio" name="newStorage[DoDelete]" value="0"<?php echo $newStorage['DoDelete'] ? '' : 'checked="checked"' ?>/>No
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button name="action" type="submit" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index 8a55e607d..d0d17d721 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -51,24 +51,20 @@ define( 'STRF_TL_AXIS_RANGE_TIME2', STRF_TL_AXIS_RANGE_TIME1.', %d %b %Y' );
 //
 // These are the time axis tick labels
 //
-define( "STRF_TL_AXIS_LABEL_YEAR", "%Y" );
-define( "STRF_TL_AXIS_LABEL_MONTH", "%M" );
-define( "STRF_TL_AXIS_LABEL_WEEK", "%d/%m" );
-define( "STRF_TL_AXIS_LABEL_DAY", "%d" );
-define( "STRF_TL_AXIS_LABEL_4HOUR", "%H:00" );
-define( "STRF_TL_AXIS_LABEL_HOUR", "%H:00" );
-define( "STRF_TL_AXIS_LABEL_10MINUTE", "%H:%M" );
-define( "STRF_TL_AXIS_LABEL_MINUTE", "%H:%M" );
-define( "STRF_TL_AXIS_LABEL_10SECOND", "%S" );
-define( "STRF_TL_AXIS_LABEL_SECOND", "%S" );
+define( 'STRF_TL_AXIS_LABEL_YEAR', '%Y' );
+define( 'STRF_TL_AXIS_LABEL_MONTH', '%M' );
+define( 'STRF_TL_AXIS_LABEL_WEEK', '%d/%m' );
+define( 'STRF_TL_AXIS_LABEL_DAY', '%d' );
+define( 'STRF_TL_AXIS_LABEL_4HOUR', '%H:00' );
+define( 'STRF_TL_AXIS_LABEL_HOUR', '%H:00' );
+define( 'STRF_TL_AXIS_LABEL_10MINUTE', '%H:%M' );
+define( 'STRF_TL_AXIS_LABEL_MINUTE', '%H:%M' );
+define( 'STRF_TL_AXIS_LABEL_10SECOND', '%S' );
+define( 'STRF_TL_AXIS_LABEL_SECOND', '%S' );
 
-$mouseover = true;
-if ( !isset($mouseover) )
-  $mouseover = true;
+$mouseover = isset($_REQUEST['mouseover']) ? $_REQUEST['mouseover'] : true;
 
-$mode = 'overlay';
-if ( !isset($mode) )
-  $mode = 'overlay';
+$mode = isset($_REQUEST['mode']) ? $_REQUEST['mode'] : 'overlay';
 
 $minEventWidth = 3;
 $maxEventWidth = 6;
@@ -130,19 +126,11 @@ $chart = array(
 );
 
 $monitors = array();
-$monitorsSql = 'SELECT * FROM Monitors ORDER BY Sequence ASC';
-//srand( 97981 );
-foreach( dbFetchAll( $monitorsSql ) as $row ) {
-  //if ( empty($row['WebColour']) )
-  //{
-      //$row['WebColour'] = sprintf( "#%02x%02x%02x", rand( 0, 255 ), rand( 0, 255), rand( 0, 255 ) );
-  //}
-  $monitors[$row['Id']] = $row;
-}
 
 # The as E, and joining with Monitors is required for the filterSQL filters.
 $rangeSql = 'SELECT min(E.StartTime) AS MinTime, max(E.EndTime) AS MaxTime FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(E.StartTime) AND NOT isnull(E.EndTime)';
 $eventsSql = 'SELECT E.* FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(StartTime)';
+$eventIdsSql = 'SELECT E.Id FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(StartTime)';
 $eventsValues = array();
 
 if ( !empty($user['MonitorIds']) ) {
@@ -150,12 +138,15 @@ if ( !empty($user['MonitorIds']) ) {
 
   $rangeSql .= $monFilterSql;
   $eventsSql .= $monFilterSql;
+  $eventIdsSql .= $monFilterSql;
 }
 
-if ( isset($_REQUEST['filter']) )
-  $tree = parseFilterToTree($_REQUEST['filter']['Query']);
-else
-  $tree = false;
+$tree = false;
+if ( isset($_REQUEST['filter']) ) {
+  $filter =  ZM\Filter::parse($_REQUEST['filter']);
+  $tree = $filter->tree();
+  ZM\Warning("Parse tree: " . print_r($tree,true));
+}
 
 if ( isset($_REQUEST['range']) )
   $range = validHtmlStr($_REQUEST['range']);
@@ -166,7 +157,7 @@ if ( isset($_REQUEST['midTime']) )
 if ( isset($_REQUEST['maxTime']) )
   $maxTime = validHtmlStr($_REQUEST['maxTime']);
 
-if ( isset($range) ) {
+if ( isset($range) and validInt($range) ) {
   $halfRange = (int)($range/2);
   if ( isset($midTime) ) {
     $midTimeT = strtotime($midTime);
@@ -207,6 +198,7 @@ if ( isset($minTime) && isset($maxTime) ) {
   if ( $filterSql ) {
     $filterSql = " AND $filterSql";
     $eventsSql .= $filterSql;
+    $eventIdsSql .= $filterSql;
   }
 } else {
   $filterSql = parseTreeToSQL($tree);
@@ -217,16 +209,20 @@ if ( isset($minTime) && isset($maxTime) ) {
     $filterSql = " AND $filterSql";
     $rangeSql .= $filterSql;
     $eventsSql .= $filterSql;
+    $eventIdsSql .= $filterSql;
   }
 
   if ( !isset($minTime) || !isset($maxTime) ) {
     // Dynamically determine range
     $row = dbFetchOne($rangeSql);
-
-    if ( !isset($minTime) )
-      $minTime = $row['MinTime'];
-    if ( !isset($maxTime) )
-      $maxTime = $row['MaxTime'];
+    if ( $row ) {
+      if ( !isset($minTime) )
+        $minTime = $row['MinTime'];
+      if ( !isset($maxTime) )
+        $maxTime = $row['MaxTime'];
+    } else {
+      # Errors will be reported by db functions
+    }
   }
 
   if ( empty($minTime) )
@@ -256,13 +252,13 @@ if ( $tree ) {
 $scales = array(
   array( 'name'=>'year',     'factor'=>60*60*24*365, 'align'=>1,  'zoomout'=>2,    'label'=>STRF_TL_AXIS_LABEL_YEAR ),
   array( 'name'=>'month',    'factor'=>60*60*24*30,  'align'=>1,  'zoomout'=>12,   'label'=>STRF_TL_AXIS_LABEL_MONTH ),
-  array( 'name'=>'week',     'factor'=>60*60*24*7,   'align'=>1,  'zoomout'=>4.25, 'label'=>STRF_TL_AXIS_LABEL_WEEK,     'labelCheck'=>"%W" ),
+  array( 'name'=>'week',     'factor'=>60*60*24*7,   'align'=>1,  'zoomout'=>4.25, 'label'=>STRF_TL_AXIS_LABEL_WEEK,     'labelCheck'=>'%W' ),
   array( 'name'=>'day',      'factor'=>60*60*24,     'align'=>1,  'zoomout'=>7,    'label'=>STRF_TL_AXIS_LABEL_DAY ),
-  array( 'name'=>"hour4",    'factor'=>60*60,        'align'=>4,  'zoomout'=>6,    'label'=>STRF_TL_AXIS_LABEL_4HOUR,    'labelCheck'=>"%H" ),
-  array( 'name'=>'hour',     'factor'=>60*60,        'align'=>1,  'zoomout'=>4,    'label'=>STRF_TL_AXIS_LABEL_HOUR,     'labelCheck'=>"%H" ),
-  array( 'name'=>"minute10", 'factor'=>60,           'align'=>10, 'zoomout'=>6,    'label'=>STRF_TL_AXIS_LABEL_10MINUTE, 'labelCheck'=>"%M" ),
-  array( 'name'=>'minute',   'factor'=>60,           'align'=>1,  'zoomout'=>10,   'label'=>STRF_TL_AXIS_LABEL_MINUTE,   'labelCheck'=>"%M" ),
-  array( 'name'=>"second10", 'factor'=>1,            'align'=>10, 'zoomout'=>6,    'label'=>STRF_TL_AXIS_LABEL_10SECOND ),
+  array( 'name'=>'hour4',    'factor'=>60*60,        'align'=>4,  'zoomout'=>6,    'label'=>STRF_TL_AXIS_LABEL_4HOUR,    'labelCheck'=>'%H' ),
+  array( 'name'=>'hour',     'factor'=>60*60,        'align'=>1,  'zoomout'=>4,    'label'=>STRF_TL_AXIS_LABEL_HOUR,     'labelCheck'=>'%H' ),
+  array( 'name'=>'minute10', 'factor'=>60,           'align'=>10, 'zoomout'=>6,    'label'=>STRF_TL_AXIS_LABEL_10MINUTE, 'labelCheck'=>'%M' ),
+  array( 'name'=>'minute',   'factor'=>60,           'align'=>1,  'zoomout'=>10,   'label'=>STRF_TL_AXIS_LABEL_MINUTE,   'labelCheck'=>'%M' ),
+  array( 'name'=>'second10', 'factor'=>1,            'align'=>10, 'zoomout'=>6,    'label'=>STRF_TL_AXIS_LABEL_10SECOND ),
   array( 'name'=>'second',   'factor'=>1,            'align'=>1,  'zoomout'=>10,   'label'=>STRF_TL_AXIS_LABEL_SECOND ),
 );
 
@@ -280,20 +276,24 @@ $halfRange = (int)($range/2);
 $midTimeT = $minTimeT + $halfRange;
 $midTime = strftime(STRF_FMT_DATETIME_DB, $midTimeT);
 
-//echo "R:$range<br>";
-//echo "MnT:$minTime<br>";
-//echo "MnTt:$minTimeT<br>";
-//echo "MdT:$midTime<br>";
-//echo "MdTt:$midTimeT<br>";
-//echo "MxT:$maxTime<br>";
-//echo "MxTt:$maxTimeT<br>";
-
 if ( isset($minTime) && isset($maxTime) ) {
   $eventsSql .= " AND EndTime >= '$minTime' AND StartTime <= '$maxTime'";
+  $eventIdsSql .= " AND EndTime >= '$minTime' AND StartTime <= '$maxTime'";
 }
 
+if ( 0 ) {
+$framesByEventId = array();
 $eventsSql .= ' ORDER BY E.Id ASC';
-//echo "ESQL: $eventsSql<br>";
+$framesSql = "SELECT EventId,FrameId,Delta,Score FROM Frames WHERE EventId IN($eventIdsSql) AND Score > 0 ORDER BY Score DESC";
+$frames_result = dbQuery($framesSql);
+while ( $row = $frames_result->fetch(PDO::FETCH_ASSOC) ) {
+  if ( !isset($framesByEventId[$row['EventId']]) ) {
+    $framesByEventId[$row['EventId']] = array();
+  }
+  $framesByEventId[$row['EventId']][] = $row;
+}
+}
+
 
 $chart['data'] = array(
   'x' => array(
@@ -311,107 +311,106 @@ $chart['data']['x']['density'] = $chart['data']['x']['range']/$chart['graph']['w
 
 $monEventSlots = array();
 $monFrameSlots = array();
-$monitorIds = array();
-$events_result = dbQuery( $eventsSql );
-if ( ! $events_result ) {
-  Fatal( "SQL-ERR");
+$events_result = dbQuery($eventsSql);
+if ( !$events_result ) {
+  ZM\Fatal('SQL-ERR');
   return;
 }
 
-$first_event = $event = $events_result->fetch(PDO::FETCH_ASSOC);
-if ( $event ) {
-  do {
-    if ( !isset($monitorIds[$event['MonitorId']]) ) {
-      $monitorIds[$event['MonitorId']] = true;
-      $monEventSlots[$event['MonitorId']] = array();
-      $monFrameSlots[$event['MonitorId']] = array();
-    }
+$max_aspect_ratio = 0;
 
-    $currEventSlots = &$monEventSlots[$event['MonitorId']];
-    $currFrameSlots = &$monFrameSlots[$event['MonitorId']];
+while( $event = $events_result->fetch(PDO::FETCH_ASSOC) ) {
+  if ( !isset($monitors[$event['MonitorId']]) ) {
+    $monitor = $monitors[$event['MonitorId']] = ZM\Monitor::find_one(array('Id'=>$event['MonitorId']));
+    $monEventSlots[$event['MonitorId']] = array();
+    $monFrameSlots[$event['MonitorId']] = array();
+    $aspect_ratio = round($monitor->Width() / $monitor->Height(), 2);
+    if ( $aspect_ratio > $max_aspect_ratio )
+      $max_aspect_ratio = $aspect_ratio;
+  }
 
-    $startTimeT = strtotime($event['StartTime']);
-    $startIndex = $rawStartIndex = (int)(($startTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
-    if ( $startIndex < 0 )
-      $startIndex = 0;
+  $currEventSlots = &$monEventSlots[$event['MonitorId']];
+  $currFrameSlots = &$monFrameSlots[$event['MonitorId']];
 
-    if ( isset($event['EndTime']) )
-      $endTimeT = strtotime($event['EndTime']);
-    else
-      $endTimeT = time();
-    $endIndex = $rawEndIndex = (int)(($endTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
+  $startTimeT = strtotime($event['StartTime']);
+  $startIndex = $rawStartIndex = (int)(($startTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
+  if ( $startIndex < 0 )
+    $startIndex = 0;
 
-    if ( $endIndex >= $chart['graph']['width'] )
-      $endIndex = $chart['graph']['width'] - 1;
+  if ( isset($event['EndTime']) )
+    $endTimeT = strtotime($event['EndTime']);
+  else
+    $endTimeT = time();
+  $endIndex = $rawEndIndex = (int)(($endTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
 
-    for ( $i = $startIndex; $i <= $endIndex; $i++ ) {
-      if ( !isset($currEventSlots[$i]) ) {
-        if ( $rawStartIndex == $rawEndIndex ) {
-          $offset = 1;
-        } else {
-          $offset = 1 + ($event['Frames']?((int)(($event['Frames']-1)*(($i-$rawStartIndex)/($rawEndIndex-$rawStartIndex)))):0);
-        }
-        $currEventSlots[$i] = array( 'count'=>0, 'width'=>1, 'offset'=>$offset, 'event'=>$event );
+  if ( $endIndex >= $chart['graph']['width'] )
+    $endIndex = $chart['graph']['width'] - 1;
+
+  for ( $i = $startIndex; $i <= $endIndex; $i++ ) {
+    if ( !isset($currEventSlots[$i]) ) {
+      if ( $rawStartIndex == $rawEndIndex ) {
+        $offset = 1;
       } else {
-        $currEventSlots[$i]['count']++;
+        $offset = 1 + ($event['Frames']?((int)(($event['Frames']-1)*(($i-$rawStartIndex)/($rawEndIndex-$rawStartIndex)))):0);
       }
+      $currEventSlots[$i] = array( 'count'=>0, 'width'=>1, 'offset'=>$offset, 'event'=>$event );
+    } else {
+      $currEventSlots[$i]['count']++;
     }
+  }
 
-    if ( $event['MaxScore'] > 0 ) {
-      if ( $startIndex == $endIndex ) {
-        # Only fills 1 slot, so just get the max Score
-        $framesSql = 'SELECT FrameId,Score FROM Frames WHERE EventId = ? AND Score > 0 ORDER BY Score DESC LIMIT 1';
-        $frame = dbFetchOne($framesSql, NULL, array($event['Id']));
+  if ( $event['MaxScore'] > 0 ) {
+    if ( $startIndex == $endIndex ) {
+      # Only fills 1 slot, so just get the max Score
+      $framesSql = 'SELECT FrameId, Score FROM Frames WHERE EventId = ? AND Score > 0 ORDER BY Score DESC LIMIT 1';
+      $frame = dbFetchOne($framesSql, NULL, array($event['Id']));
 
-        $i = $startIndex;
-        if ( !isset($currFrameSlots[$i]) ) {
-          $currFrameSlots[$i] = array('count'=>1, 'value'=>$event['MaxScore'], 'event'=>$event, 'frame'=>$frame);
-        } else {
-          $currFrameSlots[$i]['count']++;
-          if ( $event['MaxScore'] > $currFrameSlots[$i]['value'] ) {
-            $currFrameSlots[$i]['value'] = $event['MaxScore'];
-            $currFrameSlots[$i]['event'] = $event;
-            $currFrameSlots[$i]['frame'] = $frame;
-          }
-        }
-        if ( $event['MaxScore'] > $chart['data']['y']['hi'] ) {
-          $chart['data']['y']['hi'] = $event['MaxScore'];
-        }
+      $i = $startIndex;
+      if ( !isset($currFrameSlots[$i]) ) {
+        $currFrameSlots[$i] = array('count'=>1, 'value'=>$event['MaxScore'], 'event'=>$event, 'frame'=>$frame);
       } else {
-        # Fills multiple Slots, so need multiple scores to generate the graph over multiple slots.
-        $framesSql = 'SELECT FrameId,Delta,unix_timestamp(TimeStamp) AS TimeT,Score FROM Frames WHERE EventId = ? AND Score > 0';
-        $result = dbQuery($framesSql, array($event['Id']));
-        while( $frame = dbFetchNext($result) ) {
-          if ( $frame['Score'] == 0 )
-            continue;
-          $frameTimeT = $frame['TimeT'];
-          $frameTimeT = $startTimeT + $frame['Delta'];
-          $frameIndex = (int)(($frameTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
-          if ( $frameIndex < 0 )
-            continue;
-          if ( $frameIndex >= $chart['graph']['width'] )
-            continue;
-
-          if ( !isset($currFrameSlots[$frameIndex]) ) {
-            $currFrameSlots[$frameIndex] = array('count'=>1, 'value'=>$frame['Score'], 'event'=>$event, 'frame'=>$frame);
-          } else {
-            $currFrameSlots[$frameIndex]['count']++;
-            if ( $frame['Score'] > $currFrameSlots[$frameIndex]['value'] ) {
-              $currFrameSlots[$frameIndex]['value'] = $frame['Score'];
-              $currFrameSlots[$frameIndex]['event'] = $event;
-              $currFrameSlots[$frameIndex]['frame'] = $frame;
-            }
-          }
-          if ( $frame['Score'] > $chart['data']['y']['hi'] ) {
-            $chart['data']['y']['hi'] = $frame['Score'];
-          }
-        } // end foreach frame
+        $currFrameSlots[$i]['count']++;
+        if ( $event['MaxScore'] > $currFrameSlots[$i]['value'] ) {
+          $currFrameSlots[$i]['value'] = $event['MaxScore'];
+          $currFrameSlots[$i]['event'] = $event;
+          $currFrameSlots[$i]['frame'] = $frame;
+        }
       }
-    } // end if MaxScore > 0
-  } while( $event = $events_result->fetch( PDO::FETCH_ASSOC ) );
-} # end if have first event
+      if ( $event['MaxScore'] > $chart['data']['y']['hi'] ) {
+        $chart['data']['y']['hi'] = $event['MaxScore'];
+      }
+    } else {
+      # Fills multiple Slots, so need multiple scores to generate the graph over multiple slots.
+      $framesSql = 'SELECT FrameId,Delta,Score FROM Frames WHERE EventId = ? AND Score > 0';
+      $result = dbQuery($framesSql, array($event['Id']));
+      while ( $frame = dbFetchNext($result) ) {
+      #foreach ( $framesByEventId[$event['Id']] as $frame ) {
+        $frameTimeT = $startTimeT + $frame['Delta'];
+        $frameIndex = (int)(($frameTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
+        if ( $frameIndex < 0 )
+          continue;
+        if ( $frameIndex >= $chart['graph']['width'] )
+          continue;
 
-ksort( $monitorIds, SORT_NUMERIC );
+        if ( !isset($currFrameSlots[$frameIndex]) ) {
+          $currFrameSlots[$frameIndex] = array('count'=>1, 'value'=>$frame['Score'], 'event'=>$event, 'frame'=>$frame);
+        } else {
+          $currFrameSlots[$frameIndex]['count']++;
+          if ( $frame['Score'] > $currFrameSlots[$frameIndex]['value'] ) {
+            $currFrameSlots[$frameIndex]['value'] = $frame['Score'];
+            $currFrameSlots[$frameIndex]['event'] = $event;
+            $currFrameSlots[$frameIndex]['frame'] = $frame;
+          }
+        }
+        if ( $frame['Score'] > $chart['data']['y']['hi'] ) {
+          $chart['data']['y']['hi'] = $frame['Score'];
+        }
+      } // end foreach frame
+    }
+  } // end if MaxScore > 0
+} // end foreach event
+
+//ksort( $monitorIds, SORT_NUMERIC );
 ksort( $monEventSlots, SORT_NUMERIC );
 ksort( $monFrameSlots, SORT_NUMERIC );
 
@@ -424,7 +423,7 @@ if ( false ) {
     for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
       if ( isset($currFrameSlots[$i]) ) {
         if ( !isset($currFrameSlots[$i]['frame']) ) {
-          $framesSql = "SELECT FrameId,Score FROM Frames WHERE EventId = ? AND Score > 0 ORDER BY FrameId LIMIT 1";
+          $framesSql = 'SELECT FrameId, Score FROM Frames WHERE EventId = ? AND Score > 0 ORDER BY FrameId LIMIT 1';
           $currFrameSlots[$i]['frame'] = dbFetchOne( $framesSql, NULL, array( $currFrameSlots[$i]['event']['Id'] ) );
         }
       }
@@ -440,16 +439,6 @@ $majYScale = getYScale(
   $chart['grid']['y']['major']['min'],
   $chart['grid']['y']['major']['max']);
 
-$maxWidth = 0;
-$maxHeight = 0;
-
-foreach ( array_keys($monitorIds) as $monitorId ) {
-  if ( $maxWidth < $monitors[$monitorId]['Width'] )
-    $maxWidth = $monitors[$monitorId]['Width'];
-  if ( $maxHeight < $monitors[$monitorId]['Height'] )
-    $maxHeight = $monitors[$monitorId]['Height'];
-}
-
 // Optimise boxes
 foreach( array_keys($monEventSlots) as $monitorId ) {
   unset( $currEventSlots );
@@ -463,11 +452,11 @@ foreach( array_keys($monEventSlots) as $monitorId ) {
             $currSlot['width']++;
             unset( $currEventSlots[$i] );
             continue;
-          } elseif ( $currSlot['offset'] < $currEventSlots[$i]['offset'] ) {
+          } else if ( $currSlot['offset'] < $currEventSlots[$i]['offset'] ) {
             // Split very long events
             $currEventSlots[$i]['frame'] = array( 'FrameId'=>$currEventSlots[$i]['offset'] );
           }
-        } elseif ( $currSlot['width'] < $minEventWidth ) {
+        } else if ( $currSlot['width'] < $minEventWidth ) {
           // Merge multiple small events
           $currSlot['width']++;
           unset( $currEventSlots[$i] );
@@ -476,11 +465,10 @@ foreach( array_keys($monEventSlots) as $monitorId ) {
       }
       $currSlot = &$currEventSlots[$i];
     } else {
-      unset( $currSlot );
+      unset($currSlot);
     }
-  }
-  if ( isset($currSlot) )
-    unset($currSlot);
+  }  # end foreach x
+  unset($currSlot);
 } // end foreach Event Monitors
 //print_r( $monEventSlots );
 
@@ -489,7 +477,6 @@ $frameSlots = array();
 $frameMonitorIds = array_keys($monFrameSlots);
 for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
   foreach ( $frameMonitorIds as $frameMonitorId ) {
-    unset($currFrameSlots);
     $currFrameSlots = &$monFrameSlots[$frameMonitorId];
     if ( isset($currFrameSlots[$i]) ) {
       if ( !isset($frameSlots[$i]) ) {
@@ -509,10 +496,11 @@ for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
         $frameSlots[$i][] = &$currFrameSlots[$i];
       }
     }
+    unset($currFrameSlots);
   } # end foreach MonitorId
-}
+}  # end foreach x
 
-//print_r( $monEventSlots );
+//ZM\Logger::Debug(print_r( $monEventSlots,true ));
 //print_r( $monFrameSlots );
 //print_r( $chart );
 
@@ -522,9 +510,9 @@ if ( $mode == 'overlay' ) {
   $minEventBarHeight = 10;
   $maxEventBarHeight = 40;
 
-  if ( count($monitorIds) ) {
+  if ( count($monitors) ) {
     $chart['graph']['eventBarHeight'] = $minEventBarHeight;
-    while ( ($chart['graph']['eventsHeight'] = (($chart['graph']['eventBarHeight'] * count($monitorIds)) + (count($monitorIds)-1))) < $maxEventBarHeight ) {
+    while ( ($chart['graph']['eventsHeight'] = (($chart['graph']['eventBarHeight'] * count($monitors)) + (count($monitors)-1))) < $maxEventBarHeight ) {
       $chart['graph']['eventBarHeight']++;
     }
   } else {
@@ -536,7 +524,7 @@ if ( $mode == 'overlay' ) {
 
   $chart['eventBars'] = array();
   $top = $chart['graph']['activityHeight'];
-  foreach ( array_keys($monitorIds) as $monitorId ) {
+  foreach ( array_keys($monitors) as $monitorId ) {
     $chart['eventBars'][$monitorId] = array( 'top' => $top );
     $top += $chart['graph']['eventBarHeight']+1;
   }
@@ -545,10 +533,10 @@ if ( $mode == 'overlay' ) {
   $minEventBarHeight = 10;
   $maxEventBarHeight = 40;
 
-  if ( count($monitorIds) ) {
+  if ( count($monitors) ) {
     $chart['graph']['eventBarHeight'] = $minEventBarHeight;
     $chart['graph']['activityBarHeight'] = $minActivityBarHeight;
-    while ( ((($chart['graph']['eventBarHeight']+$chart['graph']['activityBarHeight']) * count($monitorIds)) + ((2*count($monitorIds))-1)) < $graphHeight ) {
+    while ( ((($chart['graph']['eventBarHeight']+$chart['graph']['activityBarHeight']) * count($monitors)) + ((2*count($monitors))-1)) < $graphHeight ) {
       $chart['graph']['activityBarHeight']++;
       if ( $chart['graph']['eventBarHeight'] < $maxEventBarHeight ) {
         $chart['graph']['eventBarHeight']++;
@@ -564,28 +552,30 @@ if ( $mode == 'overlay' ) {
   $chart['eventBars'] = array();
   $top = 0;
   $barCount = 1;
-  foreach ( array_keys($monitorIds) as $monitorId ) {
+  foreach ( array_keys($monitors) as $monitorId ) {
     $chart['eventBars'][$monitorId] = array( 'top' => $top );
     $chart['eventBars'][$monitorId] = array( 'top' => $top+$chart['graph']['activityBarHeight']+1 );
     $top +=  $chart['graph']['activityBarHeight']+1+$chart['graph']['eventBarHeight']+1;
   }
+} else {
+  ZM\Warning("No mode $mode");
 }
 
-preg_match( '/^(\d+)-(\d+)-(\d+) (\d+):(\d+)/', $minTime, $startMatches );
-preg_match( '/^(\d+)-(\d+)-(\d+) (\d+):(\d+)/', $maxTime, $endMatches );
+preg_match('/^(\d+)-(\d+)-(\d+) (\d+):(\d+)/', $minTime, $startMatches);
+preg_match('/^(\d+)-(\d+)-(\d+) (\d+):(\d+)/', $maxTime, $endMatches);
 
 if ( $startMatches[1] != $endMatches[1] ) {
   // Different years
-  $title = strftime( STRF_TL_AXIS_RANGE_YEAR1, $chart['data']['x']['lo'] )." - ".strftime( STRF_TL_AXIS_RANGE_YEAR2, $chart['data']['x']['hi'] );
-} elseif ( $startMatches[2] != $endMatches[2] ) {
+  $title = strftime( STRF_TL_AXIS_RANGE_YEAR1, $chart['data']['x']['lo'] ).' - '.strftime( STRF_TL_AXIS_RANGE_YEAR2, $chart['data']['x']['hi'] );
+} else if ( $startMatches[2] != $endMatches[2] ) {
   // Different months
-  $title = strftime( STRF_TL_AXIS_RANGE_MONTH1, $chart['data']['x']['lo'] )." - ".strftime( STRF_TL_AXIS_RANGE_MONTH2, $chart['data']['x']['hi'] );
-} elseif ( $startMatches[3] != $endMatches[3] ) {
+  $title = strftime( STRF_TL_AXIS_RANGE_MONTH1, $chart['data']['x']['lo'] ).' - '.strftime( STRF_TL_AXIS_RANGE_MONTH2, $chart['data']['x']['hi'] );
+} else if ( $startMatches[3] != $endMatches[3] ) {
   // Different dates
-  $title = strftime( STRF_TL_AXIS_RANGE_DAY1, $chart['data']['x']['lo'] )." - ".strftime( STRF_TL_AXIS_RANGE_DAY2, $chart['data']['x']['hi'] );
+  $title = strftime( STRF_TL_AXIS_RANGE_DAY1, $chart['data']['x']['lo'] ).' - '.strftime( STRF_TL_AXIS_RANGE_DAY2, $chart['data']['x']['hi'] );
 } else {
   // Different times
-  $title = strftime( STRF_TL_AXIS_RANGE_TIME1, $chart['data']['x']['lo'] )." - ".strftime( STRF_TL_AXIS_RANGE_TIME2, $chart['data']['x']['hi'] );
+  $title = strftime( STRF_TL_AXIS_RANGE_TIME1, $chart['data']['x']['lo'] ).' - '.strftime( STRF_TL_AXIS_RANGE_TIME2, $chart['data']['x']['hi'] );
 }
 
 function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomClass=false ) {
@@ -595,11 +585,9 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
   $lastTick = 0;
   unset( $lastLabel );
   $labelCheck = isset($scale['labelCheck'])?$scale['labelCheck']:$scale['label'];
-?>
-          <div id='xScale'>
-<?php
+  echo '<div id="xScale">';
   for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
-    $x = $i - 1;
+    $x = round(100*(($i)/$chart['graph']['width']),1);
     $timeOffset = (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density']));
     if ( $scale['align'] > 1 ) {
       $label = (int)(strftime( $labelCheck, $timeOffset )/$scale['align']);
@@ -614,24 +602,24 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
       if ( isset($lastLabel) ) {
         if ( $labelClass ) {
 ?>
-            <div class="<?php echo $labelClass ?>" style="left: <?php echo $x-25 ?>px;"><?php echo strftime( $scale['label'], $timeOffset ); ?></div>
+            <div class="<?php echo $labelClass ?>" style="left: <?php echo $x-round(100*(11/$chart['graph']['width']),1) ?>%;"><?php echo strftime( $scale['label'], $timeOffset ); ?></div>
 <?php
         }
         if ( $tickClass ) {
 ?>
-            <div class="<?php echo $tickClass ?>" style="left: <?php echo $x ?>px;"></div>
+            <div class="<?php echo $tickClass ?>" style="left: <?php echo $x ?>%;"></div>
 <?php
         }
         if ( $gridClass ) {
 ?>
-            <div class="<?php echo $gridClass ?>" style="left: <?php echo $x ?>px;"></div>
+            <div class="<?php echo $gridClass ?>" style="left: <?php echo $x ?>%;"></div>
 <?php
         }
         if ( $scale['name'] != 'second' && $zoomClass ) {
           $zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) );
           $zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) );
 ?>
-            <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo translate('ZoomIn') ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
+            <div class="<?php echo $zoomClass ?>" style="left: <?php echo 100*($lastTick-1)/$chart['graph']['width'] ?>%; width: <?php echo round(100*($i-$lastTick)/$chart['graph']['width'],1) ?>%;" title="<?php echo translate('ZoomIn') ?>" data-on-click="tlZoomBounds" data-zoom-min-time="<?php echo $zoomMinTime ?>" data-zoom-max-time="<?php echo $zoomMaxTime ?>"></div>
 <?php
         }
         $lastTick = $i;
@@ -644,19 +632,19 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
     $zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) );
     $zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) );
 ?>
-            <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo translate('ZoomIn') ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
+            <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo translate('ZoomIn') ?>" data-on-click="tlZoomBounds" data-zoom-min-time="<?php echo $zoomMinTime ?>" data-zoom-max-time="<?php echo $zoomMaxTime ?>"></div>
 <?php
   }
 ?>
           </div>
 <?php
-  return( ob_get_clean() );
+  return ob_get_clean();
 } # end function drawXGrid
 
 function drawYGrid( $chart, $scale, $labelClass, $tickClass, $gridClass ) {
   ob_start();
 ?>
-  <div id='yScale'>
+  <div id="yScale">
 <?php
   for ( $i = 0; $i < $scale['lines']; $i++ ) {
     $label = (int)($i * $scale['divisor']);
@@ -680,170 +668,129 @@ function drawYGrid( $chart, $scale, $labelClass, $tickClass, $gridClass ) {
 ?>
   </div>
 <?php
-  return( ob_get_clean() );
+  return ob_get_clean();
 } # end function drawYGrid
 
-function getSlotPreviewEventBehaviour( $slot ) {
-  return( "previewEvent( '".$slot['event']['Id']."', '".getSlotFrame( $slot )."' )" );
-}
-
-function getSlotShowEventBehaviour( $slot ) {
-  global $monitors;
-
-  $monitor = &$monitors[$slot['event']['MonitorId']];
-
-  return( "showEvent( '".$slot['event']['Id']."', '".getSlotFrame( $slot )."', '".reScale( $monitor['Width'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE )."', '".reScale( $monitor['Height'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE )."' )" );
-}
-
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Timeline') );
+xhtmlHeaders(__FILE__, translate('Timeline'));
 ?>
 <body>
-  <div id='page'>
   <?php echo getNavBarHTML() ?>
-    <div id='header'>
-      <div id='info'>
-        <h2><?php echo translate('Timeline') ?></h2>
-        <a id='refreshLink' href="#" onclick="location.reload(true);"><?php echo translate('Refresh') ?></a>
-      </div>
-      <div id='headerButtons'>
-        <a href="#" onclick="window.history.back();"><?php echo translate('Back') ?></a>
-        <a href="?view=events&amp;page=1<?php echo htmlspecialchars($filterQuery) ?>"><?php echo translate('List') ?></a>
+  <div id="page p-0">
+    <div class="d-flex p-1">
+      <div class="mr-auto" id="toolbar" >
+        <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        <button id="listBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('List') ?>" ><i class="fa fa-list"></i></button>
       </div>
+      <h2 class="align-self-end"><?php echo translate('Timeline') ?></h2>
     </div>
-    <div id='content' class='chartSize'>
-      <div id='topPanel' class='graphWidth'>
-        <div id='imagePanel'>
-          <div id='image' class='imageHeight'>
-		        <img id='imageSrc' class='imageWidth' src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
-<?php
-if ( 0 ) {
-//due to chrome bug, has to enable https://code.google.com/p/chromium/issues/detail?id=472300
-//crossorigin has to be added below to make caption work in chrome
-?>
-<!--
-			<video id='preview' width="100%" controls crossorigin='anonymous'>
-				<source src="<?php echo getEventDefaultVideoPath($first_event); ?>" type="video/mp4">
-Your browser does not support the video tag.
-			</video>
-o-->
-<?php } ?>
-
+    
+    <div id="content" class="chartSize">
+      <div id="topPanel" class="graphWidth">
+        <div id="imagePanel">
+          <div id="image" class="imageHeight">
+		        <img id="imageSrc" class="imageWidth" src="graphics/transparent.png" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>
           </div>
         </div>
-        <div id='dataPanel'>
-          <div id='textPanel'>
-            <div id='instruction'>
+        <div id="dataPanel">
+          <div id="textPanel">
+            <div id="instruction">
               <p><?php echo translate('TimelineTip1') ?></p>
               <p><?php echo translate('TimelineTip2') ?></p>
               <p><?php echo translate('TimelineTip3') ?></p>
               <p><?php echo translate('TimelineTip4') ?></p>
               </div>
-            <div id='eventData'>
+            <div id="eventData">
             </div>
           </div>
-          <div id='navPanel'>
-            <input type='button' title="<?php echo translate('PanLeft') ?>" value="&lt;&lt;" onclick="tlPan( '<?php echo $minTime ?>', '<?php echo $range ?>' )"/>
-            <input type='button' title="<?php echo translate('ZoomOut') ?>" value="&ndash;" onclick="tlZoomRange( '<?php echo $midTime ?>', '<?php echo (int)($range*$majXScale['zoomout']) ?>' )"/>
-            <input type='button' title="<?php echo translate('PanRight') ?>" value="&gt;&gt;" onclick="tlPan( '<?php echo $maxTime ?>', '<?php echo $range ?>' )"/>
+          <div id="navPanel">
+            <button type="button" title="<?php echo translate('PanLeft') ?>" data-on-click="tlPanLeft">
+            <i class="material-icons md-18">fast_rewind</i>
+            </button>
+            <button type="button" title="<?php echo translate('ZoomOut') ?>" data-on-click="tlZoomOut">
+<i class="material-icons md-18">zoom_out</i>
+            </button>
+            <button type="button" title="<?php echo translate('PanRight') ?>" data-on-click="tlPanRight">
+            <i class="material-icons md-18">fast_forward</i>
+            </button>
           </div>
         </div>
       </div>
-      <div id='chartPanel'>
-        <div id='chart' class='graphSize'>
+      <div id="chartPanel">
+        <div id="chart" class="graphSize">
 <?php
+
+function drawSlot($slot,$index) {
+  global $chart;
+  global $monitors;
+  global $mouseover;
+  $height = (int)($slot['value']/$chart['data']['y']['density']);
+
+  if ( $height <= 0 )
+    return '';
+  $left = round(100*($index/$chart['graph']['width']),1);
+
+  return "<div class=\"activity monitorColour{$slot['event']['MonitorId']}\"
+            style=\"left:{$left}%; height: {$height}px;\"
+  data-event-id=\"{$slot['event']['Id']}\" data-frame-id=\"".getSlotFrame($slot)."\"".
+  ( $mouseover ? ' data-on-mouseover-this="previewEvent" data-on-click-this="showEvent"' : ' data-on-click-this="previewEvent"').
+  '></div>';
+}
+
 if ( $mode == 'overlay' ) {
   echo drawYGrid( $chart, $majYScale, 'majLabelY', 'majTickY', 'majGridY graphWidth' );
 }
 echo drawXGrid( $chart, $majXScale, 'majLabelX', 'majTickX', 'majGridX graphHeight', 'zoom graphHeight' );
 if ( $mode == 'overlay' ) {
 ?>
-          <div id='activity' class='activitySize'>
+          <div id="activity" class="activitySize">
 <?php
     foreach ( $frameSlots as $index=>$slots ) {
       foreach ( $slots as $slot ) {
-        $slotHeight = (int)($slot['value']/$chart['data']['y']['density']);
-
-        if ( $slotHeight <= 0 )
-          continue;
-
-        if ( $mouseover ) {
-          $behaviours = array(
-              'onclick="'.getSlotShowEventBehaviour($slot).'"',
-              'onmouseover="'.getSlotPreviewEventBehaviour($slot).'"'
-              );
-        } else {
-          $behaviours = array(
-              'onclick="'.getSlotPreviewEventBehaviour($slot).'"'
-              );
-        }
-?>
-            <div class="activity monitorColour<?php echo $slot['event']['MonitorId'] ?>" style="left: <?php echo $index ?>px; height: <?php echo $slotHeight ?>px;" <?php echo join( ' ', $behaviours ) ?>></div>
-<?php
+        echo drawSlot($slot, $index);
       }
     }
 ?>
           </div>
 <?php
-} elseif ( $mode == 'split' ) {
-  foreach( array_keys($monFrameSlots) as $monitorId ) {
+} else if ( $mode == 'split' ) {
+  foreach ( array_keys($monFrameSlots) as $monitorId ) {
 ?>
-        <div id="activity<?php echo $monitorId ?>">
+        <div id="activity<?php echo $monitorId ?>" class="activitySize">
 <?php
-    unset($currFrameSlots);
     $currFrameSlots = &$monFrameSlots[$monitorId];
     foreach ( $currFrameSlots as $index=>$slot ) {
-      $slotHeight = (int)($slot['value']/$chart['data']['y']['density']);
-
-      if ( $slotHeight <= 0 )
-        continue;
-
-      if ( $mouseover ) {
-        $behaviours = array(
-          'onclick="'.getSlotShowEventBehaviour($slot).'"',
-          'onmouseover="'.getSlotPreviewEventBehaviour($slot).'"'
-        );
-      } else {
-        $behaviours = array(
-          'onclick="'.getSlotPreviewEventBehaviour($slot).'"'
-        );
-      }
-?>
-        <div class="activity activity<?php echo $slot['event']['MonitorId'] ?>" style="left: <?php echo $index ?>px; height: <?php echo $slotHeight ?>px;" <?php echo join( ' ', $behaviours ) ?>></div>
-<?php
+      echo drawSlot($slot, $index);
     } # end foreach $currFrameSlots
+    unset($currFrameSlots);
 ?>
         </div>
 <?php
   } # end foreach $MonitorId
 }
-foreach( array_keys($monEventSlots) as $monitorId ) {
+foreach ( array_keys($monEventSlots) as $monitorId ) {
 ?>
           <div id="events<?php echo $monitorId ?>" class="events eventsSize eventsPos<?php echo $monitorId ?>">
 <?php
-  unset( $currEventSlots );
   $currEventSlots = &$monEventSlots[$monitorId];
   for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
     if ( isset($currEventSlots[$i]) ) {
-      unset( $slot );
       $slot = &$currEventSlots[$i];
 
-      if ( $mouseover ) {
-        $behaviours = array(
-            'onclick="'.getSlotShowEventBehaviour($slot).'"',
-            'onmouseover="'.getSlotPreviewEventBehaviour($slot).'"'
-        );
-      } else {
-        $behaviours = array(
-            'onclick="'.getSlotPreviewEventBehaviour($slot).'"'
-        );
-      }
-?>
-            <div class="event eventsHeight monitorColour<?php echo $monitorId ?>" style="left: <?php echo $i ?>px; width: <?php echo $slot['width'] ?>px;" <?php echo join( ' ', $behaviours ) ?>></div>
-<?php
+  $left = round(100*($i/$chart['graph']['width']),1);
+  $width = round(100*($slot['width']/$chart['graph']['width']),1);
+
+  echo "<div class=\"event monitorColour{$slot['event']['MonitorId']}\"
+            style=\"left:{$left}%; width: {$width}%;\"
+  data-event-id=\"{$slot['event']['Id']}\" data-frame-id=\"".getSlotFrame($slot)."\"".
+  ( $mouseover ? ' data-on-mouseover-this="previewEvent" data-on-click-this="showEvent"' : ' data-on-click-this="previewEvent"').
+  '></div>';
+      unset( $slot );
     } # end if isset($currEventSlots[$i])
   } # end foreach width segment
+  unset ($currEventSlots);
 ?>
           </div>
 <?php
@@ -851,21 +798,20 @@ foreach( array_keys($monEventSlots) as $monitorId ) {
 ?>
         </div>
       </div>
-      <div id='chartLabels' class='graphWidth'>
-        <div id='key'>
+      <div id="chartLabels" class="graphWidth">
+        <div id="key">
 <?php
 foreach( array_keys($monEventSlots) as $monitorId ) {
 ?>
-          <span class='keyEntry'><?php echo $monitors[$monitorId]['Name'] ?>
-            <img id="keyBox<?php echo $monitorId ?>" class="keyBox monitorColour<?php echo $monitorId ?>" src="graphics/transparent.png" alt="<?php echo $monitors[$monitorId]['Name'] ?>"/>
+          <span class="keyEntry"><?php echo $monitors[$monitorId]->Name() ?>
+          <div id="keyBox<?php echo $monitorId ?>" class="keyBox monitorColour<?php echo $monitorId ?>" title="<?php echo $monitors[$monitorId]->Name() ?>" style="background-color: <?php echo $monitors[$monitorId]->WebColour() ?>;"></div>
           </span>
 <?php
 }
 ?>
         </div>
-        <div id='range'><?php echo $title ?></div>
+        <div id="range"><?php echo $title ?></div>
       </div>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/user.php b/web/skins/classic/views/user.php
index 78c3e206b..f8b000ebb 100644
--- a/web/skins/classic/views/user.php
+++ b/web/skins/classic/views/user.php
@@ -18,26 +18,26 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-$selfEdit = ZM_USER_SELF_EDIT && $_REQUEST['uid'] == $user['Id'];
+$selfEdit = ZM_USER_SELF_EDIT && ($_REQUEST['uid'] == $user['Id']);
 
 if ( !canEdit('System') && !$selfEdit ) {
   $view = 'error';
   return;
 }
 
+require('includes/User.php');
+
 if ( $_REQUEST['uid'] ) {
-	if ( !($newUser = dbFetchOne('SELECT * FROM Users WHERE Id = ?', NULL, ARRAY($_REQUEST['uid']))) ) {
+	if ( !($newUser = new ZM\User($_REQUEST['uid'])) ) {
 		$view = 'error';
 		return;
 	}
 } else {
-	$newUser = array();
-	$newUser['Username'] = translate('NewUser');
-	$newUser['Enabled'] = 1;
-	$newUser['MonitorIds'] = '';
+  $newUser = new ZM\User();
+	$newUser->Username(translate('NewUser'));
 }
 
-$monitorIds = array_flip(explode(',', $newUser['MonitorIds']));
+$monitorIds = array_flip(explode(',', $newUser->MonitorIds()));
 
 $yesno = array( 0=>translate('No'), 1=>translate('Yes') );
 $nv = array( 'None'=>translate('None'), 'View'=>translate('View') );
@@ -45,106 +45,94 @@ $nve = array( 'None'=>translate('None'), 'View'=>translate('View'), 'Edit'=>tran
 $bandwidths = array_merge( array( ''=>'' ), $bandwidth_options );
 $langs = array_merge( array( ''=>'' ), getLanguages() );
 
-$sql = 'SELECT Id,Name FROM Monitors ORDER BY Sequence ASC';
+$sql = 'SELECT Id, Name FROM Monitors ORDER BY Sequence ASC';
 $monitors = array();
-foreach( dbFetchAll($sql) as $monitor ) {
-  $monitors[] = $monitor;
+foreach ( dbFetchAll($sql) as $monitor ) {
+  if ( visibleMonitor($monitor['Id']) ) {
+    $monitors[$monitor['Id']] = $monitor;
+  }
 }
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('User').' - '.$newUser['Username']);
+xhtmlHeaders(__FILE__, translate('User').' - '.$newUser->Username());
 ?>
 <body>
+<?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('User').' - '.validHtmlStr($newUser['Username']); ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="post" action="?" onsubmit="return validateForm( this, <?php echo empty($newUser['Password'])?'true':'false' ?> )">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="user"/>
+      <h2><?php echo translate('User').' - '.validHtmlStr($newUser->Username()); ?></h2>
+    <div id="content" class="row justify-content-center">
+      <form id="contentForm" name="contentForm" method="post" action="?view=user">
         <input type="hidden" name="uid" value="<?php echo validHtmlStr($_REQUEST['uid']) ?>"/>
-        <input type="hidden" name="newUser[MonitorIds]" value="<?php echo validHtmlStr($newUser['MonitorIds']); ?>"/>
-        <table id="contentTable" class="major">
+        <table id="contentTable" class="table">
           <tbody>
 <?php
 if ( canEdit('System') ) {
 ?>
             <tr>
-              <th scope="row"><?php echo translate('Username') ?></th>
-              <td><input type="text" name="newUser[Username]" value="<?php echo validHtmlStr($newUser['Username']); ?>"/></td>
+              <th class="text-right" scope="row"><?php echo translate('Username') ?></th>
+              <td><input type="text" name="newUser[Username]" value="<?php echo validHtmlStr($newUser->Username()); ?>"<?php echo $newUser->Username() == 'admin' ? ' readonly="readonly"':''?>/></td>
             </tr>
 <?php
 }
 ?>
             <tr>
-              <th scope="row"><?php echo translate('NewPassword') ?></th>
+              <th class="text-right" scope="row"><?php echo translate('NewPassword') ?></th>
               <td><input type="password" name="newUser[Password]" autocomplete="new-password"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('ConfirmPassword') ?></th>
+              <th class="text-right" scope="row"><?php echo translate('ConfirmPassword') ?></th>
               <td><input type="password" name="conf_password" autocomplete="new-password"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('Language') ?></th>
-              <td><?php echo buildSelect( "newUser[Language]", $langs ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Language') ?></th>
+              <td><?php echo htmlSelect('newUser[Language]', $langs, $newUser->Language()) ?></td>
             </tr>
 <?php
-if ( canEdit('System') ) {
+if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
 ?>
             <tr>
-              <th scope="row"><?php echo translate('Enabled') ?></th>
-              <td><?php echo buildSelect( "newUser[Enabled]", $yesno ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Enabled') ?></th>
+              <td><?php echo htmlSelect('newUser[Enabled]', $yesno, $newUser->Enabled()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('Stream') ?></th>
-              <td><?php echo buildSelect( "newUser[Stream]", $nv ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Stream') ?></th>
+              <td><?php echo htmlSelect('newUser[Stream]', $nv, $newUser->Stream()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('Events') ?></th>
-              <td><?php echo buildSelect( "newUser[Events]", $nve ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Events') ?></th>
+              <td><?php echo htmlSelect('newUser[Events]', $nve, $newUser->Events()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('Control') ?></th>
-              <td><?php echo buildSelect( "newUser[Control]", $nve ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Control') ?></th>
+              <td><?php echo htmlSelect('newUser[Control]', $nve, $newUser->Control()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('Monitors') ?></th>
-              <td><?php echo buildSelect( "newUser[Monitors]", $nve ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Monitors') ?></th>
+              <td><?php echo htmlSelect('newUser[Monitors]', $nve, $newUser->Monitors()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('Groups') ?></th>
-              <td><?php echo buildSelect( "newUser[Groups]", $nve ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Groups') ?></th>
+              <td><?php echo htmlSelect('newUser[Groups]', $nve, $newUser->Groups()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('System') ?></th>
-              <td><?php echo buildSelect( "newUser[System]", $nve ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('System') ?></th>
+              <td><?php echo htmlSelect('newUser[System]', $nve, $newUser->System()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('MaxBandwidth') ?></th>
-              <td><?php echo buildSelect( "newUser[MaxBandwidth]", $bandwidths ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('MaxBandwidth') ?></th>
+              <td><?php echo htmlSelect('newUser[MaxBandwidth]', $bandwidths, $newUser->MaxBandwidth()) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('RestrictedMonitors') ?></th>
+              <th class="text-right" scope="row"><?php echo translate('RestrictedMonitors') ?></th>
               <td>
-                <select name="monitorIds" size="4" multiple="multiple">
-<?php
-    foreach ( $monitors as $monitor ) {
-      if ( visibleMonitor($monitor['Id']) ) {
-?>
-                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists($monitor['Id'], $monitorIds) ) { ?> selected="selected"<?php } ?>><?php echo htmlentities($monitor['Name']) ?></option>
-<?php
-      }
-    }
-?>
-                </select>
+<?php echo htmlSelect('newUser[MonitorIds][]', $monitors, explode(',', $newUser->MonitorIds()), array('multiple'=>'multiple')); ?>
               </td>
             </tr>
 <?php if ( ZM_OPT_USE_API ) { ?>
             <tr>
-              <th scope="row"><?php echo translate('APIEnabled')?></th>
-              <td><?php echo buildSelect( "newUser[APIEnabled]", $yesno ) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('APIEnabled')?></th>
+              <td><?php echo htmlSelect('newUser[APIEnabled]', $yesno, $newUser->APIEnabled()) ?></td>
             </tr>
 
 <?php
@@ -154,11 +142,10 @@ if ( canEdit('System') ) {
           </tbody>
         </table>
         <div id="contentButtons">
-          <button type="submit" value="Save"><?php echo translate('Save') ?></button>
+          <button type="submit" name="action" value="Save"><?php echo translate('Save') ?></button>
           <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/version.php b/web/skins/classic/views/version.php
index 3ced8c613..6552c4cd5 100644
--- a/web/skins/classic/views/version.php
+++ b/web/skins/classic/views/version.php
@@ -33,6 +33,7 @@ if ( verNum(ZM_DYN_CURR_VERSION) != verNum(ZM_DYN_LAST_VERSION) and canEdit('Sys
     'hour'   => translate('VersionRemindHour'),
     'day'    => translate('VersionRemindDay'),
     'week'   => translate('VersionRemindWeek'),
+    'month'  => translate('VersionRemindMonth'),
     'never'  => translate('VersionRemindNever')
   ) );
 }
@@ -64,16 +65,16 @@ if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) {
 } else {
 ?>
       <form name="contentForm" id="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="none"/>
+        <input type="hidden" name="view" value="version"/>
         <input type="hidden" name="action" value="version"/>
         <p><?php echo translate('UpdateAvailable') ?></p>
         <p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p>
-        <p><?php echo buildSelect( "option", $options ); ?></p>
+        <p><?php echo buildSelect('option', $options); ?></p>
         <div id="contentButtons">
 <?php
   if ( canEdit('System') ) {
 ?>
-          <button type="submit" data-on-click-this="submitForm" value="Apply"><?php echo translate('Apply') ?></button>
+          <button type="submit"><?php echo translate('Apply') ?></button>
 <?php
   }
 }
diff --git a/web/skins/classic/views/video.php b/web/skins/classic/views/video.php
index ca4c46f4b..f2099a445 100644
--- a/web/skins/classic/views/video.php
+++ b/web/skins/classic/views/video.php
@@ -27,27 +27,25 @@ require_once('includes/Event.php');
 
 $eid = validInt($_REQUEST['eid']);
 
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate,M.DefaultScale FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
-$sql_values = array($eid);
+$event = new ZM\Event($eid);
 
-if ( $user['MonitorIds'] ) {
-  $monitor_ids = explode(',', $user['MonitorIds']);
-  $sql .= ' AND MonitorId IN ('.implode(',', array_fill(0,count($monitor_ids),'?')).')';
-  $sql_values = array_merge($sql_values, $monitor_ids);
+if ( ! canView('Monitors', $event->MonitorId() ) ) {
+  $view = 'error';
+  return;
 }
-$event = dbFetchOne($sql, NULL, $sql_values);
 
+$monitor = $event->Monitor();
 if ( isset($_REQUEST['rate']) )
   $rate = validInt($_REQUEST['rate']);
 else
-  $rate = reScale(RATE_BASE, $event['DefaultRate'], ZM_WEB_DEFAULT_RATE);
+  $rate = reScale(RATE_BASE, $monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
+
 if ( isset($_REQUEST['scale']) )
   $scale = validInt($_REQUEST['scale']);
 else
-  $scale = reScale(SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
+  $scale = reScale(SCALE_BASE, $monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE);
 
-$Event = new ZM\Event($event['Id']);
-$eventPath = $Event->Path();
+$event_path = $event->Path();
 
 $videoFormats = array();
 $ffmpegFormats = preg_split('/\s+/', ZM_FFMPEG_FORMATS);
@@ -63,9 +61,9 @@ foreach ( $ffmpegFormats as $ffmpegFormat ) {
 }
 
 $videoFiles = array();
-if ( $dir = opendir($eventPath) ) {
+if ( $dir = opendir($event_path) ) {
   while ( ($file = readdir($dir)) !== false ) {
-    $file = $eventPath.'/'.$file;
+    $file = $event_path.'/'.$file;
     if ( is_file($file) ) {
       if ( preg_match('/\.(?:'.join('|', $videoFormats).')$/', $file) ) {
         $videoFiles[] = $file;
@@ -85,6 +83,7 @@ if ( isset($_REQUEST['downloadIndex']) ) {
   // can't be output buffering, as this file might be large
   ob_end_clean();
   $downloadIndex = validInt($_REQUEST['downloadIndex']);
+  ZM\Error("Download $downloadIndex, file: " . $videoFiles[$downloadIndex]);
   header('Pragma: public');
   header('Expires: 0');
   header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
@@ -124,7 +123,7 @@ if ( isset($_REQUEST['showIndex']) ) {
 } else {
 ?>
       <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="id" value="<?php echo $event['Id'] ?>"/>
+        <input type="hidden" name="id" value="<?php echo $event->Id() ?>"/>
         <table id="contentTable" class="minor">
           <tbody>
             <tr>
@@ -145,7 +144,9 @@ if ( isset($_REQUEST['showIndex']) ) {
             </tr>
           </tbody>
         </table>
-        <input type="button" value="<?php echo translate('GenerateVideo') ?>" onclick="generateVideo(this.form);"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
+        <button type="button" data-on-click="generateVideo"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>>
+        <?php echo translate('GenerateVideo') ?>
+        </button>
       </form>
 <?php
   if ( isset($_REQUEST['generated']) ) {
@@ -200,20 +201,27 @@ if ( isset($_REQUEST['showIndex']) ) {
         } elseif ( preg_match('/^S(.+)$/', $matches[3], $temp_matches) ) {
           $scaleText = $temp_matches[1];
         }
-        $width = $scale?reScale($event['Width'], $scale):$event['Width'];
-        $height = $scale?reScale($event['Height'], $scale):$event['Height'];
+        $width = $scale?reScale($event->Width(), $scale):$event->Width();
+        $height = $scale?reScale($event->Height(), $scale):$event->Height();
 ?>
         <tr>
           <td><?php echo $matches[4] ?></td>
           <td><?php echo filesize($file) ?></td>
           <td><?php echo $rateText ?></td>
           <td><?php echo $scaleText ?></td>
-          <td><?php echo makePopupLink('?view='.$view.'&amp;eid='.$event['Id'].'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event['Id'].'-'.$scale, array( 'videoview', $width, $height ), translate('View') ); ?>&nbsp;/&nbsp;<a href="<?php echo substr( $file, strlen(ZM_DIR_EVENTS)+1 ) ?>" onclick="downloadVideo( <?php echo $index ?> ); return( false );"><?php echo translate('Download') ?></a>&nbsp;/&nbsp;<a href="#" onclick="deleteVideo( <?php echo $index ?> ); return( false );"><?php echo translate('Delete') ?></a></td>
+          <td>
+            <?php echo makePopupLink('?view='.$view.'&amp;eid='.$event->Id().'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event->Id().'-'.$scale, array('videoview', $width, $height), translate('View') ); ?>
+            &nbsp;/&nbsp;
+            <a href="#"
+ data-on-click-this="downloadVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Download') ?></a>
+            &nbsp;/&nbsp;
+            <a href="#" data-on-click-this="deleteVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Delete') ?></a>
+          </td>
         </tr>
 <?php
         $index++;
-      }
-    }
+      } # end if filesize
+    } # end foreach videoFile
 ?>
         </tbody>
       </table>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 4d2fa93d5..1b9ca2994 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web watch feed view file, $Date$, $Revision$
+// ZoneMinder web watch feed view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -18,25 +18,24 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-require_once('includes/Monitor.php');
-
 if ( !canView('Stream') ) {
   $view = 'error';
   return;
 }
 
-if ( ! isset($_REQUEST['mid']) ) {
+if ( !isset($_REQUEST['mid']) ) {
   $view = 'error';
   return;
 }
 
 // This is for input sanitation
 $mid = intval($_REQUEST['mid']); 
-if ( ! visibleMonitor($mid) ) {
+if ( !visibleMonitor($mid) ) {
   $view = 'error';
   return;
 }
 
+require_once('includes/Monitor.php');
 $monitor = new ZM\Monitor($mid);
 
 #Whether to show the controls button
@@ -47,38 +46,37 @@ if ( isset($_REQUEST['scale']) ) {
 } else if ( isset($_COOKIE['zmWatchScale'.$mid]) ) {
   $scale = $_COOKIE['zmWatchScale'.$mid];
 } else {
-  $scale = reScale(SCALE_BASE, $monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE);
+  $scale = $monitor->DefaultScale();
 }
 
 $connkey = generateConnKey();
 
 $streamMode = getStreamMode();
 
-noCacheHeaders();
-
 $popup = ((isset($_REQUEST['popup'])) && ($_REQUEST['popup'] == 1));
 
-xhtmlHeaders( __FILE__, $monitor->Name().' - '.translate('Feed') );
+noCacheHeaders();
+xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
 ?>
 <body>
   <div id="page">
   <?php if ( !$popup ) echo getNavBarHTML() ?>
     <div id="header">
-        <div id="monitorName"><?php echo $monitor->Name() ?></div>
+        <div id="monitorName"><?php echo validHtmlStr($monitor->Name()) ?></div>
         <div id="menuControls">
 <?php
 if ( canView('Control') && $monitor->Type() == 'Local' ) {
 ?>
-          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
+          <div id="settingsControl"><?php echo makePopupLink($monitor->UrlToIndex().'?view=settings&amp;mid='.$monitor->Id().'&amp;'.get_auth_relay(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"') ?></div>
 <?php
 }
 ?>
-          <div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect('scale', $scales, 'changeScale(this);'); ?></div>
+          <div id="scaleControl"><?php echo translate('Scale').': '.htmlSelect('scale', $scales, $scale, array('id'=>'scale')); ?></div>
         </div>
-        <div id="closeControl"><a href="#" onclick="<?php echo $popup ? 'window.close()' : 'history.go(-1);return false;' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
+        <div id="closeControl"><a href="#" data-on-click="<?php echo $popup ? 'closeWindow' : 'backWindow' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
     </div>
 <?php
-if ( $monitor->Status() != 'Connected' ) {
+if ( $monitor->Status() != 'Connected' and $monitor->Type() != 'WebSite' ) {
   echo '<div class="warning">Monitor is not capturing. We will be unable to provide an image</div>';
 }
 ?>
@@ -89,25 +87,21 @@ if ( $streamMode == 'jpeg' ) {
   echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"';
 }
 ?>
-><?php echo getStreamHTML( $monitor, array('scale'=>$scale) ); ?></div>
+><?php echo getStreamHTML($monitor, array('scale'=>$scale)); ?></div>
 
 
 <?php if ( $monitor->Type() != 'WebSite' ) { ?>
       <div id="monitorStatus">
 <?php if ( canEdit('Monitors') ) { ?>
         <div id="enableDisableAlarms">
-          <a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms();return false;" class="hidden">
-          <?php echo translate('EnableAlarms') ?></a>
-          <a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms();return false;" class="hidden">
-          <?php echo translate('DisableAlarms') ?></a>
+          <button type="button" id="enableAlarmsLink" data-on-click="cmdEnableAlarms" class="hidden">
+          <?php echo translate('EnableAlarms') ?></button>
+          <button type="button" id="disableAlarmsLink" data-on-click="cmdDisableAlarms" class="hidden">
+          <?php echo translate('DisableAlarms') ?></button>
         </div>
-<?php
-}
-if ( canEdit('Monitors') ) {
-?>
         <div id="forceCancelAlarm">
-            <a id="forceAlarmLink" href="#" data-on-click="cmdForceAlarm"><?php echo translate('ForceAlarm') ?></a>
-            <a id="cancelAlarmLink" href="#" data-on-click="cmdCancelForcedAlarm" class="hidden"><?php echo translate('CancelForcedAlarm') ?></a>
+            <button type="button" id="forceAlarmLink" data-on-click="cmdForceAlarm"><?php echo translate('ForceAlarm') ?></button>
+            <button type="button" id="cancelAlarmLink" data-on-click="cmdCancelForcedAlarm" class="hidden"><?php echo translate('CancelForcedAlarm') ?></button>
         </div>
 <?php
 }
@@ -119,28 +113,45 @@ if ( canEdit('Monitors') ) {
 if ( $streamMode == 'jpeg' ) {
   if ( $monitor->StreamReplayBuffer() != 0 ) {
 ?>
-        <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastRev"/>
-        <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowRev"/>
+        <button type="button" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastRev">
+<i class="material-icons md-18">fast_rewind</i>
+        </button>
+        <button type="button" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowRev">
+        <i class="material-icons md-18">chevron_right</i>
+        </button>
 <?php 
   }
 ?>
-        <input type="button" value="||" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" data-on-click-true="streamCmdPause"/>
-        <input type="button" value="[]" id="stopBtn" title="<?php echo translate('Stop') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdStop"/>
-        <input type="button" value="|&gt;" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" data-on-click-true="streamCmdPlay"/>
+        <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" data-on-click-true="streamCmdPause">
+<i class="material-icons md-18">pause</i>
+        </button>
+        <button type="button" id="stopBtn" title="<?php echo translate('Stop') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdStop" style="display:none;">
+<i class="material-icons md-18">stop</i>
+        </button>
+        <button type="button" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" data-on-click-true="streamCmdPlay">
+<i class="material-icons md-18">play_arrow</i>
+        </button>
 <?php
   if ( $monitor->StreamReplayBuffer() != 0 ) {
 ?>
-        <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowFwd"/>
-        <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastFwd"/>
+        <button type="button" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdSlowFwd">
+        <i class="material-icons md-18">chevron_right</i>
+        </button>
+        <button type="button" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="unavail" disabled="disabled" data-on-click-true="streamCmdFastFwd">
+<i class="material-icons md-18">fast_forward</i>
+        </button>
 <?php
   }
 ?>
-        <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" data-on-click="streamCmdZoomOut"/>
+        <button type="button" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" data-on-click="streamCmdZoomOut">
+<i class="material-icons md-18">zoom_out</i>
+
+        </button>
 <?php
 } // end if streamMode==jpeg
 ?>
       </div>
-      <div id="replayStatus"<?php echo $streamMode=="single"?' class="hidden"':'' ?>>
+      <div id="replayStatus"<?php echo $streamMode=="single" ? ' class="hidden"' : '' ?>>
         <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue"></span></span>
         <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
         <span id="delay"><?php echo translate('Delay') ?>: <span id="delayValue"></span>s</span>
@@ -150,11 +161,11 @@ if ( $streamMode == 'jpeg' ) {
 <?php } // end if $monitor->Type() != 'WebSite' ?>
 <?php
 if ( $showPtzControls ) {
-    foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile )
+    foreach ( getSkinIncludes('includes/control_functions.php') as $includeFile )
         require_once $includeFile;
 ?>
       <div id="ptzControls" class="ptzControls">
-<?php echo ptzControls( $monitor ) ?>
+      <?php echo ptzControls($monitor) ?>
       </div>
 <?php
 }
@@ -217,5 +228,4 @@ if ( ZM_WEB_SOUND_ON_ALARM ) {
 ?>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index ea4ad990c..cf03104c7 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -18,15 +18,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView('Monitors') ) {
+$mid = empty($_REQUEST['mid']) ? 0 : validInt($_REQUEST['mid']);
+if ( !($mid and canEdit('Monitors', $mid)) ) {
   $view = 'error';
   return;
 }
 
-$mid = validInt($_REQUEST['mid']);
-$zid = !empty($_REQUEST['zid'])?validInt($_REQUEST['zid']):0;
-
-$scale = SCALE_BASE;
+$zid = (!empty($_REQUEST['zid'])) ? validInt($_REQUEST['zid']) : 0;
 
 $hicolor = '0x00ff00'; // Green
 
@@ -34,45 +32,46 @@ $presets = array();
 $presetNames = array();
 $presetNames[0] = translate('ChoosePreset');
 $sql = 'SELECT *, Units-1 AS UnitsIndex, CheckMethod-1 AS CheckMethodIndex FROM ZonePresets ORDER BY Id ASC';
-foreach( dbFetchAll( $sql ) as $preset ) {
+foreach ( dbFetchAll($sql) as $preset ) {
   $presetNames[$preset['Id']] = $preset['Name'];
   $presets[] = $preset;
 }
 
 $optTypes = array();
-foreach ( getEnumValues( 'Zones', 'Type' ) as $optType ) {
+foreach ( getEnumValues('Zones', 'Type') as $optType ) {
   $optTypes[$optType] = $optType;
 }
 
 $optUnits = array();
-foreach ( getEnumValues( 'Zones', 'Units' ) as $optUnit ) {
+foreach ( getEnumValues('Zones', 'Units') as $optUnit ) {
   $optUnits[$optUnit] = $optUnit;
 }
 
 $optCheckMethods = array();
-foreach ( getEnumValues( 'Zones', 'CheckMethod' ) as $optCheckMethod ) {
+foreach ( getEnumValues('Zones', 'CheckMethod') as $optCheckMethod ) {
   $optCheckMethods[$optCheckMethod] = $optCheckMethod;
 }
 
-$monitor = new ZM\Monitor( $mid );
+$monitor = new ZM\Monitor($mid);
 
 $minX = 0;
-$maxX = $monitor->Width()-1;
+$maxX = $monitor->ViewWidth()-1;
 $minY = 0;
-$maxY = $monitor->Height()-1;
+$maxY = $monitor->ViewHeight()-1;
 
 if ( !isset($newZone) ) {
   if ( $zid > 0 ) {
-    $zone = dbFetchOne('SELECT * FROM Zones WHERE MonitorId = ? AND Id=?', NULL, array($monitor->Id(), $zid));
+    $zone = dbFetchOne('SELECT * FROM Zones WHERE MonitorId=? AND Id=?', NULL, array($monitor->Id(), $zid));
   } else {
     $zone = array(
       'Id' => 0,
       'Name' => translate('New'),
       'Type'  =>  'Active',
+			'Units'	=>	'Pixels',
       'MonitorId' => $monitor->Id(),
       'NumCoords' => 4,
       'Coords' => sprintf('%d,%d %d,%d, %d,%d %d,%d', $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY),
-      'Area' => $monitor->Width() * $monitor->Height(),
+      'Area' => $monitor->ViewWidth() * $monitor->ViewHeight(),
       'AlarmRGB' => 0xff0000,
       'CheckMethod' => 'Blobs',
       'MinPixelThreshold' => '',
@@ -91,8 +90,8 @@ if ( !isset($newZone) ) {
       'ExtendAlarmFrames' => '',
     );
   }
-  $zone['Points'] = coordsToPoints( $zone['Coords'] );
-  $zone['AreaCoords'] = preg_replace( '/\s+/', ',', $zone['Coords'] );
+  $zone['Points'] = coordsToPoints($zone['Coords']);
+  $zone['AreaCoords'] = preg_replace('/\s+/', ',', $zone['Coords']);
 
   $newZone = $zone;
 } # end if new Zone
@@ -108,21 +107,30 @@ $newZone['AreaCoords'] = preg_replace('/\s+/', ',', $newZone['Coords']);
 $selfIntersecting = isSelfIntersecting($newZone['Points']);
 
 $focusWindow = true;
-$connkey = generateConnKey();
-$streamSrc = '';
-$streamMode = '';
 # Have to do this here, because the .js.php references somethings figured out when generating the streamHTML
-$StreamHTML = getStreamHTML($monitor, array('scale'=>$scale));
+$monitor->connKey();
+$StreamHTML = getStreamHTML($monitor, array('mode'=>'single'));
+
+# So I'm thinking now that 50% of screen real-estate with a minimum of 640px. 
+# scale should be floor(whatever that width is/actual width)
+# So we need javascript to figure out browser width, figure out scale and then activate the stream.  
 
 xhtmlHeaders(__FILE__, translate('Zone'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Monitor') ?> <?php echo $monitor->Name() ?> - <?php echo translate('Zone') ?> <?php echo $newZone['Name'] ?></h2>
+    <div class="w-100">
+      <div class="float-left pl-3 pt-1">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Monitor').' '.$monitor->Name().' - '.translate('Zone').' '.$newZone['Name'] ?></h2>
+      </div>
     </div>
     <div id="content">
-      <form name="zoneForm" id="zoneForm" method="post" action="?" onkeypress="return event.keyCode != 13;">
+      <form name="zoneForm" id="zoneForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="zone"/>
         <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
@@ -130,90 +138,13 @@ xhtmlHeaders(__FILE__, translate('Zone'));
         <input type="hidden" name="newZone[NumCoords]" value="<?php echo count($newZone['Points']) ?>"/>
         <input type="hidden" name="newZone[Coords]" value="<?php echo $newZone['Coords'] ?>"/>
         <input type="hidden" name="newZone[Area]" value="<?php echo $newZone['Area'] ?>"/>
-        <input type="hidden" name="newZone[AlarmRGB]" value=""/>
-        <div id="settingsPanel">
-          <table id="zoneSettings">
-            <tbody>
-              <tr>
-                <th scope="row"><?php echo translate('Name') ?></th>
-                <td colspan="2"><input type="text" name="newZone[Name]" value="<?php echo $newZone['Name'] ?>" size="12"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('Type') ?></th>
-                <td colspan="2"><?php echo buildSelect( "newZone[Type]", $optTypes, 'applyZoneType()' ) ?></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('Preset') ?></th>
-                <td colspan="2"><?php echo buildSelect( "presetSelector", $presetNames, array( "onchange"=>"applyPreset()", "onblur"=>"this.selectedIndex=0" ) ) ?></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('Units') ?></th>
-                <td colspan="2"><?php echo buildSelect( "newZone[Units]", $optUnits, 'applyZoneUnits()' ) ?></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneAlarmColour') ?></th>
-                <td colspan="2">
-                  <input type="text" name="newAlarmRgbR" value="<?php echo ($newZone['AlarmRGB']>>16)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>
-                  /
-                  <input type="text" name="newAlarmRgbG" value="<?php echo ($newZone['AlarmRGB']>>8)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>
-                  /
-                  <input type="text" name="newAlarmRgbB" value="<?php echo $newZone['AlarmRGB']&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>
-                </td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('CheckMethod') ?></th>
-                <td colspan="2"><?php echo buildSelect('newZone[CheckMethod]', $optCheckMethods, 'applyCheckMethod()' ) ?></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneMinMaxPixelThres') ?></th>
-                <td><input type="text" name="newZone[MinPixelThreshold]" value="<?php echo $newZone['MinPixelThreshold'] ?>" size="4" onchange="limitRange( this, 0, 255 )"/></td>
-                <td><input type="text" name="newZone[MaxPixelThreshold]" value="<?php echo $newZone['MaxPixelThreshold'] ?>" size="4" onchange="limitRange( this, 0, 255 )"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneFilterSize') ?></th>
-                <td><input type="text" name="newZone[FilterX]" value="<?php echo $newZone['FilterX'] ?>" size="4" onchange="limitFilter( this )"/></td>
-                <td><input type="text" name="newZone[FilterY]" value="<?php echo $newZone['FilterY'] ?>" size="4" onchange="limitFilter( this )"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneArea') ?></th>
-                <td colspan="2"><input type="text" name="newZone[TempArea]" value="<?php echo $newZone['Area'] ?>" size="7" disabled="disabled"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneMinMaxAlarmArea') ?></th>
-                <td><input type="text" name="newZone[MinAlarmPixels]" value="<?php echo $newZone['MinAlarmPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
-                <td><input type="text" name="newZone[MaxAlarmPixels]" value="<?php echo $newZone['MaxAlarmPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneMinMaxFiltArea') ?></th>
-                <td><input type="text" name="newZone[MinFilterPixels]" value="<?php echo $newZone['MinFilterPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
-                <td><input type="text" name="newZone[MaxFilterPixels]" value="<?php echo $newZone['MaxFilterPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneMinMaxBlobArea') ?></th>
-                <td><input type="text" name="newZone[MinBlobPixels]" value="<?php echo $newZone['MinBlobPixels'] ?>" size="6"/></td>
-                <td><input type="text" name="newZone[MaxBlobPixels]" value="<?php echo $newZone['MaxBlobPixels'] ?>" size="6"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneMinMaxBlobs') ?></th>
-                <td><input type="text" name="newZone[MinBlobs]" value="<?php echo $newZone['MinBlobs'] ?>" size="4"/></td>
-                <td><input type="text" name="newZone[MaxBlobs]" value="<?php echo $newZone['MaxBlobs'] ?>" size="4"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneOverloadFrames') ?></th>
-                <td colspan="2"><input type="text" name="newZone[OverloadFrames]" value="<?php echo $newZone['OverloadFrames'] ?>" size="4"/></td>
-              </tr>
-              <tr>
-                <th scope="row"><?php echo translate('ZoneExtendAlarmFrames') ?></th>
-                <td colspan="2"><input type="text" name="newZone[ExtendAlarmFrames]" value="<?php echo $newZone['ExtendAlarmFrames'] ?>" size="4"/></td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
+        <input type="hidden" name="newZone[AlarmRGB]"/>
+
         <div id="definitionPanel">
-          <div id="imagePanel">
-            <div id="imageFrame" style="position: relative; width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;">
-                <?php echo $StreamHTML; ?>
-                <svg id="zoneSVG" class="zones" style="position: absolute; top: 0; left: 0; width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px; background: none;">
+				  <div id="imagePanel">
+            <div id="imageFrame">
+              <?php echo $StreamHTML; ?>
+              <svg id="zoneSVG" class="zones" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>">
 <?php
 if ( $zone['Id'] ) {
   $other_zones = dbFetchAll('SELECT * FROM Zones WHERE MonitorId = ? AND Id != ?', NULL, array($monitor->Id(), $zone['Id']));
@@ -229,52 +160,159 @@ if ( count($other_zones) ) {
   echo $html;
 }
 ?>
-                  <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="Editing <?php echo $zone['Type'] ?>"/>
-                  Sorry, your browser does not support inline SVG
-                </svg>
+                <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="Editing <?php echo $zone['Type'] ?>"/>
+                Sorry, your browser does not support inline SVG
+              </svg>
+            </div><?php # imageFrame?>
+            <div id="monitorState">
+              <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
             </div>
-          </div>
-          <div id="monitorState"><?php echo translate('State') ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div>
-          <table id="zonePoints">
-            <tbody>
-              <tr>
+            <div id="StreamControlButtons">
+              <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>">
+                <i class="material-icons md-18">pause</i>
+              </button>
+              <button type="button" id="playBtn" title="<?php echo translate('Play') ?>">
+                <i class="material-icons md-18">play_arrow</i>
+              </button>
+            </div>
+          </div><!--imagePanel-->
+
+					<div id="settingsPanel">
+						<table id="zoneSettings">
+							<tbody>
+								<tr>
+									<th scope="row"><?php echo translate('Name') ?></th>
+									<td colspan="2"><input type="text" name="newZone[Name]" value="<?php echo $newZone['Name'] ?>"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('Type') ?></th>
+									<td colspan="2"><?php echo htmlSelect('newZone[Type]', $optTypes, $newZone['Type'],
+											array('data-on-change'=>'applyZoneType', 'id'=>'newZone[Type]')); ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('Preset') ?></th>
+									<td colspan="2">
+										<?php echo htmlSelect('presetSelector', $presetNames,
+												( isset($_REQUEST['presetSelector']) ? $_REQUEST['presetSelector'] : null),
+												array('data-on-change'=>'applyPreset', 'id'=>'presetSelector') )
+										?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('Units') ?></th>
+                  <td colspan="2">
+<?php
+                        echo htmlSelect('newZone[Units]', $optUnits, $newZone['Units'],
+                        array('data-on-change'=>'applyZoneUnits', 'id'=>'newZone[Units]')
+                        );
+                        # Used later for number inputs
+                        $step = $newZone['Units'] == 'Percent' ? ' step="0.01" max="100"' : '';
+?>
+                  </td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneAlarmColour') ?></th>
+									<td colspan="2">
+										<input type="number" name="newAlarmRgbR" value="<?php echo ($newZone['AlarmRGB']>>16)&0xff ?>" min="0" max="255"/>
+										/
+										<input type="number" name="newAlarmRgbG" value="<?php echo ($newZone['AlarmRGB']>>8)&0xff ?>" min="0" max="255"/>
+										/
+										<input type="number" name="newAlarmRgbB" value="<?php echo $newZone['AlarmRGB']&0xff ?>" min="0" max="255"/>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('CheckMethod') ?></th>
+									<td colspan="2"><?php echo htmlSelect('newZone[CheckMethod]', $optCheckMethods, $newZone['CheckMethod']); ?></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneMinMaxPixelThres') ?></th>
+									<td><input type="number" name="newZone[MinPixelThreshold]" value="<?php echo $newZone['MinPixelThreshold'] ?>" min="0" max="255"/></td>
+									<td><input type="number" name="newZone[MaxPixelThreshold]" value="<?php echo $newZone['MaxPixelThreshold'] ?>" min="0" max="255"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneFilterSize') ?></th>
+									<td><input type="number" name="newZone[FilterX]" value="<?php echo $newZone['FilterX'] ?>" min="0"/></td>
+									<td><input type="number" name="newZone[FilterY]" value="<?php echo $newZone['FilterY'] ?>" min="0"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneArea') ?></th>
+									<td colspan="2"><input type="number" name="newZone[TempArea]" value="<?php echo $newZone['Area'] ?>" disabled="disabled"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneMinMaxAlarmArea') ?></th>
+                  <td><input type="number" name="newZone[MinAlarmPixels]" value="<?php echo $newZone['MinAlarmPixels'] ?>"<?php echo $step ?> min="0"/></td>
+									<td><input type="number" name="newZone[MaxAlarmPixels]" value="<?php echo $newZone['MaxAlarmPixels'] ?>"<?php echo $step ?> min="0"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneMinMaxFiltArea') ?></th>
+									<td><input type="number" name="newZone[MinFilterPixels]" value="<?php echo $newZone['MinFilterPixels'] ?>"<?php echo $step ?> min="0"/></td>
+									<td><input type="number" name="newZone[MaxFilterPixels]" value="<?php echo $newZone['MaxFilterPixels'] ?>"<?php echo $step ?> min="0"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneMinMaxBlobArea') ?></th>
+									<td><input type="number" name="newZone[MinBlobPixels]" value="<?php echo $newZone['MinBlobPixels'] ?>"<?php echo $step ?> min="0"/></td>
+									<td><input type="number" name="newZone[MaxBlobPixels]" value="<?php echo $newZone['MaxBlobPixels'] ?>"<?php echo $step ?> min="0"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneMinMaxBlobs') ?></th>
+									<td><input type="number" name="newZone[MinBlobs]" value="<?php echo $newZone['MinBlobs'] ?>" min="0"/></td>
+									<td><input type="number" name="newZone[MaxBlobs]" value="<?php echo $newZone['MaxBlobs'] ?>" min="0"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneOverloadFrames') ?></th>
+									<td colspan="2"><input type="number" name="newZone[OverloadFrames]" value="<?php echo $newZone['OverloadFrames'] ?>" min="0"/></td>
+								</tr>
+								<tr>
+									<th scope="row"><?php echo translate('ZoneExtendAlarmFrames') ?></th>
+									<td colspan="2"><input type="number" name="newZone[ExtendAlarmFrames]" value="<?php echo $newZone['ExtendAlarmFrames'] ?>" min="0"/></td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+
+					<div id="zonePoints">
+					  <table>
+ 					 	  <tbody>
+					 		  <tr>
 <?php
 $pointCols = 2;
 for ( $i = 0; $i < $pointCols; $i++ ) {
 ?>
-                <td>
-                  <table>
-                    <thead>
-                      <tr>
-                        <th><?php echo translate('Point') ?></th>
-                        <th><?php echo translate('X') ?></th>
-                        <th><?php echo translate('Y') ?></th>
-                        <th><?php echo translate('Action') ?></th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                  </table>
-                </td>
+									<td>
+										<table>
+											<thead>
+												<tr>
+													<th><?php echo translate('Point') ?></th>
+													<th><?php echo translate('X') ?></th>
+													<th><?php echo translate('Y') ?></th>
+													<th><?php echo translate('Action') ?></th>
+												</tr>
+											</thead>
+											<tbody>
+											</tbody>
+										</table>
+									</td>
 <?php
+# I think this for horizontal filler
     if ( $i < ($pointCols-1) ) {
 ?>
-                <td>&nbsp;</td>
+									<td>&nbsp;</td>
 <?php
     }
-}
+} # end foreach pointcol
 ?>
-              </tr>
-            </tbody>
-          </table>
-          <button id="pauseBtn" type="button" data-on-click="streamCmdPauseToggle"><?php echo translate('Pause') ?></button>
-          <button type="button" id="submitBtn" name="submitBtn" value="Save" data-on-click-this="saveChanges"<?php if (!canEdit('Monitors') || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>>
-          <?php echo translate('Save') ?>
-          </button>
-          <button type="button" value="Cancel" onclick="refreshParentWindow(); closeWindow();"><?php echo translate('Cancel') ?></button>
-        </div>
+								</tr>
+							</tbody>
+						</table>
+					<div class="buttons">
+						<button type="button" id="saveBtn" value="Save" <?php if (!canEdit('Monitors') || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>>
+						<?php echo translate('Save') ?>
+						</button>
+						<button type="button" id="cancelBtn" value="Cancel"><?php echo translate('Cancel') ?></button>
+					</div>
+					</div><!--end ZonePoints-->
+        </div><!--definitionsPanel-->
       </form>
-    </div>
-  </div>
-</body>
-</html>
+    </div><!--content-->
+  </div><!--page-->
+  <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 2d29e13d9..dee405023 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web zones view file, $Date$, $Revision$
+// ZoneMinder web zones view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -18,92 +18,118 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView('Monitors') ) {
+$mids = null;
+if ( isset($_REQUEST['mid']) ) {
+  $mids = array();
+  $mids[] = validInt($_REQUEST['mid']);
+} else if ( isset($_REQUEST['mids']) ) {
+  $mids = $_REQUEST['mids'];
+} else {
+  $mids = dbFetchAll('SELECT Id FROM Monitors'.($user['MonitorIds'] ? 'WHERE Id IN ('.$user['MonitorIds'].')' : ''), 'Id');
+}
+
+if ( !($mids and count($mids)) ) {
   $view = 'error';
   return;
 }
-
-$mid = validInt($_REQUEST['mid']);
-$monitor = new ZM\Monitor($mid);
-# Width() and Height() are already rotated
-$minX = 0;
-$maxX = $monitor->Width()-1;
-$minY = 0;
-$maxY = $monitor->Height()-1;
-
-$zones = array();
-foreach( dbFetchAll('SELECT * FROM Zones WHERE MonitorId=? ORDER BY Area DESC', NULL, array($mid)) as $row ) {
-  $row['Points'] = coordsToPoints($row['Coords']);
-
-  limitPoints($row['Points'], $minX, $minY, $maxX, $maxY);
-  $row['Coords'] = pointsToCoords($row['Points']);
-  $row['AreaCoords'] = preg_replace('/\s+/', ',', $row['Coords']);
-  $zones[] = $row;
-}
-
-$connkey = generateConnKey();
+$monitors = ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Monitor', array('Id'=>$mids));
 
 xhtmlHeaders(__FILE__, translate('Zones'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons"><a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a></div>
-      <h2><?php echo translate('Zones') ?></h2>
+    <div class="w-100 py-1">
+      <div class="float-left pl-3">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Zones') ?></h2>
+      </div>
     </div>
-    <div id="content" style="width:<?php echo $monitor->Width() ?>px; height:<?php echo $monitor->Height() ?>px; position:relative; margin: 0 auto;">
+    <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="delete"/>
-        <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
-        <div id="contentButtons">
-          <?php echo makePopupButton('?view=zone&mid=' . $mid . '&zid=0', 'zmZone', array('zone', $monitor->Width(), $monitor->Height()), translate('AddNewZone'), canEdit('Monitors')); ?>
-          <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
-        </div>
-        <table id="contentTable" class="major" cellspacing="0">
-          <thead>
-            <tr>
-              <th class="colName"><?php echo translate('Name') ?></th>
-              <th class="colType"><?php echo translate('Type') ?></th>
-              <th class="colUnits"><?php echo translate('AreaUnits') ?></th>
-              <th class="colMark"><?php echo translate('Mark') ?></th>
-            </tr>
-          </thead>
-          <tbody>
 <?php
-foreach( $zones as $zone ) {
+  foreach ( $mids as $mid ) {
+    $monitor = $monitors[$mid];
+    $monitor->connKey();
+    # ViewWidth() and ViewHeight() are already rotated
+    $minX = 0;
+    $maxX = $monitor->ViewWidth()-1;
+    $minY = 0;
+    $maxY = $monitor->ViewHeight()-1;
+
+    $zones = array();
+    foreach ( dbFetchAll('SELECT * FROM Zones WHERE MonitorId=? ORDER BY Area DESC', NULL, array($mid)) as $row ) {
+      $row['Points'] = coordsToPoints($row['Coords']);
+
+      limitPoints($row['Points'], $minX, $minY, $maxX, $maxY);
+      $row['Coords'] = pointsToCoords($row['Points']);
+      $row['AreaCoords'] = preg_replace('/\s+/', ',', $row['Coords']);
+      $zones[] = $row;
+    }
+
+    $options = array('width'=>'100%', 'height'=>'auto');
 ?>
-            <tr>
-              <td class="colName"><?php echo makePopupLink('?view=zone&mid=' . $mid . '&zid=' . $zone['Id'], 'zmZone', array('zone', $monitor->Width(), $monitor->Height()), validHtmlStr($zone['Name']), true, 'onclick="streamCmdQuit( true ); return( false );"'); ?></td>
-              <td class="colType"><?php echo validHtmlStr($zone['Type']) ?></td>
-              <td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf( "%.2f", ($zone['Area']*100)/($monitor->Width()*$monitor->Height()) ) ?></td>
-              <td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
-            </tr>
-<?php
-}
-?>
-          </tbody>
-        </table>
-        <div class="ZonesImage" style="position:relative; clear:both;">
-        <?php echo getStreamHTML( $monitor ); ?>
-        <svg class="zones" width="<?php echo $monitor->Width() ?>" height="<?php echo $monitor->Height() ?>" style="position:absolute; top: 0; left: 0; background: none;">
+    <div class="Monitor">
+        <input type="hidden" name="mids[]" value="<?php echo $mid ?>"/>
+        <div class="ZonesImage">
+          <?php echo getStreamHTML($monitor, $options); ?>
+          <svg class="zones" viewBox="0 0 <?php echo $monitor->ViewWidth().' '.$monitor->ViewHeight() ?>">
 <?php
       foreach( array_reverse($zones) as $zone ) {
 ?>
-          <polygon points="<?php echo $zone['AreaCoords'] ?>" class="popup-link <?php echo $zone['Type']?>" onclick="streamCmdQuit( true ); return( false );"
-                   data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
-                   data-window-name="zmZone"
-                   data-window-tag="zone"
-                   data-window-width="<?php echo $monitor->Width ?>"
-                   data-window-height="<?php echo $monitor->Height ?>"/>
+            <polygon points="<?php echo $zone['AreaCoords'] ?>"
+                     class="zmlink <?php echo $zone['Type']?>"
+                     data-on-click-true="streamCmdQuit"
+                     data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
+            />
 <?php
       } // end foreach zone
 ?>
           Sorry, your browser does not support inline SVG
         </svg>
         </div>
+				<div class="zones">
+					<table id="zonesTable" class="major">
+						<thead>
+							<tr>
+								<th class="colName"><?php echo translate('Name') ?></th>
+								<th class="colType"><?php echo translate('Type') ?></th>
+								<th class="colUnits"><?php echo translate('AreaUnits') ?></th>
+								<th class="colMark"><?php echo translate('Mark') ?></th>
+							</tr>
+						</thead>
+						<tbody>
+	<?php
+	foreach( $zones as $zone ) {
+	?>
+							<tr>
+								<td class="colName"><?php echo makeLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
+								<td class="colType"><?php echo validHtmlStr($zone['Type']) ?></td>
+								<td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf('%.2f', ($zone['Area']*100)/($monitor->ViewWidth()*$monitor->ViewHeight()) ) ?></td>
+								<td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit('Monitors') ) { ?> disabled="disabled"<?php } ?>/></td>
+							</tr>
+	<?php
+	}
+	?>
+						</tbody>
+					</table>
+                                     <div id="contentButtons">
+                                       <?php echo makeButton('?view=zone&mid='.$mid.'&zid=0', 'AddNewZone', canEdit('Monitors')); ?>
+                                       <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
+                                     </div>
+				</div><!--zones-->
+<br class="clear"/>
+      </div><!--Monitor-->
+<?php 
+  } # end foreach monitor
+?>
       </form>
     </div>
   </div>
-</body>
-</html>
+  <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
+<?php xhtmlFooter() ?>
diff --git a/web/views/archive.php b/web/views/archive.php
index 2f6980eea..352849ee9 100644
--- a/web/views/archive.php
+++ b/web/views/archive.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder file view file, $Date: 2008-09-29 14:15:13 +0100 (Mon, 29 Sep 2008) $, $Revision: 2640 $
+// ZoneMinder file view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -23,11 +23,13 @@ if ( !canView('Events') ) {
   return;
 }
 
-$archivetype = $_REQUEST['type'];
-$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
+$archivetype = isset($_REQUEST['type']) ? $_REQUEST['type'] : '';
+if ( !$archivetype ) {
+  ZM\Error('No archive type given to archive.php. Please specify a tar or zip archive.');
+  return;
+}
 
-if ( $archivetype ) {
-  switch ($archivetype) {
+switch ($archivetype) {
   case 'tar.gz':
     $mimetype = 'gzip';
     $file_ext = 'tar.gz';
@@ -43,29 +45,29 @@ if ( $archivetype ) {
   default:
     $mimetype = NULL;
     $file_ext = NULL;
-  }
-
-  if ( $mimetype ) {
-    $filename = "zmExport_$connkey.$file_ext";
-    $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
-    ZM\Logger::Debug("downloading archive from $filename_path");
-    if ( is_readable($filename_path) ) {
-      header("Content-type: application/$mimetype" );
-      header("Content-Disposition: inline; filename=$filename");
-      header('Content-Length: ' . filesize($filename_path) );
-      set_time_limit(0);
-      if ( ! @readfile($filename_path) ) {
-        ZM\Error("Error sending $filename_path");
-      }
-    } else {
-      ZM\Error("$filename_path does not exist or is not readable.");
-    }
-  } else {
-    ZM\Error("Unsupported archive type specified. Supported archives are tar and zip");
-  }
-} else {
-  ZM\Error("No archive type given to archive.php. Please specify a tar or zip archive.");
 }
 
-?>
+if ( !$mimetype ) {
+  ZM\Error('Unsupported archive type specified. Supported archives are tar and zip');
+  return;
+}
 
+$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
+$filename = "zmExport_$connkey.$file_ext";
+$filename_path = ZM_DIR_EXPORTS.'/'.$filename;
+ZM\Logger::Debug("downloading archive from $filename_path");
+if ( is_readable($filename_path) ) {
+  while (ob_get_level()) {
+    ob_end_clean();
+  }
+  header("Content-type: application/$mimetype");
+  header("Content-Disposition: inline; filename=$filename");
+  header('Content-Length: '.filesize($filename_path));
+  set_time_limit(0);
+  if ( !@readfile($filename_path) ) {
+    ZM\Error("Error sending $filename_path");
+  }
+} else {
+  ZM\Error($filename_path.' does not exist or is not readable.');
+}
+?>
diff --git a/web/views/image.php b/web/views/image.php
index 5959982d8..ff26682c7 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -57,6 +57,7 @@ $filename = '';
 $Frame = null;
 $Event = null;
 $path = null;
+$media_type='image/jpeg';
 
 if ( empty($_REQUEST['path']) ) {
 
@@ -69,7 +70,6 @@ if ( empty($_REQUEST['path']) ) {
   }
 
   if ( !empty($_REQUEST['eid']) ) {
-    ZM\Logger::Debug("Loading by eid");
     $Event = ZM\Event::find_one(array('Id'=>$_REQUEST['eid']));
     if ( !$Event ) {
       header('HTTP/1.0 404 Not Found');
@@ -78,6 +78,47 @@ if ( empty($_REQUEST['path']) ) {
     }
 
     if ( $_REQUEST['fid'] == 'objdetect' ) {
+        // if animation file is found, return that, else return image
+        // we are only looking for GIF or jpg here, not mp4
+        // as most often, browsers asking for this link will be expecting
+        // media types that can be rendered as <img src=>
+        $path_anim_gif = $Event->Path().'/objdetect.gif';
+        $path_image = $Event->Path().'/objdetect.jpg';
+        if (file_exists($path_anim_gif)) {
+          // we found the animation gif file
+          $media_type = 'image/gif';
+          ZM\Logger::Debug("Animation file found at $path");
+          $path = $path_anim_gif;
+        } else if (file_exists($path_image)) {
+            // animation not found, but image found
+            ZM\Logger::Debug("Image file found at $path");
+            $path = $path_image;
+        } else {
+            // neither animation nor image found
+            header('HTTP/1.0 404 Not Found');
+            ZM\Fatal("Object detection animation and image not found for this event");  
+        }
+        $Frame = new ZM\Frame();
+        $Frame->Id('objdetect');
+      } else if ( $_REQUEST['fid'] == 'objdetect_mp4' ) {
+        $path = $Event->Path().'/objdetect.mp4';
+        if ( !file_exists($path) ) {
+          header('HTTP/1.0 404 Not Found');
+          ZM\Fatal("File $path does not exist. You might not have enabled create_animation in objectconfig.ini. If you have, inspect debug logs for errors during creation");
+          }
+        $Frame = new ZM\Frame();
+        $Frame->Id('objdetect');
+        $media_type = 'video/mp4';
+      } else if ( $_REQUEST['fid'] == 'objdetect_gif' ) {
+        $path = $Event->Path().'/objdetect.gif';
+        if ( !file_exists($path) ) {
+          header('HTTP/1.0 404 Not Found');
+          ZM\Fatal("File $path does not exist. You might not have enabled create_animation in objectconfig.ini. If you have, inspect debug logs for errors during creation");
+      }
+      $Frame = new ZM\Frame();
+      $Frame->Id('objdetect');
+      $media_type = 'image/gif';
+    } else if ( $_REQUEST['fid'] == 'objdetect_jpg' ) {
       $path = $Event->Path().'/objdetect.jpg';
       if ( !file_exists($path) ) {
         header('HTTP/1.0 404 Not Found');
@@ -86,47 +127,66 @@ if ( empty($_REQUEST['path']) ) {
       $Frame = new ZM\Frame();
       $Frame->Id('objdetect');
     } else if ( $_REQUEST['fid'] == 'alarm' ) {
-      # look for first alarmed frame
-      $Frame = ZM\Frame::find_one(
-        array('EventId'=>$_REQUEST['eid'], 'Type'=>'Alarm'),
-        array('order'=>'FrameId ASC'));
-      if ( !$Frame ) { # no alarms, get first one I find
-        $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid']));
-        if ( !$Frame ) { 
-          ZM\Warning('No frame found for event '.$_REQUEST['eid']);
-          $Frame = new ZM\Frame();
-          $Frame->Delta(1);
-          $Frame->FrameId(1);
+      $path = $Event->Path().'/alarm.jpg';
+      if ( !file_exists($path) ) {
+        # legacy support
+        # look for first alarmed frame
+        $Frame = ZM\Frame::find_one(
+          array('EventId'=>$_REQUEST['eid'], 'Type'=>'Alarm'),
+          array('order'=>'FrameId ASC'));
+        if ( !$Frame ) { # no alarms, get first one I find
+          $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid']));
+          if ( !$Frame ) { 
+            ZM\Warning('No frame found for event '.$_REQUEST['eid']);
+            $Frame = new ZM\Frame();
+            $Frame->Delta(1);
+            $Frame->FrameId(1);
+          }
+        }
+        $Monitor = $Event->Monitor();
+        if ( $Event->SaveJPEGs() & 1 ) {
+          # If we store Frames as jpgs, then we don't store an alarmed snapshot
+          $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
+        } else {
+          header('HTTP/1.0 404 Not Found');
+          ZM\Fatal('No alarm jpg found for event '.$_REQUEST['eid']);
+          return;
         }
-      }
-      $Monitor = $Event->Monitor();
-      if ( $Monitor->SaveJPEGs() & 1 ) {
-        # If we store Frames as jpgs, then we don't store an alarmed snapshot
-        $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
       } else {
-        $path = $Event->Path().'/alarm.jpg';
-      }
-    } else if ( $_REQUEST['fid'] == 'snapshot' ) {
-      $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid'], 'Score'=>$Event->MaxScore()));
-      if ( !$Frame )
-        $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid']));
-      if ( !$Frame ) {
-        ZM\Warning('No frame found for event ' . $_REQUEST['eid']);
         $Frame = new ZM\Frame();
         $Frame->Delta(1);
-        if ( $Monitor->SaveJPEGs() & 1 ) {
-          $Frame->FrameId(0);
-        } else {
-          $Frame->FrameId('snapshot');
+        $Frame->FrameId('alarm');
+      } # alarm.jpg found
+    } else if ( $_REQUEST['fid'] == 'snapshot' ) {
+      $path = $Event->Path().'/snapshot.jpg';
+      if ( !file_exists($path) ) {
+        $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid'], 'Score'=>$Event->MaxScore()));
+        if ( !$Frame )
+          $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid']));
+        if ( !$Frame ) {
+          ZM\Warning('No frame found for event ' . $_REQUEST['eid']);
+          $Frame = new ZM\Frame();
+          $Frame->Delta(1);
+          if ( $Event->SaveJPEGs() & 1 ) {
+            $Frame->FrameId(0);
+          } else {
+            $Frame->FrameId('snapshot');
+          }
         }
-      }
-      $Monitor = $Event->Monitor();
-      if ( $Monitor->SaveJPEGs() & 1 ) {
-        # If we store Frames as jpgs, then we don't store a snapshot
-        $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
+        $Monitor = $Event->Monitor();
+        if ( $Event->SaveJPEGs() & 1 ) {
+          # If we store Frames as jpgs, then we don't store a snapshot
+          $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
+        } else {
+          header('HTTP/1.0 404 Not Found');
+          ZM\Fatal('No alarm jpg found for event '.$_REQUEST['eid']);
+          return;
+        } # end if stored jpgs
       } else {
-        $path = $Event->Path().'/snapshot.jpg';
-      }
+        $Frame = new ZM\Frame();
+        $Frame->Delta(1);
+        $Frame->FrameId('snapshot');
+      } # end if found snapshot.jpg
     } else {
 
       $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid'], 'FrameId'=>$_REQUEST['fid']));
@@ -182,7 +242,7 @@ if ( empty($_REQUEST['path']) ) {
         header('HTTP/1.0 404 Not Found');
         ZM\Fatal("Can't create frame images from video because there is no video file for this event at (".$Event->Path().'/'.$Event->DefaultVideo() );
       }
-      $command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path;
+      $command = ZM_PATH_FFMPEG.' -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path;
       #$command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
 #$command ='ffmpeg -v 0 -i '.$Storage->Path().'/'.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
       ZM\Logger::Debug("Running $command");
@@ -192,7 +252,7 @@ if ( empty($_REQUEST['path']) ) {
       ZM\Logger::Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
       if ( ! file_exists( $path ) ) {
         header('HTTP/1.0 404 Not Found');
-        ZM\Fatal("Can't create frame images from video for this event (".$Event->DefaultVideo() );
+        ZM\Fatal('Can\'t create frame images from video for this event '.$Event->DefaultVideo() );
       }
       # Generating an image file will use up more disk space, so update the Event record.
       $Event->DiskSpace(null);
@@ -244,7 +304,6 @@ if ( !empty($_REQUEST['scale']) ) {
 
 $width = 0;
 if ( !empty($_REQUEST['width']) ) {
-ZM\Logger::Debug("Setting width: " . $_REQUEST['width']);
   if ( is_numeric($_REQUEST['width']) ) {
     $x = $_REQUEST['width'];
     if ( $x >= 10 and $x <= 8000 )
@@ -264,7 +323,7 @@ if ( !empty($_REQUEST['height']) ) {
 if ( $errorText ) {
   ZM\Error($errorText);
 } else {
-  header('Content-type: image/jpeg');
+  header("Content-type: $media_type");
   if ( ( $scale==0 || $scale==100 ) && ($width==0) && ($height==0) ) {
     # This is so that Save Image As give a useful filename
     if ( $Event ) {
diff --git a/web/views/no_database_connection.php b/web/views/no_database_connection.php
new file mode 100644
index 000000000..c9b5d9a54
--- /dev/null
+++ b/web/views/no_database_connection.php
@@ -0,0 +1,65 @@
+<?php
+//
+// ZoneMinder web error view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+  <div id="page">
+    <div id="header">
+      <h1>ZoneMinder Error</h1>
+    </div>
+    <div id="content">
+      <p class="error">
+<?php 
+global $error_message;
+echo $error_message;
+?>
+      </p>
+      <p>ZoneMinder will retry connection in <span id="countdown">30</span> seconds.</p>
+      <p>
+        <button id="reloadButton" type="button">Reload</button>
+      </p>
+    </div>
+  </div>
+  <script>
+    document.getElementById('reloadButton').addEventListener("click", function() {
+      location.reload();
+    });
+
+    var countdown = 30; // seconds
+    function timerCountdown() {
+      console.log('hello');
+      document.getElementById('countdown').innerHTML=countdown;
+      countdown --;
+      if ( countdown <= 0 ) {
+        location.reload();
+      } else {
+        setTimeout(timerCountdown, 1000);
+      }
+    }
+    setTimeout(timerCountdown, 1000);
+  </script>
+</body>
+</html>
diff --git a/web/views/view_video.php b/web/views/view_video.php
index 011343dc3..56837a5ba 100644
--- a/web/views/view_video.php
+++ b/web/views/view_video.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web video view file, $Date: 2008-09-29 14:15:13 +0100 (Mon, 29 Sep 2008) $, $Revision: 2640 $
+// ZoneMinder web video view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -30,6 +30,8 @@ if ( !canView('Events') ) {
   return;
 }
 
+# in index.php we do ob_end_start but there can be no output before view_video and we often don't have enough ram to buffer the content.
+ob_end_clean();
 require_once('includes/Event.php');
 
 $errorText = false;
@@ -40,11 +42,9 @@ $Event = null;
 if ( ! empty($_REQUEST['eid']) ) {
   $Event = new ZM\Event($_REQUEST['eid']);
   $path = $Event->Path().'/'.$Event->DefaultVideo();
-	ZM\Logger::Debug("Path: $path");
 } else if ( ! empty($_REQUEST['event_id']) ) {
   $Event = new ZM\Event($_REQUEST['event_id']);
   $path = $Event->Path().'/'.$Event->DefaultVideo();
-	ZM\Logger::Debug("Path: $path");
 } else {
   $errorText = 'No video path';
 }
@@ -55,23 +55,21 @@ if ( $errorText ) {
   die();
 } 
 
-$size = filesize($path);
-
-$fh = @fopen($path,'rb');
-if ( ! $fh ) {
+if ( ! ($fh = @fopen($path,'rb') ) ) {
   header('HTTP/1.0 404 Not Found');
   die();
 }
 
+$size = filesize($path);
 $begin = 0;
 $end = $size-1;
 $length = $size;
 
 if ( isset($_SERVER['HTTP_RANGE']) ) {
-  ZM\Logger::Debug('Using Range ' . $_SERVER['HTTP_RANGE']);
+  ZM\Logger::Debug('Using Range '.$_SERVER['HTTP_RANGE']);
   if ( preg_match('/bytes=\h*(\d+)-(\d*)[\D.*]?/i', $_SERVER['HTTP_RANGE'], $matches) ) {
     $begin = intval($matches[1]);
-    if ( ! empty($matches[2]) ) {
+    if ( !empty($matches[2]) ) {
       $end = intval($matches[2]);
     }
     $length = $end - $begin + 1;
@@ -103,10 +101,10 @@ flush();
 $cur = $begin;
 fseek($fh, $begin, 0);
 
-while( $length && ( !feof($fh) ) && ( connection_status() == 0 ) ) {
+while ( $length && ( !feof($fh) ) && ( connection_status() == 0 ) ) {
   $amount = min(1024*16, $length);
 
-  print fread( $fh, $amount );
+  print fread($fh, $amount);
   $length -= $amount;
   # Why introduce a speed limit?
   #usleep(100);
diff --git a/zmconfgen.pl.in b/zmconfgen.pl.in
index cbffa1e6d..d3f165651 100644
--- a/zmconfgen.pl.in
+++ b/zmconfgen.pl.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL_EXECUTABLE@ -w
 #
 # ==========================================================================
 #
@@ -25,13 +25,13 @@
 #
 
 use strict;
-use lib './scripts/ZoneMinder/lib';
+use lib '@CMAKE_CURRENT_BINARY_DIR@/scripts/ZoneMinder/lib';
 use ZoneMinder::ConfigData qw/:data/;
 
 $| = 1;
 
-my $config_header = "src/zm_config_defines.h";
-my $config_sql = "db/zm_create.sql";
+my $config_header = '@CMAKE_CURRENT_BINARY_DIR@/src/zm_config_defines.h';
+my $config_sql = '@CMAKE_CURRENT_BINARY_DIR@/db/zm_create.sql';
 
 generateConfigFiles();
 
@@ -43,148 +43,125 @@ sub generateConfigFiles
 	generateConfigSQL();
 }
 
-sub generateConfigHeader
-{
-	print( "Generating '$config_header'\n" );
-	open( CFG_HDR_FILE, ">$config_header" ) or die( "Can't open '$config_header' for writing" );
-	print( CFG_HDR_FILE "// The file is autogenerated by zmconfgen.pl\n" );
-	print( CFG_HDR_FILE "// Do not edit this file as any changes will be overwritten\n\n" );
+sub generateConfigHeader {
+	print("Generating '$config_header'\n");
+	open(CFG_HDR_FILE, '>'.$config_header) or die("Can't open '$config_header' for writing");
+	print(CFG_HDR_FILE "// The file is autogenerated by zmconfgen.pl\n");
+	print(CFG_HDR_FILE "// Do not edit this file as any changes will be overwritten\n\n");
 	my $last_id = 0;
-	my $define_list = "";
-	my $declare_list = "";
-	my $assign_list = "";
-	foreach my $option ( @options )
-	{
-		next if ( !defined($option->{id}) );
+	my $define_list = '';
+	my $declare_list = '';
+	my $assign_list = '';
+	foreach my $option ( @options ) {
+		next if !defined($option->{id});
 
-		my $opt_id = $option->{id};
-		my $opt_name = $option->{name};
-		my $opt_type = $option->{type};
-		my $var_name = substr( lc($opt_name), 3 );
+    # If only used in ui, then don't include it in C++ config defines
+    next if $option->{processes} and ($option->{processes} ne 'web');
 
-		$define_list .= sprintf( "#define $opt_name $opt_id\n" );
+    my $opt_id = $option->{id};
+    my $opt_name = $option->{name};
+    my $opt_type = $option->{type};
+    my $var_name = substr( lc($opt_name), 3 );
 
-		$declare_list .= sprintf( "\t" );
-		if ( $opt_type->{db_type} eq 'boolean' )
-		{
-			$declare_list .= sprintf( "bool " );
-		}
-		elsif ( $opt_type->{db_type} eq 'integer' || $opt_type->{db_type} eq 'hexadecimal' )
-		{
-			$declare_list .= sprintf( "int " );
-		}
-		elsif ( $opt_type->{db_type} eq 'decimal' )
-		{
-			$declare_list .= sprintf( "double " );
-		}
-		else
-		{
-			$declare_list .= sprintf( "const char *" );
-		}
-		$declare_list .= sprintf( $var_name.";\\\n" );
+    $define_list .= "#define $opt_name $opt_id\n";
 
-		$assign_list .= sprintf( "\t" );
-		$assign_list .= sprintf( $var_name." = " );
-		if ( $opt_type->{db_type} eq 'boolean' )
-		{
-			$assign_list .= sprintf( "(bool)" );
-		}
-		elsif ( $opt_type->{db_type} eq 'integer' || $opt_type->{db_type} eq 'hexadecimal' )
-		{
-			$assign_list .= sprintf( "(int)" );
-		}
-		elsif ( $opt_type->{db_type} eq 'decimal' )
-		{
-			$assign_list .= sprintf( "(double) " );
-		}
-		else
-		{
-			$assign_list .= sprintf( "(const char *)" );
-		}
-		$assign_list .= sprintf( "config.Item( ".$opt_name." );\\\n" );
+    $declare_list .= "\t";
+    if ( $opt_type->{db_type} eq 'boolean' ) {
+      $declare_list .= 'bool ';
+    } elsif ( $opt_type->{db_type} eq 'integer' || $opt_type->{db_type} eq 'hexadecimal' ) {
+      $declare_list .= 'int ';
+    } elsif ( $opt_type->{db_type} eq 'decimal' ) {
+      $declare_list .= 'double ';
+    } else {
+      $declare_list .= 'const char *';
+    }
+    $declare_list .= $var_name.";\\\n";
 
-		$last_id = $option->{id};
-	}
-	print( CFG_HDR_FILE $define_list."\n\n" );
-	print( CFG_HDR_FILE "#define ZM_MAX_CFG_ID $last_id\n\n" );
-	print( CFG_HDR_FILE "#define ZM_CFG_DECLARE_LIST \\\n" );
-	print( CFG_HDR_FILE $declare_list."\n\n" );
-	print( CFG_HDR_FILE "#define ZM_CFG_ASSIGN_LIST \\\n" );
-	print( CFG_HDR_FILE $assign_list."\n\n" );
-	close( CFG_HDR_FILE );
+    $assign_list .= "\t";
+    $assign_list .= $var_name.' = ';
+    if ( $opt_type->{db_type} eq 'boolean' ) {
+      $assign_list .= '(bool)';
+    } elsif ( $opt_type->{db_type} eq 'integer' || $opt_type->{db_type} eq 'hexadecimal' ) {
+      $assign_list .= '(int)';
+    } elsif ( $opt_type->{db_type} eq 'decimal' ) {
+      $assign_list .= '(double) ';
+    } else {
+      $assign_list .= '(const char *)';
+    }
+    $assign_list .= 'config.Item('.$opt_name.");\\\n";
+
+    $last_id = $option->{id};
+  } # end foreach option
+  print( CFG_HDR_FILE $define_list."\n\n" );
+  print( CFG_HDR_FILE "#define ZM_MAX_CFG_ID $last_id\n\n" );
+  print( CFG_HDR_FILE "#define ZM_CFG_DECLARE_LIST \\\n" );
+  print( CFG_HDR_FILE $declare_list."\n\n" );
+  print( CFG_HDR_FILE "#define ZM_CFG_ASSIGN_LIST \\\n" );
+  print( CFG_HDR_FILE $assign_list."\n\n" );
+  close( CFG_HDR_FILE );
 }
 
-sub generateConfigSQL
-{
-	print( "Updating '$config_sql'\n" );
-	my $config_sql_temp = $config_sql.".temp";
-	open( CFG_SQL_FILE, "<$config_sql" ) or die( "Can't open '$config_sql' for reading" );
-	open( CFG_TEMP_SQL_FILE, ">$config_sql_temp" ) or die( "Can't open '$config_sql_temp' for writing" );
-	while ( my $line = <CFG_SQL_FILE> )
-	{
-		last if ( $line =~ /^-- This section is autogenerated/ );
-		print( CFG_TEMP_SQL_FILE $line );
-	}
-	close( CFG_SQL_FILE );
+sub generateConfigSQL {
+  print("Updating '$config_sql'\n");
+  my $config_sql_temp = $config_sql.'.temp';
+  open(CFG_SQL_FILE, '<'.$config_sql) or die("Can't open '$config_sql' for reading");
+  open(CFG_TEMP_SQL_FILE, '>'.$config_sql_temp) or die("Can't open '$config_sql_temp' for writing");
+  while ( my $line = <CFG_SQL_FILE> ) {
+    last if ( $line =~ /^-- This section is autogenerated/ );
+    print(CFG_TEMP_SQL_FILE $line);
+  }
+  close(CFG_SQL_FILE);
 
-	print( CFG_TEMP_SQL_FILE "-- This section is autogenerated by zmconfgen.pl\n" );
-	print( CFG_TEMP_SQL_FILE "-- Do not edit this file as any changes will be overwritten\n" );
-	print( CFG_TEMP_SQL_FILE "--\n\n" );
-	print( CFG_TEMP_SQL_FILE "delete from Config;\n\n" );
-	foreach my $option ( @options )
-	{
-		#print( $option->{name}."\n" ) if ( !$option->{category} );
-		$option->{db_type} = $option->{type}->{db_type};
-		$option->{db_hint} = $option->{type}->{hint};
-		$option->{db_pattern} = $option->{type}->{pattern};
-		$option->{db_format} = $option->{type}->{format};
-		if ( $option->{db_type} eq "boolean" )
-		{
-			$option->{db_value} = ($option->{value} eq "yes")?"1":"0";
-		}
-		else
-		{
-			$option->{db_value} = $option->{value};
-		}
-        if ( $option->{name} eq "ZM_DYN_CURR_VERSION" || $option->{name} eq "ZM_DYN_DB_VERSION" )
-        {
-            $option->{db_value} = '@VERSION@';
-        }
-		if ( my $requires = $option->{requires} )
-		{
-			$option->{db_requires} = join( ";", map { my $value = $_->{value}; $value = ($value eq "yes")?1:0 if ( $options_hash{$_->{name}}->{db_type} eq "boolean" ); ( "$_->{name}=$value" ) } @$requires );
-		}
-		else
-		{
-			$option->{db_requires} = "";
-		}
-		printf( CFG_TEMP_SQL_FILE
-			"insert into Config set Id = %d, Name = '%s', Value = '%s', Type = '%s', DefaultValue = '%s', Hint = '%s', Pattern = '%s', Format = '%s', Prompt = '%s', Help = '%s', Category = '%s', Readonly = '%s', Requires = '%s';\n",
-			$option->{id},
-			$option->{name},
-			addSlashes($option->{db_value}),
-			$option->{db_type},
-			addSlashes($option->{default}),
-			addSlashes($option->{db_hint}),
-			addSlashes($option->{db_pattern}),
-			addSlashes($option->{db_format}),
-			addSlashes($option->{description}),
-			addSlashes($option->{help}),
-			$option->{category},
-			$option->{readonly}?1:0,
-			$option->{db_requires}
-		);
-	}
-	print( CFG_TEMP_SQL_FILE "\n" );
-	close( CFG_TEMP_SQL_FILE );
+  print( CFG_TEMP_SQL_FILE "-- This section is autogenerated by zmconfgen.pl\n" );
+  print( CFG_TEMP_SQL_FILE "-- Do not edit this file as any changes will be overwritten\n" );
+  print( CFG_TEMP_SQL_FILE "--\n\n" );
+  print( CFG_TEMP_SQL_FILE "delete from Config;\n\n" );
+  foreach my $option ( @options ) {
+    #print( $option->{name}."\n" ) if ( !$option->{category} );
+    $option->{db_type} = $option->{type}->{db_type};
+    $option->{db_hint} = $option->{type}->{hint};
+    $option->{db_pattern} = $option->{type}->{pattern};
+    $option->{db_format} = $option->{type}->{format};
+    my %processes = map { $_ => $_ } split(',', $option->{processes}) if $option->{processes};
+    if ( $option->{db_type} eq 'boolean' ) {
+      $option->{db_value} = ($option->{value} eq 'yes') ? '1' : '0';
+    } else {
+      $option->{db_value} = $option->{value};
+    }
+    if ( $option->{name} eq 'ZM_DYN_CURR_VERSION' || $option->{name} eq 'ZM_DYN_DB_VERSION' ) {
+      $option->{db_value} = '@VERSION@';
+    }
+    if ( my $requires = $option->{requires} ) {
+      $option->{db_requires} = join(';', map { my $value = $_->{value}; $value = ($value eq 'yes')?1:0 if ( $options_hash{$_->{name}}->{db_type} eq 'boolean' ); ( "$_->{name}=$value" ) } @$requires );
+    } else {
+      $option->{db_requires} = '';
+    }
+    printf( CFG_TEMP_SQL_FILE
+      "INSERT INTO Config SET Id = %d, Name = '%s', Value = '%s', Type = '%s', DefaultValue = '%s', Hint = '%s', Pattern = '%s', Format = '%s', Prompt = '%s', Help = '%s', Category = '%s', Readonly = '%s', Requires = '%s';\n",
+      $option->{id},
+      $option->{name},
+      addSlashes($option->{db_value}),
+      $option->{db_type},
+      addSlashes($option->{default}),
+      addSlashes($option->{db_hint}),
+      addSlashes($option->{db_pattern}),
+      addSlashes($option->{db_format}),
+      addSlashes($option->{description}),
+      addSlashes($option->{help}),
+      $option->{category},
+      $option->{readonly}?1:0,
+      $option->{db_requires}
+    );
+  } # end foreach option
+  print(CFG_TEMP_SQL_FILE "\n");
+  close(CFG_TEMP_SQL_FILE);
 
-	rename( $config_sql_temp, $config_sql ) or die( "Can't rename '$config_sql_temp' to '$config_sql': $!" );
+  rename( $config_sql_temp, $config_sql ) or die( "Can't rename '$config_sql_temp' to '$config_sql': $!" );
 }
 
-sub addSlashes
-{
-	my $string = shift;
-    return( "" ) if ( !defined($string) );
-	$string =~ s|(['"])|\\$1|g;
-	return( $string );
+sub addSlashes {
+  my $string = shift;
+  return '' if !defined($string);
+  $string =~ s|(['"])|\\$1|g;
+  return $string;
 }
diff --git a/zoneminder-config.cmake b/zoneminder-config.cmake
index 46cf28d46..edcb42ff6 100644
--- a/zoneminder-config.cmake
+++ b/zoneminder-config.cmake
@@ -38,7 +38,6 @@
 #cmakedefine HAVE_LIBGCRYPT 1
 #cmakedefine HAVE_GCRYPT_H 1
 #cmakedefine HAVE_LIBGNUTLS 1
-#cmakedefine HAVE_GNUTLS_OPENSSL_H 1
 #cmakedefine HAVE_GNUTLS_GNUTLS_H 1
 #cmakedefine HAVE_LIBMYSQLCLIENT 1
 #cmakedefine HAVE_MYSQL_H 1
@@ -60,12 +59,15 @@
 #cmakedefine HAVE_LIBAVRESAMPLE_AVRESAMPLE_H 1
 #cmakedefine HAVE_LIBVLC 1
 #cmakedefine HAVE_VLC_VLC_H 1
+#cmakedefine HAVE_LIBVNC 1
+#cmakedefine HAVE_RFB_RFB_H 1
 #cmakedefine HAVE_LIBX264 1
 #cmakedefine HAVE_X264_H 1
 #cmakedefine HAVE_LIBMP4V2 1
 #cmakedefine HAVE_MP4_H 1
 #cmakedefine HAVE_MP4V2_H 1
 #cmakedefine HAVE_MP4V2_MP4V2_H 1
+#cmakedefine HAVE_LIBJWT 1
 
 /* Authenication checks */
 #cmakedefine HAVE_MD5_OPENSSL 1